Commit a607aec1 authored by Axel Beckert's avatar Axel Beckert

Imported Upstream version 2.8.9dev6

parent 7a3169e7
-- $LynxId: CHANGES,v 1.784 2015/04/13 00:00:14 tom Exp $
-- $LynxId: CHANGES,v 1.797 2015/05/07 00:18:31 tom Exp $
===============================================================================
Changes since Lynx 2.8 release
===============================================================================
2015-05-06 (2.8.9dev.6)
* add a note about OCSP to url-support documentation (Debian #745835) -TD
* change defaults for SSL prompts when a problem is detected to "no" (Debian
#783477) -TD
* if an SSL error message is too long for the screen-width, trim it with an
ellipsis so that the "(y)" part of the prompt for continuing will be visible
(Debian #783476) -TD
* update test-packages to use ncurses6 test-packages -TD
* modify configure script to check for ncurses ".pc" files first before looking
for the "ncurses*-config" scripts -TD
* modify configure script to accept a release-number for the ncurses/ncursesw
values of the "--with-screen" option, e.g., "--with-screen=ncursesw6" -TD
* cosmetic fixes for autoconf macros to avoid vi-workaround -TD
* da.po, et.po, fr.po, nl.po, vi.po from
http://translationproject.org/latest/lynx
* regenerated lynx.pot, sent to translation project -TD
* update config.guess (2015-03-04), config.sub (2015-03-08)
2015-04-12 (2.8.9dev.5)
* add codes U+200A, U+200B to def7_uni.tbl (prompted by report by Sven
Hartrumpf, as well as referring to
......
......@@ -692,6 +692,10 @@ II. Compile instructions -- UNIX
the curses library. The variant ncursesw is the wide-character
version of ncurses. See also the --enable-widec option.
For the ncurses/ncursesw options, the script also accepts variants
such as "ncursesw6", which helps it to find a specific ncurses config
script.
The pdcurses selection supported by the configure script is a UNIX-only
library which uses X11. If you are configuring with DJGPP, the likely
choice is "curses", since that is how PDCurses is normally installed.
......@@ -1462,4 +1466,4 @@ VIII. Acknowledgment
-- 1999/04/24 - H. Nelson <lynx-admin@irm.nara.kindai.ac.jp>
-- vile:txtmode
-- $LynxId: INSTALLATION,v 1.123 2014/01/09 20:07:01 tom Exp $
-- $LynxId: INSTALLATION,v 1.124 2015/04/23 09:22:32 tom Exp $
lynx-dev (2.8.9dev.5) unstable; urgency=low
lynx-dev (2.8.9dev.6) unstable; urgency=low
* maintenance updates
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 22 Mar 2015 11:16:20 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Tue, 14 Apr 2015 20:19:14 -0400
lynx-dev (2.8.8dev.16) unstable; urgency=high
......
......@@ -90,7 +90,7 @@ configure-stamp:
--enable-source-cache \
--enable-syslog \
--with-gnutls=/usr \
--with-screen=ncursesw \
--with-screen=ncursesw6 \
--with-textdomain=$(PACKAGE) \
--with-zlib \
--without-included-gettext \
......
; $LynxId: lynx.nsi,v 1.23 2015/03/22 15:16:20 tom Exp $
; $LynxId: lynx.nsi,v 1.24 2015/04/15 00:19:14 tom Exp $
; Script originally generated with the Venis Install Wizard, but customized.
; The Inno Setup script is preferred; but this can be built via cross-compiling.
......@@ -9,8 +9,8 @@
!define VERSION_EPOCH "2"
!define VERSION_MAJOR "8"
!define VERSION_MINOR "9"
!define VERSION_LEVEL "1005"
!define VERSION_PATCH "dev.5"
!define VERSION_LEVEL "1006"
!define VERSION_PATCH "dev.6"
!define SUBKEY "Lynx"
......
# $LynxId: lynx.spec,v 1.30 2015/03/22 15:16:20 tom Exp $
# $LynxId: lynx.spec,v 1.32 2015/05/04 10:37:30 tom Exp $
Summary: A text-based Web browser
Name: lynx
Version: 2.8.9
Release: dev.5
Release: dev.6
License: GPLv2
Group: Applications/Internet
Source: lynx%{version}%{release}.tgz
......@@ -80,7 +80,7 @@ CPPFLAGS="-DMISC_EXP -DEXP_HTTP_HEADERS" \
--enable-syslog \
--enable-warnings \
--with-bzlib \
--with-screen=ncursesw \
--with-screen=ncursesw6 \
--with-ssl \
--with-zlib
make \
......
; version used for Inno Setup files.
; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$
#define LYNX_VERSION "2.8.9dev.5"
#define LYNX_VERSION "2.8.9dev.6"
; most-recent full release and target
#define LYNX_RELEASE "2.8.9"
......
/*
* $LynxId: HTTP.c,v 1.137 2015/01/25 16:58:33 tom Exp $
* $LynxId: HTTP.c,v 1.142 2015/05/06 23:34:07 tom Exp $
*
* HyperText Tranfer Protocol - Client implementation HTTP.c
* ==========================
......@@ -45,6 +45,7 @@
#include <LYUtils.h>
#include <LYrcFile.h>
#include <LYLeaks.h>
#include <LYCurses.h>
#ifdef USE_SSL
#ifdef USE_OPENSSL_INCL
......@@ -71,6 +72,60 @@ static void free_ssl_ctx(void)
SSL_CTX_free(ssl_ctx);
}
static BOOL needs_limit(const char *actual)
{
return ((int) strlen(actual) > LYcols - 7) ? TRUE : FALSE;
}
static char *limited_string(const char *source, const char *actual)
{
int limit = ((int) strlen(source)
- ((int) strlen(actual) - (LYcols - 10)));
char *temp = NULL;
StrAllocCopy(temp, source);
if (limit < 0)
limit = 0;
strcpy(temp + limit, "...");
return temp;
}
/*
* If the error message is too long to fit in the line, truncate that to fit
* within the limits for prompting.
*/
static void SSL_single_prompt(char **target, const char *source)
{
HTSprintf0(target, SSL_FORCED_PROMPT, source);
if (needs_limit(*target)) {
char *temp = limited_string(source, *target);
*target = NULL;
HTSprintf0(target, SSL_FORCED_PROMPT, temp);
free(temp);
}
}
static void SSL_double_prompt(char **target, const char *format, const char
*arg1, const char *arg2)
{
HTSprintf0(target, format, arg1, arg2);
if (needs_limit(*target)) {
char *parg2 = limited_string(arg2, *target);
*target = NULL;
HTSprintf0(target, format, arg1, parg2);
if (needs_limit(*target)) {
char *parg1 = limited_string(arg1, *target);
*target = NULL;
HTSprintf0(target, format, parg1, parg2);
free(parg1);
}
free(parg2);
}
}
static int HTSSLCallback(int preverify_ok, X509_STORE_CTX * x509_ctx GCC_UNUSED)
{
char *msg = NULL;
......@@ -88,10 +143,10 @@ static int HTSSLCallback(int preverify_ok, X509_STORE_CTX * x509_ctx GCC_UNUSED)
#ifndef USE_NSS_COMPAT_INCL
if (!(preverify_ok || ssl_okay || ssl_noprompt)) {
#ifdef USE_X509_SUPPORT
HTSprintf0(&msg, SSL_FORCED_PROMPT,
X509_verify_cert_error_string((long)
X509_STORE_CTX_get_error(x509_ctx)));
if (HTForcedPrompt(ssl_noprompt, msg, YES))
SSL_single_prompt(&msg,
X509_verify_cert_error_string((long)
X509_STORE_CTX_get_error(x509_ctx)));
if (HTForcedPrompt(ssl_noprompt, msg, NO))
ssl_okay = 1;
else
result = 0;
......@@ -790,13 +845,13 @@ static int HTLoadHTTP(const char *arg,
gnutls_datum_t out;
if (ret < 0) {
HTSprintf0(&msg, SSL_FORCED_PROMPT,
gettext("GnuTLS error when trying to verify certificate."));
SSL_single_prompt(&msg,
gettext("GnuTLS error when trying to verify certificate."));
} else {
type = gnutls_certificate_type_get(handle->gnutls_state);
ret = gnutls_certificate_verification_status_print(tls_status,
type, &out, 0);
HTSprintf0(&msg, SSL_FORCED_PROMPT, out.data);
SSL_single_prompt(&msg, out.data);
gnutls_free(out.data);
}
#else
......@@ -813,11 +868,11 @@ static int HTLoadHTTP(const char *arg,
} else {
msg2 = gettext("the certificate is not trusted");
}
HTSprintf0(&msg, SSL_FORCED_PROMPT, msg2);
SSL_single_prompt(&msg, msg2);
#endif
CTRACE((tfp, "HTLoadHTTP: %s\n", msg));
if (!ssl_noprompt) {
if (!HTForcedPrompt(ssl_noprompt, msg, YES)) {
if (!HTForcedPrompt(ssl_noprompt, msg, NO)) {
flag_continue = 0;
}
} else if (ssl_noprompt == FORCE_PROMPT_NO) {
......@@ -1005,25 +1060,27 @@ static int HTLoadHTTP(const char *arg,
/* if an error occurred, format the appropriate message */
if (status_sslcertcheck == 0) {
HTSprintf0(&msg, SSL_FORCED_PROMPT,
gettext("Can't find common name in certificate"));
SSL_single_prompt(&msg,
gettext("Can't find common name in certificate"));
} else if (status_sslcertcheck == 1) {
HTSprintf0(&msg,
gettext("SSL error:host(%s)!=cert(%s)-Continue?"),
ssl_host, ssl_all_cns);
SSL_double_prompt(&msg,
gettext("SSL error:host(%s)!=cert(%s)-Continue?"),
ssl_host, ssl_all_cns);
}
/* if an error occurred, let the user decide how much he trusts */
if (status_sslcertcheck < 2) {
if (!HTForcedPrompt(ssl_noprompt, msg, YES)) {
if (msg == NULL)
StrAllocCopy(msg, gettext("SSL error"));
if (!HTForcedPrompt(ssl_noprompt, msg, NO)) {
status = HT_NOT_LOADED;
FREE(msg);
FREE(ssl_all_cns);
goto done;
}
HTSprintf0(&msg,
gettext("UNVERIFIED connection to %s (cert=%s)"),
ssl_host, ssl_all_cns ? ssl_all_cns : "NONE");
SSL_double_prompt(&msg,
gettext("UNVERIFIED connection to %s (cert=%s)"),
ssl_host, ssl_all_cns ? ssl_all_cns : "NONE");
_HTProgress(msg);
FREE(msg);
}
......
This diff is collapsed.
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright 1992-2014 Free Software Foundation, Inc.
# Copyright 1992-2015 Free Software Foundation, Inc.
timestamp='2014-03-23'
timestamp='2015-03-04'
# 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
......@@ -24,12 +24,12 @@ timestamp='2014-03-23'
# program. This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3").
#
# Originally written by Per Bothner.
# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# 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
#
# Please send patches with a ChangeLog entry to config-patches@gnu.org.
# Please send patches to <config-patches@gnu.org>.
me=`echo "$0" | sed -e 's,.*/,,'`
......@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright 1992-2014 Free Software Foundation, Inc.
Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -168,20 +168,27 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# Note: NetBSD doesn't particularly care about the vendor
# portion of the name. We always set it to "unknown".
sysctl="sysctl -n hw.machine_arch"
UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
/usr/sbin/$sysctl 2>/dev/null || echo unknown)`
UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
/sbin/$sysctl 2>/dev/null || \
/usr/sbin/$sysctl 2>/dev/null || \
echo unknown)`
case "${UNAME_MACHINE_ARCH}" in
armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
sh5el) machine=sh5le-unknown ;;
earmv*)
arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
machine=${arch}${endian}-unknown
;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
# to ELF recently, or will in the future.
case "${UNAME_MACHINE_ARCH}" in
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ELF__
......@@ -197,6 +204,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
os=netbsd
;;
esac
# Determine ABI tags.
case "${UNAME_MACHINE_ARCH}" in
earm*)
expr='s/^earmv[0-9]/-eabi/;s/eb$//'
abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
;;
esac
# The OS release
# Debian GNU/NetBSD machines have a different userland, and
# thus, need a distinct triplet. However, they do not need
......@@ -213,7 +227,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
echo "${machine}-${os}${release}${abi}"
exit ;;
*:Bitrig:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
......@@ -579,8 +593,9 @@ EOF
else
IBM_ARCH=powerpc
fi
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
if [ -x /usr/bin/lslpp ] ; then
IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
else
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
......@@ -932,6 +947,9 @@ EOF
crisv32:Linux:*:*)
echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
e2k:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
frv:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
......
#! /bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2014 Free Software Foundation, Inc.
# Copyright 1992-2015 Free Software Foundation, Inc.
timestamp='2014-07-28'
timestamp='2015-03-08'
# 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
......@@ -25,7 +25,7 @@ timestamp='2014-07-28'
# of the GNU General Public License, version 3 ("GPLv3").
# Please send patches with a ChangeLog entry to config-patches@gnu.org.
# Please send patches to <config-patches@gnu.org>.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
......@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright 1992-2014 Free Software Foundation, Inc.
Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -117,7 +117,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
......@@ -259,8 +259,8 @@ case $basic_machine in
| bfin \
| c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
| epiphany \
| fido | fr30 | frv \
| e2k | epiphany \
| fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
| i370 | i860 | i960 | ia64 \
......@@ -302,6 +302,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
| riscv32 | riscv64 \
| rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
......@@ -312,6 +313,7 @@ case $basic_machine in
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| visium \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
......@@ -326,6 +328,9 @@ case $basic_machine in
c6x)
basic_machine=tic6x-unknown
;;
leon|leon[3-9])
basic_machine=sparc-$basic_machine
;;
m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
basic_machine=$basic_machine-unknown
os=-none
......@@ -376,7 +381,7 @@ case $basic_machine in
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| c8051-* | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| e2k-* | elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
......@@ -436,6 +441,7 @@ case $basic_machine in
| ubicom32-* \
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
| vax-* \
| visium-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
......@@ -512,6 +518,9 @@ case $basic_machine in
basic_machine=i386-pc
os=-aros
;;
asmjs)
basic_machine=asmjs-unknown
;;
aux)
basic_machine=m68k-apple
os=-aux
......@@ -773,6 +782,9 @@ case $basic_machine in
basic_machine=m68k-isi
os=-sysv
;;
leon-*|leon[3-9]-*)
basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
;;
m68knommu)
basic_machine=m68k-unknown
os=-linux
......@@ -1364,7 +1376,7 @@ case $os in
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -aos* | -aros* | -cloudabi* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
......
This diff is collapsed.
dnl $LynxId: configure.in,v 1.273 2015/03/22 15:16:20 tom Exp $
dnl $LynxId: configure.in,v 1.276 2015/04/23 09:26:06 tom Exp $
dnl
dnl Process this file with autoconf to produce a configure script.
dnl
......@@ -8,7 +8,7 @@ dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
dnl
dnl ---------------------------------------------------------------------------
dnl Copyright 1997-2014,2015 by Thomas E. Dickey
dnl
dnl
dnl Permission to use, copy, modify, and distribute this software and its
dnl documentation for any purpose and without fee is hereby granted,
dnl provided that the above copyright notice appear in all copies and that
......@@ -17,7 +17,7 @@ dnl supporting documentation, and that the name of the above listed
dnl copyright holder(s) not be used in advertising or publicity pertaining
dnl to distribution of the software without specific, written prior
dnl permission.
dnl
dnl
dnl THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
dnl TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
dnl AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
......@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
dnl
dnl ask PRCS to plug-in the project-version for the configure-script.
dnl $Format: "AC_REVISION($ProjectVersion$)"$
AC_REVISION(2.8.9dev.5)
AC_REVISION(2.8.9dev.6)
# Save the original $CFLAGS so we can distinguish whether the user set those
# in the environment, or whether autoconf added -O and -g options:
......@@ -64,7 +64,7 @@ AC_ARG_PROGRAM
PACKAGE=lynx
dnl ask PRCS to plug-in the project-version for the packages.
# $Format: "VERSION=$ProjectVersion$"$
VERSION=2.8.9dev.5
VERSION=2.8.9dev.6
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
......@@ -84,9 +84,9 @@ dnl Checks for location of programs
dnl --------------------------------------------------------------------------
dnl Only add to this case statement when a system has a compiler that is not
dnl detected by AC_PROG_CC.
dnl detected by AC_PROG_CC.
case $host_os in
openedition)
(openedition)
: ${CFLAGS="-D_ALL_SOURCE -Wl,EDIT=NO"}
: ${CC=c89}
;;
......@@ -96,11 +96,11 @@ CF_PROG_CC
AC_PROG_CPP
AC_PROG_LN_S
case $host_os in
mingw*)
(mingw*)
LN_S="cp -p"
AC_MSG_RESULT(Override: No symbolic links in mingw.)
;;
*)
(*)
;;
esac
AC_PROG_MAKE_SET
......@@ -155,7 +155,7 @@ CF_ARG_ENABLE(debug,
AC_MSG_RESULT($with_debug)
if test "$with_debug" = "yes" ; then
case $host_os in
ultrix*|osf*)
(ultrix*|osf*)
test -z "$ORIGINAL_CFLAGS" && CF_STRIP_O_OPT(CFLAGS)
if test -z "$GCC" ; then
CFLAGS="$CFLAGS -g3"
......@@ -164,11 +164,11 @@ if test "$with_debug" = "yes" ; then
esac
else
case $host_os in
osf*) #(vi
(osf*)
test -z "$GCC" && CFLAGS="$CFLAGS -std1"
test -z "$ORIGINAL_CFLAGS" && CF_STRIP_G_OPT(CFLAGS)
;;
*)
(*)
test -z "$ORIGINAL_CFLAGS" && CF_STRIP_G_OPT(CFLAGS)
;;
esac
......@@ -218,57 +218,57 @@ AC_DEFINE(UNIX,1,[Define to 1 if we can run a configure script])
dnl Only add to this case statement things that we cannot design tests for.
TRY_CFLAGS=
case $host_os in
aix4*)
(aix4*)
TRY_CFLAGS="$TRY_CFLAGS -DAIX4 -D_BSD=44 -D_AIX"
LIBS="$LIBS -lbsd"
;;
aix*)
(aix*)
TRY_CFLAGS="$TRY_CFLAGS -D_ACS_COMPAT_CODE"
LIBS="$LIBS -lbsd"
;;
apollo*)
(apollo*)
TRY_CFLAGS="$TRY_CFLAGS -D_BUILTINS -W0,-opt,4"
;;
bsdi*)
(bsdi*)
TRY_CFLAGS="$TRY_CFLAGS -DBSDI"
;;
clix*)
(clix*)
# Tested on CLIX 3.1 (T.Dickey). The original makefile entry
# contributed by Alex Matulich (matuli_a@marlin.navsea.navy.mil) also
# references -lmalloc and -lbsd.
AC_CHECK_LIB(c_s,strcmp)
;;
convex*)
(convex*)
TRY_CFLAGS="$TRY_CFLAGS -D__STDC__ -Dunix"
;;
cygwin*)
(cygwin*)
TRY_CFLAGS="$TRY_CFLAGS -DWIN_EX -D_WINDOWS_NSL"
LIBS="$LIBS -luser32"
;;
dgux*)
(dgux*)
TRY_CFLAGS="$TRY_CFLAGS -DDGUX"
;;
hpux*)
(hpux*)
TRY_CFLAGS="$TRY_CFLAGS -DSNAKE -D_XOPEN_SOURCE_EXTENDED"
test -z "$GCC" && TRY_CFLAGS="$TRY_CFLAGS -Wp,-H600000 -DSYS_HPUX"
;;
isc*)
(isc*)
# -DPOSIX_JC is necessary, else LYBookmark.c never finds out what a mode_t is.
TRY_CFLAGS="$TRY_CFLAGS -DISC -DPOSIX_JC"
LIBS="$LIBS -linet -lnsl_s -lcposix"
;;
irix6.*) #(vi
(irix6.*)
TRY_CFLAGS="$TRY_CFLAGS -DSYS_IRIX64"
;;
irix*)
(irix*)
# The original makefile used the $CFLAGS option -cckr for some form
# of K&R compatibility. However, this causes compilation warnings for
# varargs on IRIX 5.2, and does not appear to be needed.
;;
linux*)
(linux*)
TRY_CFLAGS="$TRY_CFLAGS -DLINUX"
;;
mingw*)
(mingw*)
# put these directly in CPPFLAGS since they will not work in lynx_cfg.h
CF_ADD_CFLAGS(\
-DWIN32_LEAN_AND_MEAN \
......@@ -284,58 +284,58 @@ mingw*)
)
EXTRA_OBJS="$EXTRA_OBJS Xsystem\$o"
;;
msdosdjgpp*)
(msdosdjgpp*)
LIBS="$LIBS -lwatt"
TRY_CFLAGS="$TRY_CFLAGS -DDOSPATH -DNOUSERS"
;;
next*)
(next*)
TRY_CFLAGS="$TRY_CFLAGS -DNEXT"
;;
osf4*)
(osf4*)
# The -Olimit flag (see below) is no longer available with
# Digital C 5.2, which is bundled with Digital UNIX 4.0.
TRY_CFLAGS="$TRY_CFLAGS -DDSYS5 -DSYS_TRU64"
;;
osf*)
(osf*)
# Increase the maximum size of functions that will be optimized.
test -z "$GCC" && TRY_CFLAGS="$TRY_CFLAGS -O -Olimit 4000"
TRY_CFLAGS="$TRY_CFLAGS -DDSYS5 -DSYS_TRU64"
;;
sco3.2v5*)
(sco3.2v5*)
test $ac_cv_prog_gcc != yes && TRY_CFLAGS="$TRY_CFLAGS -belf"
;;
sco*)
(sco*)
LIBS="$LIBS -lmalloc"
# It's a little late to do much, but try to warn user if he's using
# SCO's cc (which is reported to have broken const/volatile).
case "$CC" in #(vi
cc|*/cc)
case "$CC" in
(cc|*/cc)
AC_MSG_WARN(You should consider using gcc or rcc if available)
unset ac_cv_prog_CC
AC_CHECK_PROGS(CC,gcc rcc,$CC)
;;
esac
;;
sequent-ptx)
(sequent-ptx)
TRY_CFLAGS="$TRY_CFLAGS -DSVR4_BSDSELECT -DNO_IOCTL -DUSE_FCNTL"
;;
sequent-ptx2)
(sequent-ptx2)
TRY_CFLAGS="$TRY_CFLAGS -DSVR4_BSDSELECT"
;;
sony-newsos*)
(sony-newsos*)
TRY_CFLAGS="$TRY_CFLAGS -I/usr/sony/include"
AC_CHECK_HEADERS(jcurses.h)
;;
svr4)
(svr4)
TRY_CFLAGS="$TRY_CFLAGS -DSVR4_BSDSELECT -DSVR4"
;;
sunos3*)
(sunos3*)
TRY_CFLAGS="$TRY_CFLAGS -DSUN"
;;
sunos4*)
(sunos4*)
TRY_CFLAGS="$TRY_CFLAGS -DSUN -DSUN4"
;;
ultrix*)
(ultrix*)
# Increase the maximum size of functions that will be optimized.
test -z "$GCC" && TRY_CFLAGS="$TRY_CFLAGS -O -Olimit 600 -G 7"
TRY_CFLAGS="$TRY_CFLAGS -DULTRIX"
......@@ -346,7 +346,7 @@ ultrix*)
esac
case $host_os in
mingw*)
(mingw*)
EXTRA_OBJS="$EXTRA_OBJS LYIcon\$o"
;;
esac
......@@ -515,16 +515,16 @@ AC_ARG_WITH(screen,
ncurses, ncursesw, pdcurses or slang)],
[
case $withval in
curses|ncurses|ncursesw|pdcurses|slang)
(curses|ncurses*|pdcurses|slang)
cf_cv_screen=$withval
;;
*) AC_ERROR(Unexpected value)
(*) AC_ERROR(Unexpected value $withval)
;;
esac],
[cf_cv_screen=curses])])
case $cf_cv_screen in
curses|ncurses*)
(curses|ncurses*)
CF_WITH_CURSES_DIR
;;
esac
......@@ -532,31 +532,31 @@ esac
cf_wide_curses=no
dft_color_style=yes
case $cf_cv_screen in
curses)
(curses)
CF_CURSES_CONFIG
CF_CURS_PERFORMANCE
CF_CURS_TOUCHLINE
;;
ncurses)
CF_NCURSES_CONFIG
;;
ncursesw)
(ncursesw*)
CF_UTF8_LIB
CF_NCURSES_CONFIG(ncursesw)
CF_NCURSES_CONFIG($cf_cv_screen)
cf_wide_curses=yes
;;
pdcurses)