mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2024-12-15 07:30:12 +08:00
ncurses 5.6 - patch 20071201
+ add note about configure options needed for Berkeley database to the INSTALL file. + improve checks for version of Berkeley database libraries. + amend fix for rpath to not modify LDFLAGS if the platform has no applicable transformation (report by Christian Ebert, cf: 20071124).
This commit is contained in:
Thomas E. Dickey
parent
c7bc3019ea
commit
9378ce0407
8
INSTALL
8
INSTALL
@ -25,7 +25,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: INSTALL,v 1.121 2007/11/24 20:22:52 tom Exp $
|
||||
-- $Id: INSTALL,v 1.122 2007/12/01 19:37:47 tom Exp $
|
||||
---------------------------------------------------------------------
|
||||
How to install Ncurses/Terminfo on your system
|
||||
---------------------------------------------------------------------
|
||||
@ -699,6 +699,12 @@ SUMMARY OF CONFIGURE OPTIONS:
|
||||
each compiled entry in a separate binary file within a directory
|
||||
tree.
|
||||
|
||||
In particular, this uses the Berkeley database 1.8.5 interface, as
|
||||
provided by that and its successors db 2, 3, and 4. The actual
|
||||
interface is slightly different in the successor versions of the
|
||||
Berkeley database. The database should have been configured using
|
||||
"--enable-compat185".
|
||||
|
||||
If you use this option for configuring ncurses, tic will only be able
|
||||
to write entries in the hashed database. infocmp can still read
|
||||
entries from a directory tree as well as reading entries from the
|
||||
|
||||
9
NEWS
9
NEWS
@ -25,7 +25,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.1184 2007/11/25 00:04:31 tom Exp $
|
||||
-- $Id: NEWS,v 1.1186 2007/12/01 19:38:49 tom Exp $
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
This is a log of changes that ncurses has gone through since Zeyd started
|
||||
@ -45,6 +45,13 @@ 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.
|
||||
|
||||
20071201
|
||||
+ add note about configure options needed for Berkeley database to the
|
||||
INSTALL file.
|
||||
+ improve checks for version of Berkeley database libraries.
|
||||
+ amend fix for rpath to not modify LDFLAGS if the platform has no
|
||||
applicable transformation (report by Christian Ebert, cf: 20071124).
|
||||
|
||||
20071124
|
||||
+ modify configure option --with-hashed-db to accept a parameter which
|
||||
is the install-prefix of a given Berkeley Database (prompted by
|
||||
|
||||
58
aclocal.m4
vendored
58
aclocal.m4
vendored
@ -28,7 +28,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.440 2007/11/25 00:58:01 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.442 2007/12/01 20:02:42 tom Exp $
|
||||
dnl Macros used in NCURSES auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -1687,7 +1687,7 @@ fi
|
||||
])
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_HASHED_DB_LIBS version: 6 updated: 2006/12/16 12:33:30
|
||||
dnl CF_HASHED_DB_LIBS version: 7 updated: 2007/12/01 15:01:37
|
||||
dnl -----------------
|
||||
dnl Given that we have the header and version for hashed database, find the
|
||||
dnl library information.
|
||||
@ -1695,7 +1695,7 @@ AC_DEFUN([CF_HASHED_DB_LIBS],
|
||||
[
|
||||
AC_CACHE_CHECK(for db libraries, cf_cv_hashed_db_libs,[
|
||||
cf_cv_hashed_db_libs=unknown
|
||||
for cf_db_libs in db$cf_cv_hashed_db_version db ''
|
||||
for cf_db_libs in db$cf_cv_hashed_db_version db-$cf_cv_hashed_db_version db ''
|
||||
do
|
||||
cf_save_libs="$LIBS"
|
||||
if test -n "$cf_db_libs"; then
|
||||
@ -1759,7 +1759,7 @@ done
|
||||
])
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_HASHED_DB_VERSION version: 2 updated: 2006/08/19 15:12:49
|
||||
dnl CF_HASHED_DB_VERSION version: 3 updated: 2007/12/01 15:01:37
|
||||
dnl --------------------
|
||||
dnl Given that we have the header file for hashed database, find the version
|
||||
dnl information.
|
||||
@ -1768,7 +1768,7 @@ AC_DEFUN([CF_HASHED_DB_VERSION],
|
||||
AC_CACHE_CHECK(for version of db, cf_cv_hashed_db_version,[
|
||||
cf_cv_hashed_db_version=unknown
|
||||
|
||||
for cf_db_version in 1 2 3 4
|
||||
for cf_db_version in 1 2 3 4 5
|
||||
do
|
||||
CF_MSG_LOG(checking for db version $cf_db_version)
|
||||
AC_TRY_COMPILE([
|
||||
@ -3841,7 +3841,7 @@ define([CF_REMOVE_LIB],
|
||||
$1=`echo "$2" | sed -e 's/-l$3[[ ]]//g' -e 's/-l$3[$]//'`
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_RPATH_HACK version: 2 updated: 2007/11/24 19:09:03
|
||||
dnl CF_RPATH_HACK version: 3 updated: 2007/12/01 11:14:13
|
||||
dnl -------------
|
||||
AC_DEFUN([CF_RPATH_HACK],
|
||||
[
|
||||
@ -3865,28 +3865,30 @@ case "$EXTRA_LDFLAGS" in #(vi
|
||||
cf_rpath_hack=
|
||||
;;
|
||||
esac
|
||||
cf_rpath_dst=
|
||||
for cf_rpath_src in $LDFLAGS
|
||||
do
|
||||
CF_VERBOSE(Filtering $cf_rpath_src)
|
||||
case $cf_rpath_src in #(vi
|
||||
-L*) #(vi
|
||||
if test "$cf_rpath_hack" = "-R " ; then
|
||||
cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e 's%-L%-R %'`
|
||||
else
|
||||
cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e s%-L%$cf_rpath_hack%`
|
||||
fi
|
||||
CF_VERBOSE(...Filter $cf_rpath_tmp)
|
||||
EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
|
||||
;;
|
||||
*)
|
||||
cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
LDFLAGS=$cf_rpath_dst
|
||||
CF_VERBOSE(...checked LDFLAGS $LDFLAGS)
|
||||
CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS)
|
||||
if test -n "$cf_rpath_hack" ; then
|
||||
cf_rpath_dst=
|
||||
for cf_rpath_src in $LDFLAGS
|
||||
do
|
||||
CF_VERBOSE(Filtering $cf_rpath_src)
|
||||
case $cf_rpath_src in #(vi
|
||||
-L*) #(vi
|
||||
if test "$cf_rpath_hack" = "-R " ; then
|
||||
cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e 's%-L%-R %'`
|
||||
else
|
||||
cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e s%-L%$cf_rpath_hack%`
|
||||
fi
|
||||
CF_VERBOSE(...Filter $cf_rpath_tmp)
|
||||
EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
|
||||
;;
|
||||
*)
|
||||
cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
LDFLAGS=$cf_rpath_dst
|
||||
CF_VERBOSE(...checked LDFLAGS $LDFLAGS)
|
||||
CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS)
|
||||
fi
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
|
||||
82
configure
vendored
82
configure
vendored
@ -13584,7 +13584,7 @@ else
|
||||
|
||||
cf_cv_hashed_db_version=unknown
|
||||
|
||||
for cf_db_version in 1 2 3 4
|
||||
for cf_db_version in 1 2 3 4 5
|
||||
do
|
||||
|
||||
echo "${as_me-configure}:13590: testing checking for db version $cf_db_version ..." 1>&5
|
||||
@ -13659,7 +13659,7 @@ if test "${cf_cv_hashed_db_libs+set}" = set; then
|
||||
else
|
||||
|
||||
cf_cv_hashed_db_libs=unknown
|
||||
for cf_db_libs in db$cf_cv_hashed_db_version db ''
|
||||
for cf_db_libs in db$cf_cv_hashed_db_version db-$cf_cv_hashed_db_version db ''
|
||||
do
|
||||
cf_save_libs="$LIBS"
|
||||
if test -n "$cf_db_libs"; then
|
||||
@ -15851,42 +15851,44 @@ case "$EXTRA_LDFLAGS" in #(vi
|
||||
cf_rpath_hack=
|
||||
;;
|
||||
esac
|
||||
cf_rpath_dst=
|
||||
for cf_rpath_src in $LDFLAGS
|
||||
do
|
||||
test -n "$verbose" && echo " Filtering $cf_rpath_src" 1>&6
|
||||
if test -n "$cf_rpath_hack" ; then
|
||||
cf_rpath_dst=
|
||||
for cf_rpath_src in $LDFLAGS
|
||||
do
|
||||
test -n "$verbose" && echo " Filtering $cf_rpath_src" 1>&6
|
||||
|
||||
echo "${as_me-configure}:15859: testing Filtering $cf_rpath_src ..." 1>&5
|
||||
echo "${as_me-configure}:15860: testing Filtering $cf_rpath_src ..." 1>&5
|
||||
|
||||
case $cf_rpath_src in #(vi
|
||||
-L*) #(vi
|
||||
if test "$cf_rpath_hack" = "-R " ; then
|
||||
cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e 's%-L%-R %'`
|
||||
else
|
||||
cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e s%-L%$cf_rpath_hack%`
|
||||
fi
|
||||
test -n "$verbose" && echo " ...Filter $cf_rpath_tmp" 1>&6
|
||||
case $cf_rpath_src in #(vi
|
||||
-L*) #(vi
|
||||
if test "$cf_rpath_hack" = "-R " ; then
|
||||
cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e 's%-L%-R %'`
|
||||
else
|
||||
cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e s%-L%$cf_rpath_hack%`
|
||||
fi
|
||||
test -n "$verbose" && echo " ...Filter $cf_rpath_tmp" 1>&6
|
||||
|
||||
echo "${as_me-configure}:15870: testing ...Filter $cf_rpath_tmp ..." 1>&5
|
||||
echo "${as_me-configure}:15871: testing ...Filter $cf_rpath_tmp ..." 1>&5
|
||||
|
||||
EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
|
||||
;;
|
||||
*)
|
||||
cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
LDFLAGS=$cf_rpath_dst
|
||||
test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6
|
||||
EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
|
||||
;;
|
||||
*)
|
||||
cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
LDFLAGS=$cf_rpath_dst
|
||||
test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6
|
||||
|
||||
echo "${as_me-configure}:15882: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
|
||||
echo "${as_me-configure}:15883: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
|
||||
|
||||
test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
|
||||
test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
|
||||
|
||||
echo "${as_me-configure}:15886: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
|
||||
echo "${as_me-configure}:15887: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
|
||||
|
||||
fi
|
||||
else
|
||||
echo "$as_me:15889: result: no" >&5
|
||||
echo "$as_me:15891: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
@ -15996,7 +15998,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:15999: creating $CONFIG_STATUS" >&5
|
||||
{ echo "$as_me:16001: creating $CONFIG_STATUS" >&5
|
||||
echo "$as_me: creating $CONFIG_STATUS" >&6;}
|
||||
cat >$CONFIG_STATUS <<_ACEOF
|
||||
#! $SHELL
|
||||
@ -16172,7 +16174,7 @@ cat >>$CONFIG_STATUS <<\EOF
|
||||
echo "$ac_cs_version"; exit 0 ;;
|
||||
--he | --h)
|
||||
# Conflict between --help and --header
|
||||
{ { echo "$as_me:16175: error: ambiguous option: $1
|
||||
{ { echo "$as_me:16177: 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;}
|
||||
@ -16191,7 +16193,7 @@ Try \`$0 --help' for more information." >&2;}
|
||||
ac_need_defaults=false;;
|
||||
|
||||
# This is an error.
|
||||
-*) { { echo "$as_me:16194: error: unrecognized option: $1
|
||||
-*) { { echo "$as_me:16196: 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;}
|
||||
@ -16287,7 +16289,7 @@ do
|
||||
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
||||
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
|
||||
"include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
|
||||
*) { { echo "$as_me:16290: error: invalid argument: $ac_config_target" >&5
|
||||
*) { { echo "$as_me:16292: error: invalid argument: $ac_config_target" >&5
|
||||
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
||||
{ (exit 1); exit 1; }; };;
|
||||
esac
|
||||
@ -16668,7 +16670,7 @@ done; }
|
||||
esac
|
||||
|
||||
if test x"$ac_file" != x-; then
|
||||
{ echo "$as_me:16671: creating $ac_file" >&5
|
||||
{ echo "$as_me:16673: creating $ac_file" >&5
|
||||
echo "$as_me: creating $ac_file" >&6;}
|
||||
rm -f "$ac_file"
|
||||
fi
|
||||
@ -16686,7 +16688,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:16689: error: cannot find input file: $f" >&5
|
||||
test -f "$f" || { { echo "$as_me:16691: error: cannot find input file: $f" >&5
|
||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
echo $f;;
|
||||
@ -16699,7 +16701,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
echo $srcdir/$f
|
||||
else
|
||||
# /dev/null tree
|
||||
{ { echo "$as_me:16702: error: cannot find input file: $f" >&5
|
||||
{ { echo "$as_me:16704: error: cannot find input file: $f" >&5
|
||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi;;
|
||||
@ -16765,7 +16767,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:16768: creating $ac_file" >&5
|
||||
test x"$ac_file" != x- && { echo "$as_me:16770: creating $ac_file" >&5
|
||||
echo "$as_me: creating $ac_file" >&6;}
|
||||
|
||||
# First look for the input files in the build tree, otherwise in the
|
||||
@ -16776,7 +16778,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:16779: error: cannot find input file: $f" >&5
|
||||
test -f "$f" || { { echo "$as_me:16781: error: cannot find input file: $f" >&5
|
||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
echo $f;;
|
||||
@ -16789,7 +16791,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
echo $srcdir/$f
|
||||
else
|
||||
# /dev/null tree
|
||||
{ { echo "$as_me:16792: error: cannot find input file: $f" >&5
|
||||
{ { echo "$as_me:16794: error: cannot find input file: $f" >&5
|
||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi;;
|
||||
@ -16847,7 +16849,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:16850: $ac_file is unchanged" >&5
|
||||
{ echo "$as_me:16852: $ac_file is unchanged" >&5
|
||||
echo "$as_me: $ac_file is unchanged" >&6;}
|
||||
else
|
||||
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||||
|
||||
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.617 2007/11/24 18:44:07 tom Exp $
|
||||
# $Id: dist.mk,v 1.618 2007/12/01 16:08:01 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 = 6
|
||||
NCURSES_PATCH = 20071124
|
||||
NCURSES_PATCH = 20071201
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
|
||||
#include <curses.priv.h>
|
||||
|
||||
MODULE_ID("$Id: lib_delwin.c,v 1.14 2007/10/20 21:51:07 tom Exp $")
|
||||
MODULE_ID("$Id: lib_delwin.c,v 1.14 2007/11/03 20:24:15 tom Exp $")
|
||||
|
||||
static bool
|
||||
cannot_delete(WINDOW *win)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user