mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2024-12-15 07:30:12 +08:00
ncurses 5.9 - patch 20110924
+ modify _nc_read_tic_entry() so that hashed-database is checked before filesystem. + updated CF_CURSES_LIBS check in test/configure script. + modify configure script and makefiles to split TIC_ARGS and TINFO_ARGS into pieces corresponding to LDFLAGS and LIBS variables, to help separate searches for tic- and tinfo-libraries (patch by Nick Alcock aka "Nix"). + build-fix for lib_mouse.c changes (ch: 20110917).
This commit is contained in:
Thomas E. Dickey
parent
f3eb40315f
commit
22fd3b2368
43
Ada95/configure
vendored
43
Ada95/configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Revision: 1.33 .
|
||||
# From configure.in Revision: 1.35 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by Autoconf 2.52.20101002.
|
||||
#
|
||||
@ -11467,7 +11467,9 @@ fi
|
||||
################################################################################
|
||||
|
||||
# not needed
|
||||
TINFO_ARGS2=
|
||||
TINFO_LDFLAGS2=
|
||||
|
||||
TINFO_LIBS=
|
||||
|
||||
### Construct the list of include-directories to be generated
|
||||
|
||||
@ -11504,7 +11506,7 @@ elif test "$includedir" != "/usr/include"; then
|
||||
fi
|
||||
|
||||
### Build up pieces for makefile rules
|
||||
echo "$as_me:11507: checking default library suffix" >&5
|
||||
echo "$as_me:11509: checking default library suffix" >&5
|
||||
echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
|
||||
|
||||
case $DFT_LWR_MODEL in
|
||||
@ -11515,10 +11517,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
|
||||
shared) DFT_ARG_SUFFIX='' ;;
|
||||
esac
|
||||
test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
|
||||
echo "$as_me:11518: result: $DFT_ARG_SUFFIX" >&5
|
||||
echo "$as_me:11520: result: $DFT_ARG_SUFFIX" >&5
|
||||
echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
|
||||
|
||||
echo "$as_me:11521: checking default library-dependency suffix" >&5
|
||||
echo "$as_me:11523: checking default library-dependency suffix" >&5
|
||||
echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
|
||||
|
||||
case $DFT_LWR_MODEL in #(vi
|
||||
@ -11571,10 +11573,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
|
||||
esac
|
||||
test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}"
|
||||
test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
|
||||
echo "$as_me:11574: result: $DFT_DEP_SUFFIX" >&5
|
||||
echo "$as_me:11576: result: $DFT_DEP_SUFFIX" >&5
|
||||
echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
|
||||
|
||||
echo "$as_me:11577: checking default object directory" >&5
|
||||
echo "$as_me:11579: checking default object directory" >&5
|
||||
echo $ECHO_N "checking default object directory... $ECHO_C" >&6
|
||||
|
||||
case $DFT_LWR_MODEL in
|
||||
@ -11590,7 +11592,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
|
||||
DFT_OBJ_SUBDIR='obj_s' ;;
|
||||
esac
|
||||
esac
|
||||
echo "$as_me:11593: result: $DFT_OBJ_SUBDIR" >&5
|
||||
echo "$as_me:11595: result: $DFT_OBJ_SUBDIR" >&5
|
||||
echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
|
||||
|
||||
### Set up low-level terminfo dependencies for makefiles.
|
||||
@ -11806,7 +11808,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:11809: creating $CONFIG_STATUS" >&5
|
||||
{ echo "$as_me:11811: creating $CONFIG_STATUS" >&5
|
||||
echo "$as_me: creating $CONFIG_STATUS" >&6;}
|
||||
cat >$CONFIG_STATUS <<_ACEOF
|
||||
#! $SHELL
|
||||
@ -11982,7 +11984,7 @@ cat >>$CONFIG_STATUS <<\EOF
|
||||
echo "$ac_cs_version"; exit 0 ;;
|
||||
--he | --h)
|
||||
# Conflict between --help and --header
|
||||
{ { echo "$as_me:11985: error: ambiguous option: $1
|
||||
{ { echo "$as_me:11987: 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;}
|
||||
@ -12001,7 +12003,7 @@ Try \`$0 --help' for more information." >&2;}
|
||||
ac_need_defaults=false;;
|
||||
|
||||
# This is an error.
|
||||
-*) { { echo "$as_me:12004: error: unrecognized option: $1
|
||||
-*) { { echo "$as_me:12006: 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;}
|
||||
@ -12072,7 +12074,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:12075: error: invalid argument: $ac_config_target" >&5
|
||||
*) { { echo "$as_me:12077: error: invalid argument: $ac_config_target" >&5
|
||||
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
||||
{ (exit 1); exit 1; }; };;
|
||||
esac
|
||||
@ -12260,7 +12262,8 @@ s,@ADA_INCLUDE@,$ADA_INCLUDE,;t t
|
||||
s,@ADA_OBJECTS@,$ADA_OBJECTS,;t t
|
||||
s,@ADA_SHAREDLIB@,$ADA_SHAREDLIB,;t t
|
||||
s,@MAKE_ADA_SHAREDLIB@,$MAKE_ADA_SHAREDLIB,;t t
|
||||
s,@TINFO_ARGS2@,$TINFO_ARGS2,;t t
|
||||
s,@TINFO_LDFLAGS2@,$TINFO_LDFLAGS2,;t t
|
||||
s,@TINFO_LIBS@,$TINFO_LIBS,;t t
|
||||
s,@ACPPFLAGS@,$ACPPFLAGS,;t t
|
||||
s,@DFT_ARG_SUFFIX@,$DFT_ARG_SUFFIX,;t t
|
||||
s,@DFT_DEP_SUFFIX@,$DFT_DEP_SUFFIX,;t t
|
||||
@ -12388,7 +12391,7 @@ done; }
|
||||
esac
|
||||
|
||||
if test x"$ac_file" != x-; then
|
||||
{ echo "$as_me:12391: creating $ac_file" >&5
|
||||
{ echo "$as_me:12394: creating $ac_file" >&5
|
||||
echo "$as_me: creating $ac_file" >&6;}
|
||||
rm -f "$ac_file"
|
||||
fi
|
||||
@ -12406,7 +12409,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:12409: error: cannot find input file: $f" >&5
|
||||
test -f "$f" || { { echo "$as_me:12412: error: cannot find input file: $f" >&5
|
||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
echo $f;;
|
||||
@ -12419,7 +12422,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
echo $srcdir/$f
|
||||
else
|
||||
# /dev/null tree
|
||||
{ { echo "$as_me:12422: error: cannot find input file: $f" >&5
|
||||
{ { echo "$as_me:12425: error: cannot find input file: $f" >&5
|
||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi;;
|
||||
@ -12485,7 +12488,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:12488: creating $ac_file" >&5
|
||||
test x"$ac_file" != x- && { echo "$as_me:12491: creating $ac_file" >&5
|
||||
echo "$as_me: creating $ac_file" >&6;}
|
||||
|
||||
# First look for the input files in the build tree, otherwise in the
|
||||
@ -12496,7 +12499,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:12499: error: cannot find input file: $f" >&5
|
||||
test -f "$f" || { { echo "$as_me:12502: error: cannot find input file: $f" >&5
|
||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
echo $f;;
|
||||
@ -12509,7 +12512,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
echo $srcdir/$f
|
||||
else
|
||||
# /dev/null tree
|
||||
{ { echo "$as_me:12512: error: cannot find input file: $f" >&5
|
||||
{ { echo "$as_me:12515: error: cannot find input file: $f" >&5
|
||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi;;
|
||||
@ -12567,7 +12570,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:12570: $ac_file is unchanged" >&5
|
||||
{ echo "$as_me:12573: $ac_file is unchanged" >&5
|
||||
echo "$as_me: $ac_file is unchanged" >&6;}
|
||||
else
|
||||
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||||
|
||||
@ -28,14 +28,14 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey
|
||||
dnl
|
||||
dnl $Id: configure.in,v 1.33 2011/09/10 21:35:27 tom Exp $
|
||||
dnl $Id: configure.in,v 1.35 2011/09/24 15:32:32 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.13.20020210)
|
||||
AC_REVISION($Revision: 1.33 $)
|
||||
AC_REVISION($Revision: 1.35 $)
|
||||
AC_INIT(gen/gen.c)
|
||||
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
|
||||
|
||||
@ -534,8 +534,10 @@ fi
|
||||
################################################################################
|
||||
|
||||
# not needed
|
||||
TINFO_ARGS2=
|
||||
AC_SUBST(TINFO_ARGS2)
|
||||
TINFO_LDFLAGS2=
|
||||
AC_SUBST(TINFO_LDFLAGS2)
|
||||
TINFO_LIBS=
|
||||
AC_SUBST(TINFO_LIBS)
|
||||
|
||||
### Construct the list of include-directories to be generated
|
||||
CF_INCLUDE_DIRS
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
#
|
||||
# Author: Juergen Pfeifer, 1996
|
||||
#
|
||||
# $Id: Makefile.in,v 1.74 2011/03/26 23:36:30 tom Exp $
|
||||
# $Id: Makefile.in,v 1.75 2011/09/24 14:41:24 nix Exp $
|
||||
#
|
||||
.SUFFIXES:
|
||||
|
||||
@ -73,7 +73,7 @@ ABI_VERSION = @cf_cv_abi_version@
|
||||
LOCAL_LIBDIR = @top_builddir@/lib
|
||||
|
||||
LINK = $(HOST_CC)
|
||||
LD_FLAGS = @LD_MODEL@ $(LOCAL_LIBS) @LDFLAGS@ @LIBS@ @LOCAL_LDFLAGS2@ $(LDFLAGS) @TINFO_ARGS2@
|
||||
LD_FLAGS = @LD_MODEL@ $(LOCAL_LIBS) @TINFO_LDFLAGS2@ @LDFLAGS@ @LIBS@ @LOCAL_LDFLAGS2@ $(LDFLAGS) @TINFO_LIBS@
|
||||
|
||||
RANLIB = @RANLIB@
|
||||
|
||||
@ -411,7 +411,7 @@ adahtml:
|
||||
@mkdir -p $(HTML_DIR)
|
||||
cp -p ../src/*.ad[sb] . && chmod +w *.ad[sb]
|
||||
@USE_OLD_MAKERULES@ ln -sf ../src/*.ali .
|
||||
@USE_GNAT_PROJECTS@ ln -sf ../static-ali/*.ali .
|
||||
@USE_GNAT_PROJECTS@ ln -sf ../static-ali/*.ali .
|
||||
@echo "Filtering generated files"
|
||||
@for f in $(GEN_SRC); do \
|
||||
h=`basename $$f` ;\
|
||||
|
||||
12
NEWS
12
NEWS
@ -25,7 +25,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.1784 2011/09/17 22:05:18 tom Exp $
|
||||
-- $Id: NEWS,v 1.1788 2011/09/24 20:18:22 tom Exp $
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
This is a log of changes that ncurses has gone through since Zeyd started
|
||||
@ -45,6 +45,16 @@ 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.
|
||||
|
||||
20110924
|
||||
+ modify _nc_read_tic_entry() so that hashed-database is checked before
|
||||
filesystem.
|
||||
+ updated CF_CURSES_LIBS check in test/configure script.
|
||||
+ modify configure script and makefiles to split TIC_ARGS and
|
||||
TINFO_ARGS into pieces corresponding to LDFLAGS and LIBS variables,
|
||||
to help separate searches for tic- and tinfo-libraries (patch by Nick
|
||||
Alcock aka "Nix").
|
||||
+ build-fix for lib_mouse.c changes (ch: 20110917).
|
||||
|
||||
20110917
|
||||
+ fix compiler warning for clang 2.9
|
||||
+ improve merging of mouse events (integrated patch by Damien
|
||||
|
||||
16
aclocal.m4
vendored
16
aclocal.m4
vendored
@ -28,7 +28,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.574 2011/09/10 20:31:55 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.575 2011/09/24 16:55:29 tom Exp $
|
||||
dnl Macros used in NCURSES auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -2696,7 +2696,7 @@ ifdef([AC_FUNC_FSEEKO],[
|
||||
])
|
||||
])
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_LDFLAGS_STATIC version: 9 updated: 2011/07/02 15:36:04
|
||||
dnl CF_LDFLAGS_STATIC version: 10 updated: 2011/09/24 12:51:48
|
||||
dnl -----------------
|
||||
dnl Check for compiler/linker flags used to temporarily force usage of static
|
||||
dnl libraries. This depends on the compiler and platform. Use this to help
|
||||
@ -2767,7 +2767,17 @@ EOF
|
||||
int cf_ldflags_static(FILE *fp);
|
||||
],[
|
||||
return cf_ldflags_static(stdin);
|
||||
],[cf_ldflags_static=yes],[cf_ldflags_static=no])
|
||||
],[
|
||||
# some linkers simply ignore the -dynamic
|
||||
case x`file conftest$ac_exeext 2>/dev/null` in #(vi
|
||||
*static*) # (vi
|
||||
cf_ldflags_static=no
|
||||
;;
|
||||
*)
|
||||
cf_ldflags_static=yes
|
||||
;;
|
||||
esac
|
||||
],[cf_ldflags_static=no])
|
||||
|
||||
rm -f libconftest.*
|
||||
LIBS="$cf_save_LIBS"
|
||||
|
||||
103
configure
vendored
103
configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Revision: 1.525 .
|
||||
# From configure.in Revision: 1.526 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by Autoconf 2.52.20101002.
|
||||
#
|
||||
@ -19151,9 +19151,11 @@ if test "$with_ticlib" != no ; then
|
||||
TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}"
|
||||
TICS_LIB_SUFFIX="${TICS_NAME}${LIB_SUFFIX}"
|
||||
fi
|
||||
TICS_ARGS="-L${LIB_DIR} -l${TICS_LIB_SUFFIX}"
|
||||
TICS_LDFLAGS="-L${LIB_DIR}"
|
||||
TICS_LIBS="-l${TICS_LIB_SUFFIX}"
|
||||
else
|
||||
TICS_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
|
||||
TICS_LDFLAGS="-L${LIB_DIR}"
|
||||
TICS_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX}"
|
||||
fi
|
||||
|
||||
if test "$with_termlib" != no ; then
|
||||
@ -19176,14 +19178,16 @@ if test "$with_termlib" != no ; then
|
||||
if test "$DFT_LWR_MODEL" = "libtool"; then
|
||||
TEST_ARGS="${TEST_DEPS}"
|
||||
TEST_ARG2="${TEST_DEP2}"
|
||||
TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
|
||||
TINFO_LDFLAGS="-L${LIB_DIR}"
|
||||
TINFO_LIBS="$TEST_ARGS"
|
||||
TICS_LIST="$SHLIB_LIST $TEST_ARGS"
|
||||
SHLIB_LIST="${SHLIB_LIST} $TEST_ARGS"
|
||||
else
|
||||
TEST_ARGS="-l${TINFO_ARG_SUFFIX}"
|
||||
TEST_ARG2="-l${TINFO_ARG_SUFFIX}"
|
||||
TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
|
||||
TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
|
||||
TINFO_LDFLAGS="-L${LIB_DIR}"
|
||||
TINFO_LIBS="$TEST_ARGS"
|
||||
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
|
||||
fi
|
||||
else
|
||||
@ -19197,7 +19201,8 @@ else
|
||||
TICS_LIST="$SHLIB_LIST"
|
||||
fi
|
||||
|
||||
TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
|
||||
TINFO_LDFLAGS="-L${LIB_DIR}"
|
||||
TINFO_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX}"
|
||||
fi
|
||||
|
||||
if test "$DFT_LWR_MODEL" = shared ; then
|
||||
@ -19221,7 +19226,7 @@ if test "$DFT_LWR_MODEL" = "libtool"; then
|
||||
fi
|
||||
|
||||
# needed for Ada95
|
||||
TINFO_ARGS2=`echo "$TINFO_ARGS" | sed -e 's,-L\.\./,-L../../,'`
|
||||
TINFO_LDFLAGS2=`echo "$TINFO_LDFLAGS" | sed -e 's,-L\.\./,-L../../,'`
|
||||
|
||||
case $DFT_LWR_MODEL in
|
||||
normal|debug|profile)
|
||||
@ -19266,19 +19271,19 @@ fi
|
||||
|
||||
if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
|
||||
then
|
||||
echo "$as_me:19269: checking if linker supports switching between static/dynamic" >&5
|
||||
echo "$as_me:19274: checking if linker supports switching between static/dynamic" >&5
|
||||
echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
|
||||
|
||||
rm -f libconftest.a
|
||||
cat >conftest.$ac_ext <<EOF
|
||||
#line 19274 "configure"
|
||||
#line 19279 "configure"
|
||||
#include <stdio.h>
|
||||
int cf_ldflags_static(FILE *fp) { return fflush(fp); }
|
||||
EOF
|
||||
if { (eval echo "$as_me:19278: \"$ac_compile\"") >&5
|
||||
if { (eval echo "$as_me:19283: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:19281: \$? = $ac_status" >&5
|
||||
echo "$as_me:19286: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } ; then
|
||||
( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
|
||||
( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
|
||||
@ -19289,10 +19294,10 @@ EOF
|
||||
|
||||
LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line 19292 "configure"
|
||||
#line 19297 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#line 19295 "configure"
|
||||
#line 19300 "configure"
|
||||
#include <stdio.h>
|
||||
int cf_ldflags_static(FILE *fp);
|
||||
|
||||
@ -19307,18 +19312,28 @@ main ()
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (eval echo "$as_me:19310: \"$ac_link\"") >&5
|
||||
if { (eval echo "$as_me:19315: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:19313: \$? = $ac_status" >&5
|
||||
echo "$as_me:19318: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (eval echo "$as_me:19316: \"$ac_try\"") >&5
|
||||
{ (eval echo "$as_me:19321: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:19319: \$? = $ac_status" >&5
|
||||
echo "$as_me:19324: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
cf_ldflags_static=yes
|
||||
|
||||
# some linkers simply ignore the -dynamic
|
||||
case x`file conftest$ac_exeext 2>/dev/null` in #(vi
|
||||
*static*) # (vi
|
||||
cf_ldflags_static=no
|
||||
;;
|
||||
*)
|
||||
cf_ldflags_static=yes
|
||||
;;
|
||||
esac
|
||||
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
@ -19329,7 +19344,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
|
||||
rm -f libconftest.*
|
||||
LIBS="$cf_save_LIBS"
|
||||
|
||||
echo "$as_me:19332: result: $cf_ldflags_static" >&5
|
||||
echo "$as_me:19347: result: $cf_ldflags_static" >&5
|
||||
echo "${ECHO_T}$cf_ldflags_static" >&6
|
||||
|
||||
if test $cf_ldflags_static != yes
|
||||
@ -19345,12 +19360,12 @@ fi
|
||||
;;
|
||||
esac
|
||||
|
||||
echo "$as_me:19348: checking where we will install curses.h" >&5
|
||||
echo "$as_me:19363: checking where we will install curses.h" >&5
|
||||
echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
|
||||
test "$with_overwrite" = no && \
|
||||
test "x$includedir" = 'x${prefix}/include' && \
|
||||
includedir='${prefix}/include/ncurses'${LIB_SUFFIX}
|
||||
echo "$as_me:19353: result: $includedir" >&5
|
||||
echo "$as_me:19368: result: $includedir" >&5
|
||||
echo "${ECHO_T}$includedir" >&6
|
||||
|
||||
### Resolve a conflict between normal and wide-curses by forcing applications
|
||||
@ -19358,7 +19373,7 @@ echo "${ECHO_T}$includedir" >&6
|
||||
if test "$with_overwrite" != no ; then
|
||||
if test "$NCURSES_LIBUTF8" = 1 ; then
|
||||
NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
|
||||
{ echo "$as_me:19361: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
|
||||
{ echo "$as_me:19376: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
|
||||
echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
|
||||
fi
|
||||
fi
|
||||
@ -19375,7 +19390,7 @@ EOF
|
||||
### Construct the list of subdirectories for which we'll customize makefiles
|
||||
### with the appropriate compile-rules.
|
||||
|
||||
echo "$as_me:19378: checking for src modules" >&5
|
||||
echo "$as_me:19393: checking for src modules" >&5
|
||||
echo $ECHO_N "checking for src modules... $ECHO_C" >&6
|
||||
|
||||
# dependencies and linker-arguments for test-programs
|
||||
@ -19438,7 +19453,7 @@ EOF
|
||||
fi
|
||||
fi
|
||||
done
|
||||
echo "$as_me:19441: result: $cf_cv_src_modules" >&5
|
||||
echo "$as_me:19456: result: $cf_cv_src_modules" >&5
|
||||
echo "${ECHO_T}$cf_cv_src_modules" >&6
|
||||
|
||||
TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
|
||||
@ -19644,7 +19659,7 @@ fi
|
||||
|
||||
# Extract the first word of "tic", so it can be a program name with args.
|
||||
set dummy tic; ac_word=$2
|
||||
echo "$as_me:19647: checking for $ac_word" >&5
|
||||
echo "$as_me:19662: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_path_TIC_PATH+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
@ -19661,7 +19676,7 @@ for ac_dir in $ac_dummy; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if $as_executable_p "$ac_dir/$ac_word"; then
|
||||
ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
|
||||
echo "$as_me:19664: found $ac_dir/$ac_word" >&5
|
||||
echo "$as_me:19679: found $ac_dir/$ac_word" >&5
|
||||
break
|
||||
fi
|
||||
done
|
||||
@ -19673,10 +19688,10 @@ fi
|
||||
TIC_PATH=$ac_cv_path_TIC_PATH
|
||||
|
||||
if test -n "$TIC_PATH"; then
|
||||
echo "$as_me:19676: result: $TIC_PATH" >&5
|
||||
echo "$as_me:19691: result: $TIC_PATH" >&5
|
||||
echo "${ECHO_T}$TIC_PATH" >&6
|
||||
else
|
||||
echo "$as_me:19679: result: no" >&5
|
||||
echo "$as_me:19694: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
@ -19684,7 +19699,7 @@ if test -n "$FALLBACK_LIST"
|
||||
then
|
||||
if test "$TIC_PATH" = unknown
|
||||
then
|
||||
{ echo "$as_me:19687: WARNING: no tic program found for fallbacks" >&5
|
||||
{ echo "$as_me:19702: WARNING: no tic program found for fallbacks" >&5
|
||||
echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
|
||||
fi
|
||||
fi
|
||||
@ -19785,7 +19800,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:19788: creating $CONFIG_STATUS" >&5
|
||||
{ echo "$as_me:19803: creating $CONFIG_STATUS" >&5
|
||||
echo "$as_me: creating $CONFIG_STATUS" >&6;}
|
||||
cat >$CONFIG_STATUS <<_ACEOF
|
||||
#! $SHELL
|
||||
@ -19961,7 +19976,7 @@ cat >>$CONFIG_STATUS <<\EOF
|
||||
echo "$ac_cs_version"; exit 0 ;;
|
||||
--he | --h)
|
||||
# Conflict between --help and --header
|
||||
{ { echo "$as_me:19964: error: ambiguous option: $1
|
||||
{ { echo "$as_me:19979: 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;}
|
||||
@ -19980,7 +19995,7 @@ Try \`$0 --help' for more information." >&2;}
|
||||
ac_need_defaults=false;;
|
||||
|
||||
# This is an error.
|
||||
-*) { { echo "$as_me:19983: error: unrecognized option: $1
|
||||
-*) { { echo "$as_me:19998: 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;}
|
||||
@ -20086,7 +20101,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:20089: error: invalid argument: $ac_config_target" >&5
|
||||
*) { { echo "$as_me:20104: error: invalid argument: $ac_config_target" >&5
|
||||
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
||||
{ (exit 1); exit 1; }; };;
|
||||
esac
|
||||
@ -20355,12 +20370,14 @@ s,@CXX_LIB_SUFFIX@,$CXX_LIB_SUFFIX,;t t
|
||||
s,@TICS_ARG_SUFFIX@,$TICS_ARG_SUFFIX,;t t
|
||||
s,@TICS_DEP_SUFFIX@,$TICS_DEP_SUFFIX,;t t
|
||||
s,@TICS_LIB_SUFFIX@,$TICS_LIB_SUFFIX,;t t
|
||||
s,@TICS_ARGS@,$TICS_ARGS,;t t
|
||||
s,@TICS_LDFLAGS@,$TICS_LDFLAGS,;t t
|
||||
s,@TICS_LIBS@,$TICS_LIBS,;t t
|
||||
s,@TINFO_ARG_SUFFIX@,$TINFO_ARG_SUFFIX,;t t
|
||||
s,@TINFO_DEP_SUFFIX@,$TINFO_DEP_SUFFIX,;t t
|
||||
s,@TINFO_LIB_SUFFIX@,$TINFO_LIB_SUFFIX,;t t
|
||||
s,@TINFO_ARGS@,$TINFO_ARGS,;t t
|
||||
s,@TINFO_ARGS2@,$TINFO_ARGS2,;t t
|
||||
s,@TINFO_LDFLAGS@,$TINFO_LDFLAGS,;t t
|
||||
s,@TINFO_LIBS@,$TINFO_LIBS,;t t
|
||||
s,@TINFO_LDFLAGS2@,$TINFO_LDFLAGS2,;t t
|
||||
s,@LDFLAGS_STATIC@,$LDFLAGS_STATIC,;t t
|
||||
s,@LDFLAGS_SHARED@,$LDFLAGS_SHARED,;t t
|
||||
s,@WITH_OVERWRITE@,$WITH_OVERWRITE,;t t
|
||||
@ -20497,7 +20514,7 @@ done; }
|
||||
esac
|
||||
|
||||
if test x"$ac_file" != x-; then
|
||||
{ echo "$as_me:20500: creating $ac_file" >&5
|
||||
{ echo "$as_me:20517: creating $ac_file" >&5
|
||||
echo "$as_me: creating $ac_file" >&6;}
|
||||
rm -f "$ac_file"
|
||||
fi
|
||||
@ -20515,7 +20532,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:20518: error: cannot find input file: $f" >&5
|
||||
test -f "$f" || { { echo "$as_me:20535: error: cannot find input file: $f" >&5
|
||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
echo $f;;
|
||||
@ -20528,7 +20545,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
echo $srcdir/$f
|
||||
else
|
||||
# /dev/null tree
|
||||
{ { echo "$as_me:20531: error: cannot find input file: $f" >&5
|
||||
{ { echo "$as_me:20548: error: cannot find input file: $f" >&5
|
||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi;;
|
||||
@ -20594,7 +20611,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:20597: creating $ac_file" >&5
|
||||
test x"$ac_file" != x- && { echo "$as_me:20614: creating $ac_file" >&5
|
||||
echo "$as_me: creating $ac_file" >&6;}
|
||||
|
||||
# First look for the input files in the build tree, otherwise in the
|
||||
@ -20605,7 +20622,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:20608: error: cannot find input file: $f" >&5
|
||||
test -f "$f" || { { echo "$as_me:20625: error: cannot find input file: $f" >&5
|
||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
echo $f;;
|
||||
@ -20618,7 +20635,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
echo $srcdir/$f
|
||||
else
|
||||
# /dev/null tree
|
||||
{ { echo "$as_me:20621: error: cannot find input file: $f" >&5
|
||||
{ { echo "$as_me:20638: error: cannot find input file: $f" >&5
|
||||
echo "$as_me: error: cannot find input file: $f" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi;;
|
||||
@ -20676,7 +20693,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:20679: $ac_file is unchanged" >&5
|
||||
{ echo "$as_me:20696: $ac_file is unchanged" >&5
|
||||
echo "$as_me: $ac_file is unchanged" >&6;}
|
||||
else
|
||||
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||||
|
||||
29
configure.in
29
configure.in
@ -28,14 +28,14 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: configure.in,v 1.525 2011/09/10 19:53:50 tom Exp $
|
||||
dnl $Id: configure.in,v 1.526 2011/09/24 14:40:59 nix 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.13.20020210)
|
||||
AC_REVISION($Revision: 1.525 $)
|
||||
AC_REVISION($Revision: 1.526 $)
|
||||
AC_INIT(ncurses/base/lib_initscr.c)
|
||||
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
|
||||
|
||||
@ -1723,14 +1723,17 @@ if test "$with_ticlib" != no ; then
|
||||
TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}"
|
||||
TICS_LIB_SUFFIX="${TICS_NAME}${LIB_SUFFIX}"
|
||||
fi
|
||||
TICS_ARGS="-L${LIB_DIR} -l${TICS_LIB_SUFFIX}"
|
||||
TICS_LDFLAGS="-L${LIB_DIR}"
|
||||
TICS_LIBS="-l${TICS_LIB_SUFFIX}"
|
||||
else
|
||||
TICS_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
|
||||
TICS_LDFLAGS="-L${LIB_DIR}"
|
||||
TICS_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX}"
|
||||
fi
|
||||
AC_SUBST(TICS_ARG_SUFFIX)
|
||||
AC_SUBST(TICS_DEP_SUFFIX)
|
||||
AC_SUBST(TICS_LIB_SUFFIX)
|
||||
AC_SUBST(TICS_ARGS)
|
||||
AC_SUBST(TICS_LDFLAGS)
|
||||
AC_SUBST(TICS_LIBS)
|
||||
|
||||
if test "$with_termlib" != no ; then
|
||||
|
||||
@ -1752,14 +1755,16 @@ if test "$with_termlib" != no ; then
|
||||
if test "$DFT_LWR_MODEL" = "libtool"; then
|
||||
TEST_ARGS="${TEST_DEPS}"
|
||||
TEST_ARG2="${TEST_DEP2}"
|
||||
TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
|
||||
TINFO_LDFLAGS="-L${LIB_DIR}"
|
||||
TINFO_LIBS="$TEST_ARGS"
|
||||
TICS_LIST="$SHLIB_LIST $TEST_ARGS"
|
||||
SHLIB_LIST="${SHLIB_LIST} $TEST_ARGS"
|
||||
else
|
||||
TEST_ARGS="-l${TINFO_ARG_SUFFIX}"
|
||||
TEST_ARG2="-l${TINFO_ARG_SUFFIX}"
|
||||
TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
|
||||
TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
|
||||
TINFO_LDFLAGS="-L${LIB_DIR}"
|
||||
TINFO_LIBS="$TEST_ARGS"
|
||||
SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
|
||||
fi
|
||||
else
|
||||
@ -1773,7 +1778,8 @@ else
|
||||
TICS_LIST="$SHLIB_LIST"
|
||||
fi
|
||||
|
||||
TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
|
||||
TINFO_LDFLAGS="-L${LIB_DIR}"
|
||||
TINFO_LIBS="-l${LIB_NAME}${DFT_ARG_SUFFIX}"
|
||||
fi
|
||||
|
||||
if test "$DFT_LWR_MODEL" = shared ; then
|
||||
@ -1788,7 +1794,8 @@ fi
|
||||
AC_SUBST(TINFO_ARG_SUFFIX)
|
||||
AC_SUBST(TINFO_DEP_SUFFIX)
|
||||
AC_SUBST(TINFO_LIB_SUFFIX)
|
||||
AC_SUBST(TINFO_ARGS)
|
||||
AC_SUBST(TINFO_LDFLAGS)
|
||||
AC_SUBST(TINFO_LIBS)
|
||||
|
||||
if test "$with_dlsym" = yes ; then
|
||||
CF_REMOVE_LIB(TICS_LIST,$TICS_LIST,dl)
|
||||
@ -1799,8 +1806,8 @@ if test "$DFT_LWR_MODEL" = "libtool"; then
|
||||
fi
|
||||
|
||||
# needed for Ada95
|
||||
TINFO_ARGS2=`echo "$TINFO_ARGS" | sed -e 's,-L\.\./,-L../../,'`
|
||||
AC_SUBST(TINFO_ARGS2)
|
||||
TINFO_LDFLAGS2=`echo "$TINFO_LDFLAGS" | sed -e 's,-L\.\./,-L../../,'`
|
||||
AC_SUBST(TINFO_LDFLAGS2)
|
||||
|
||||
case $DFT_LWR_MODEL in
|
||||
normal|debug|profile)
|
||||
|
||||
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.834 2011/09/17 16:04:54 tom Exp $
|
||||
# $Id: dist.mk,v 1.835 2011/09/24 14:14:47 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 = 20110917
|
||||
NCURSES_PATCH = 20110924
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
||||
@ -84,7 +84,7 @@
|
||||
#define CUR SP_TERMTYPE
|
||||
#endif
|
||||
|
||||
MODULE_ID("$Id: lib_mouse.c,v 1.129 2011/09/17 21:52:30 tom Exp $")
|
||||
MODULE_ID("$Id: lib_mouse.c,v 1.130 2011/09/24 00:42:25 tom Exp $")
|
||||
|
||||
#include <tic.h>
|
||||
|
||||
@ -1246,7 +1246,7 @@ _nc_mouse_parse(SCREEN *sp, int runcount)
|
||||
|
||||
if (next == eventp) {
|
||||
/* Will end the loop, but check event type and compact before */
|
||||
endLoop = true;
|
||||
endLoop = TRUE;
|
||||
} else {
|
||||
/* merge click events forward */
|
||||
if ((ep->bstate & BUTTON_CLICKED)
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
|
||||
#include <tic.h>
|
||||
|
||||
MODULE_ID("$Id: read_entry.c,v 1.110 2011/08/13 21:10:03 tom Exp $")
|
||||
MODULE_ID("$Id: read_entry.c,v 1.111 2011/09/24 20:15:12 tom Exp $")
|
||||
|
||||
#define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
|
||||
|
||||
@ -115,9 +115,11 @@ fake_read(char *src, int *offset, int limit, char *dst, unsigned want)
|
||||
#define even_boundary(value) \
|
||||
if ((value) % 2 != 0) Read(buf, 1)
|
||||
|
||||
/*
|
||||
* Return TGETENT_YES if read, TGETENT_NO if not found or garbled.
|
||||
*/
|
||||
NCURSES_EXPORT(int)
|
||||
_nc_read_termtype(TERMTYPE *ptr, char *buffer, int limit)
|
||||
/* return 1 if read, 0 if not found or garbled */
|
||||
{
|
||||
int offset = 0;
|
||||
int name_size, bool_count, num_count, str_count, str_size;
|
||||
@ -390,6 +392,51 @@ _nc_read_file_entry(const char *const filename, TERMTYPE *ptr)
|
||||
return (code);
|
||||
}
|
||||
|
||||
#if USE_HASHED_DB
|
||||
/*
|
||||
* Return if if we can build the filename of a ".db" file.
|
||||
*/
|
||||
static bool
|
||||
make_db_filename(char *filename, unsigned limit, const char *const path)
|
||||
{
|
||||
static const char suffix[] = DBM_SUFFIX;
|
||||
|
||||
unsigned lens = sizeof(suffix) - 1;
|
||||
unsigned size = strlen(path);
|
||||
unsigned test = lens + size;
|
||||
bool result = FALSE;
|
||||
|
||||
if (test < limit) {
|
||||
if (size >= lens
|
||||
&& !strcmp(path + size - lens, suffix))
|
||||
(void) strcpy(filename, path);
|
||||
else
|
||||
(void) sprintf(filename, "%s%s", path, suffix);
|
||||
result = TRUE;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Return true if we can build the name of a filesystem entry.
|
||||
*/
|
||||
static bool
|
||||
make_dir_filename(char *filename,
|
||||
unsigned limit,
|
||||
const char *const path,
|
||||
const char *name)
|
||||
{
|
||||
unsigned need = (unsigned) (LEAF_LEN + 3 + strlen(path) + strlen(name));
|
||||
bool result = FALSE;
|
||||
|
||||
if (need <= limit) {
|
||||
(void) sprintf(filename, "%s/" LEAF_FMT "/%s", path, *name, name);
|
||||
result = TRUE;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/*
|
||||
* Build a terminfo pathname and try to read the data. Returns TGETENT_YES on
|
||||
* success, TGETENT_NO on failure.
|
||||
@ -403,97 +450,76 @@ _nc_read_tic_entry(char *filename,
|
||||
{
|
||||
int code = TGETENT_NO;
|
||||
|
||||
/*
|
||||
* If we are looking in a directory, assume the entry is a file under that,
|
||||
* according to the normal rules.
|
||||
*/
|
||||
unsigned need = (unsigned) (LEAF_LEN + 3 + strlen(path) + strlen(name));
|
||||
if (need <= limit)
|
||||
(void) sprintf(filename, "%s/" LEAF_FMT "/%s", path, *name, name);
|
||||
|
||||
if (_nc_is_dir_path(path))
|
||||
code = _nc_read_file_entry(filename, tp);
|
||||
else {
|
||||
#if USE_HASHED_DB
|
||||
static const char suffix[] = DBM_SUFFIX;
|
||||
DB *capdbp;
|
||||
unsigned lens = sizeof(suffix) - 1;
|
||||
unsigned size = strlen(path);
|
||||
unsigned test = lens + size;
|
||||
DB *capdbp;
|
||||
|
||||
if (test < limit) {
|
||||
if (size >= lens
|
||||
&& !strcmp(path + size - lens, suffix))
|
||||
(void) strcpy(filename, path);
|
||||
else
|
||||
(void) sprintf(filename, "%s%s", path, suffix);
|
||||
if (make_db_filename(filename, limit, path)
|
||||
&& (capdbp = _nc_db_open(filename, FALSE)) != 0) {
|
||||
|
||||
if ((capdbp = _nc_db_open(filename, FALSE)) != 0) {
|
||||
DBT key, data;
|
||||
int reccnt = 0;
|
||||
char *save = strdup(name);
|
||||
DBT key, data;
|
||||
int reccnt = 0;
|
||||
char *save = strdup(name);
|
||||
|
||||
memset(&key, 0, sizeof(key));
|
||||
key.data = save;
|
||||
key.size = strlen(save);
|
||||
memset(&key, 0, sizeof(key));
|
||||
key.data = save;
|
||||
key.size = strlen(save);
|
||||
|
||||
/*
|
||||
* This lookup could return termcap data, which we do not want.
|
||||
* We are looking for compiled (binary) terminfo data.
|
||||
*
|
||||
* cgetent uses a two-level lookup. On the first it uses the
|
||||
* given name to return a record containing only the aliases
|
||||
* for an entry. On the second (using that list of aliases as
|
||||
* a key), it returns the content of the terminal description.
|
||||
* We expect second lookup to return data beginning with the
|
||||
* same set of aliases.
|
||||
*
|
||||
* For compiled terminfo, the list of aliases in the second
|
||||
* case will be null-terminated. A termcap entry will not be,
|
||||
* and will run on into the description. So we can easily
|
||||
* distinguish between the two (source/binary) by checking the
|
||||
* lengths.
|
||||
*/
|
||||
while (_nc_db_get(capdbp, &key, &data) == 0) {
|
||||
int used = data.size - 1;
|
||||
char *have = (char *) data.data;
|
||||
/*
|
||||
* This lookup could return termcap data, which we do not want. We are
|
||||
* looking for compiled (binary) terminfo data.
|
||||
*
|
||||
* cgetent uses a two-level lookup. On the first it uses the given
|
||||
* name to return a record containing only the aliases for an entry.
|
||||
* On the second (using that list of aliases as a key), it returns the
|
||||
* content of the terminal description. We expect second lookup to
|
||||
* return data beginning with the same set of aliases.
|
||||
*
|
||||
* For compiled terminfo, the list of aliases in the second case will
|
||||
* be null-terminated. A termcap entry will not be, and will run on
|
||||
* into the description. So we can easily distinguish between the two
|
||||
* (source/binary) by checking the lengths.
|
||||
*/
|
||||
while (_nc_db_get(capdbp, &key, &data) == 0) {
|
||||
int used = data.size - 1;
|
||||
char *have = (char *) data.data;
|
||||
|
||||
if (*have++ == 0) {
|
||||
if (data.size > key.size
|
||||
&& IS_TIC_MAGIC(have)) {
|
||||
code = _nc_read_termtype(tp, have, used);
|
||||
if (code == TGETENT_NO) {
|
||||
_nc_free_termtype(tp);
|
||||
}
|
||||
}
|
||||
break;
|
||||
if (*have++ == 0) {
|
||||
if (data.size > key.size
|
||||
&& IS_TIC_MAGIC(have)) {
|
||||
code = _nc_read_termtype(tp, have, used);
|
||||
if (code == TGETENT_NO) {
|
||||
_nc_free_termtype(tp);
|
||||
}
|
||||
|
||||
/*
|
||||
* Just in case we have a corrupt database, do not waste
|
||||
* time with it.
|
||||
*/
|
||||
if (++reccnt >= 3)
|
||||
break;
|
||||
|
||||
/*
|
||||
* Prepare for the second level.
|
||||
*/
|
||||
key.data = have;
|
||||
key.size = used;
|
||||
}
|
||||
|
||||
free(save);
|
||||
break;
|
||||
}
|
||||
|
||||
/*
|
||||
* Just in case we have a corrupt database, do not waste time with
|
||||
* it.
|
||||
*/
|
||||
if (++reccnt >= 3)
|
||||
break;
|
||||
|
||||
/*
|
||||
* Prepare for the second level.
|
||||
*/
|
||||
key.data = have;
|
||||
key.size = used;
|
||||
}
|
||||
|
||||
free(save);
|
||||
} else /* may be either filesystem or flat file */
|
||||
#endif
|
||||
#if USE_TERMCAP
|
||||
if (code != TGETENT_YES) {
|
||||
code = _nc_read_termcap_entry(name, tp);
|
||||
sprintf(filename, "%.*s", PATH_MAX - 1, _nc_get_source());
|
||||
}
|
||||
#endif
|
||||
if (make_dir_filename(filename, limit, path, name)) {
|
||||
code = _nc_read_file_entry(filename, tp);
|
||||
}
|
||||
#if USE_TERMCAP
|
||||
if (code != TGETENT_YES) {
|
||||
code = _nc_read_termcap_entry(name, tp);
|
||||
sprintf(filename, "%.*s", PATH_MAX - 1, _nc_get_source());
|
||||
}
|
||||
#endif
|
||||
return code;
|
||||
}
|
||||
#endif /* USE_DATABASE */
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# $Id: Makefile.in,v 1.86 2011/07/30 22:51:50 tom Exp $
|
||||
# $Id: Makefile.in,v 1.87 2011/09/24 15:13:34 nix Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. #
|
||||
# Copyright (c) 1998-2010,2011 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 "Software"), #
|
||||
@ -109,16 +109,16 @@ RPATH_LIST = @RPATH_LIST@
|
||||
LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LIBTOOL)
|
||||
LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL)
|
||||
LDFLAGS_DEBUG = $(LDFLAGS) $(CFLAGS_DEBUG)
|
||||
LDFLAGS_PROFILE = $(LDFLAGS) $(CFLAGS_PROFILE)
|
||||
LDFLAGS_PROFILE = $(LDFLAGS) $(CFLAGS_PROFILE)
|
||||
LDFLAGS_SHARED = $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
|
||||
|
||||
LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
|
||||
|
||||
LIBS_TIC = @LDFLAGS_STATIC@ @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
|
||||
LDFLAGS_TIC = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TIC)
|
||||
LIBS_TIC = @TINFO_LDFLAGS@ @LDFLAGS_STATIC@ @TICS_LIBS@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
|
||||
LDFLAGS_TIC = @TICS_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TIC)
|
||||
|
||||
LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
|
||||
LDFLAGS_TINFO = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
|
||||
LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
|
||||
LDFLAGS_TINFO = @TINFO_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
|
||||
|
||||
LINT = @LINT@
|
||||
LINT_OPTS = @LINT_OPTS@
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# $Id: Makefile.in,v 1.108 2010/11/28 16:39:40 tom Exp $
|
||||
# $Id: Makefile.in,v 1.109 2011/09/24 15:13:44 nix Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. #
|
||||
# Copyright (c) 1998-2010,2011 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 "Software"), #
|
||||
@ -102,7 +102,7 @@ LDFLAGS_DEBUG = $(LDFLAGS) $(CFLAGS_DEBUG)
|
||||
LDFLAGS_PROFILE = $(LDFLAGS) $(CFLAGS_PROFILE)
|
||||
LDFLAGS_SHARED = $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
|
||||
|
||||
TEST_ARGS = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@
|
||||
TEST_ARGS = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@
|
||||
|
||||
# use these for linking with all of the libraries
|
||||
LIBS_DEFAULT = $(TEST_ARGS) @LIBS@ $(TEST_LIBS) $(MATH_LIB)
|
||||
@ -117,8 +117,8 @@ LIBS_CURSES = `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-lform.*-lpanel[^ ]*//'` $
|
||||
LDFLAGS_CURSES = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_CURSES)
|
||||
|
||||
# use these for linking with the tinfo library if we have it, or curses library if not
|
||||
LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LIBS@ $(TEST_LIBS) $(MATH_LIB)
|
||||
LDFLAGS_TINFO = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
|
||||
LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LIBS@ $(TEST_LIBS) $(MATH_LIB)
|
||||
LDFLAGS_TINFO = @TINFO_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
|
||||
|
||||
LINT = @LINT@
|
||||
LINT_OPTS = @LINT_OPTS@
|
||||
|
||||
15
test/aclocal.m4
vendored
15
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.64 2011/08/07 00:40:42 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.66 2011/09/24 16:54:41 tom Exp $
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey
|
||||
dnl
|
||||
@ -678,7 +678,7 @@ fi
|
||||
AC_CHECK_HEADERS($cf_cv_ncurses_header)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_CURSES_LIBS version: 34 updated: 2011/04/09 14:51:08
|
||||
dnl CF_CURSES_LIBS version: 35 updated: 2011/08/09 21:06:37
|
||||
dnl --------------
|
||||
dnl Look for the curses libraries. Older curses implementations may require
|
||||
dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first.
|
||||
@ -758,7 +758,7 @@ if test ".$ac_cv_func_initscr" != .yes ; then
|
||||
# Check for library containing tgoto. Do this before curses library
|
||||
# because it may be needed to link the test-case for initscr.
|
||||
AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[
|
||||
for cf_term_lib in $cf_check_list termcap termlib unknown
|
||||
for cf_term_lib in $cf_check_list otermcap termcap termlib unknown
|
||||
do
|
||||
AC_CHECK_LIB($cf_term_lib,tgoto,[break])
|
||||
done
|
||||
@ -2647,6 +2647,15 @@ ncursesw/term.h)
|
||||
esac
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_TOP_BUILDDIR version: 1 updated: 2006/10/15 16:33:23
|
||||
dnl ---------------
|
||||
dnl Define a top_builddir symbol, for applications that need an absolute path.
|
||||
AC_DEFUN([CF_TOP_BUILDDIR],
|
||||
[
|
||||
top_builddir=`pwd`
|
||||
AC_SUBST(top_builddir)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_TPUTS_PROTO version: 2 updated: 2011/04/23 19:25:50
|
||||
dnl --------------
|
||||
dnl Check for type of function-pointer passed to tputs. Some old
|
||||
|
||||
2313
test/configure
vendored
2313
test/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -28,7 +28,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1996, etc.
|
||||
dnl
|
||||
dnl $Id: configure.in,v 1.97 2011/04/23 22:10:32 tom Exp $
|
||||
dnl $Id: configure.in,v 1.99 2011/09/24 15:42:11 tom Exp $
|
||||
dnl This is a simple configuration-script for the ncurses test programs that
|
||||
dnl allows the test-directory to be separately configured against a reference
|
||||
dnl system (i.e., sysvr4 curses)
|
||||
@ -60,6 +60,7 @@ CF_MATH_LIB(MATH_LIB,sin(x))
|
||||
AC_SUBST(MATH_LIB)
|
||||
|
||||
dnl Things that we don't need (or must override) if we're not building ncurses
|
||||
CF_TOP_BUILDDIR
|
||||
CC_G_OPT="-g" AC_SUBST(CC_G_OPT)
|
||||
CC_SHARED_OPTS=unknown AC_SUBST(CC_SHARED_OPTS)
|
||||
CPPFLAGS="$CPPFLAGS" AC_SUBST(CPPFLAGS)
|
||||
@ -81,7 +82,8 @@ PTHREAD="-lm" AC_SUBST(PTHREAD)
|
||||
TEST_ARGS="" AC_SUBST(TEST_ARGS)
|
||||
TEST_DEPS="" AC_SUBST(TEST_DEPS)
|
||||
TEST_LIBS="" AC_SUBST(TEST_LIBS)
|
||||
TINFO_ARGS='$(LIBS_CURSES)' AC_SUBST(TINFO_ARGS)
|
||||
TINFO_LDFLAGS='' AC_SUBST(TINFO_LDFLAGS)
|
||||
TINFO_LIBS='$(LIBS_CURSES)' AC_SUBST(TINFO_LIBS)
|
||||
cf_cv_abi_version="" AC_SUBST(cf_cv_abi_version)
|
||||
cf_cv_rel_version="" AC_SUBST(cf_cv_rel_version)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user