Permalink
Browse files

Patched ncurses to 5.7-20100612

  • Loading branch information...
1 parent 381606f commit 787f0f99445e5816e83d0928ce75c13e22952ba9 @mscdex committed Jun 12, 2010
View
@@ -117,6 +117,7 @@
./Ada95/samples/tour.adb
./Ada95/samples/tour.ads
./Ada95/src/Makefile.in
+./Ada95/src/library.gpr
./Ada95/src/terminal_interface-curses-aux.adb
./Ada95/src/terminal_interface-curses-forms-field_types-alpha.adb
./Ada95/src/terminal_interface-curses-forms-field_types-alpha.ads
View
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.1552 2010/06/05 21:27:04 tom Exp $
+-- $Id: NEWS,v 1.1558 2010/06/12 18:52:13 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.
+20100612
+ + start integrating changes to use gnatmake project files in Ada95 tree
+ + add test_make / test_clean / test_install rules in Ada95/src
+ + change install-path for adainclude directory to /usr/share/ada (was
+ /usr/lib/ada).
+ + update Ada95/configure.
+ + add mlterm+256color entry, for mlterm 3.0.0 -TD
+ + modify test/configure to use macros to ensure consistent order
+ of updating LIBS variable.
+
20100605
+ change search order of options for Solaris in CF_SHARED_OPTS, to
work with 64-bit compiles.
View
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 1.495 .
+# From configure.in Revision: 1.496 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.52.20100530.
#
@@ -807,7 +807,7 @@ Testing/development Options:
--with-trace test: add trace() function to all models of ncurses
Ada95 Binding Options:
--with-ada-compiler=CMD specify Ada95 compiler command (default gnatmake)
- --with-ada-include=DIR Ada includes are in DIR (default: PREFIX/lib/ada/adainclude)
+ --with-ada-include=DIR Ada includes are in DIR (default: PREFIX/share/ada/adainclude)
--with-ada-objects=DIR Ada objects are in DIR (default: PREFIX/lib/ada/adalib)
Some influential environment variables:
@@ -5480,7 +5480,7 @@ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
aix[56]*) #(vi
if test "$GCC" = yes; then
CC_SHARED_OPTS=
- MK_SHARED_LIB="$(CC) -shared"
+ MK_SHARED_LIB='$(CC) -shared'
fi
;;
beos*) #(vi
@@ -5728,7 +5728,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
if test "$GCC" != yes; then
cf_save_CFLAGS="$CFLAGS"
- for cf_shared_opts in -xcode=pic13 -xcode=pic32 -Kpic -KPIC -O
+ for cf_shared_opts in -xcode=pic32 -xcode=pic13 -KPIC -Kpic -O
do
CFLAGS="$cf_shared_opts $cf_save_CFLAGS"
cat >conftest.$ac_ext <<_ACEOF
@@ -18004,8 +18004,8 @@ if test "${with_ada_include+set}" = set; then
withval="$with_ada_include"
else
- withval="${ADA_INCLUDE-$prefix/lib/ada/adainclude}"
-fi; if test -n "$prefix/lib/ada/adainclude" ; then
+ withval="${ADA_INCLUDE-$prefix/share/ada/adainclude}"
+fi; if test -n "$prefix/share/ada/adainclude" ; then
if test "x$prefix" != xNONE; then
cf_path_syntax="$prefix"
@@ -28,14 +28,14 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: configure.in,v 1.495 2010/06/05 20:00:26 tom Exp $
+dnl $Id: configure.in,v 1.496 2010/06/12 18:47:28 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.495 $)
+AC_REVISION($Revision: 1.496 $)
AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
@@ -1647,8 +1647,8 @@ end conftest;],[cf_cv_pragma_unreferenced=yes],[cf_cv_pragma_unreferenced=no])
CF_WITH_PATH(ada-include,
[ --with-ada-include=DIR Ada includes are in DIR],
ADA_INCLUDE,
- PREFIX/lib/ada/adainclude,
- [$]prefix/lib/ada/adainclude)
+ PREFIX/share/ada/adainclude,
+ [$]prefix/share/ada/adainclude)
AC_SUBST(ADA_INCLUDE)
CF_WITH_PATH(ada-objects,
View
@@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# $Id: dist.mk,v 1.761 2010/06/05 15:56:44 tom Exp $
+# $Id: dist.mk,v 1.762 2010/06/12 11:23:08 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 = 20100605
+NCURSES_PATCH = 20100612
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
@@ -6,8 +6,8 @@
# Report bugs and new terminal descriptions to
# bug-ncurses@gnu.org
#
-# $Revision: 1.362 $
-# $Date: 2010/03/20 20:10:08 $
+# $Revision: 1.363 $
+# $Date: 2010/06/12 14:39:51 $
#
# 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
@@ -4010,6 +4010,9 @@ mlterm+pcfkeys|fragment for PC-style fkeys,
kRIT6=\EO1;6C, kRIT7=\EO1;7C, kUP=\EO1;2A, kUP3=\EO1;3A,
kUP4=\EO1;4A, kUP5=\EO1;5A, kUP6=\EO1;6A, kUP7=\EO1;7A,
+mlterm-256color|mlterm 3.0 with xterm 256-colors,
+ use=xterm+256color, use=rxvt,
+
# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
# Updated: Oezguer Kesim <kesim@math.fu-berlin.de> 02 Nov 1997
# Notes:
@@ -22259,6 +22262,9 @@ v3220|LANPAR Vision II model 3220/3221/3222,
# * rename atari and st52 to atari-old, st52-old, use newer entries from
# FreeMiNT by Guido Flohr (from patch/report by Alan Hourihane).
#
+# 2010-06-12
+# * add mlterm+256color entry -TD
+#
# The following sets edit modes for GNU EMACS.
# Local Variables:
# fill-prefix:"\t"
@@ -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.39 2010/05/29 20:55:40 tom Exp $
+dnl $Id: aclocal.m4,v 1.40 2010/06/12 12:31:55 tom Exp $
dnl
dnl Author: Thomas E. Dickey
dnl
@@ -185,6 +185,14 @@ if test -n "$1" ; then
fi
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_ADD_LIB version: 2 updated: 2010/06/02 05:03:05
+dnl ----------
+dnl Add a library, used to enforce consistency.
+dnl
+dnl $1 = library to add, without the "-l"
+dnl $2 = variable to update (default $LIBS)
+AC_DEFUN([CF_ADD_LIB],[CF_ADD_LIBS(-l$1,ifelse($2,,LIBS,[$2]))])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_ADD_LIBDIR version: 9 updated: 2010/05/26 16:44:57
dnl -------------
dnl Adds to the library-path
@@ -221,6 +229,14 @@ if test -n "$1" ; then
fi
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_ADD_LIBS version: 1 updated: 2010/06/02 05:03:05
+dnl -----------
+dnl Add one or more libraries, used to enforce consistency.
+dnl
+dnl $1 = libraries to add, with the "-l", etc.
+dnl $2 = variable to update (default $LIBS)
+AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1 [$]ifelse($2,,LIBS,[$2])"])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_ADD_SUBDIR_PATH version: 2 updated: 2007/07/29 10:12:59
dnl ------------------
dnl Append to a search-list for a nonstandard header/lib-file
@@ -2264,7 +2280,7 @@ ncursesw/term.h)
esac
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_TRY_PKG_CONFIG version: 2 updated: 2010/05/26 05:38:42
+dnl CF_TRY_PKG_CONFIG version: 3 updated: 2010/06/02 05:03:05
dnl -----------------
dnl This is a simple wrapper to use for pkg-config, for libraries which may be
dnl available in that form.
@@ -2280,7 +2296,7 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $1; then
cf_pkgconfig_incs="`$PKG_CONFIG --cflags $1 2>/dev/null`"
cf_pkgconfig_libs="`$PKG_CONFIG --libs $1 2>/dev/null`"
CF_ADD_CFLAGS($cf_pkgconfig_incs)
- LIBS="$cf_pkgconfig_libs $LIBS"
+ CF_ADD_LIBS($cf_pkgconfig_libs)
ifelse([$2],,:,[$2])
else
ifelse([$3],,:,[$3])
@@ -2533,7 +2549,7 @@ if test -n "$cf_xopen_source" ; then
fi
])
dnl ---------------------------------------------------------------------------
-dnl CF_X_ATHENA version: 14 updated: 2010/05/26 19:19:58
+dnl CF_X_ATHENA version: 15 updated: 2010/06/02 05:03:05
dnl -----------
dnl Check for Xaw (Athena) libraries
dnl
@@ -2592,7 +2608,7 @@ if test "$PKG_CONFIG" != none ; then
cf_x_athena_inc="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`"
cf_x_athena_lib="`$PKG_CONFIG --libs $cf_athena_pkg 2>/dev/null`"
CF_ADD_CFLAGS($cf_x_athena_inc)
- LIBS="$cf_x_athena_lib $LIBS"
+ CF_ADD_LIBS($cf_x_athena_lib)
CF_UPPER(cf_x_athena_LIBS,HAVE_LIB_$cf_x_athena)
AC_DEFINE_UNQUOTED($cf_x_athena_LIBS)
@@ -2656,7 +2672,7 @@ elif test "$cf_x_athena_inc" != default ; then
fi
])
dnl ---------------------------------------------------------------------------
-dnl CF_X_ATHENA_LIBS version: 8 updated: 2010/05/26 05:38:42
+dnl CF_X_ATHENA_LIBS version: 9 updated: 2010/06/02 05:03:05
dnl ----------------
dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.
@@ -2680,10 +2696,10 @@ do
cf_save="$LIBS"
cf_test=XawSimpleMenuAddGlobalActions
if test $cf_path != default ; then
- LIBS="-L$cf_path/lib $cf_lib $LIBS"
+ CF_ADD_LIBS(-L$cf_path/lib $cf_lib)
AC_MSG_CHECKING(for $cf_lib in $cf_path)
else
- LIBS="$cf_lib $LIBS"
+ CF_ADD_LIBS($cf_lib)
AC_MSG_CHECKING(for $cf_test in $cf_lib)
fi
AC_TRY_LINK([],[$cf_test()],
@@ -2708,15 +2724,15 @@ CF_UPPER(cf_x_athena_LIBS,HAVE_LIB_$cf_x_athena)
AC_DEFINE_UNQUOTED($cf_x_athena_LIBS)
])
dnl ---------------------------------------------------------------------------
-dnl CF_X_EXT version: 2 updated: 2010/05/26 05:38:42
+dnl CF_X_EXT version: 3 updated: 2010/06/02 05:03:05
dnl --------
AC_DEFUN([CF_X_EXT],[
CF_TRY_PKG_CONFIG(Xext,,[
AC_CHECK_LIB(Xext,XextCreateExtension,
- [LIBS="-lXext $LIBS"])])
+ [CF_ADD_LIB(Xext)])])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_X_TOOLKIT version: 13 updated: 2010/05/26 05:45:44
+dnl CF_X_TOOLKIT version: 14 updated: 2010/06/02 05:03:05
dnl ------------
dnl Check for X Toolkit libraries
dnl
@@ -2736,7 +2752,7 @@ CF_TRY_PKG_CONFIG(xt,[
AC_CHECK_FUNC(XOpenDisplay,,[
AC_CHECK_LIB(X11,XOpenDisplay,
- [LIBS="-lX11 $LIBS"],,
+ [CF_ADD_LIB(X11)],,
[$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])])
AC_CHECK_FUNC(XtAppInitialize,,[

0 comments on commit 787f0f9

Please sign in to comment.