mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2025-01-24 15:13:56 +08:00
ncurses 5.7 - patch 20101127
+ miscellaneous build-fixes for Ada95 and test-directories when built out-of-tree. + use VPATH in makefiles to simplify out-of-tree builds (Debian #34182). + fix typo in rmso for tek4106 entry -Goran Weinholt
This commit is contained in:
Thomas E. Dickey
parent
92e599aba4
commit
c340bf75ca
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.20 2010/06/12 19:03:37 tom Exp $
|
||||
# $Id: Makefile.in,v 1.21 2010/11/27 21:45:27 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2003,2010 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -30,9 +30,10 @@
|
||||
# Author: Juergen Pfeifer, 1996
|
||||
#
|
||||
# Version Control
|
||||
# $Revision: 1.20 $
|
||||
# $Revision: 1.21 $
|
||||
#
|
||||
SHELL = /bin/sh
|
||||
VPATH = @srcdir@
|
||||
THIS = Makefile
|
||||
|
||||
SUBDIRS = @ADA_SUBDIRS@
|
||||
|
||||
@ -28,11 +28,12 @@
|
||||
#
|
||||
# Author: Juergen Pfeifer, 1996
|
||||
#
|
||||
# $Id: Makefile.in,v 1.68 2010/07/17 19:56:15 tom Exp $
|
||||
# $Id: Makefile.in,v 1.69 2010/11/27 21:45:27 tom Exp $
|
||||
#
|
||||
.SUFFIXES:
|
||||
|
||||
SHELL = /bin/sh
|
||||
VPATH = @srcdir@
|
||||
THIS = Makefile
|
||||
|
||||
x = @PROG_EXT@
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.1 2010/02/27 01:07:34 tom Exp $
|
||||
# $Id: Makefile.in,v 1.2 2010/11/27 21:45:27 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 2010 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -40,6 +40,7 @@
|
||||
.SUFFIXES:
|
||||
|
||||
SHELL = /bin/sh
|
||||
VPATH = @srcdir@
|
||||
THIS = Makefile
|
||||
|
||||
DESTDIR = @DESTDIR@
|
||||
|
||||
@ -28,11 +28,12 @@
|
||||
#
|
||||
# Author: Juergen Pfeifer, 1996
|
||||
#
|
||||
# $Id: Makefile.in,v 1.39 2010/06/26 15:17:19 tom Exp $
|
||||
# $Id: Makefile.in,v 1.40 2010/11/27 21:45:27 tom Exp $
|
||||
#
|
||||
.SUFFIXES:
|
||||
|
||||
SHELL = /bin/sh
|
||||
VPATH = @srcdir@
|
||||
THIS = Makefile
|
||||
|
||||
x = @PROG_EXT@
|
||||
|
||||
@ -28,11 +28,12 @@
|
||||
#
|
||||
# Author: Juergen Pfeifer, 1996
|
||||
#
|
||||
# $Id: Makefile.in,v 1.51 2010/07/03 22:59:03 tom Exp $
|
||||
# $Id: Makefile.in,v 1.53 2010/11/27 22:14:16 tom Exp $
|
||||
#
|
||||
.SUFFIXES:
|
||||
|
||||
SHELL = /bin/sh
|
||||
VPATH = @srcdir@
|
||||
THIS = Makefile
|
||||
|
||||
MODEL = ../../@DFT_OBJ_SUBDIR@
|
||||
@ -85,11 +86,11 @@ ADAFLAGS = @ADAFLAGS@ -I. -I$(srcdir)
|
||||
LIB_NAME = AdaCurses
|
||||
SONAME = @ADA_SHAREDLIB@
|
||||
|
||||
GNAT_PROJECT = library.gpr
|
||||
GNAT_PROJECT = $(srcdir)/library.gpr
|
||||
|
||||
# build/source are the Ada95 tree
|
||||
BUILD_DIR = @srcdir@/..
|
||||
SOURCE_DIR = @srcdir@/..
|
||||
BUILD_DIR = ..
|
||||
SOURCE_DIR = ..
|
||||
|
||||
BUILD_DIR_LIB = $(BUILD_DIR)/lib
|
||||
SOURCE_DIR_SRC = $(SOURCE_DIR)/src
|
||||
@ -97,8 +98,9 @@ SOURCE_DIR_SRC = $(SOURCE_DIR)/src
|
||||
ADAMAKE = @cf_ada_make@
|
||||
ADAMAKEFLAGS = \
|
||||
-P$(GNAT_PROJECT) \
|
||||
-XBUILD_DIR=$(BUILD_DIR) \
|
||||
-XSOURCE_DIR=$(SOURCE_DIR) \
|
||||
-XBUILD_DIR=`cd $(BUILD_DIR);pwd` \
|
||||
-XSOURCE_DIR=`cd $(SOURCE_DIR);pwd` \
|
||||
-XSOURCE_DIR2=`cd $(srcdir);pwd` \
|
||||
-XLIB_NAME=$(LIB_NAME) \
|
||||
-XSONAME=$(SONAME)
|
||||
|
||||
|
||||
@ -25,12 +25,13 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
------------------------------------------------------------------------------
|
||||
-- $Id: library.gpr,v 1.4 2010/06/26 19:43:16 tom Exp $
|
||||
-- $Id: library.gpr,v 1.5 2010/11/27 22:15:04 tom Exp $
|
||||
-- http://gcc.gnu.org/onlinedocs/gnat_ugn_unw/Library-Projects.html
|
||||
-- http://www.adaworld.com/debian/debian-ada-policy.html
|
||||
project Library is
|
||||
Build_Dir := External ("BUILD_DIR");
|
||||
Source_Dir := External ("SOURCE_DIR");
|
||||
Source_Dir2 := External ("SOURCE_DIR2");
|
||||
Kind := External ("LIB_KIND");
|
||||
for Library_Name use External ("LIB_NAME");
|
||||
for Library_Version use External ("SONAME");
|
||||
@ -40,6 +41,7 @@ project Library is
|
||||
for Object_Dir use Build_Dir & "/" & Kind & "-obj";
|
||||
for Library_ALI_Dir use Build_Dir & "/" & Kind & "-ali";
|
||||
for Source_Dirs use (Source_Dir & "/src",
|
||||
Source_Dir2,
|
||||
Build_Dir & "/src");
|
||||
package Compiler is
|
||||
for Default_Switches ("Ada") use
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.29 2010/10/02 16:32:41 juergen Exp $
|
||||
# $Id: Makefile.in,v 1.30 2010/11/27 21:45:27 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2008,2010 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -32,6 +32,7 @@
|
||||
# Master Makefile for ncurses library.
|
||||
|
||||
SHELL = /bin/sh
|
||||
VPATH = @srcdir@
|
||||
|
||||
DESTDIR=@DESTDIR@
|
||||
CF_MFLAGS = @cf_cv_makeflags@ DESTDIR="$(DESTDIR)"
|
||||
|
||||
8
NEWS
8
NEWS
@ -25,7 +25,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.1612 2010/11/20 22:04:29 tom Exp $
|
||||
-- $Id: NEWS,v 1.1614 2010/11/28 00:32:32 tom Exp $
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
This is a log of changes that ncurses has gone through since Zeyd started
|
||||
@ -45,6 +45,12 @@ 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.
|
||||
|
||||
20101127
|
||||
+ miscellaneous build-fixes for Ada95 and test-directories when built
|
||||
out-of-tree.
|
||||
+ use VPATH in makefiles to simplify out-of-tree builds (Debian #34182).
|
||||
+ fix typo in rmso for tek4106 entry -Goran Weinholt
|
||||
|
||||
20101120
|
||||
+ improve checks in test/configure for X libraries, from xterm #267
|
||||
changes.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.92 2010/09/04 21:29:06 tom Exp $
|
||||
# $Id: Makefile.in,v 1.93 2010/11/27 21:45:27 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -35,6 +35,7 @@
|
||||
.SUFFIXES:
|
||||
|
||||
SHELL = /bin/sh
|
||||
VPATH = @srcdir@
|
||||
|
||||
CF_MFLAGS = @cf_cv_makeflags@
|
||||
@SET_MAKE@
|
||||
|
||||
@ -28,14 +28,14 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: configure.in,v 1.513 2010/11/06 23:05:04 tom Exp $
|
||||
dnl $Id: configure.in,v 1.514 2010/11/28 00:12:45 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.513 $)
|
||||
AC_REVISION($Revision: 1.514 $)
|
||||
AC_INIT(ncurses/base/lib_initscr.c)
|
||||
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
|
||||
|
||||
@ -887,6 +887,7 @@ if test "$with_ext_funcs" = yes ; then
|
||||
AC_DEFINE(HAVE_HAS_KEY)
|
||||
AC_DEFINE(HAVE_RESIZETERM)
|
||||
AC_DEFINE(HAVE_RESIZE_TERM)
|
||||
AC_DEFINE(HAVE_TERM_ENTRY_H)
|
||||
AC_DEFINE(HAVE_USE_DEFAULT_COLORS)
|
||||
AC_DEFINE(HAVE_WRESIZE)
|
||||
AC_DEFINE(NCURSES_EXT_FUNCS)
|
||||
|
||||
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.781 2010/11/20 18:49:14 tom Exp $
|
||||
# $Id: dist.mk,v 1.782 2010/11/27 16:17:05 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 = 7
|
||||
NCURSES_PATCH = 20101120
|
||||
NCURSES_PATCH = 20101127
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.52 2010/05/15 20:04:40 tom Exp $
|
||||
# $Id: Makefile.in,v 1.53 2010/11/27 21:45:27 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -43,6 +43,7 @@
|
||||
.SUFFIXES:
|
||||
|
||||
SHELL = /bin/sh
|
||||
VPATH = @srcdir@
|
||||
THIS = Makefile
|
||||
|
||||
x = @EXEEXT@
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.39 2010/09/25 22:16:12 juergen Exp $
|
||||
# $Id: Makefile.in,v 1.40 2010/11/27 21:45:27 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998,2009,2010 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -40,6 +40,7 @@
|
||||
.SUFFIXES:
|
||||
|
||||
SHELL = /bin/sh
|
||||
VPATH = @srcdir@
|
||||
THIS = Makefile
|
||||
|
||||
DESTDIR = @DESTDIR@
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: ncurses_defs,v 1.43 2010/05/15 21:22:29 tom Exp $
|
||||
# $Id: ncurses_defs,v 1.44 2010/11/28 00:13:09 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 2000-2008,2010 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -141,6 +141,7 @@ HAVE_TERMIOS_H
|
||||
HAVE_TERMIO_H
|
||||
HAVE_TERMNAME 1
|
||||
HAVE_TERM_H 1
|
||||
HAVE_TERM_ENTRY_H 1
|
||||
HAVE_TGETENT 1
|
||||
HAVE_TIGETNUM 1
|
||||
HAVE_TIGETSTR 1
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.44 2010/05/15 20:04:40 tom Exp $
|
||||
# $Id: Makefile.in,v 1.45 2010/11/27 21:45:27 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2007,2010 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -35,6 +35,7 @@
|
||||
# the top-level MANIFEST and any man/*.renames files!
|
||||
|
||||
SHELL = /bin/sh
|
||||
VPATH = @srcdir@
|
||||
|
||||
DESTDIR = @DESTDIR@
|
||||
srcdir = @srcdir@
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.53 2010/05/15 20:04:40 tom Exp $
|
||||
# $Id: Makefile.in,v 1.54 2010/11/27 21:45:27 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -43,6 +43,7 @@
|
||||
.SUFFIXES:
|
||||
|
||||
SHELL = /bin/sh
|
||||
VPATH = @srcdir@
|
||||
THIS = Makefile
|
||||
|
||||
x = @EXEEXT@
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.53 2010/05/15 20:25:20 tom Exp $
|
||||
# $Id: Makefile.in,v 1.54 2010/11/27 21:45:27 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -43,6 +43,7 @@
|
||||
.SUFFIXES :
|
||||
|
||||
SHELL = /bin/sh
|
||||
VPATH = @srcdir@
|
||||
THIS = Makefile
|
||||
|
||||
CF_MFLAGS = @cf_cv_makeflags@
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
# Report bugs and new terminal descriptions to
|
||||
# bug-ncurses@gnu.org
|
||||
#
|
||||
# $Revision: 1.377 $
|
||||
# $Date: 2010/11/20 20:10:14 $
|
||||
# $Revision: 1.379 $
|
||||
# $Date: 2010/11/27 21:06:47 $
|
||||
#
|
||||
# The original header is preserved below for reference. It is noted that there
|
||||
# is a "newer" version which differs in some cosmetic details (but actually
|
||||
@ -16251,6 +16251,15 @@ tek4106brl|tek4107brl|tek4109brl|Tektronix 4106 4107 or 4109,
|
||||
sc=\E7, sgr0=\E[m, smacs=^N, smcup=\E[?6l, smir=\E[4h,
|
||||
smkx=\E[?1h\E=, smso=\E[7;42m, smul=\E[4m, tbc=\E[3g,
|
||||
|
||||
# Tektronix 4107/4109 interpret 4 modes using "\E%!" followed by a code:
|
||||
# 0 selects Tek mode, i.e., \E%!0
|
||||
# 1 selects ANSI mode
|
||||
# 2 selects ANSI edit-mode
|
||||
# 3 selects VT52 mode
|
||||
#
|
||||
# One odd thing about the description (which has been unchanged since the 90s)
|
||||
# is that the cursor addressing is using VT52 mode, and a few others use the
|
||||
# VT52's non-CSI versions of ANSI, e.g., \EJ.
|
||||
tek4107|tek4109|tektronix terminals 4107 4109,
|
||||
OTbs, am, mir, msgr, ul, xenl, xt,
|
||||
cols#79, it#8, lines#29,
|
||||
@ -16260,7 +16269,7 @@ tek4107|tek4109|tektronix terminals 4107 4109,
|
||||
cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\E%!3,
|
||||
dim=\E%!1\E[<0m$<2>\E%!0, ed=\EJ, el=\EK, ht=^I, ind=^J,
|
||||
kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
|
||||
rev=\E%!1\E[7m$<2>\E%0, ri=\EI,
|
||||
rev=\E%!1\E[7m$<2>\E%!0, ri=\EI,
|
||||
rmso=\E%!1\E[m$<2>\E%!0, rmul=\E%!1\E[m$<2>\E%!0,
|
||||
sgr=\E%%!1\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m$<2>\E%%!0,
|
||||
sgr0=\E%!1\E[m$<2>\E%!0, smso=\E%!1\E[7;5m$<2>\E%!0,
|
||||
@ -22324,6 +22333,9 @@ v3220|LANPAR Vision II model 3220/3221/3222,
|
||||
# is merely one of several terminals whose behavior is provided by this
|
||||
# library -TD
|
||||
#
|
||||
# 2010-11-27
|
||||
# * fix typo in rmso for tek4106 -Goran Weinholt
|
||||
#
|
||||
# The following sets edit modes for GNU EMACS.
|
||||
# Local Variables:
|
||||
# fill-prefix:"\t"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.129 2010/10/23 20:53:01 tom Exp $
|
||||
# $Id: Makefile.in,v 1.130 2010/11/27 21:45:27 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -46,6 +46,7 @@
|
||||
.SUFFIXES:
|
||||
|
||||
SHELL = /bin/sh
|
||||
VPATH = @srcdir@
|
||||
THIS = Makefile
|
||||
|
||||
CF_MFLAGS = @cf_cv_makeflags@
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.57 2010/05/15 20:04:40 tom Exp $
|
||||
# $Id: Makefile.in,v 1.58 2010/11/27 21:45:27 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -43,6 +43,7 @@
|
||||
.SUFFIXES:
|
||||
|
||||
SHELL = /bin/sh
|
||||
VPATH = @srcdir@
|
||||
THIS = Makefile
|
||||
|
||||
x = @EXEEXT@
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.84 2010/05/15 20:04:40 tom Exp $
|
||||
# $Id: Makefile.in,v 1.85 2010/11/27 21:45:27 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -43,6 +43,7 @@
|
||||
.SUFFIXES:
|
||||
|
||||
SHELL = /bin/sh
|
||||
VPATH = @srcdir@
|
||||
THIS = Makefile
|
||||
|
||||
CF_MFLAGS = @cf_cv_makeflags@
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# $Id: Makefile.in,v 1.106 2010/11/06 19:33:08 tom Exp $
|
||||
# $Id: Makefile.in,v 1.107 2010/11/27 21:47:17 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc. #
|
||||
# Copyright (c) 1998-2008,2010 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"), #
|
||||
@ -35,6 +35,7 @@
|
||||
.SUFFIXES:
|
||||
|
||||
SHELL = /bin/sh
|
||||
VPATH = @srcdir@
|
||||
|
||||
@SET_MAKE@
|
||||
|
||||
|
||||
537
test/configure
vendored
537
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.83 2010/11/20 21:51:03 tom Exp $
|
||||
dnl $Id: configure.in,v 1.84 2010/11/28 00:16:57 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)
|
||||
@ -162,6 +162,7 @@ pdcurses) #(vi
|
||||
form.h \
|
||||
menu.h \
|
||||
panel.h \
|
||||
term_entry.h \
|
||||
)
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
/*
|
||||
* Author: Thomas E. Dickey
|
||||
*
|
||||
* $Id: demo_terminfo.c,v 1.8 2010/11/13 20:51:50 tom Exp $
|
||||
* $Id: demo_terminfo.c,v 1.9 2010/11/28 00:15:27 tom Exp $
|
||||
*
|
||||
* A simple demo of the terminfo interface.
|
||||
*/
|
||||
@ -37,6 +37,10 @@
|
||||
#include <test.priv.h>
|
||||
|
||||
#ifdef NCURSES_VERSION
|
||||
#if !(defined(HAVE_TERM_ENTRY_H) && HAVE_TERM_ENTRY_H)
|
||||
#undef NCURSES_XNAMES
|
||||
#define NCURSES_XNAMES 0
|
||||
#endif
|
||||
#if NCURSES_XNAMES
|
||||
#include <term_entry.h>
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user