Commit b9e52b1f authored by Atsuhito Kohda's avatar Atsuhito Kohda Committed by Axel Beckert

Imported Debian patch 2.8.6-18

parent cf61312d
Changes since Lynx 2.8 release
===============================================================================
2005-12-18 (2.8.6dev.16)
* change configure option default for --enable-justify-elts to true -TD
* change default for JUSTIFY to "false" (suggested by Bela Lubkin) -TD
* update config.guess (2005-11-11) and config.sub (2005-11-13)
* print the contents of image maps, if any, at the end of a dump (Debian
#335593) -TD
* fix off-by-one line calculation that allowed the last page to be blank
(Debian #330413) -TD
* modify statusline() to retain one trailing blank if the given string has a
trailing blank. This makes prompts easier to read (report by Karl-Heinz
Weirich) -TD
* modify pipe read in LYGetHostByName() to retry until either the pipe closes
or the struct passed back from the child process completes. This is needed
for OS/2 EMX (report by Karl-Heinz Weirich) -TD
* strip unneeded " " from translation when building info page using
wide curses (Debian #342877) -TD
* add scripts/tbl2html.pl, which can be used to generate test pages for the
charsets from src/chrtrans/*.tbl -TD
* add ISO-8859-13 and ISO-8859-14 chrtrans tables, revise ISO-8859-10
based on
http://czyborra.com/charsets/iso8859.html
Change display name for ISO-8859-10 to indicate the region -TD
* add codepage 857 (DOSTurkish), since console-tools package provides a
suitable font -TD
* improve UCSetBoxChars(), checking if the current character set does not
match the character set inferred from the locale. This reduces the number
of cases where line-drawing in the options menu does not work -TD
* rename test/iso8859-1.html and test/iso88592.html to test/iso-8859-1.html
and test/isoi-8859-2.html, corresponding to the proper MIME names to
simplify test-scripts -TD
* update Linux console font support to use console-tools package (tested on
Debian). The configure script checks for consolechars and setfont programs
(must find at least one). The corresponding SETFONT_PATH can be set in
lynx.cfg to provide a choice between the two -TD
* strip special characters such as '%' from parameters passed to external
programs for EXTERNAL mechanism on Windows platform. This is ifdef'd
with WIN_EX (Takeshi Hataguchi).
* modify definition of addch_raw() to allow scrollbar to work with slang2
(this only works on the Windows platform) -GV
* modify LYSysShell() to use $COMSPEC if $SHELL is not defined -GV
* workaround for codepage support on OS/2 by changing the effect of unctrl().
Add/use new preferred function use_legacy_coding() to ncurses which provides
the same effect with the wide-character ncursesw (report by Karl-Heinz
Weirich) -TD
* fixes for de.po (Debian #313789, patch by Jens Seidel).
* add a null pointer check for HTCurSelectedOptionValue in HText_setLastOptionValue()
to improve handling of this fragment:
<FORM><SELECT><OPTION><FORM><SELECT>
(Alexey Dobriyan).
* add a null pointer check in HTML_TAB case of HTML_start_element() to handle
this fragment:
<TAB INDENT=1 TO>
(Alexey Dobriyan).
* remove pointer to
http://www.moxienet.com/lynx/
since it no longer has useful information about SSL for Lynx (Crouton).
* add description of configure --with-build-cc, etc., to INSTALLATION -TD
* modify Switch_Display_Charset() so the font-switching feature can be turned
off at runtime, rather than silently re-enabling it every time a new page is
viewed. The automatic switching is enabled if the user has configured lynx
to use one of the automatically-detected fonts -TD
* fix ifdef's to allow building --without-font-switch with OS/2 EMX -TD
* work around bug in PDCurses wrapping by adjusting LYcolLimit macro. The
dev.14 change to HText_appendCharacter() exposed this bug in the Options menu
(report by Hataguchi Takeshi) -TD
* fix change to lynx_default_colors() from dev.14 change to work with the
bright-blue.lss file (report by FLWM) -TD
* add a configure test for ctermid(), needed for OS/2 EMX (report by
YANAGIHARA Nobuyuki) -TD
2005-10-30 (2.8.6dev.15)
* update URL for VMS server information in LYCgi.c
* modify LYLoadCGI() to prompt user, displaying the command that would be
......@@ -183,7 +253,7 @@ Changes since Lynx 2.8 release
* remove fixed limit on history[] array (report by Richard Eyre) -TD
* improve logic for highlighting links which extend to multiple lines by
ensuring that if they cover a blank line that the following lines of the
link will be highlighted rather than the blank line (report Hataguchi
link will be highlighted rather than the blank line (report by Hataguchi
Takeshi).
* replace most instances of exit() by exit_immediately(), except those needed
for the leak-checking code, to add an ifdef'd call to _nc_freeall() which
......
......@@ -251,17 +251,14 @@ II. Compile instructions -- UNIX
--disable-finger (define DISABLE_FINGER)
Do not compile-in code used to connect to "finger" URLs.
--disable-ftp (define DISABLE_FTP)
Do not compile-in code used to connect to FTP servers.
--disable-forms-options (define NO_OPTION_FORMS)
Disable the Form-based Options Menu (see --disable-menu-options).
The default is to compile key-based & form-based Options Menu code,
allowing users the final choice via FORMS_OPTIONS in lynx.cfg
or the -forms_options command-line switch.
--disable-gopher (define DISABLE_GOPHER)
Do not compile-in code used to connect to GOPHER servers.
--disable-ftp (define DISABLE_FTP)
Do not compile-in code used to connect to FTP servers.
--disable-full-paths
Use this option to control whether full pathnames are compiled in for
......@@ -280,11 +277,17 @@ II. Compile instructions -- UNIX
setenv TELNET /bin/false
--disable-gopher (define DISABLE_GOPHER)
Do not compile-in code used to connect to GOPHER servers.
--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
./po subdirectory.
--disable-justify-elts (define EXP_JUSTIFY_ELTS)
Do not use element-justification logic.
--disable-largefiles (prevent defining LONG_LIST)
Use this option to disable the compiler and linker options that
......@@ -340,14 +343,14 @@ II. Compile instructions -- UNIX
Compiles-in an alternative list-page, bound to 'A' rather than 'l',
which always lists URLs rather than titles.
--enable-change-exec (define ENABLE_OPTS_CHANGE_EXEC)
Allow users to change the execution status within the options screen.
See EXEC_LINKS and EXEC_SCRIPTS.
--enable-cgi-links (define LYNXCGI_LINKS)
Allows lynx to access a cgi script directly without the need for
a http daemon.
--enable-change-exec (define ENABLE_OPTS_CHANGE_EXEC)
Allow users to change the execution status within the options screen.
See EXEC_LINKS and EXEC_SCRIPTS.
--enable-charset-choice (define EXP_CHARSET_CHOICE)
Add logic for ASSUMED_DOC_CHARSET_CHOICE and DISPLAY_CHARSET_CHOICE in
lynx.cfg, allowing user to configure a subset of the compiled-in
......@@ -402,15 +405,6 @@ II. Compile instructions -- UNIX
generate an HTMLized copy of lynx.cfg which will be installed with
the other help files.
--enable-ipv6 (define ENABLE_IPV6)
use experimental IPV6 (with IPV4) logic.
--enable-japanese-utf8 (define EXP_JAPANESEUTF8_SUPPORT)
use experimental Japanese UTF-8 logic.
--enable-justify-elts (define EXP_JUSTIFY_ELTS)
use experimental element-justification logic.
--enable-internal-links (prevent defining DONT_TRACK_INTERNAL_LINKS)
With `internal links' (links within a document to a location within
the same document) enabled, Lynx will distinguish between, for example,
......@@ -423,6 +417,12 @@ II. Compile instructions -- UNIX
alternate opinion asserts that the feature could actually result in
inappropriate resubmission of form content.
--enable-ipv6 (define ENABLE_IPV6)
use experimental IPV6 (with IPV4) logic.
--enable-japanese-utf8 (define EXP_JAPANESEUTF8_SUPPORT)
use experimental Japanese UTF-8 logic.
--enable-kbd-layout (define EXP_KEYBOARD_LAYOUT)
Disabled by default, this option allows you to use translation
tables on the input keystrokes. Current tables include
......@@ -474,6 +474,14 @@ II. Compile instructions -- UNIX
support a configure script, such as MS-DOS, Win32 and VMS, you must
edit userdefs.h if you wish to specify the location of lynx.cfg).
--with-Xaw3d
This option allows you to specify the X libraries used if you
are configuring lynx to use PDCurses on a Unix platform.
--with-XawPlus
This option allows you to specify the X libraries used if you
are configuring lynx to use PDCurses on a Unix platform.
--with-charsets=list (define ALL_CHARSETS)
Limit the number of charsets that are compiled-in to the specified
list of comma-separated MIME names.
......@@ -507,6 +515,11 @@ II. Compile instructions -- UNIX
--with-libiconv-prefix=DIR
search for libiconv in DIR/include and DIR/lib
--with-neXtaw
This option allows you to specify the X libraries used if you
are configuring lynx to use PDCurses on a Unix platform.
--with-nls-datadir=DIR
Use this option to override the configure script's NLS data directory,
under which the locale (i.e., language) files are installed. The
......@@ -568,6 +581,34 @@ II. Compile instructions -- UNIX
or one level above. In either case, the corresponding header files
are assumed to be in the parallel "include" directory.
--with-build-cc=XXX
If cross-compiling, specify a host C compiler, which is needed to
compile a utility which generates tables for lynx.
If you do not give this option, the configure script checks if the
$BUILD_CC variable is set, and otherwise defaults to gcc or cc.
--with-build-cpp=XXX
This is unused by lynx.
--with-build-cflags=XXX
If cross-compiling, specify the host C compiler-flags. You might need
to do this if the target compiler has unusual flags which confuse the
host compiler.
--with-build-cppflags=XXX
If cross-compiling, specify the host C preprocessor-flags. You might
need to do this if the target compiler has unusual flags which confuse
the host compiler.
--with-build-ldflags=XXX
If cross-compiling, specify the host linker-flags. You might need to
do this if the target linker has unusual flags which confuse the host
compiler.
--with-build-libs=XXX
If cross-compiling, the host libraries. You might need to do this if
the target environment requires unusual libraries.
--with-bzlib (define USE_BZLIB)
Use libbz2 for decompression of some bzip2 files.
......
......@@ -2929,6 +2929,11 @@ void HTInitProgramPaths(void)
path = RMDIR_PATH;
break;
#endif
#ifdef SETFONT_PATH
case ppSETFONT:
path = SETFONT_PATH;
break;
#endif
#ifdef TAR_PATH
case ppTAR:
path = TAR_PATH;
......
......@@ -301,6 +301,7 @@ extern "C" {
,ppRLOGIN
,ppRM
,ppRMDIR
,ppSETFONT
,ppTAR
,ppTELNET
,ppTN3270
......
......@@ -1736,11 +1736,11 @@ void HTStartAnchor5(HTStructured * obj, const char *name,
present[HTML_A_NAME] = YES;
value[HTML_A_NAME] = name;
}
if (href) {
if (href && *href) {
present[HTML_A_HREF] = YES;
value[HTML_A_HREF] = href;
}
if (linktype) {
if (linktype && *linktype) {
present[HTML_A_TYPE] = YES;
value[HTML_A_TYPE] = linktype;
}
......
......@@ -608,6 +608,28 @@ extern int h_errno;
#endif
#endif
/*
* Even though it is a small amount, we cannot count on reading the whole
* struct via a pipe in one read -TD
*/
static unsigned readit(int fd, char *buffer, unsigned length)
{
unsigned result = 0;
while (length != 0) {
unsigned got = read(fd, buffer, length);
if (got != 0) {
result += got;
buffer += got;
length -= got;
} else {
break;
}
}
return result;
}
/* Resolve an internet hostname, like gethostbyname
* ------------------------------------------------
*
......@@ -883,6 +905,7 @@ LYNX_HOSTENT *LYGetHostByName(char *str)
* Return our resulting rehostent through pipe...
*/
write(pfd[1], rehostent, rehostentlen);
close(pfd[1]);
_exit(0);
} else {
/*
......@@ -952,7 +975,7 @@ LYNX_HOSTENT *LYGetHostByName(char *str)
/*
* First get status, including length of address. -BL, kw
*/
readret = read(pfd[0], &statuses, sizeof(statuses));
readret = readit(pfd[0], (char *) &statuses, sizeof(statuses));
if (readret == sizeof(statuses)) {
h_errno = statuses.child_h_errno;
set_errno(statuses.child_errno);
......@@ -997,7 +1020,7 @@ LYNX_HOSTENT *LYGetHostByName(char *str)
/*
* Then get the full reorganized hostent. -BL, kw
*/
readret = read(pfd[0], rehostent, statuses.rehostentlen);
readret = readit(pfd[0], rehostent, statuses.rehostentlen);
#ifdef DEBUG_HOSTENT
dump_hostent("Read from pipe", (LYNX_HOSTENT *) rehostent);
#endif
......
......@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
timestamp='2005-09-19'
timestamp='2005-11-11'
# 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
......@@ -214,11 +214,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
*4.0)
*4.0)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
;;
*5.*)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
*5.*)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
;;
esac
# According to Compaq, /usr/sbin/psrinfo has been available on
......@@ -290,7 +290,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo s390-ibm-zvmoe
exit ;;
*:OS400:*:*)
echo powerpc-ibm-os400
echo powerpc-ibm-os400
exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
......@@ -745,14 +745,14 @@ EOF
exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
5000:UNIX_System_V:4.*:*)
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
......@@ -773,13 +773,13 @@ EOF
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
# uname -m includes "-pc" on this system.
echo ${UNAME_MACHINE}-mingw32
# uname -m includes "-pc" on this system.
echo ${UNAME_MACHINE}-mingw32
exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
x86:Interix*:[34]*)
x86:Interix*:[345]*)
echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
......@@ -824,7 +824,7 @@ EOF
echo crisv32-axis-linux-gnu
exit ;;
frv:Linux:*:*)
echo frv-unknown-linux-gnu
echo frv-unknown-linux-gnu
exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
......@@ -874,8 +874,8 @@ EOF
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
echo or32-unknown-linux-gnu
exit ;;
echo or32-unknown-linux-gnu
exit ;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
exit ;;
......@@ -911,7 +911,7 @@ EOF
echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
......@@ -1024,7 +1024,7 @@ EOF
fi
exit ;;
i*86:*:5:[678]*)
# UnixWare 7.x, OpenUNIX and OpenServer 6.
# UnixWare 7.x, OpenUNIX and OpenServer 6.
case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
......@@ -1192,8 +1192,8 @@ EOF
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
if test "$UNAME_PROCESSOR" = "x86"; then
UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
fi
echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
exit ;;
......@@ -1245,13 +1245,13 @@ EOF
echo pdp10-unknown-its
exit ;;
SEI:*:*:SEIUX)
echo mips-sei-seiux${UNAME_RELEASE}
echo mips-sei-seiux${UNAME_RELEASE}
exit ;;
*:DragonFly:*:*)
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;;
*:*VMS:*:*)
UNAME_MACHINE=`(uname -p) 2>/dev/null`
UNAME_MACHINE=`(uname -p) 2>/dev/null`
case "${UNAME_MACHINE}" in
A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;;
......
......@@ -57,6 +57,7 @@
#undef HAVE_BSD_TOUCHLINE /* CF_CURS_TOUCHLINE */
#undef HAVE_CATGETS /* defined if you want to use non-GNU catgets */
#undef HAVE_CBREAK
#undef HAVE_CTERMID
#undef HAVE_CURSESX_H
#undef HAVE_CURSES_VERSION /* CF_FUNC_CURSES_VERSION */
#undef HAVE_CUSERID
......@@ -146,6 +147,7 @@
#undef HAVE_UNISTD_H /* have <unistd.h> */
#undef HAVE_UNSETENV
#undef HAVE_USE_DEFAULT_COLORS /* ncurses extension */
#undef HAVE_USE_LEGACY_CODING /* ncurses extension */
#undef HAVE_USLEEP
#undef HAVE_UTMP /* CF_UTMP */
#undef HAVE_UTMP_UT_HOST /* CF_UTMP_UT_HOST */
......@@ -200,6 +202,7 @@
#undef REAL_UNIX_SYSTEM /* CF_SLANG_UNIX_DEFS */
#undef RLOGIN_PATH /* CF_PATH_PROG(rlogin) */
#undef RM_PATH /* CF_PATH_PROG(rm) */
#undef SETFONT_PATH /* CF_PATH_PROG(setfont) */
#undef SOCKS /* CF_SOCKS, CF_SOCKS5 */
#undef STDC_HEADERS
#undef SYSTEM_MAIL /* CF_DEFINE_PROG */
......
......@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
timestamp='2005-07-08'
timestamp='2005-11-13'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
......@@ -171,6 +171,10 @@ case $os in
-hiux*)
os=-hiuxwe2
;;
-sco6)
os=-sco5v6
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco5)
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
......@@ -187,6 +191,10 @@ case $os in
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco5v6*)
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco*)
os=-sco3.2v2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
......@@ -291,8 +299,8 @@ case $basic_machine in
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
i*86 | x86_64)
basic_machine=$basic_machine-pc
;;
basic_machine=$basic_machine-pc
;;
# Object if more than one company name word.
*-*-*)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
......@@ -377,7 +385,7 @@ case $basic_machine in
basic_machine=a29k-amd
os=-udi
;;
abacus)
abacus)
basic_machine=abacus-unknown
;;
adobe68k)
......@@ -1145,8 +1153,8 @@ esac
if [ x"$os" != x"" ]
then
case $os in
# First match some system type aliases
# that might get confused with valid system types.
# First match some system type aliases
# that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
......@@ -1188,7 +1196,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku*)
| -skyos* | haiku*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
......@@ -1227,7 +1235,7 @@ case $os in
-opened*)
os=-openedition
;;
-os400*)
-os400*)
os=-os400
;;
-wince*)
......@@ -1276,7 +1284,7 @@ case $os in
-sinix*)
os=-sysv4
;;
-tpf*)
-tpf*)
os=-tpf
;;
-triton*)
......@@ -1349,9 +1357,9 @@ case $basic_machine in
arm*-semi)
os=-aout
;;
c4x-* | tic4x-*)
os=-coff
;;
c4x-* | tic4x-*)
os=-coff
;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
......@@ -1401,7 +1409,7 @@ case $basic_machine in
*-ibm)
os=-aix
;;
*-knuth)
*-knuth)
os=-mmixware
;;
*-wec)
......
This diff is collapsed.
......@@ -5,7 +5,7 @@ dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
dnl
dnl ask PRCS to plug-in the project-version for the configure-script.
dnl $Format: "AC_REVISION($ProjectVersion$)"$
AC_REVISION(2.8.6dev.15)
AC_REVISION(2.8.6dev.16)
# Save the original $CFLAGS so we can distinguish whether the user set those
# in the environment, or whether autoconf added -O and -g options:
......@@ -37,7 +37,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.6dev.15
VERSION=2.8.6dev.16
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
AC_SUBST(DESTDIR)
......@@ -572,6 +572,7 @@ CF_FIONBIO
CF_REMOVE_BROKEN
CF_FUNC_LSTAT
AC_CHECK_FUNCS( \
ctermid \
cuserid \
ftime \
getcwd \
......@@ -758,14 +759,6 @@ if test "$enableval" = "yes"; then
fi
dnl AC_REPLACE_FUNCS(getaddrinfo getnameinfo)
AC_MSG_CHECKING(if experimental element-justification logic should be used)
CF_ARG_ENABLE(justify-elts,
[ --enable-justify-elts use experimental element-justification logic],
[use_exp_justify_elts=$enableval],
[use_exp_justify_elts=no])
AC_MSG_RESULT($use_exp_justify_elts)
test $use_exp_justify_elts != no && AC_DEFINE(EXP_JUSTIFY_ELTS)
AC_MSG_CHECKING(if experimental keyboard-layout logic should be used)
CF_ARG_ENABLE(kbd-layout,
[ --enable-kbd-layout use experimental keyboard-layout support],
......@@ -836,6 +829,14 @@ CF_ARG_DISABLE(file-upload,
AC_MSG_RESULT($use_file_upload)
test $use_file_upload != no && AC_DEFINE(USE_FILE_UPLOAD)
AC_MSG_CHECKING(if element-justification logic should be used)
CF_ARG_DISABLE(justify-elts,
[ --enable-justify-elts use element-justification logic],
[use_justify_elts=$enableval],
[use_justify_elts=yes])
AC_MSG_RESULT($use_justify_elts)
test $use_justify_elts != no && AC_DEFINE(EXP_JUSTIFY_ELTS)
AC_MSG_CHECKING(if partial-display should be used)
CF_ARG_DISABLE(partial,
[ --disable-partial use partial-display logic],
......@@ -893,7 +894,22 @@ CF_ARG_ENABLE(font-switch,
[use_setfont=yes],
[use_setfont=no])
AC_MSG_RESULT($use_setfont)
test $use_setfont = yes && AC_DEFINE(EXP_CHARTRANS_AUTOSWITCH)
if test $use_setfont = yes ; then
case $host_os in
linux*)
CF_PATH_PROG(SETFONT, consolechars, setfont)
;;
*)
SETFONT=unknown
CF_VERBOSE(Assume $host_os has font-switching)
;;
esac
if test -n "$SETFONT" ; then
AC_DEFINE(EXP_CHARTRANS_AUTOSWITCH)
else
AC_MSG_WARN(Cannot find a font-setting program)
fi
fi
AC_MSG_CHECKING(if you want cgi-link support)
CF_ARG_ENABLE(cgi-links,
......@@ -1187,6 +1203,7 @@ if test $cf_cv_screen != slang ; then
touchline \
touchwin \
use_default_colors \
use_legacy_coding \
wattr_get \
wborder \
wredrawln \
......
......@@ -32307,8 +32307,8 @@ Prereq: 1.19
# Slovenian translation of Lynx WWW browser.
# Copyright (C) 1999 Free Software Foundation, Inc.
# Roman Maurer <roman.maurer@hermes.si>, 1999.
-# $Id: 2.8.6dev.10.patch,v 1.1 2005/01/03 02:28:15 kohda Exp $
+# $Id: 2.8.6dev.10.patch,v 1.1 2005/01/03 02:28:15 kohda Exp $
-# $Id: 2.8.6dev.10.patch,v 1.1 2005-01-03 02:28:15 kohda Exp $
+# $Id: 2.8.6dev.10.patch,v 1.1 2005-01-03 02:28:15 kohda Exp $
# $Source: /var/lib/cvs/debian/lynx-cur/debian/2.8.6dev.10.patch,v $
#
msgid ""
......@@ -34485,8 +34485,8 @@ Prereq: 1.12
# Volodymyr M. Lisivka <lvm@mystery.lviv.net>, 2003
# Dmytro O. Redchuk <dor@kiev-online.net>, 2001-2002
# Olexander Kunytsa <kunia@snark.ukma.kiev.ua>, 2000-2001
-# $Id: 2.8.6dev.10.patch,v 1.1 2005/01/03 02:28:15 kohda Exp $
+# $Id: 2.8.6dev.10.patch,v 1.1 2005/01/03 02:28:15 kohda Exp $
-# $Id: 2.8.6dev.10.patch,v 1.1 2005-01-03 02:28:15 kohda Exp $
+# $Id: 2.8.6dev.10.patch,v 1.1 2005-01-03 02:28:15 kohda Exp $
#
msgid ""
msgstr ""
......@@ -44182,8 +44182,8 @@ Prereq: 1.58
@@ -1,6 +1,6 @@
/* character level styles for Lynx
* (c) 1996 Rob Partington -- donated to the Lyncei (if they want it :-)
- * $Id: 2.8.6dev.10.patch,v 1.1 2005/01/03 02:28:15 kohda Exp $
+ * $Id: 2.8.6dev.10.patch,v 1.1 2005/01/03 02:28:15 kohda Exp $
- * $Id: 2.8.6dev.10.patch,v 1.1 2005-01-03 02:28:15 kohda Exp $
+ * $Id: 2.8.6dev.10.patch,v 1.1 2005-01-03 02:28:15 kohda Exp $
*/
#include <HTUtils.h>
#include <HTML.h>
......@@ -25871,8 +25871,8 @@ Prereq: 1.20
# Slovenian translation of Lynx WWW browser.
# Copyright (C) 1999 Free Software Foundation, Inc.
# Roman Maurer <roman.maurer@hermes.si>, 1999.
-# $Id: 2.8.6dev.12.patch,v 1.1 2005/06/04 23:20:06 kohda Exp $
+# $Id: 2.8.6dev.12.patch,v 1.1 2005/06/04 23:20:06 kohda Exp $
-# $Id: 2.8.6dev.12.patch,v 1.1 2005-06-04 23:20:06 kohda Exp $
+# $Id: 2.8.6dev.12.patch,v 1.1 2005-06-04 23:20:06 kohda Exp $
# $Source: /var/lib/cvs/debian/lynx-cur/debian/2.8.6dev.12.patch,v $
#
msgid ""
......@@ -30066,8 +30066,8 @@ Prereq: 1.13
# Volodymyr M. Lisivka <lvm@mystery.lviv.net>, 2003
# Dmytro O. Redchuk <dor@kiev-online.net>, 2001-2002
# Olexander Kunytsa <kunia@snark.ukma.kiev.ua>, 2000-2001
-# $Id: 2.8.6dev.12.patch,v 1.1 2005/06/04 23:20:06 kohda Exp $
+# $Id: 2.8.6dev.12.patch,v 1.1 2005/06/04 23:20:06 kohda Exp $
-# $Id: 2.8.6dev.12.patch,v 1.1 2005-06-04 23:20:06 kohda Exp $
+# $Id: 2.8.6dev.12.patch,v 1.1 2005-06-04 23:20:06 kohda Exp $
#
msgid ""
msgstr ""
......@@ -42995,8 +42995,8 @@ Prereq: 1.59
@@ -1,6 +1,6 @@
/* character level styles for Lynx
* (c) 1996 Rob Partington -- donated to the Lyncei (if they want it :-)
- * $Id: 2.8.6dev.12.patch,v 1.1 2005/06/04 23:20:06 kohda Exp $
+ * $Id: 2.8.6dev.12.patch,v 1.1 2005/06/04 23:20:06 kohda Exp $
- * $Id: 2.8.6dev.12.patch,v 1.1 2005-06-04 23:20:06 kohda Exp $
+ * $Id: 2.8.6dev.12.patch,v 1.1 2005-06-04 23:20:06 kohda Exp $
*/
#include <HTUtils.h>
#include <HTML.h>
......@@ -36803,8 +36803,8 @@ Prereq: 1.21
# Slovenian translation of Lynx WWW browser.
# Copyright (C) 1999 Free Software Foundation, Inc.
# Roman Maurer <roman.maurer@hermes.si>, 1999.
-# $Id: 2.8.6dev.14.patch,v 1.1 2005/10/17 23:34:41 kohda Exp $
+# $Id: 2.8.6dev.14.patch,v 1.1 2005/10/17 23:34:41 kohda Exp $
-# $Id: 2.8.6dev.14.patch,v 1.1 2005-10-17 23:34:41 kohda Exp $
+# $Id: 2.8.6dev.14.patch,v 1.1 2005-10-17 23:34:41 kohda Exp $
# $Source: /var/lib/cvs/debian/lynx-cur/debian/2.8.6dev.14.patch,v $
#
msgid ""
......@@ -40413,8 +40413,8 @@ Prereq: 1.14
# Volodymyr M. Lisivka <lvm@mystery.lviv.net>, 2003
# Dmytro O. Redchuk <dor@kiev-online.net>, 2001-2002
# Olexander Kunytsa <kunia@snark.ukma.kiev.ua>, 2000-2001
-# $Id: 2.8.6dev.14.patch,v 1.1 2005/10/17 23:34:41 kohda Exp $
+# $Id: 2.8.6dev.14.patch,v 1.1 2005/10/17 23:34:41 kohda Exp $
-# $Id: 2.8.6dev.14.patch,v 1.1 2005-10-17 23:34:41 kohda Exp $
+# $Id: 2.8.6dev.14.patch,v 1.1 2005-10-17 23:34:41 kohda Exp $