mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2025-02-23 16:09:15 +08:00
ncurses 6.0 - patch 20160827
+ add "v" menu entry to test/ncurses.c to show baudrate and other
values.
+ add "newer" baudrate symbols from Linux and FreeBSD to progs/tset.c,
lib_baudrate.c
+ modify CF_XOPEN_SOURCE macro:
+ add "uclinux" to case for "linux" (patch by Yann E. Morin)
+ modify _GNU_SOURCE for cygwin headers, tested with cygwin 2.3, 2.5
(patch by Corinna Vinschen, from changes to tin).
+ improve CF_CC_ENV_FLAGS macro to allow for compiler wrappers such
as "ccache" (report by Enrico Scholz).
+ update config.guess, config.sub from
http://git.savannah.gnu.org/cgit/config.git
This commit is contained in:
Thomas E. Dickey
parent
29a36e53e1
commit
4d01f5de85
21
Ada95/aclocal.m4
vendored
21
Ada95/aclocal.m4
vendored
@ -28,7 +28,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.113 2016/08/06 23:41:47 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.115 2016/08/27 16:25:56 tom Exp $
|
||||
dnl Macros used in NCURSES Ada95 auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -514,11 +514,11 @@ AC_SUBST(BUILD_EXEEXT)
|
||||
AC_SUBST(BUILD_OBJEXT)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_CC_ENV_FLAGS version: 4 updated: 2016/06/25 16:23:40
|
||||
dnl CF_CC_ENV_FLAGS version: 5 updated: 2016/08/27 11:24:46
|
||||
dnl ---------------
|
||||
dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
|
||||
dnl into CC. This will not help with broken scripts that wrap the compiler with
|
||||
dnl options, but eliminates a more common category of user confusion.
|
||||
dnl into CC. This will not help with broken scripts that wrap the compiler
|
||||
dnl with options, but eliminates a more common category of user confusion.
|
||||
dnl
|
||||
dnl In particular, it addresses the problem of being able to run the C
|
||||
dnl preprocessor in a consistent manner.
|
||||
@ -537,8 +537,8 @@ case "$CC" in
|
||||
AC_MSG_RESULT(broken)
|
||||
AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
|
||||
# humor him...
|
||||
cf_flags=`echo "$CC" | sed -e 's/^[[^ ]]*[[ ]][[ ]]*//'`
|
||||
CC=`echo "$CC " | sed -e 's/[[ ]]-[[IUD]][[^ ]][[^ ]]*//g' -e 's/[[ ]]*$//'`
|
||||
cf_flags=`echo "$CC" | sed -e 's/^.*[[ ]]\(-[[^ ]]\)/\1/'`
|
||||
CC=`echo "$CC " | sed -e 's/[[ ]]-[[^ ]].*$//' -e 's/[[ ]]*$//'`
|
||||
CF_ADD_CFLAGS($cf_flags)
|
||||
CF_VERBOSE(resulting CC: '$CC')
|
||||
CF_VERBOSE(resulting CFLAGS: '$CFLAGS')
|
||||
@ -3839,7 +3839,7 @@ AC_ARG_WITH(system-type,
|
||||
])
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_XOPEN_SOURCE version: 50 updated: 2015/10/17 19:03:33
|
||||
dnl CF_XOPEN_SOURCE version: 52 updated: 2016/08/27 12:21:42
|
||||
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,
|
||||
@ -3859,7 +3859,7 @@ case $host_os in
|
||||
(aix[[4-7]]*)
|
||||
cf_xopen_source="-D_ALL_SOURCE"
|
||||
;;
|
||||
(cygwin|msys)
|
||||
(msys)
|
||||
cf_XOPEN_SOURCE=600
|
||||
;;
|
||||
(darwin[[0-8]].*)
|
||||
@ -3887,7 +3887,7 @@ case $host_os in
|
||||
cf_xopen_source="-D_SGI_SOURCE"
|
||||
cf_XOPEN_SOURCE=
|
||||
;;
|
||||
(linux*|gnu*|mint*|k*bsd*-gnu)
|
||||
(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
|
||||
CF_GNU_SOURCE
|
||||
;;
|
||||
(minix*)
|
||||
@ -3909,9 +3909,6 @@ case $host_os in
|
||||
(openbsd*)
|
||||
# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
|
||||
;;
|
||||
(os2*)
|
||||
cf_XOPEN_SOURCE=
|
||||
;;
|
||||
(osf[[45]]*)
|
||||
cf_xopen_source="-D_OSF_SOURCE"
|
||||
;;
|
||||
|
||||
819
Ada95/configure
vendored
819
Ada95/configure
vendored
File diff suppressed because it is too large
Load Diff
16
NEWS
16
NEWS
@ -25,7 +25,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.2647 2016/08/20 23:43:08 tom Exp $
|
||||
-- $Id: NEWS,v 1.2653 2016/08/27 23:27:45 tom Exp $
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
This is a log of changes that ncurses has gone through since Zeyd started
|
||||
@ -45,6 +45,20 @@ See the AUTHORS file for the corresponding full names.
|
||||
Changes through 1.9.9e did not credit all contributions;
|
||||
it is not possible to add this information.
|
||||
|
||||
20160827
|
||||
+ add "v" menu entry to test/ncurses.c to show baudrate and other
|
||||
values.
|
||||
+ add "newer" baudrate symbols from Linux and FreeBSD to progs/tset.c,
|
||||
lib_baudrate.c
|
||||
+ modify CF_XOPEN_SOURCE macro:
|
||||
+ add "uclinux" to case for "linux" (patch by Yann E. Morin)
|
||||
+ modify _GNU_SOURCE for cygwin headers, tested with cygwin 2.3, 2.5
|
||||
(patch by Corinna Vinschen, from changes to tin).
|
||||
+ improve CF_CC_ENV_FLAGS macro to allow for compiler wrappers such
|
||||
as "ccache" (report by Enrico Scholz).
|
||||
+ update config.guess, config.sub from
|
||||
http://git.savannah.gnu.org/cgit/config.git
|
||||
|
||||
20160820
|
||||
+ update tput manual page to reflect changes to manipulate terminal
|
||||
modes by sharing functions with tset.
|
||||
|
||||
21
aclocal.m4
vendored
21
aclocal.m4
vendored
@ -28,7 +28,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.792 2016/08/06 23:41:12 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.794 2016/08/27 16:24:33 tom Exp $
|
||||
dnl Macros used in NCURSES auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -711,11 +711,11 @@ AC_SUBST(BUILD_EXEEXT)
|
||||
AC_SUBST(BUILD_OBJEXT)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_CC_ENV_FLAGS version: 4 updated: 2016/06/25 16:23:40
|
||||
dnl CF_CC_ENV_FLAGS version: 5 updated: 2016/08/27 11:24:46
|
||||
dnl ---------------
|
||||
dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
|
||||
dnl into CC. This will not help with broken scripts that wrap the compiler with
|
||||
dnl options, but eliminates a more common category of user confusion.
|
||||
dnl into CC. This will not help with broken scripts that wrap the compiler
|
||||
dnl with options, but eliminates a more common category of user confusion.
|
||||
dnl
|
||||
dnl In particular, it addresses the problem of being able to run the C
|
||||
dnl preprocessor in a consistent manner.
|
||||
@ -734,8 +734,8 @@ case "$CC" in
|
||||
AC_MSG_RESULT(broken)
|
||||
AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
|
||||
# humor him...
|
||||
cf_flags=`echo "$CC" | sed -e 's/^[[^ ]]*[[ ]][[ ]]*//'`
|
||||
CC=`echo "$CC " | sed -e 's/[[ ]]-[[IUD]][[^ ]][[^ ]]*//g' -e 's/[[ ]]*$//'`
|
||||
cf_flags=`echo "$CC" | sed -e 's/^.*[[ ]]\(-[[^ ]]\)/\1/'`
|
||||
CC=`echo "$CC " | sed -e 's/[[ ]]-[[^ ]].*$//' -e 's/[[ ]]*$//'`
|
||||
CF_ADD_CFLAGS($cf_flags)
|
||||
CF_VERBOSE(resulting CC: '$CC')
|
||||
CF_VERBOSE(resulting CFLAGS: '$CFLAGS')
|
||||
@ -7828,7 +7828,7 @@ AC_SUBST(VERSIONED_SYMS)
|
||||
AC_SUBST(WILDCARD_SYMS)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_XOPEN_SOURCE version: 50 updated: 2015/10/17 19:03:33
|
||||
dnl CF_XOPEN_SOURCE version: 52 updated: 2016/08/27 12:21:42
|
||||
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,
|
||||
@ -7848,7 +7848,7 @@ case $host_os in
|
||||
(aix[[4-7]]*)
|
||||
cf_xopen_source="-D_ALL_SOURCE"
|
||||
;;
|
||||
(cygwin|msys)
|
||||
(msys)
|
||||
cf_XOPEN_SOURCE=600
|
||||
;;
|
||||
(darwin[[0-8]].*)
|
||||
@ -7876,7 +7876,7 @@ case $host_os in
|
||||
cf_xopen_source="-D_SGI_SOURCE"
|
||||
cf_XOPEN_SOURCE=
|
||||
;;
|
||||
(linux*|gnu*|mint*|k*bsd*-gnu)
|
||||
(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
|
||||
CF_GNU_SOURCE
|
||||
;;
|
||||
(minix*)
|
||||
@ -7898,9 +7898,6 @@ case $host_os in
|
||||
(openbsd*)
|
||||
# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
|
||||
;;
|
||||
(os2*)
|
||||
cf_XOPEN_SOURCE=
|
||||
;;
|
||||
(osf[[45]]*)
|
||||
cf_xopen_source="-D_OSF_SOURCE"
|
||||
;;
|
||||
|
||||
113
config.guess
vendored
113
config.guess
vendored
@ -2,7 +2,7 @@
|
||||
# Attempt to guess a canonical system name.
|
||||
# Copyright 1992-2016 Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2016-01-01'
|
||||
timestamp='2016-05-15'
|
||||
|
||||
# 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
|
||||
@ -186,9 +186,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
|
||||
esac
|
||||
# The Operating System including object format, if it has switched
|
||||
# to ELF recently, or will in the future.
|
||||
# to ELF recently (or will in the future) and ABI.
|
||||
case "${UNAME_MACHINE_ARCH}" in
|
||||
arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
|
||||
earm*)
|
||||
os=netbsdelf
|
||||
;;
|
||||
arm*|i386|m68k|ns32k|sh3*|sparc|vax)
|
||||
eval $set_cc_for_build
|
||||
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
||||
| grep -q __ELF__
|
||||
@ -237,6 +240,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
|
||||
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:LibertyBSD:*:*)
|
||||
UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
|
||||
echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:ekkoBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
@ -268,42 +275,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
|
||||
case "$ALPHA_CPU_TYPE" in
|
||||
"EV4 (21064)")
|
||||
UNAME_MACHINE="alpha" ;;
|
||||
UNAME_MACHINE=alpha ;;
|
||||
"EV4.5 (21064)")
|
||||
UNAME_MACHINE="alpha" ;;
|
||||
UNAME_MACHINE=alpha ;;
|
||||
"LCA4 (21066/21068)")
|
||||
UNAME_MACHINE="alpha" ;;
|
||||
UNAME_MACHINE=alpha ;;
|
||||
"EV5 (21164)")
|
||||
UNAME_MACHINE="alphaev5" ;;
|
||||
UNAME_MACHINE=alphaev5 ;;
|
||||
"EV5.6 (21164A)")
|
||||
UNAME_MACHINE="alphaev56" ;;
|
||||
UNAME_MACHINE=alphaev56 ;;
|
||||
"EV5.6 (21164PC)")
|
||||
UNAME_MACHINE="alphapca56" ;;
|
||||
UNAME_MACHINE=alphapca56 ;;
|
||||
"EV5.7 (21164PC)")
|
||||
UNAME_MACHINE="alphapca57" ;;
|
||||
UNAME_MACHINE=alphapca57 ;;
|
||||
"EV6 (21264)")
|
||||
UNAME_MACHINE="alphaev6" ;;
|
||||
UNAME_MACHINE=alphaev6 ;;
|
||||
"EV6.7 (21264A)")
|
||||
UNAME_MACHINE="alphaev67" ;;
|
||||
UNAME_MACHINE=alphaev67 ;;
|
||||
"EV6.8CB (21264C)")
|
||||
UNAME_MACHINE="alphaev68" ;;
|
||||
UNAME_MACHINE=alphaev68 ;;
|
||||
"EV6.8AL (21264B)")
|
||||
UNAME_MACHINE="alphaev68" ;;
|
||||
UNAME_MACHINE=alphaev68 ;;
|
||||
"EV6.8CX (21264D)")
|
||||
UNAME_MACHINE="alphaev68" ;;
|
||||
UNAME_MACHINE=alphaev68 ;;
|
||||
"EV6.9A (21264/EV69A)")
|
||||
UNAME_MACHINE="alphaev69" ;;
|
||||
UNAME_MACHINE=alphaev69 ;;
|
||||
"EV7 (21364)")
|
||||
UNAME_MACHINE="alphaev7" ;;
|
||||
UNAME_MACHINE=alphaev7 ;;
|
||||
"EV7.9 (21364A)")
|
||||
UNAME_MACHINE="alphaev79" ;;
|
||||
UNAME_MACHINE=alphaev79 ;;
|
||||
esac
|
||||
# A Pn.n version is a patched version.
|
||||
# A Vn.n version is a released version.
|
||||
# A Tn.n version is a released field test version.
|
||||
# A Xn.n version is an unreleased experimental baselevel.
|
||||
# 1.2 uses "1.2" for uname -r.
|
||||
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
|
||||
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
|
||||
# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
|
||||
exitcode=$?
|
||||
trap '' 0
|
||||
@ -376,16 +383,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
exit ;;
|
||||
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
|
||||
eval $set_cc_for_build
|
||||
SUN_ARCH="i386"
|
||||
SUN_ARCH=i386
|
||||
# If there is a compiler, see if it is configured for 64-bit objects.
|
||||
# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
|
||||
# This test works for both compilers.
|
||||
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
|
||||
if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
|
||||
if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
|
||||
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
|
||||
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
|
||||
grep IS_64BIT_ARCH >/dev/null
|
||||
then
|
||||
SUN_ARCH="x86_64"
|
||||
SUN_ARCH=x86_64
|
||||
fi
|
||||
fi
|
||||
echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||
@ -410,7 +417,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
exit ;;
|
||||
sun*:*:4.2BSD:*)
|
||||
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
|
||||
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
|
||||
test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
|
||||
case "`/bin/arch`" in
|
||||
sun3)
|
||||
echo m68k-sun-sunos${UNAME_RELEASE}
|
||||
@ -635,13 +642,13 @@ EOF
|
||||
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
|
||||
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
|
||||
case "${sc_cpu_version}" in
|
||||
523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
|
||||
528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
|
||||
523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
|
||||
528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
|
||||
532) # CPU_PA_RISC2_0
|
||||
case "${sc_kernel_bits}" in
|
||||
32) HP_ARCH="hppa2.0n" ;;
|
||||
64) HP_ARCH="hppa2.0w" ;;
|
||||
'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
|
||||
32) HP_ARCH=hppa2.0n ;;
|
||||
64) HP_ARCH=hppa2.0w ;;
|
||||
'') HP_ARCH=hppa2.0 ;; # HP-UX 10.20
|
||||
esac ;;
|
||||
esac
|
||||
fi
|
||||
@ -680,11 +687,11 @@ EOF
|
||||
exit (0);
|
||||
}
|
||||
EOF
|
||||
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
|
||||
(CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
|
||||
test -z "$HP_ARCH" && HP_ARCH=hppa
|
||||
fi ;;
|
||||
esac
|
||||
if [ ${HP_ARCH} = "hppa2.0w" ]
|
||||
if [ ${HP_ARCH} = hppa2.0w ]
|
||||
then
|
||||
eval $set_cc_for_build
|
||||
|
||||
@ -697,12 +704,12 @@ EOF
|
||||
# $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
|
||||
# => hppa64-hp-hpux11.23
|
||||
|
||||
if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
|
||||
if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
|
||||
grep -q __LP64__
|
||||
then
|
||||
HP_ARCH="hppa2.0w"
|
||||
HP_ARCH=hppa2.0w
|
||||
else
|
||||
HP_ARCH="hppa64"
|
||||
HP_ARCH=hppa64
|
||||
fi
|
||||
fi
|
||||
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
|
||||
@ -807,14 +814,14 @@ EOF
|
||||
echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
|
||||
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_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}"
|
||||
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/ /_/'`
|
||||
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:*:*)
|
||||
@ -896,7 +903,7 @@ EOF
|
||||
exit ;;
|
||||
*:GNU/*:*:*)
|
||||
# other systems with GNU libc and userland
|
||||
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
|
||||
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
|
||||
exit ;;
|
||||
i*86:Minix:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-minix
|
||||
@ -919,7 +926,7 @@ EOF
|
||||
EV68*) UNAME_MACHINE=alphaev68 ;;
|
||||
esac
|
||||
objdump --private-headers /bin/sh | grep -q ld.so.1
|
||||
if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
|
||||
if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
arc:Linux:*:* | arceb:Linux:*:*)
|
||||
@ -1272,6 +1279,9 @@ EOF
|
||||
SX-8R:SUPER-UX:*:*)
|
||||
echo sx8r-nec-superux${UNAME_RELEASE}
|
||||
exit ;;
|
||||
SX-ACE:SUPER-UX:*:*)
|
||||
echo sxace-nec-superux${UNAME_RELEASE}
|
||||
exit ;;
|
||||
Power*:Rhapsody:*:*)
|
||||
echo powerpc-apple-rhapsody${UNAME_RELEASE}
|
||||
exit ;;
|
||||
@ -1285,9 +1295,9 @@ EOF
|
||||
UNAME_PROCESSOR=powerpc
|
||||
fi
|
||||
if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
|
||||
if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
|
||||
if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
|
||||
if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
|
||||
(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
|
||||
(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
|
||||
grep IS_64BIT_ARCH >/dev/null
|
||||
then
|
||||
case $UNAME_PROCESSOR in
|
||||
@ -1309,7 +1319,7 @@ EOF
|
||||
exit ;;
|
||||
*:procnto*:*:* | *:QNX:[0123456789]*:*)
|
||||
UNAME_PROCESSOR=`uname -p`
|
||||
if test "$UNAME_PROCESSOR" = "x86"; then
|
||||
if test "$UNAME_PROCESSOR" = x86; then
|
||||
UNAME_PROCESSOR=i386
|
||||
UNAME_MACHINE=pc
|
||||
fi
|
||||
@ -1340,7 +1350,7 @@ EOF
|
||||
# "uname -m" is not consistent, so use $cputype instead. 386
|
||||
# is converted to i386 for consistency with other x86
|
||||
# operating systems.
|
||||
if test "$cputype" = "386"; then
|
||||
if test "$cputype" = 386; then
|
||||
UNAME_MACHINE=i386
|
||||
else
|
||||
UNAME_MACHINE="$cputype"
|
||||
@ -1382,7 +1392,7 @@ EOF
|
||||
echo i386-pc-xenix
|
||||
exit ;;
|
||||
i*86:skyos:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
|
||||
echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
|
||||
exit ;;
|
||||
i*86:rdos:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-rdos
|
||||
@ -1401,18 +1411,17 @@ esac
|
||||
cat >&2 <<EOF
|
||||
$0: unable to guess system type
|
||||
|
||||
This script, last modified $timestamp, has failed to recognize
|
||||
the operating system you are using. It is advised that you
|
||||
download the most up to date version of the config scripts from
|
||||
This script (version $timestamp), has failed to recognize the
|
||||
operating system you are using. If your script is old, overwrite
|
||||
config.guess and config.sub with the latest versions from:
|
||||
|
||||
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
|
||||
and
|
||||
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
|
||||
|
||||
If the version you run ($0) is already up to date, please
|
||||
send the following data and any information you think might be
|
||||
pertinent to <config-patches@gnu.org> in order to provide the needed
|
||||
information to handle your system.
|
||||
If $0 has already been updated, send the following data and any
|
||||
information you think might be pertinent to config-patches@gnu.org to
|
||||
provide the necessary information to handle your system.
|
||||
|
||||
config.guess timestamp = $timestamp
|
||||
|
||||
|
||||
22
config.sub
vendored
22
config.sub
vendored
@ -2,7 +2,7 @@
|
||||
# Configuration validation subroutine script.
|
||||
# Copyright 1992-2016 Free Software Foundation, Inc.
|
||||
|
||||
timestamp='2016-01-01'
|
||||
timestamp='2016-08-25'
|
||||
|
||||
# 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
|
||||
@ -643,6 +643,14 @@ case $basic_machine in
|
||||
basic_machine=m68k-bull
|
||||
os=-sysv3
|
||||
;;
|
||||
e500v[12])
|
||||
basic_machine=powerpc-unknown
|
||||
os=$os"spe"
|
||||
;;
|
||||
e500v[12]-*)
|
||||
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
os=$os"spe"
|
||||
;;
|
||||
ebmon29k)
|
||||
basic_machine=a29k-amd
|
||||
os=-ebmon
|
||||
@ -1022,7 +1030,7 @@ case $basic_machine in
|
||||
ppc-* | ppcbe-*)
|
||||
basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
ppcle | powerpclittle | ppc-le | powerpc-little)
|
||||
ppcle | powerpclittle)
|
||||
basic_machine=powerpcle-unknown
|
||||
;;
|
||||
ppcle-* | powerpclittle-*)
|
||||
@ -1032,7 +1040,7 @@ case $basic_machine in
|
||||
;;
|
||||
ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
|
||||
ppc64le | powerpc64little)
|
||||
basic_machine=powerpc64le-unknown
|
||||
;;
|
||||
ppc64le-* | powerpc64little-*)
|
||||
@ -1382,14 +1390,14 @@ case $os in
|
||||
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
||||
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
||||
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
|
||||
| -bitrig* | -openbsd* | -solidbsd* \
|
||||
| -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
|
||||
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
|
||||
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
||||
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
||||
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
||||
| -chorusos* | -chorusrdb* | -cegcc* \
|
||||
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
|
||||
| -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
|
||||
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
|
||||
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
|
||||
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
||||
@ -1399,7 +1407,7 @@ case $os in
|
||||
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
||||
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
||||
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
|
||||
| -onefs* | -tirtos*)
|
||||
| -onefs* | -tirtos* | -phoenix*)
|
||||
# Remember, each alternative MUST END IN *, to match a version number.
|
||||
;;
|
||||
-qnx*)
|
||||
@ -1531,6 +1539,8 @@ case $os in
|
||||
;;
|
||||
-nacl*)
|
||||
;;
|
||||
-ios)
|
||||
;;
|
||||
-none)
|
||||
;;
|
||||
*)
|
||||
|
||||
4
dist.mk
4
dist.mk
@ -25,7 +25,7 @@
|
||||
# use or other dealings in this Software without prior written #
|
||||
# authorization. #
|
||||
##############################################################################
|
||||
# $Id: dist.mk,v 1.1120 2016/08/20 18:31:02 tom Exp $
|
||||
# $Id: dist.mk,v 1.1121 2016/08/27 14:24:23 tom Exp $
|
||||
# Makefile for creating ncurses distributions.
|
||||
#
|
||||
# This only needs to be used directly as a makefile by developers, but
|
||||
@ -37,7 +37,7 @@ SHELL = /bin/sh
|
||||
# These define the major/minor/patch versions of ncurses.
|
||||
NCURSES_MAJOR = 6
|
||||
NCURSES_MINOR = 0
|
||||
NCURSES_PATCH = 20160820
|
||||
NCURSES_PATCH = 20160827
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
||||
@ -79,7 +79,7 @@
|
||||
#undef USE_OLD_TTY
|
||||
#endif /* USE_OLD_TTY */
|
||||
|
||||
MODULE_ID("$Id: lib_baudrate.c,v 1.38 2016/05/28 23:22:52 tom Exp $")
|
||||
MODULE_ID("$Id: lib_baudrate.c,v 1.41 2016/08/28 00:35:00 tom Exp $")
|
||||
|
||||
/*
|
||||
* int
|
||||
@ -90,8 +90,8 @@ MODULE_ID("$Id: lib_baudrate.c,v 1.38 2016/05/28 23:22:52 tom Exp $")
|
||||
*/
|
||||
|
||||
struct speed {
|
||||
NCURSES_OSPEED s; /* values for 'ospeed' */
|
||||
int sp; /* the actual speed */
|
||||
int given_speed; /* values for 'ospeed' */
|
||||
int actual_speed; /* the actual speed */
|
||||
};
|
||||
|
||||
#define DATA(number) { B##number, number }
|
||||
@ -117,6 +117,9 @@ static struct speed const speeds[] =
|
||||
#elif defined(EXTA)
|
||||
{EXTA, 19200},
|
||||
#endif
|
||||
#ifdef B28800
|
||||
DATA(28800),
|
||||
#endif
|
||||
#ifdef B38400
|
||||
DATA(38400),
|
||||
#elif defined(EXTB)
|
||||
@ -127,18 +130,57 @@ static struct speed const speeds[] =
|
||||
#endif
|
||||
/* ifdef to prevent overflow when OLD_TTY is not available */
|
||||
#if !(NCURSES_OSPEED_COMPAT && defined(__FreeBSD__) && (__FreeBSD_version > 700000))
|
||||
#ifdef B76800
|
||||
DATA(76800),
|
||||
#endif
|
||||
#ifdef B115200
|
||||
DATA(115200),
|
||||
#endif
|
||||
#ifdef B153600
|
||||
DATA(153600),
|
||||
#endif
|
||||
#ifdef B230400
|
||||
DATA(230400),
|
||||
#endif
|
||||
#ifdef B307200
|
||||
DATA(307200),
|
||||
#endif
|
||||
#ifdef B460800
|
||||
DATA(460800),
|
||||
#endif
|
||||
#ifdef B500000
|
||||
DATA(500000),
|
||||
#endif
|
||||
#ifdef B576000
|
||||
DATA(576000),
|
||||
#endif
|
||||
#ifdef B921600
|
||||
DATA(921600),
|
||||
#endif
|
||||
#ifdef B1000000
|
||||
DATA(1000000),
|
||||
#endif
|
||||
#ifdef B1152000
|
||||
DATA(1152000),
|
||||
#endif
|
||||
#ifdef B1500000
|
||||
DATA(1500000),
|
||||
#endif
|
||||
#ifdef B2000000
|
||||
DATA(2000000),
|
||||
#endif
|
||||
#ifdef B2500000
|
||||
DATA(2500000),
|
||||
#endif
|
||||
#ifdef B3000000
|
||||
DATA(3000000),
|
||||
#endif
|
||||
#ifdef B3500000
|
||||
DATA(3500000),
|
||||
#endif
|
||||
#ifdef B4000000
|
||||
DATA(4000000),
|
||||
#endif
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -152,6 +194,10 @@ _nc_baudrate(int OSpeed)
|
||||
|
||||
int result = ERR;
|
||||
|
||||
if (OSpeed < 0)
|
||||
OSpeed = (NCURSES_OSPEED) OSpeed;
|
||||
if (OSpeed < 0)
|
||||
OSpeed = (unsigned short) OSpeed;
|
||||
#if !USE_REENTRANT
|
||||
if (OSpeed == last_OSpeed) {
|
||||
result = last_baudrate;
|
||||
@ -162,8 +208,11 @@ _nc_baudrate(int OSpeed)
|
||||
unsigned i;
|
||||
|
||||
for (i = 0; i < SIZEOF(speeds); i++) {
|
||||
if ((int) speeds[i].s == OSpeed) {
|
||||
result = speeds[i].sp;
|
||||
if (speeds[i].given_speed > OSpeed) {
|
||||
break;
|
||||
}
|
||||
if (speeds[i].given_speed == OSpeed) {
|
||||
result = speeds[i].actual_speed;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -187,8 +236,8 @@ _nc_ospeed(int BaudRate)
|
||||
unsigned i;
|
||||
|
||||
for (i = 0; i < SIZEOF(speeds); i++) {
|
||||
if (speeds[i].sp == BaudRate) {
|
||||
result = speeds[i].s;
|
||||
if (speeds[i].actual_speed == BaudRate) {
|
||||
result = speeds[i].given_speed;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.0+20160820) unstable; urgency=low
|
||||
ncurses6 (6.0+20160827) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 20 Aug 2016 14:31:02 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 27 Aug 2016 10:24:23 -0400
|
||||
|
||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.0+20160820) unstable; urgency=low
|
||||
ncurses6 (6.0+20160827) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 20 Aug 2016 14:31:02 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 27 Aug 2016 10:24:23 -0400
|
||||
|
||||
ncurses6 (5.9-20131005) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (6.0+20160820) unstable; urgency=low
|
||||
ncurses6 (6.0+20160827) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 20 Aug 2016 14:31:02 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 27 Aug 2016 10:24:23 -0400
|
||||
|
||||
ncurses6 (5.9-20120608) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; $Id: mingw-ncurses.nsi,v 1.172 2016/08/20 18:31:02 tom Exp $
|
||||
; $Id: mingw-ncurses.nsi,v 1.173 2016/08/27 14:24:23 tom Exp $
|
||||
|
||||
; TODO add examples
|
||||
; TODO bump ABI to 6
|
||||
@ -10,7 +10,7 @@
|
||||
!define VERSION_MAJOR "6"
|
||||
!define VERSION_MINOR "0"
|
||||
!define VERSION_YYYY "2016"
|
||||
!define VERSION_MMDD "0820"
|
||||
!define VERSION_MMDD "0827"
|
||||
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
|
||||
|
||||
!define MY_ABI "5"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
Summary: shared libraries for terminal handling
|
||||
Name: mingw32-ncurses6
|
||||
Version: 6.0
|
||||
Release: 20160820
|
||||
Release: 20160827
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: shared libraries for terminal handling
|
||||
Name: ncurses6
|
||||
Version: 6.0
|
||||
Release: 20160820
|
||||
Release: 20160827
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{version}-%{release}.tgz
|
||||
|
||||
48
progs/tset.c
48
progs/tset.c
@ -96,7 +96,7 @@
|
||||
char *ttyname(int fd);
|
||||
#endif
|
||||
|
||||
MODULE_ID("$Id: tset.c,v 1.108 2016/08/20 23:53:44 tom Exp $")
|
||||
MODULE_ID("$Id: tset.c,v 1.110 2016/08/27 18:06:47 tom Exp $")
|
||||
|
||||
#ifndef environ
|
||||
extern char **environ;
|
||||
@ -273,15 +273,57 @@ static const SPEEDS speeds[] =
|
||||
#ifdef B57600
|
||||
DATA("57600", B57600),
|
||||
#endif
|
||||
#ifdef B76800
|
||||
DATA("76800", B57600),
|
||||
#endif
|
||||
#ifdef B115200
|
||||
DATA("115200", B115200),
|
||||
#endif
|
||||
#ifdef B153600
|
||||
DATA("153600", B153600),
|
||||
#endif
|
||||
#ifdef B230400
|
||||
DATA("230400", B230400),
|
||||
#endif
|
||||
#ifdef B307200
|
||||
DATA("307200", B307200),
|
||||
#endif
|
||||
#ifdef B460800
|
||||
DATA("460800", B460800),
|
||||
#endif
|
||||
#ifdef B500000
|
||||
DATA("500000", B500000),
|
||||
#endif
|
||||
#ifdef B576000
|
||||
DATA("576000", B576000),
|
||||
#endif
|
||||
#ifdef B921600
|
||||
DATA("921600", B921600),
|
||||
#endif
|
||||
#ifdef B1000000
|
||||
DATA("1000000", B1000000),
|
||||
#endif
|
||||
#ifdef B1152000
|
||||
DATA("1152000", B1152000),
|
||||
#endif
|
||||
#ifdef B1500000
|
||||
DATA("1500000", B1500000),
|
||||
#endif
|
||||
#ifdef B2000000
|
||||
DATA("2000000", B2000000),
|
||||
#endif
|
||||
#ifdef B2500000
|
||||
DATA("2500000", B2500000),
|
||||
#endif
|
||||
#ifdef B3000000
|
||||
DATA("3000000", B3000000),
|
||||
#endif
|
||||
#ifdef B3500000
|
||||
DATA("3500000", B3500000),
|
||||
#endif
|
||||
#ifdef B4000000
|
||||
DATA("4000000", B4000000),
|
||||
#endif
|
||||
};
|
||||
#undef DATA
|
||||
|
||||
@ -296,6 +338,10 @@ tbaudrate(char *rate)
|
||||
++rate;
|
||||
|
||||
for (n = 0; n < SIZEOF(speeds); ++n) {
|
||||
if (n > 0 && (speeds[n].speed <= speeds[n - 1].speed)) {
|
||||
/* if the speeds are not increasing, likely a numeric overflow */
|
||||
break;
|
||||
}
|
||||
if (!CaselessCmp(rate, speeds[n].string)) {
|
||||
sp = speeds + n;
|
||||
break;
|
||||
|
||||
21
test/aclocal.m4
vendored
21
test/aclocal.m4
vendored
@ -26,7 +26,7 @@ dnl sale, use or other dealings in this Software without prior written *
|
||||
dnl authorization. *
|
||||
dnl***************************************************************************
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.131 2016/08/06 23:42:15 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.133 2016/08/27 16:27:51 tom Exp $
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey
|
||||
dnl
|
||||
@ -376,11 +376,11 @@ ifelse([$3],,[ :]dnl
|
||||
])dnl
|
||||
])])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_CC_ENV_FLAGS version: 4 updated: 2016/06/25 16:23:40
|
||||
dnl CF_CC_ENV_FLAGS version: 5 updated: 2016/08/27 11:24:46
|
||||
dnl ---------------
|
||||
dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
|
||||
dnl into CC. This will not help with broken scripts that wrap the compiler with
|
||||
dnl options, but eliminates a more common category of user confusion.
|
||||
dnl into CC. This will not help with broken scripts that wrap the compiler
|
||||
dnl with options, but eliminates a more common category of user confusion.
|
||||
dnl
|
||||
dnl In particular, it addresses the problem of being able to run the C
|
||||
dnl preprocessor in a consistent manner.
|
||||
@ -399,8 +399,8 @@ case "$CC" in
|
||||
AC_MSG_RESULT(broken)
|
||||
AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
|
||||
# humor him...
|
||||
cf_flags=`echo "$CC" | sed -e 's/^[[^ ]]*[[ ]][[ ]]*//'`
|
||||
CC=`echo "$CC " | sed -e 's/[[ ]]-[[IUD]][[^ ]][[^ ]]*//g' -e 's/[[ ]]*$//'`
|
||||
cf_flags=`echo "$CC" | sed -e 's/^.*[[ ]]\(-[[^ ]]\)/\1/'`
|
||||
CC=`echo "$CC " | sed -e 's/[[ ]]-[[^ ]].*$//' -e 's/[[ ]]*$//'`
|
||||
CF_ADD_CFLAGS($cf_flags)
|
||||
CF_VERBOSE(resulting CC: '$CC')
|
||||
CF_VERBOSE(resulting CFLAGS: '$CFLAGS')
|
||||
@ -3444,7 +3444,7 @@ esac
|
||||
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_XOPEN_SOURCE version: 50 updated: 2015/10/17 19:03:33
|
||||
dnl CF_XOPEN_SOURCE version: 52 updated: 2016/08/27 12:21:42
|
||||
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,
|
||||
@ -3464,7 +3464,7 @@ case $host_os in
|
||||
(aix[[4-7]]*)
|
||||
cf_xopen_source="-D_ALL_SOURCE"
|
||||
;;
|
||||
(cygwin|msys)
|
||||
(msys)
|
||||
cf_XOPEN_SOURCE=600
|
||||
;;
|
||||
(darwin[[0-8]].*)
|
||||
@ -3492,7 +3492,7 @@ case $host_os in
|
||||
cf_xopen_source="-D_SGI_SOURCE"
|
||||
cf_XOPEN_SOURCE=
|
||||
;;
|
||||
(linux*|gnu*|mint*|k*bsd*-gnu)
|
||||
(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
|
||||
CF_GNU_SOURCE
|
||||
;;
|
||||
(minix*)
|
||||
@ -3514,9 +3514,6 @@ case $host_os in
|
||||
(openbsd*)
|
||||
# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
|
||||
;;
|
||||
(os2*)
|
||||
cf_XOPEN_SOURCE=
|
||||
;;
|
||||
(osf[[45]]*)
|
||||
cf_xopen_source="-D_OSF_SOURCE"
|
||||
;;
|
||||
|
||||
2697
test/configure
vendored
2697
test/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -40,7 +40,7 @@ AUTHOR
|
||||
Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
|
||||
Thomas E. Dickey (beginning revision 1.27 in 1996).
|
||||
|
||||
$Id: ncurses.c,v 1.438 2016/06/11 21:05:48 tom Exp $
|
||||
$Id: ncurses.c,v 1.441 2016/08/27 23:43:06 tom Exp $
|
||||
|
||||
***************************************************************************/
|
||||
|
||||
@ -6835,6 +6835,88 @@ overlap_test(void)
|
||||
endwin();
|
||||
}
|
||||
|
||||
static void
|
||||
show_setting_name(const char *name)
|
||||
{
|
||||
printw("%-25s ", name);
|
||||
}
|
||||
|
||||
static void
|
||||
show_string_setting(const char *name, const char *value)
|
||||
{
|
||||
show_setting_name(name);
|
||||
if (value) {
|
||||
printw("\"%s\"", value);
|
||||
} else {
|
||||
attron(A_REVERSE);
|
||||
addstr("<NULL>");
|
||||
attroff(A_REVERSE);
|
||||
}
|
||||
addch('\n');
|
||||
}
|
||||
|
||||
static void
|
||||
show_number_setting(const char *name, int value)
|
||||
{
|
||||
show_setting_name(name);
|
||||
if (value >= 0) {
|
||||
printw("%d", value);
|
||||
} else {
|
||||
attron(A_REVERSE);
|
||||
printw("%d", value);
|
||||
attroff(A_REVERSE);
|
||||
}
|
||||
addch('\n');
|
||||
}
|
||||
|
||||
static void
|
||||
show_boolean_setting(const char *name, int value)
|
||||
{
|
||||
show_setting_name(name);
|
||||
if (value >= 0) {
|
||||
printw("%s", value ? "TRUE" : "FALSE");
|
||||
} else {
|
||||
attron(A_REVERSE);
|
||||
printw("%d", value);
|
||||
attroff(A_REVERSE);
|
||||
}
|
||||
addch('\n');
|
||||
}
|
||||
|
||||
static void
|
||||
show_settings(void)
|
||||
{
|
||||
#if USE_WIDEC_SUPPORT
|
||||
wchar_t ch;
|
||||
#endif
|
||||
|
||||
move(0, 0);
|
||||
show_string_setting("termname", termname());
|
||||
show_string_setting("longname", longname());
|
||||
show_number_setting("baudrate", baudrate());
|
||||
if (erasechar() > 0) {
|
||||
show_string_setting("unctrl(erasechar)", unctrl(erasechar()));
|
||||
show_string_setting("keyname(erasechar)", keyname(erasechar()));
|
||||
}
|
||||
if (killchar() > 0) {
|
||||
show_string_setting("unctrl(killchar)", unctrl(killchar()));
|
||||
show_string_setting("keyname(killchar)", keyname(killchar()));
|
||||
}
|
||||
#if USE_WIDEC_SUPPORT
|
||||
if (erasewchar(&ch) == OK) {
|
||||
show_string_setting("key_name(erasewchar)", key_name(ch));
|
||||
}
|
||||
if (killwchar(&ch) == OK) {
|
||||
show_string_setting("key_name(killwchar)", key_name(ch));
|
||||
}
|
||||
#endif
|
||||
show_boolean_setting("has_ic", has_ic());
|
||||
show_boolean_setting("has_il", has_il());
|
||||
Pause();
|
||||
erase();
|
||||
endwin();
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
*
|
||||
* Main sequence
|
||||
@ -6967,6 +7049,10 @@ do_single_test(const char c)
|
||||
break;
|
||||
#endif
|
||||
|
||||
case 'v':
|
||||
show_settings();
|
||||
break;
|
||||
|
||||
case '?':
|
||||
break;
|
||||
|
||||
@ -7114,6 +7200,7 @@ main_menu(bool top)
|
||||
#if USE_LIBMENU && defined(TRACE)
|
||||
(void) puts("t = set trace level");
|
||||
#endif
|
||||
(void) puts("v = show terminal name and settings");
|
||||
(void) puts("? = repeat this command summary");
|
||||
|
||||
(void) fputs("> ", stdout);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user