#! /bin/sh
-# From configure.in Revision: 1.16 .
+# From configure.in Revision: 1.17 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.52.20100530.
#
NCURSES_SHLIB2="sh -c"
-for cf_path in . .. ../..
-do
- if test -f $cf_path/tar-copy.sh
- then
- NCURSES_COPY2=`echo 'sh $(top_srcdir)/'$cf_path'/tar-copy.sh' | sed -e 's,/./,/,'`
- break
- fi
-done
-
ADA_SUBDIRS="include gen src samples"
for cf_dir in $ADA_SUBDIRS
do
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:11220: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:11211: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
- { { echo "$as_me:11396: error: ambiguous option: $1
+ { { echo "$as_me:11387: 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;}
ac_need_defaults=false;;
# This is an error.
- -*) { { echo "$as_me:11415: error: unrecognized option: $1
+ -*) { { echo "$as_me:11406: 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;}
"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:11484: error: invalid argument: $ac_config_target" >&5
+ *) { { echo "$as_me:11475: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
s,@TEST_ARG2@,$TEST_ARG2,;t t
s,@TEST_LIBS2@,$TEST_LIBS2,;t t
s,@NCURSES_SHLIB2@,$NCURSES_SHLIB2,;t t
-s,@NCURSES_COPY2@,$NCURSES_COPY2,;t t
s,@ADA_SUBDIRS@,$ADA_SUBDIRS,;t t
s,@NCURSES_TREE@,$NCURSES_TREE,;t t
s,@EXTERNAL_TREE@,$EXTERNAL_TREE,;t t
esac
if test x"$ac_file" != x-; then
- { echo "$as_me:11794: creating $ac_file" >&5
+ { echo "$as_me:11784: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:11812: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:11802: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:11825: error: cannot find input file: $f" >&5
+ { { echo "$as_me:11815: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
* ) ac_file_in=$ac_file.in ;;
esac
- test x"$ac_file" != x- && { echo "$as_me:11891: creating $ac_file" >&5
+ test x"$ac_file" != x- && { echo "$as_me:11881: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:11902: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:11892: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:11915: error: cannot find input file: $f" >&5
+ { { echo "$as_me:11905: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
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:11973: $ac_file is unchanged" >&5
+ { echo "$as_me:11963: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
dnl
dnl Author: Thomas E. Dickey
dnl
-dnl $Id: configure.in,v 1.16 2010/07/03 21:18:11 tom Exp $
+dnl $Id: configure.in,v 1.17 2010/07/17 19:56:25 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.16 $)
+AC_REVISION($Revision: 1.17 $)
AC_INIT(gen/gen.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
NCURSES_SHLIB2="sh -c"
AC_SUBST(NCURSES_SHLIB2)
-dnl ditto for "$(top_srcdir)/tar-copy.sh"
-for cf_path in . .. ../..
-do
- if test -f $cf_path/tar-copy.sh
- then
- NCURSES_COPY2=`echo 'sh $(top_srcdir)/'$cf_path'/tar-copy.sh' | sed -e 's,/./,/,'`
- break
- fi
-done
-AC_SUBST(NCURSES_COPY2)
-
ADA_SUBDIRS="include gen src samples"
for cf_dir in $ADA_SUBDIRS
do
#
# Author: Juergen Pfeifer, 1996
#
-# $Id: Makefile.in,v 1.67 2010/06/12 16:32:02 tom Exp $
+# $Id: Makefile.in,v 1.68 2010/07/17 19:56:15 tom Exp $
#
.SUFFIXES:
bindir = @bindir@
includedir = @includedir@
-ADA_INCLUDE = $(DESTDIR)@ADA_INCLUDE@
-ADA_OBJECTS = $(DESTDIR)@ADA_OBJECTS@
-
INSTALL = @INSTALL@
INSTALL_PROG = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
ADACURSES_CONFIG = adacurses@DFT_ARG_SUFFIX@-config
WRAPPER = @NCURSES_SHLIB2@
-TAR_COPY = @NCURSES_COPY2@
PROG_GENERATE = ./generate$x
GENERATE = $(PROG_GENERATE) '@DFT_ARG_SUFFIX@'
sources:
-$(DESTDIR)$(bindir) \
-$(ADA_INCLUDE) \
-$(ADA_OBJECTS) :
+$(DESTDIR)$(bindir) :
mkdir -p $@
-install \
-install.libs :: $(ADA_INCLUDE)
- @echo installing package $(ALIB) in $(ADA_INCLUDE)
- @$(TAR_COPY) '$(ALIB)*.ad?' $(ADA_SRCDIR) $(ADA_INCLUDE)
- @$(TAR_COPY) '$(ALIB)[-.]*.ad?' $(ADA_SRCDIR) $(ADA_INCLUDE)
- @test $(srcdir) != ./ && $(TAR_COPY) '$(ALIB)*.ad?' $(srcdir)/../src $(ADA_INCLUDE)
- @test $(srcdir) != ./ && $(TAR_COPY) '$(ALIB)[-.]*.ad?' $(srcdir)/../src $(ADA_INCLUDE)
-
-install \
-install.libs :: $(ADA_OBJECTS)
- @echo installing package $(ALIB) in $(ADA_OBJECTS)
- @-chmod a-wx $(ADA_SRCDIR)/*.ali
- @$(TAR_COPY) '$(ALIB)*.ali' $(ADA_SRCDIR) $(ADA_OBJECTS)
- @$(TAR_COPY) '$(ALIB)[-.]*.ali' $(ADA_SRCDIR) $(ADA_OBJECTS)
- @-chmod u+x $(ADA_SRCDIR)/*.ali
-
install \
install.libs :: $(DESTDIR)$(bindir) $(ADACURSES_CONFIG)
$(INSTALL_PROG) $(ADACURSES_CONFIG) $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
-uninstall \
-uninstall.libs ::
- @echo removing package $(ALIB) from $(ADA_INCLUDE)
- -@cd $(ADA_INCLUDE) && rm -f $(ALIB)[-.]*
-
-uninstall \
-uninstall.libs ::
- @echo removing package $(ALIB) from $(ADA_OBJECTS)
- -@cd $(ADA_OBJECTS) && rm -f $(ALIB)[-.]*
-
uninstall \
uninstall.libs ::
-rm -f $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
./progs/tput.c
./progs/transform.c
./progs/tset.c
-./tar-copy.sh
./test/Makefile.in
./test/README
./test/aclocal.m4
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.1564 2010/07/03 22:20:55 tom Exp $
+-- $Id: NEWS,v 1.1566 2010/07/17 23:00:18 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information.
+20100717
+ * add hard-reset for rs2 to wsvt25 to help ensure that reset ends
+ the alternate character set (patch by Nicholas Marriott)
+ + remove tar-copy.sh and related configure/Makefile chunks, since the
+ Ada95 binding is now installed using rules in Ada95/src.
+
20100703
+ continue integrating changes to use gnatmake project files in Ada95
+ add/use configure check to turn on project rules for Ada95/src.
#! /bin/sh
-# From configure.in Revision: 1.500 .
+# From configure.in Revision: 1.501 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.52.20100530.
#
# symbols that differ when compiling Ada95 by itself.
NCURSES_SHLIB2='sh $(top_srcdir)/misc/shlib'
-NCURSES_COPY2='sh $(top_srcdir)/tar-copy.sh'
-
# values to use as strings
cat >>confdefs.h <<EOF
#define NCURSES_PATHSEP '$PATH_SEPARATOR'
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:18925: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:18923: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
- { { echo "$as_me:19101: error: ambiguous option: $1
+ { { echo "$as_me:19099: 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;}
ac_need_defaults=false;;
# This is an error.
- -*) { { echo "$as_me:19120: error: unrecognized option: $1
+ -*) { { echo "$as_me:19118: 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;}
"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:19222: error: invalid argument: $ac_config_target" >&5
+ *) { { echo "$as_me:19220: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
s,@ADA_SUBDIRS@,$ADA_SUBDIRS,;t t
s,@DIRS_TO_MAKE@,$DIRS_TO_MAKE,;t t
s,@NCURSES_SHLIB2@,$NCURSES_SHLIB2,;t t
-s,@NCURSES_COPY2@,$NCURSES_COPY2,;t t
s,@HAVE_TCGETATTR@,$HAVE_TCGETATTR,;t t
s,@HAVE_TERMIO_H@,$HAVE_TERMIO_H,;t t
s,@HAVE_TERMIOS_H@,$HAVE_TERMIOS_H,;t t
esac
if test x"$ac_file" != x-; then
- { echo "$as_me:19627: creating $ac_file" >&5
+ { echo "$as_me:19624: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:19645: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:19642: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:19658: error: cannot find input file: $f" >&5
+ { { echo "$as_me:19655: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
* ) ac_file_in=$ac_file.in ;;
esac
- test x"$ac_file" != x- && { echo "$as_me:19724: creating $ac_file" >&5
+ test x"$ac_file" != x- && { echo "$as_me:19721: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:19735: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:19732: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:19748: error: cannot find input file: $f" >&5
+ { { echo "$as_me:19745: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
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:19806: $ac_file is unchanged" >&5
+ { echo "$as_me:19803: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: configure.in,v 1.500 2010/07/03 21:17:32 tom Exp $
+dnl $Id: configure.in,v 1.501 2010/07/17 19:56:41 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.500 $)
+AC_REVISION($Revision: 1.501 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
NCURSES_SHLIB2='sh $(top_srcdir)/misc/shlib'
AC_SUBST(NCURSES_SHLIB2)
-NCURSES_COPY2='sh $(top_srcdir)/tar-copy.sh'
-AC_SUBST(NCURSES_COPY2)
-
# values to use as strings
AC_DEFINE_UNQUOTED(NCURSES_PATHSEP,'$PATH_SEPARATOR')
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.765 2010/07/03 16:52:23 tom Exp $
+# $Id: dist.mk,v 1.766 2010/07/17 19:39:41 tom Exp $
# Makefile for creating ncurses distributions.
#
# This only needs to be used directly as a makefile by developers, but
# These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 5
NCURSES_MINOR = 7
-NCURSES_PATCH = 20100703
+NCURSES_PATCH = 20100717
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
# Report bugs and new terminal descriptions to
# bug-ncurses@gnu.org
#
-# $Revision: 1.363 $
-# $Date: 2010/06/12 14:39:51 $
+# $Revision: 1.364 $
+# $Date: 2010/07/17 22:55:06 $
#
# 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
is2=\E[r\E[25;1H, kend=\E[8~, kf1=\E[11~, kf10=\E[21~,
kf11=\E[23~, kf12=\E[24~, kf2=\E[12~, kf3=\E[13~,
kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
- kf9=\E[20~, khome=\E[7~, op=\E[m, setab=\E[4%p1%dm,
- setaf=\E[3%p1%dm, use=vt220,
+ kf9=\E[20~, khome=\E[7~, op=\E[m, rs1=\Ec,
+ setab=\E[4%p1%dm, setaf=\E[3%p1%dm, use=vt220,
wsvt25m|NetBSD wscons in 25 line DEC VT220 mode with Meta,
km, use=wsvt25,
# 2010-06-12
# * add mlterm+256color entry -TD
#
+# 2010-07-17
+# * add hard-reset for rs2 to wsvt25 to help ensure that reset ends
+# the alternate character set (patch by Nicholas Marriott)
+#
# The following sets edit modes for GNU EMACS.
# Local Variables:
# fill-prefix:"\t"
+++ /dev/null
-#!/bin/sh
-# $Id: tar-copy.sh,v 1.5 2003/10/25 14:40:07 tom Exp $
-##############################################################################
-# Copyright (c) 1998,2003 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"), #
-# to deal in the Software without restriction, including without limitation #
-# the rights to use, copy, modify, merge, publish, distribute, distribute #
-# with modifications, sublicense, and/or sell copies of the Software, and to #
-# permit persons to whom the Software is furnished to do so, subject to the #
-# following conditions: #
-# #
-# The above copyright notice and this permission notice shall be included in #
-# all copies or substantial portions of the Software. #
-# #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, #
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL #
-# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER #
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING #
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER #
-# DEALINGS IN THE SOFTWARE. #
-# #
-# Except as contained in this notice, the name(s) of the above copyright #
-# holders shall not be used in advertising or otherwise to promote the sale, #
-# use or other dealings in this Software without prior written #
-# authorization. #
-##############################################################################
-#
-# Author: Thomas E. Dickey
-#
-# Copy a collection of files using 'tar', so that their dates and links are
-# preserved
-#
-# Parameters:
-# $1 = files to copy
-# $2 = source directory
-# $3 = destination directory
-#
-#DOIT=echo
-DOIT=eval
-
-if test $# != 3 ; then
- echo "Usage: $0 files source target"
- exit 1
-elif test ! -d "$2" ; then
- echo "Source directory not found: $2"
- exit 1
-elif test ! -d "$3" ; then
- echo "Target directory not found: $3"
- exit 1
-fi
-
-WD=`pwd`
-
-TMP=$WD/copy$$
-
-cd $2
-TEST=`ls -d $1 2>/dev/null`
-if test -z "$TEST"
-then
- echo "... no match for \"$1\" in $2"
-else
- echo "... installing files matching \"$1\" in $2"
- trap "rm -f $TMP" 0 1 2 5 15
- if ( tar cf $TMP $1 )
- then
- cd $3
- LIST=`tar tf $TMP 2>&1`
- $DOIT rm -rf $LIST 2>/dev/null
- $DOIT tar xvf $TMP
- else
- echo "Cannot create tar of $1 files"
- exit 1
- fi
-fi