mirror/ncursesw-morphos
2
0
Fork 0
mirror of https://github.com/Aigor44/ncursesw-morphos.git synced 2024-11-27 06:49:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

ncurses 5.9 - patch 20131116

Browse Source 
+ add special case to configure script to move _XOPEN_SOURCE_EXTENDED
  definition from CPPFLAGS to CFLAGS if it happens to be needed for
  Solaris, because g++ errors with that definition (report by
  Jean-Pierre Flori, Sage #15268).
+ correct logic in infocmp's -i option which was intended to ignore
  strings which correspond to function-keys as candidates for piecing
  together initialization- or reset-strings.  The problem dates to
  1.9.7a, but was overlooked until changes in -Wlogical-op warnings for
  gcc 4.8 (report by David Binderman).
+ updated CF_GCC_WARNINGS to documented options for gcc 4.9.0, adding
  checks for -Wextra, -Wignored-qualifiers and -Wlogical-op
+ updated CF_GCC_WARNINGS to documented options for gcc 4.9.0, moving
  checks for -Wextra and -Wdeclaration-after-statement into the macro,
  and adding checks for -Wignored-qualifiers, -Wlogical-op and
  -Wvarargs
+ updated CF_CURSES_UNCTRL_H and CF_SHARED_OPTS macros from ongoing
  work on cdk.
+ update config.sub from
	http://git.savannah.gnu.org/cgit/config.git
This commit is contained in:
Thomas E. Dickey 2013-11-17 00:20:49 +00:00
parent 67ab4b308e
commit 89407f55b3
27 changed files with 2121 additions and 1987 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Ada95/aclocal.m4 vendored
View File

@ -28,7 +28,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey
dnl
dnl $Id: aclocal.m4,v 1.74 2013/10/14 08:48:41 tom Exp $
dnl $Id: aclocal.m4,v 1.76 2013/11/16 20:06:15 tom Exp $
dnl Macros used in NCURSES Ada95 auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@ -1056,7 +1056,7 @@ if test "$GCC" = yes ; then
fi
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_GCC_WARNINGS version: 29 updated: 2012/06/16 14:55:39
dnl CF_GCC_WARNINGS version: 30 updated: 2013/11/16 13:56:26
dnl ---------------
dnl Check if the compiler supports useful warning options. There's a few that
dnl we don't use, simply because they're too noisy:
@ -1132,14 +1132,19 @@ then
Wbad-function-cast \
Wcast-align \
Wcast-qual \
Wdeclaration-after-statement \
Wextra \
Wignored-qualifiers \
Winline \
Wlogical-op \
Wmissing-declarations \
Wmissing-prototypes \
Wnested-externs \
Wpointer-arith \
Wshadow \
Wstrict-prototypes \
Wundef $cf_warn_CONST $1
Wundef \
Wvarargs $cf_warn_CONST $1
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
if AC_TRY_EVAL(ac_compile); then
@ -2836,7 +2841,7 @@ define([CF_REMOVE_LIB],
$1=`echo "$2" | sed -e 's/-l$3[[ ]]//g' -e 's/-l$3[$]//'`
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_SHARED_OPTS version: 83 updated: 2013/09/21 17:34:53
dnl CF_SHARED_OPTS version: 84 updated: 2013/11/03 06:26:10
dnl --------------
dnl --------------
dnl Attempt to determine the appropriate CC/LD options for creating a shared
@ -2871,6 +2876,12 @@ AC_DEFUN([CF_SHARED_OPTS],
INSTALL_LIB="-m 644"
: ${rel_builddir:=.}
shlibdir=$libdir
AC_SUBST(shlibdir)
MAKE_DLLS="#"
AC_SUBST(MAKE_DLLS)
cf_cv_do_symlinks=no
cf_ld_rpath_opt=
test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
@ -2933,6 +2944,8 @@ AC_DEFUN([CF_SHARED_OPTS],
RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
cf_cv_shlib_version=cygdll
cf_cv_shlib_version_infix=cygdll
shlibdir=$bindir
MAKE_DLLS=
cat >mk_shared_lib.sh <<-CF_EOF
#!/bin/sh
SHARED_LIB=\[$]1
@ -2953,6 +2966,8 @@ CF_EOF
RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
cf_cv_shlib_version=msysdll
cf_cv_shlib_version_infix=msysdll
shlibdir=$bindir
MAKE_DLLS=
cat >mk_shared_lib.sh <<-CF_EOF
#!/bin/sh
SHARED_LIB=\[$]1
@ -3040,6 +3055,8 @@ CF_EOF
mingw*) #(vi
cf_cv_shlib_version=mingw
cf_cv_shlib_version_infix=mingw
shlibdir=$bindir
MAKE_DLLS=
if test "$DFT_LWR_MODEL" = "shared" ; then
LOCAL_LDFLAGS="-Wl,--enable-auto-import"
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"

847
Ada95/configure vendored
View File

File diff suppressed because it is too large Load Diff

6
Ada95/configure.in
View File

@ -28,14 +28,14 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey
dnl
dnl $Id: configure.in,v 1.48 2013/09/07 17:54:05 Alexey.Pavlov Exp $
dnl $Id: configure.in,v 1.49 2013/11/16 20:06:37 tom Exp $
dnl Process this file with autoconf to produce a configure script.
dnl
dnl See http://invisible-island.net/autoconf/ for additional information.
dnl
dnl ---------------------------------------------------------------------------
AC_PREREQ(2.52.20030208)
AC_REVISION($Revision: 1.48 $)
AC_REVISION($Revision: 1.49 $)
AC_INIT(gen/gen.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
@ -373,7 +373,7 @@ AC_MSG_RESULT($with_warnings)
if test "x$with_warnings" = "xyes"; then
CF_ADD_ADAFLAGS(-gnatg)
CF_GCC_WARNINGS(Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum)
CF_GCC_WARNINGS(Wno-unknown-pragmas Wswitch-enum)
fi
CF_GCC_ATTRIBUTES

23
NEWS
View File

@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- $Id: NEWS,v 1.2134 2013/11/11 02:07:02 tom Exp $
-- $Id: NEWS,v 1.2141 2013/11/16 23:27:52 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@ -45,6 +45,27 @@ 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.
20131116
+ add special case to configure script to move _XOPEN_SOURCE_EXTENDED
definition from CPPFLAGS to CFLAGS if it happens to be needed for
Solaris, because g++ errors with that definition (report by
Jean-Pierre Flori, Sage #15268).
+ correct logic in infocmp's -i option which was intended to ignore
strings which correspond to function-keys as candidates for piecing
together initialization- or reset-strings. The problem dates to
1.9.7a, but was overlooked until changes in -Wlogical-op warnings for
gcc 4.8 (report by David Binderman).
+ updated CF_GCC_WARNINGS to documented options for gcc 4.9.0, adding
checks for -Wextra, -Wignored-qualifiers and -Wlogical-op
+ updated CF_GCC_WARNINGS to documented options for gcc 4.9.0, moving
checks for -Wextra and -Wdeclaration-after-statement into the macro,
and adding checks for -Wignored-qualifiers, -Wlogical-op and
-Wvarargs
+ updated CF_CURSES_UNCTRL_H and CF_SHARED_OPTS macros from ongoing
work on cdk.
+ update config.sub from
http://git.savannah.gnu.org/cgit/config.git
20131110
+ minor cleanup of terminfo.tail

32
aclocal.m4 vendored
View File

@ -28,7 +28,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
dnl $Id: aclocal.m4,v 1.681 2013/10/14 08:26:40 tom Exp $
dnl $Id: aclocal.m4,v 1.684 2013/11/16 19:28:35 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@ -1942,7 +1942,7 @@ if test "$GCC" = yes ; then
fi
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_GCC_WARNINGS version: 29 updated: 2012/06/16 14:55:39
dnl CF_GCC_WARNINGS version: 30 updated: 2013/11/16 13:56:26
dnl ---------------
dnl Check if the compiler supports useful warning options. There's a few that
dnl we don't use, simply because they're too noisy:
@ -2018,14 +2018,19 @@ then
Wbad-function-cast \
Wcast-align \
Wcast-qual \
Wdeclaration-after-statement \
Wextra \
Wignored-qualifiers \
Winline \
Wlogical-op \
Wmissing-declarations \
Wmissing-prototypes \
Wnested-externs \
Wpointer-arith \
Wshadow \
Wstrict-prototypes \
Wundef $cf_warn_CONST $1
Wundef \
Wvarargs $cf_warn_CONST $1
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
if AC_TRY_EVAL(ac_compile); then
@ -2463,7 +2468,7 @@ if test "$GXX" = yes; then
fi
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_GXX_WARNINGS version: 7 updated: 2012/06/16 14:55:39
dnl CF_GXX_WARNINGS version: 8 updated: 2013/11/16 14:27:53
dnl ---------------
dnl Check if the compiler supports useful warning options.
dnl
@ -2552,16 +2557,17 @@ then
for cf_opt in \
Wabi \
fabi-version=0 \
Wextra \
Wignored-qualifiers \
Wlogical-op \
Woverloaded-virtual \
Wsign-promo \
Wsynth \
Wold-style-cast \
Wcast-align \
Wcast-qual \
Wmissing-prototypes \
Wpointer-arith \
Wshadow \
Wstrict-prototypes \
Wundef $cf_gxx_extra_warnings $1
do
CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
@ -5345,7 +5351,7 @@ CF_VERBOSE(...checked $1 [$]$1)
AC_SUBST(EXTRA_LDFLAGS)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_SHARED_OPTS version: 83 updated: 2013/09/21 17:34:53
dnl CF_SHARED_OPTS version: 84 updated: 2013/11/03 06:26:10
dnl --------------
dnl --------------
dnl Attempt to determine the appropriate CC/LD options for creating a shared
@ -5380,6 +5386,12 @@ AC_DEFUN([CF_SHARED_OPTS],
INSTALL_LIB="-m 644"
: ${rel_builddir:=.}
shlibdir=$libdir
AC_SUBST(shlibdir)
MAKE_DLLS="#"
AC_SUBST(MAKE_DLLS)
cf_cv_do_symlinks=no
cf_ld_rpath_opt=
test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
@ -5442,6 +5454,8 @@ AC_DEFUN([CF_SHARED_OPTS],
RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
cf_cv_shlib_version=cygdll
cf_cv_shlib_version_infix=cygdll
shlibdir=$bindir
MAKE_DLLS=
cat >mk_shared_lib.sh <<-CF_EOF
#!/bin/sh
SHARED_LIB=\[$]1
@ -5462,6 +5476,8 @@ CF_EOF
RM_SHARED_OPTS="$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dll.a"
cf_cv_shlib_version=msysdll
cf_cv_shlib_version_infix=msysdll
shlibdir=$bindir
MAKE_DLLS=
cat >mk_shared_lib.sh <<-CF_EOF
#!/bin/sh
SHARED_LIB=\[$]1
@ -5549,6 +5565,8 @@ CF_EOF
mingw*) #(vi
cf_cv_shlib_version=mingw
cf_cv_shlib_version_infix=mingw
shlibdir=$bindir
MAKE_DLLS=
if test "$DFT_LWR_MODEL" = "shared" ; then
LOCAL_LDFLAGS="-Wl,--enable-auto-import"
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"

4
config.sub vendored
View File

@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2013 Free Software Foundation, Inc.
timestamp='2013-09-05'
timestamp='2013-10-01'
# 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
@ -265,6 +265,7 @@ case $basic_machine in
| hexagon \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| k1om \
| le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
@ -381,6 +382,7 @@ case $basic_machine in
| hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
| k1om-* \
| le32-* | le64-* \
| lm32-* \
| m32c-* | m32r-* | m32rle-* \

2868
configure vendored
View File

File diff suppressed because it is too large Load Diff

19
configure.in
View File

@ -28,14 +28,14 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
dnl $Id: configure.in,v 1.574 2013/09/07 17:54:05 Alexey.Pavlov Exp $
dnl $Id: configure.in,v 1.576 2013/11/16 23:22:48 tom Exp $
dnl Process this file with autoconf to produce a configure script.
dnl
dnl See http://invisible-island.net/autoconf/ for additional information.
dnl
dnl ---------------------------------------------------------------------------
AC_PREREQ(2.52.20030208)
AC_REVISION($Revision: 1.574 $)
AC_REVISION($Revision: 1.576 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
@ -1271,7 +1271,7 @@ AC_MSG_RESULT($with_warnings)
if test "x$with_warnings" = "xyes"; then
CF_ADD_ADAFLAGS(-gnatg)
CF_GCC_WARNINGS(Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum)
CF_GCC_WARNINGS(Wno-unknown-pragmas Wswitch-enum)
if test "x$cf_with_cxx" = xyes ; then
CF_GXX_WARNINGS(Wno-unused)
fi
@ -1948,6 +1948,19 @@ AC_SUBST(MENU_NAME)
AC_SUBST(FORM_NAME)
AC_SUBST(CXX_NAME)
# workaround for g++ versus Solaris (20131116)
case $cf_cv_system_name in #(vi
solaris2*) #(vi
case "x$CPPFLAGS" in #(vi
*-D_XOPEN_SOURCE_EXTENDED*)
CF_VERBOSE(moving _XOPEN_SOURCE_EXTENDED to work around g++ problem)
CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
CPPFLAGS=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'`
;;
esac
;;
esac
SUB_SCRIPTS=
AC_OUTPUT( \

4
dist.mk
View File

@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
# $Id: dist.mk,v 1.956 2013/11/10 22:44:38 tom Exp $
# $Id: dist.mk,v 1.958 2013/11/16 17:39:03 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 = 5
NCURSES_MINOR = 9
NCURSES_PATCH = 20131110
NCURSES_PATCH = 20131116
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

7
ncurses/curses.priv.h
View File

@ -34,7 +34,7 @@
****************************************************************************/
/*
* $Id: curses.priv.h,v 1.528 2013/10/28 00:02:27 tom Exp $
* $Id: curses.priv.h,v 1.529 2013/11/16 19:44:28 tom Exp $
*
* curses.priv.h
*
@ -2344,12 +2344,13 @@ extern NCURSES_EXPORT_VAR(TERM_DRIVER) _nc_TINFO_DRIVER;
#endif
#ifdef USE_TERM_DRIVER
#define IsTermInfo(sp) (TCBOf(sp) && ((TCBOf(sp)->drv->isTerminfo)))
#define IsTermInfo(sp) ((TCBOf(sp) != 0) && ((TCBOf(sp)->drv->isTerminfo)))
#define HasTInfoTerminal(sp) ((0 != TerminalOf(sp)) && IsTermInfo(sp))
#else
#define IsTermInfo(sp) TRUE
#define HasTInfoTerminal(sp) (0 != TerminalOf(sp))
#endif
#define HasTInfoTerminal(sp) ((0 != TerminalOf(sp)) && IsTermInfo(sp))
#define IsValidTIScreen(sp) (HasTInfoTerminal(sp))
/*

8
ncurses/tinfo/comp_scan.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. *
* Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@ -50,7 +50,7 @@
#include <ctype.h>
#include <tic.h>
MODULE_ID("$Id: comp_scan.c,v 1.101 2012/12/08 22:19:25 tom Exp $")
MODULE_ID("$Id: comp_scan.c,v 1.102 2013/11/16 19:57:50 tom Exp $")
/*
* Maximum length of string capability we'll accept before raising an error.
@ -380,7 +380,7 @@ _nc_get_token(bool silent)
if (end_of_stream()) {
yyin = 0;
(void) next_char(); /* frees its allocated memory */
(void) next_char(); /* frees its allocated memory */
if (tok_buf != 0) {
if (_nc_curr_token.tk_name == tok_buf)
_nc_curr_token.tk_name = 0;
@ -432,7 +432,7 @@ _nc_get_token(bool silent)
#if NCURSES_EXT_FUNCS
&& !(ch == '.' && _nc_disable_period)
#endif
&& !strchr(terminfo_punct, (char) ch)) {
&& ((strchr) (terminfo_punct, (char) ch) == 0)) {
if (!silent)
_nc_warning("Illegal character (expected alphanumeric or %s) - '%s'",
terminfo_punct, unctrl(UChar(ch)));

4
ncurses/tinfo/db_iterator.c
View File

@ -43,7 +43,7 @@
#include <hashed_db.h>
#endif
MODULE_ID("$Id: db_iterator.c,v 1.36 2013/05/25 20:20:08 tom Exp $")
MODULE_ID("$Id: db_iterator.c,v 1.37 2013/11/16 19:42:56 tom Exp $")
#define HaveTicDirectory _nc_globals.have_tic_directory
#define KeepTicDirectory _nc_globals.keep_tic_directory
@ -185,7 +185,7 @@ _nc_tic_dir(const char *path)
if (path != 0) {
TicDirectory = path;
HaveTicDirectory = TRUE;
} else if (!HaveTicDirectory && use_terminfo_vars()) {
} else if (HaveTicDirectory == 0 && use_terminfo_vars()) {
char *envp;
if ((envp = getenv("TERMINFO")) != 0)
return _nc_tic_dir(envp);

8
ncurses/tinfo/lib_has_cap.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. *
* Copyright (c) 1998-2009,2013 Free Software Foundation, Inc. *
* *
* Permission is hereby granted, free of charge, to any person obtaining a *
* copy of this software and associated documentation files (the *
@ -46,7 +46,7 @@
#define CUR SP_TERMTYPE
#endif
MODULE_ID("$Id: lib_has_cap.c,v 1.9 2009/10/24 22:15:47 tom Exp $")
MODULE_ID("$Id: lib_has_cap.c,v 1.10 2013/11/16 19:57:22 tom Exp $")
NCURSES_EXPORT(bool)
NCURSES_SP_NAME(has_ic) (NCURSES_SP_DCL0)
@ -55,7 +55,7 @@ NCURSES_SP_NAME(has_ic) (NCURSES_SP_DCL0)
T((T_CALLED("has_ic(%p)"), (void *) SP_PARM));
if (IsValidTIScreen(SP_PARM) && IsTermInfo(SP_PARM)) {
if (HasTInfoTerminal(SP_PARM)) {
code = ((insert_character || parm_ich
|| (enter_insert_mode && exit_insert_mode))
&& (delete_character || parm_dch)) ? TRUE : FALSE;
@ -77,7 +77,7 @@ NCURSES_SP_NAME(has_il) (NCURSES_SP_DCL0)
{
bool code = FALSE;
T((T_CALLED("has_il(%p)"), (void *) SP_PARM));
if (IsValidTIScreen(SP_PARM) && IsTermInfo(SP_PARM)) {
if (HasTInfoTerminal(SP_PARM)) {
code = ((insert_line || parm_insert_line)
&& (delete_line || parm_delete_line)) ? TRUE : FALSE;
}

4
ncurses/tinfo/lib_options.c
View File

@ -46,7 +46,7 @@
#define CUR SP_TERMTYPE
#endif
MODULE_ID("$Id: lib_options.c,v 1.74 2013/01/12 16:44:17 tom Exp $")
MODULE_ID("$Id: lib_options.c,v 1.75 2013/11/16 19:25:39 tom Exp $")
NCURSES_EXPORT(int)
idlok(WINDOW *win, bool flag)
@ -56,7 +56,7 @@ idlok(WINDOW *win, bool flag)
if (win) {
SCREEN *sp = _nc_screen_of(win);
if (sp && IsTermInfo(sp)) {
if (sp != 0 && IsTermInfo(sp)) {
sp->_nc_sp_idlok =
win->_idlok = (flag && (NCURSES_SP_NAME(has_il) (NCURSES_SP_ARG)
|| change_scroll_region));

4
ncurses/tinfo/write_entry.c
View File

@ -47,7 +47,7 @@
#define TRACE_OUT(p) /*nothing */
#endif
MODULE_ID("$Id: write_entry.c,v 1.89 2013/09/28 20:20:30 tom Exp $")
MODULE_ID("$Id: write_entry.c,v 1.90 2013/11/16 19:58:14 tom Exp $")
static int total_written;
@ -93,7 +93,7 @@ check_writeable(int code)
char dir[sizeof(LEAF_FMT)];
char *s = 0;
if (code == 0 || (s = strchr(dirnames, code)) == 0)
if (code == 0 || (s = (strchr) (dirnames, code)) == 0)
_nc_err_abort("Illegal terminfo subdirectory \"" LEAF_FMT "\"", code);
if (verified[s - dirnames])

4
package/debian-mingw/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (5.9-20131110) unstable; urgency=low
ncurses6 (5.9-20131116) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 09 Nov 2013 09:23:57 -0500
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Nov 2013 17:08:49 -0500
ncurses6 (5.9-20131005) unstable; urgency=low

4
package/debian-mingw64/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (5.9-20131110) unstable; urgency=low
ncurses6 (5.9-20131116) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 09 Nov 2013 09:23:57 -0500
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Nov 2013 17:08:49 -0500
ncurses6 (5.9-20131005) unstable; urgency=low

4
package/debian/changelog
View File

@ -1,8 +1,8 @@
ncurses6 (5.9-20131110) unstable; urgency=low
ncurses6 (5.9-20131116) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 09 Nov 2013 09:23:57 -0500
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 16 Nov 2013 17:08:49 -0500
ncurses6 (5.9-20120608) unstable; urgency=low

4
package/mingw-ncurses.nsi
View File

@ -1,4 +1,4 @@
; $Id: mingw-ncurses.nsi,v 1.13 2013/11/10 22:44:38 tom Exp $
; $Id: mingw-ncurses.nsi,v 1.15 2013/11/16 17:39:03 tom Exp $
; TODO add examples
; TODO bump ABI to 6
@ -10,7 +10,7 @@
!define VERSION_MAJOR "5"
!define VERSION_MINOR "9"
!define VERSION_YYYY "2013"
!define VERSION_MMDD "1110"
!define VERSION_MMDD "1116"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"

2
package/mingw-ncurses.spec
View File

@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 5.9
Release: 20131110
Release: 20131116
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

2
package/ncurses.spec
View File

@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 5.9
Release: 20131110
Release: 20131116
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

4
progs/dump_entry.c
View File

@ -39,7 +39,7 @@
#include "termsort.c" /* this C file is generated */
#include <parametrized.h> /* so is this */
MODULE_ID("$Id: dump_entry.c,v 1.109 2013/05/04 18:48:56 tom Exp $")
MODULE_ID("$Id: dump_entry.c,v 1.110 2013/11/16 19:58:01 tom Exp $")
#define INDENT 8
#define DISCARD(string) string = ABSENT_STRING
@ -876,7 +876,7 @@ fmt_entry(TERMTYPE *tterm,
tp = boxchars;
for (cp = acstrans; *cp; cp++) {
sp = strchr(acs_chars, *cp);
sp = (strchr) (acs_chars, *cp);
if (sp)
*tp++ = sp[1];
else {

13
progs/infocmp.c
View File

@ -42,7 +42,7 @@
#include <dump_entry.h>
MODULE_ID("$Id: infocmp.c,v 1.126 2013/06/08 16:51:33 tom Exp $")
MODULE_ID("$Id: infocmp.c,v 1.127 2013/11/16 20:26:09 tom Exp $")
#define L_CURL "{"
#define R_CURL "}"
@ -788,7 +788,7 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp)
const assoc *ap;
int tp_lines = tp->Numbers[2];
if (cap == ABSENT_STRING || cap == CANCELLED_STRING)
if (!VALID_STRING(cap))
return;
(void) printf("%s: ", name);
@ -804,12 +804,13 @@ analyze_string(const char *name, const char *cap, TERMTYPE *tp)
for (i = 0; i < STRCOUNT; i++) {
char *cp = tp->Strings[i];
/* don't use soft-key capabilities */
if (strnames[i][0] == 'k' && strnames[i][0] == 'f')
/* don't use function-key capabilities */
if (strnames[i][0] == 'k' && strnames[i][1] == 'f')
continue;
if (cp != ABSENT_STRING && cp != CANCELLED_STRING && cp[0] && cp
!= cap) {
if (VALID_STRING(cp) &&
cp[0] != '\0' &&
cp != cap) {
len = strlen(cp);
(void) strncpy(buf2, sp, len);
buf2[len] = '\0';

4
progs/tic.c
View File

@ -46,7 +46,7 @@
#include <hashed_db.h>
#include <transform.h>
MODULE_ID("$Id: tic.c,v 1.188 2013/08/24 21:48:21 tom Exp $")
MODULE_ID("$Id: tic.c,v 1.189 2013/11/16 19:58:09 tom Exp $")
#define STDIN_NAME "<stdin>"
@ -1140,7 +1140,7 @@ keypad_index(const char *string)
long result = -1;
if ((ch = keypad_final(string)) != '\0') {
test = strchr(list, ch);
test = (strchr) (list, ch);
if (test != 0)
result = (long) (test - list);
}

15
test/aclocal.m4 vendored
View File

@ -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.90 2013/10/12 21:02:05 tom Exp $
dnl $Id: aclocal.m4,v 1.92 2013/11/16 20:05:42 tom Exp $
dnl
dnl Author: Thomas E. Dickey
dnl
@ -845,7 +845,7 @@ ncursesw/term.h)
esac
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_CURSES_UNCTRL_H version: 2 updated: 2012/10/06 08:57:51
dnl CF_CURSES_UNCTRL_H version: 3 updated: 2013/11/03 06:26:10
dnl ------------------
dnl Any X/Open curses implementation must have unctrl.h, but ncurses packages
dnl may put it in a subdirectory (along with ncurses' other headers, of
@ -879,13 +879,13 @@ do
break],
[cf_cv_unctrl_header=no])
done
])
case $cf_cv_unctrl_header in #(vi
no)
AC_MSG_WARN(unctrl.h header not found)
;;
esac
])
case $cf_cv_unctrl_header in #(vi
unctrl.h) #(vi
@ -1387,7 +1387,7 @@ if test "$GCC" = yes ; then
fi
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_GCC_WARNINGS version: 29 updated: 2012/06/16 14:55:39
dnl CF_GCC_WARNINGS version: 30 updated: 2013/11/16 13:56:26
dnl ---------------
dnl Check if the compiler supports useful warning options. There's a few that
dnl we don't use, simply because they're too noisy:
@ -1463,14 +1463,19 @@ then
Wbad-function-cast \
Wcast-align \
Wcast-qual \
Wdeclaration-after-statement \
Wextra \
Wignored-qualifiers \
Winline \
Wlogical-op \
Wmissing-declarations \
Wmissing-prototypes \
Wnested-externs \
Wpointer-arith \
Wshadow \
Wstrict-prototypes \
Wundef $cf_warn_CONST $1
Wundef \
Wvarargs $cf_warn_CONST $1
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
if AC_TRY_EVAL(ac_compile); then

4
test/bs.c
View File

@ -34,7 +34,7 @@
* v2.0 featuring strict ANSI/POSIX conformance, November 1993.
* v2.1 with ncurses mouse support, September 1995
*
* $Id: bs.c,v 1.61 2013/04/27 19:46:53 tom Exp $
* $Id: bs.c,v 1.62 2013/11/16 19:57:56 tom Exp $
*/
#include <test.priv.h>
@ -444,7 +444,7 @@ initgame(void)
do {
c = (char) getcoord(PLAYER);
} while
(!strchr(docked, c));
(!(strchr) (docked, c));
if (c == 'R')
(void) ungetch('R');

185
test/configure vendored
View File

@ -13096,17 +13096,17 @@ fi
rm -f conftest.$ac_objext conftest.$ac_ext
done
fi
echo "$as_me:13100: result: $cf_cv_unctrl_header" >&5
echo "${ECHO_T}$cf_cv_unctrl_header" >&6
case $cf_cv_unctrl_header in #(vi
no)
{ echo "$as_me:13101: WARNING: unctrl.h header not found" >&5
{ echo "$as_me:13105: WARNING: unctrl.h header not found" >&5
echo "$as_me: WARNING: unctrl.h header not found" >&2;}
;;
esac
fi
echo "$as_me:13107: result: $cf_cv_unctrl_header" >&5
echo "${ECHO_T}$cf_cv_unctrl_header" >&6
case $cf_cv_unctrl_header in #(vi
unctrl.h) #(vi
@ -15187,22 +15187,27 @@ echo "$as_me: checking for $CC warning options..." >&6;}
Wbad-function-cast \
Wcast-align \
Wcast-qual \
Wdeclaration-after-statement \
Wextra \
Wignored-qualifiers \
Winline \
Wlogical-op \
Wmissing-declarations \
Wmissing-prototypes \
Wnested-externs \
Wpointer-arith \
Wshadow \
Wstrict-prototypes \
Wundef $cf_warn_CONST
Wundef \
Wvarargs $cf_warn_CONST
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
if { (eval echo "$as_me:15200: \"$ac_compile\"") >&5
if { (eval echo "$as_me:15205: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
echo "$as_me:15203: \$? = $ac_status" >&5
echo "$as_me:15208: \$? = $ac_status" >&5
(exit $ac_status); }; then
test -n "$verbose" && echo "$as_me:15205: result: ... -$cf_opt" >&5
test -n "$verbose" && echo "$as_me:15210: result: ... -$cf_opt" >&5
echo "${ECHO_T}... -$cf_opt" >&6
case $cf_opt in #(vi
Wcast-qual) #(vi
@ -15213,7 +15218,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
[34].*)
test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
echo "${as_me:-configure}:15216: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
echo "${as_me:-configure}:15221: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
continue;;
esac
@ -15223,7 +15228,7 @@ echo "${as_me:-configure}:15216: testing feature is broken in gcc $GCC_VERSION .
[12].*)
test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6
echo "${as_me:-configure}:15226: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
echo "${as_me:-configure}:15231: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
continue;;
esac
@ -15239,7 +15244,7 @@ rm -rf conftest*
fi
fi
echo "$as_me:15242: checking if you want to use dmalloc for testing" >&5
echo "$as_me:15247: checking if you want to use dmalloc for testing" >&5
echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
# Check whether --with-dmalloc or --without-dmalloc was given.
@ -15256,7 +15261,7 @@ EOF
else
with_dmalloc=
fi;
echo "$as_me:15259: result: ${with_dmalloc:-no}" >&5
echo "$as_me:15264: result: ${with_dmalloc:-no}" >&5
echo "${ECHO_T}${with_dmalloc:-no}" >&6
case .$with_cflags in #(vi
@ -15350,23 +15355,23 @@ fi
esac
if test "$with_dmalloc" = yes ; then
echo "$as_me:15353: checking for dmalloc.h" >&5
echo "$as_me:15358: checking for dmalloc.h" >&5
echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
if test "${ac_cv_header_dmalloc_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
#line 15359 "configure"
#line 15364 "configure"
#include "confdefs.h"
#include <dmalloc.h>
_ACEOF
if { (eval echo "$as_me:15363: \"$ac_cpp conftest.$ac_ext\"") >&5
if { (eval echo "$as_me:15368: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:15369: \$? = $ac_status" >&5
echo "$as_me:15374: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@ -15385,11 +15390,11 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
echo "$as_me:15388: result: $ac_cv_header_dmalloc_h" >&5
echo "$as_me:15393: result: $ac_cv_header_dmalloc_h" >&5
echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
if test $ac_cv_header_dmalloc_h = yes; then
echo "$as_me:15392: checking for dmalloc_debug in -ldmalloc" >&5
echo "$as_me:15397: checking for dmalloc_debug in -ldmalloc" >&5
echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@ -15397,7 +15402,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldmalloc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line 15400 "configure"
#line 15405 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@ -15416,16 +15421,16 @@ dmalloc_debug ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:15419: \"$ac_link\"") >&5
if { (eval echo "$as_me:15424: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:15422: \$? = $ac_status" >&5
echo "$as_me:15427: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:15425: \"$ac_try\"") >&5
{ (eval echo "$as_me:15430: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:15428: \$? = $ac_status" >&5
echo "$as_me:15433: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dmalloc_dmalloc_debug=yes
else
@ -15436,7 +15441,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:15439: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
echo "$as_me:15444: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
cat >>confdefs.h <<EOF
@ -15451,7 +15456,7 @@ fi
fi
echo "$as_me:15454: checking if you want to use dbmalloc for testing" >&5
echo "$as_me:15459: checking if you want to use dbmalloc for testing" >&5
echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
# Check whether --with-dbmalloc or --without-dbmalloc was given.
@ -15468,7 +15473,7 @@ EOF
else
with_dbmalloc=
fi;
echo "$as_me:15471: result: ${with_dbmalloc:-no}" >&5
echo "$as_me:15476: result: ${with_dbmalloc:-no}" >&5
echo "${ECHO_T}${with_dbmalloc:-no}" >&6
case .$with_cflags in #(vi
@ -15562,23 +15567,23 @@ fi
esac
if test "$with_dbmalloc" = yes ; then
echo "$as_me:15565: checking for dbmalloc.h" >&5
echo "$as_me:15570: checking for dbmalloc.h" >&5
echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
if test "${ac_cv_header_dbmalloc_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
#line 15571 "configure"
#line 15576 "configure"
#include "confdefs.h"
#include <dbmalloc.h>
_ACEOF
if { (eval echo "$as_me:15575: \"$ac_cpp conftest.$ac_ext\"") >&5
if { (eval echo "$as_me:15580: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:15581: \$? = $ac_status" >&5
echo "$as_me:15586: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@ -15597,11 +15602,11 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
echo "$as_me:15600: result: $ac_cv_header_dbmalloc_h" >&5
echo "$as_me:15605: result: $ac_cv_header_dbmalloc_h" >&5
echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
if test $ac_cv_header_dbmalloc_h = yes; then
echo "$as_me:15604: checking for debug_malloc in -ldbmalloc" >&5
echo "$as_me:15609: checking for debug_malloc in -ldbmalloc" >&5
echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@ -15609,7 +15614,7 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldbmalloc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line 15612 "configure"
#line 15617 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@ -15628,16 +15633,16 @@ debug_malloc ();
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:15631: \"$ac_link\"") >&5
if { (eval echo "$as_me:15636: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:15634: \$? = $ac_status" >&5
echo "$as_me:15639: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:15637: \"$ac_try\"") >&5
{ (eval echo "$as_me:15642: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:15640: \$? = $ac_status" >&5
echo "$as_me:15645: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dbmalloc_debug_malloc=yes
else
@ -15648,7 +15653,7 @@ fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:15651: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
echo "$as_me:15656: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
cat >>confdefs.h <<EOF
@ -15663,7 +15668,7 @@ fi
fi
echo "$as_me:15666: checking if you want to use valgrind for testing" >&5
echo "$as_me:15671: checking if you want to use valgrind for testing" >&5
echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
# Check whether --with-valgrind or --without-valgrind was given.
@ -15680,7 +15685,7 @@ EOF
else
with_valgrind=
fi;
echo "$as_me:15683: result: ${with_valgrind:-no}" >&5
echo "$as_me:15688: result: ${with_valgrind:-no}" >&5
echo "${ECHO_T}${with_valgrind:-no}" >&6
case .$with_cflags in #(vi
@ -15773,7 +15778,7 @@ fi
;;
esac
echo "$as_me:15776: checking if you want to perform memory-leak testing" >&5
echo "$as_me:15781: checking if you want to perform memory-leak testing" >&5
echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
# Check whether --enable-leaks or --disable-leaks was given.
@ -15783,7 +15788,7 @@ if test "${enable_leaks+set}" = set; then
else
: ${with_no_leaks:=no}
fi;
echo "$as_me:15786: result: $with_no_leaks" >&5
echo "$as_me:15791: result: $with_no_leaks" >&5
echo "${ECHO_T}$with_no_leaks" >&6
if test "$with_no_leaks" = yes ; then
@ -15799,7 +15804,7 @@ EOF
fi
LD_RPATH_OPT=
echo "$as_me:15802: checking for an rpath option" >&5
echo "$as_me:15807: checking for an rpath option" >&5
echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
case $cf_cv_system_name in #(vi
irix*) #(vi
@ -15830,17 +15835,17 @@ solaris2*) #(vi
*)
;;
esac
echo "$as_me:15833: result: $LD_RPATH_OPT" >&5
echo "$as_me:15838: result: $LD_RPATH_OPT" >&5
echo "${ECHO_T}$LD_RPATH_OPT" >&6
case "x$LD_RPATH_OPT" in #(vi
x-R*)
echo "$as_me:15838: checking if we need a space after rpath option" >&5
echo "$as_me:15843: checking if we need a space after rpath option" >&5
echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
cf_save_LIBS="$LIBS"
LIBS="${LD_RPATH_OPT}$libdir $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line 15843 "configure"
#line 15848 "configure"
#include "confdefs.h"
int
@ -15852,16 +15857,16 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:15855: \"$ac_link\"") >&5
if { (eval echo "$as_me:15860: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:15858: \$? = $ac_status" >&5
echo "$as_me:15863: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:15861: \"$ac_try\"") >&5
{ (eval echo "$as_me:15866: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:15864: \$? = $ac_status" >&5
echo "$as_me:15869: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_rpath_space=no
else
@ -15871,13 +15876,13 @@ cf_rpath_space=yes
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS="$cf_save_LIBS"
echo "$as_me:15874: result: $cf_rpath_space" >&5
echo "$as_me:15879: result: $cf_rpath_space" >&5
echo "${ECHO_T}$cf_rpath_space" >&6
test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
;;
esac
echo "$as_me:15880: checking if rpath-hack should be disabled" >&5
echo "$as_me:15885: checking if rpath-hack should be disabled" >&5
echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
# Check whether --enable-rpath-hack or --disable-rpath-hack was given.
@ -15894,21 +15899,21 @@ else
cf_disable_rpath_hack=no
fi;
echo "$as_me:15897: result: $cf_disable_rpath_hack" >&5
echo "$as_me:15902: result: $cf_disable_rpath_hack" >&5
echo "${ECHO_T}$cf_disable_rpath_hack" >&6
if test "$cf_disable_rpath_hack" = no ; then
echo "$as_me:15901: checking for updated LDFLAGS" >&5
echo "$as_me:15906: checking for updated LDFLAGS" >&5
echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
if test -n "$LD_RPATH_OPT" ; then
echo "$as_me:15904: result: maybe" >&5
echo "$as_me:15909: result: maybe" >&5
echo "${ECHO_T}maybe" >&6
for ac_prog in ldd
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo "$as_me:15911: checking for $ac_word" >&5
echo "$as_me:15916: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@ -15923,7 +15928,7 @@ for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_cf_ldd_prog="$ac_prog"
echo "$as_me:15926: found $ac_dir/$ac_word" >&5
echo "$as_me:15931: found $ac_dir/$ac_word" >&5
break
done
@ -15931,10 +15936,10 @@ fi
fi
cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
if test -n "$cf_ldd_prog"; then
echo "$as_me:15934: result: $cf_ldd_prog" >&5
echo "$as_me:15939: result: $cf_ldd_prog" >&5
echo "${ECHO_T}$cf_ldd_prog" >&6
else
echo "$as_me:15937: result: no" >&5
echo "$as_me:15942: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@ -15948,7 +15953,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
cf_rpath_oops=
cat >conftest.$ac_ext <<_ACEOF
#line 15951 "configure"
#line 15956 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@ -15960,16 +15965,16 @@ printf("Hello");
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:15963: \"$ac_link\"") >&5
if { (eval echo "$as_me:15968: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
echo "$as_me:15966: \$? = $ac_status" >&5
echo "$as_me:15971: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:15969: \"$ac_try\"") >&5
{ (eval echo "$as_me:15974: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:15972: \$? = $ac_status" >&5
echo "$as_me:15977: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@ -15997,7 +16002,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
then
test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
echo "${as_me:-configure}:16000: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
echo "${as_me:-configure}:16005: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
break
@ -16009,11 +16014,11 @@ echo "${as_me:-configure}:16000: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
echo "${as_me:-configure}:16012: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
echo "${as_me:-configure}:16017: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6
echo "${as_me:-configure}:16016: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
echo "${as_me:-configure}:16021: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
cf_rpath_dst=
for cf_rpath_src in $LDFLAGS
@ -16050,7 +16055,7 @@ do
then
test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
echo "${as_me:-configure}:16053: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
echo "${as_me:-configure}:16058: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
fi
@ -16063,11 +16068,11 @@ LDFLAGS=$cf_rpath_dst
test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6
echo "${as_me:-configure}:16066: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
echo "${as_me:-configure}:16071: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6
echo "${as_me:-configure}:16070: testing ...checking LIBS $LIBS ..." 1>&5
echo "${as_me:-configure}:16075: testing ...checking LIBS $LIBS ..." 1>&5
cf_rpath_dst=
for cf_rpath_src in $LIBS
@ -16104,7 +16109,7 @@ do
then
test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
echo "${as_me:-configure}:16107: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
echo "${as_me:-configure}:16112: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
fi
@ -16117,14 +16122,14 @@ LIBS=$cf_rpath_dst
test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6
echo "${as_me:-configure}:16120: testing ...checked LIBS $LIBS ..." 1>&5
echo "${as_me:-configure}:16125: testing ...checked LIBS $LIBS ..." 1>&5
test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
echo "${as_me:-configure}:16124: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
echo "${as_me:-configure}:16129: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
else
echo "$as_me:16127: result: no" >&5
echo "$as_me:16132: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@ -16214,7 +16219,7 @@ DEFS=-DHAVE_CONFIG_H
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
{ echo "$as_me:16217: creating $CONFIG_STATUS" >&5
{ echo "$as_me:16222: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
@ -16390,7 +16395,7 @@ cat >>$CONFIG_STATUS <<\EOF
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
{ { echo "$as_me:16393: error: ambiguous option: $1
{ { echo "$as_me:16398: error: ambiguous option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2;}
@ -16409,7 +16414,7 @@ Try \`$0 --help' for more information." >&2;}
ac_need_defaults=false;;
# This is an error.
-*) { { echo "$as_me:16412: error: unrecognized option: $1
-*) { { echo "$as_me:16417: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2;}
@ -16459,7 +16464,7 @@ do
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
"ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;;
*) { { echo "$as_me:16462: error: invalid argument: $ac_config_target" >&5
*) { { echo "$as_me:16467: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
@ -16730,7 +16735,7 @@ done; }
esac
if test x"$ac_file" != x-; then
{ echo "$as_me:16733: creating $ac_file" >&5
{ echo "$as_me:16738: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
@ -16748,7 +16753,7 @@ echo "$as_me: creating $ac_file" >&6;}
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
test -f "$f" || { { echo "$as_me:16751: error: cannot find input file: $f" >&5
test -f "$f" || { { echo "$as_me:16756: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@ -16761,7 +16766,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo $srcdir/$f
else
# /dev/null tree
{ { echo "$as_me:16764: error: cannot find input file: $f" >&5
{ { echo "$as_me:16769: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@ -16777,7 +16782,7 @@ cat >>$CONFIG_STATUS <<\EOF
if test -n "$ac_seen"; then
ac_used=`grep '@datarootdir@' $ac_item`
if test -z "$ac_used"; then
{ echo "$as_me:16780: WARNING: datarootdir was used implicitly but not set:
{ echo "$as_me:16785: WARNING: datarootdir was used implicitly but not set:
$ac_seen" >&5
echo "$as_me: WARNING: datarootdir was used implicitly but not set:
$ac_seen" >&2;}
@ -16786,7 +16791,7 @@ $ac_seen" >&2;}
fi
ac_seen=`grep '${datarootdir}' $ac_item`
if test -n "$ac_seen"; then
{ echo "$as_me:16789: WARNING: datarootdir was used explicitly but not set:
{ echo "$as_me:16794: WARNING: datarootdir was used explicitly but not set:
$ac_seen" >&5
echo "$as_me: WARNING: datarootdir was used explicitly but not set:
$ac_seen" >&2;}
@ -16823,7 +16828,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file`
if test -z "$ac_init"; then
ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
{ echo "$as_me:16826: WARNING: Variable $ac_name is used but was not set:
{ echo "$as_me:16831: WARNING: Variable $ac_name is used but was not set:
$ac_seen" >&5
echo "$as_me: WARNING: Variable $ac_name is used but was not set:
$ac_seen" >&2;}
@ -16834,7 +16839,7 @@ $ac_seen" >&2;}
egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
if test -s $tmp/out; then
ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
{ echo "$as_me:16837: WARNING: Some variables may not be substituted:
{ echo "$as_me:16842: WARNING: Some variables may not be substituted:
$ac_seen" >&5
echo "$as_me: WARNING: Some variables may not be substituted:
$ac_seen" >&2;}
@ -16883,7 +16888,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
* ) ac_file_in=$ac_file.in ;;
esac
test x"$ac_file" != x- && { echo "$as_me:16886: creating $ac_file" >&5
test x"$ac_file" != x- && { echo "$as_me:16891: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
@ -16894,7 +16899,7 @@ echo "$as_me: creating $ac_file" >&6;}
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
test -f "$f" || { { echo "$as_me:16897: error: cannot find input file: $f" >&5
test -f "$f" || { { echo "$as_me:16902: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@ -16907,7 +16912,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo $srcdir/$f
else
# /dev/null tree
{ { echo "$as_me:16910: error: cannot find input file: $f" >&5
{ { echo "$as_me:16915: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@ -16965,7 +16970,7 @@ cat >>$CONFIG_STATUS <<\EOF
rm -f $tmp/in
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
{ echo "$as_me:16968: $ac_file is unchanged" >&5
{ echo "$as_me:16973: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \