mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2024-12-15 07:30:12 +08:00
ncurses 5.7 - patch 20100904
+ add configure option --without-tests, to suppress building test programs (request by Frederic L W Meunier).
This commit is contained in:
Thomas E. Dickey
parent
d4ff840fdd
commit
275aeb5889
34
Ada95/aclocal.m4
vendored
34
Ada95/aclocal.m4
vendored
@ -28,7 +28,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.15 2010/07/24 21:33:12 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.16 2010/09/04 21:41:53 tom Exp $
|
||||
dnl Macros used in NCURSES Ada95 auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -931,7 +931,7 @@ if test "$GCC" = yes ; then
|
||||
fi
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_GCC_WARNINGS version: 25 updated: 2010/04/24 11:03:31
|
||||
dnl CF_GCC_WARNINGS version: 26 updated: 2010/08/14 18:25:37
|
||||
dnl ---------------
|
||||
dnl Check if the compiler supports useful warning options. There's a few that
|
||||
dnl we don't use, simply because they're too noisy:
|
||||
@ -1035,7 +1035,7 @@ then
|
||||
done
|
||||
CFLAGS="$cf_save_CFLAGS"
|
||||
fi
|
||||
rm -f conftest*
|
||||
rm -rf conftest*
|
||||
|
||||
AC_SUBST(EXTRA_CFLAGS)
|
||||
])dnl
|
||||
@ -1069,7 +1069,7 @@ fi
|
||||
AC_SUBST(PRAGMA_UNREF)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_GNAT_TRY_LINK version: 1 updated: 2004/08/21 19:02:08
|
||||
dnl CF_GNAT_TRY_LINK version: 2 updated: 2010/08/14 18:25:37
|
||||
dnl ----------------
|
||||
dnl Verify that a test program compiles/links with GNAT.
|
||||
dnl $cf_ada_make is set to the program that compiles/links
|
||||
@ -1081,7 +1081,7 @@ dnl $3 is the shell command to execute if successful
|
||||
dnl $4 is the shell command to execute if not successful
|
||||
AC_DEFUN([CF_GNAT_TRY_LINK],
|
||||
[
|
||||
rm -f conftest*
|
||||
rm -rf conftest*
|
||||
cat >>conftest.ads <<CF_EOF
|
||||
$1
|
||||
CF_EOF
|
||||
@ -1093,10 +1093,10 @@ ifelse($3,, :,[ $3])
|
||||
ifelse($4,,,[else
|
||||
$4])
|
||||
fi
|
||||
rm -f conftest*
|
||||
rm -rf conftest*
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_GNAT_TRY_RUN version: 3 updated: 2004/08/21 19:02:08
|
||||
dnl CF_GNAT_TRY_RUN version: 4 updated: 2010/08/14 18:25:37
|
||||
dnl ---------------
|
||||
dnl Verify that a test program compiles and runs with GNAT
|
||||
dnl $cf_ada_make is set to the program that compiles/links
|
||||
@ -1108,7 +1108,7 @@ dnl $3 is the shell command to execute if successful
|
||||
dnl $4 is the shell command to execute if not successful
|
||||
AC_DEFUN([CF_GNAT_TRY_RUN],
|
||||
[
|
||||
rm -f conftest*
|
||||
rm -rf conftest*
|
||||
cat >>conftest.ads <<CF_EOF
|
||||
$1
|
||||
CF_EOF
|
||||
@ -1124,7 +1124,7 @@ ifelse($4,,,[ else
|
||||
ifelse($4,,,[else
|
||||
$4])
|
||||
fi
|
||||
rm -f conftest*
|
||||
rm -rf conftest*
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_GNAT_VERSION version: 14 updated: 2010/07/03 17:45:09
|
||||
@ -1459,7 +1459,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
|
||||
AC_SUBST(LIB_PREFIX)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_LIB_SONAME version: 4 updated: 2010/05/29 16:31:02
|
||||
dnl CF_LIB_SONAME version: 5 updated: 2010/08/14 18:25:37
|
||||
dnl -------------
|
||||
dnl Find the and soname for the given shared library. Set the cache variable
|
||||
dnl cf_cv_$3_soname to this, unless it is not found. Then set the cache
|
||||
@ -1490,7 +1490,7 @@ cf_save_LIBS="$LIBS"
|
||||
test -z "$cf_cv_$3_soname" && cf_cv_$3_soname=unknown
|
||||
fi
|
||||
fi
|
||||
rm -f conftest*
|
||||
rm -rf conftest*
|
||||
LIBS="$cf_save_LIBS"
|
||||
fi
|
||||
])
|
||||
@ -1815,13 +1815,13 @@ fi
|
||||
test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_MKSTEMP version: 6 updated: 2010/05/22 14:44:30
|
||||
dnl CF_MKSTEMP version: 7 updated: 2010/08/14 18:25:37
|
||||
dnl ----------
|
||||
dnl Check for a working mkstemp. This creates two files, checks that they are
|
||||
dnl successfully created and distinct (AmigaOS apparently fails on the last).
|
||||
AC_DEFUN([CF_MKSTEMP],[
|
||||
AC_CACHE_CHECK(for working mkstemp, cf_cv_func_mkstemp,[
|
||||
rm -f conftest*
|
||||
rm -rf conftest*
|
||||
AC_TRY_RUN([
|
||||
#include <sys/types.h>
|
||||
#include <stdlib.h>
|
||||
@ -2509,7 +2509,7 @@ AC_PROG_AWK
|
||||
test -z "$AWK" && AC_MSG_ERROR(No awk program found)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_PROG_CC_C_O version: 2 updated: 2006/12/16 15:55:46
|
||||
dnl CF_PROG_CC_C_O version: 3 updated: 2010/08/14 18:25:37
|
||||
dnl --------------
|
||||
dnl Analogous to AC_PROG_CC_C_O, but more useful: tests only $CC, ensures that
|
||||
dnl the output file can be renamed, and allows for a shell variable that can
|
||||
@ -2539,7 +2539,7 @@ then
|
||||
else
|
||||
eval cf_cv_prog_$1_c_o=no
|
||||
fi
|
||||
rm -f conftest*
|
||||
rm -rf conftest*
|
||||
])dnl
|
||||
if test $cf_cv_prog_$1_c_o = yes; then
|
||||
AC_MSG_RESULT([yes])
|
||||
@ -2621,7 +2621,7 @@ fi
|
||||
AC_SUBST(cf_ada_make)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_PROG_LN_S version: 1 updated: 2010/07/24 17:12:40
|
||||
dnl CF_PROG_LN_S version: 2 updated: 2010/08/14 18:25:37
|
||||
dnl ------------
|
||||
dnl Combine checks for "ln -s" and "ln -sf", updating $LN_S to include "-f"
|
||||
dnl option if it is supported.
|
||||
@ -2637,7 +2637,7 @@ if $LN_S -f conf$$.src conf$$.dst 2>/dev/null; then
|
||||
else
|
||||
cf_prog_ln_sf=no
|
||||
fi
|
||||
|
||||
rm -f conf$$.dst conf$$src
|
||||
AC_MSG_RESULT($cf_prog_ln_sf)
|
||||
|
||||
test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f"
|
||||
|
||||
1887
Ada95/configure
vendored
1887
Ada95/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -28,14 +28,14 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey
|
||||
dnl
|
||||
dnl $Id: configure.in,v 1.18 2010/07/24 20:46:50 tom Exp $
|
||||
dnl $Id: configure.in,v 1.19 2010/09/04 21:43:36 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.18 $)
|
||||
AC_REVISION($Revision: 1.19 $)
|
||||
AC_INIT(gen/gen.c)
|
||||
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
|
||||
|
||||
@ -98,6 +98,13 @@ if test "$PKG_CONFIG" != no ; then
|
||||
fi
|
||||
AC_SUBST(PKG_CONFIG_LIBDIR)
|
||||
|
||||
AC_MSG_CHECKING(if you want to build test-programs)
|
||||
AC_ARG_WITH(tests,
|
||||
[ --without-tests suppress build with test-programs],
|
||||
[cf_with_tests=$withval],
|
||||
[cf_with_tests=yes])
|
||||
AC_MSG_RESULT($cf_with_tests)
|
||||
|
||||
AC_MSG_CHECKING(if we should assume mixed-case filenames)
|
||||
AC_ARG_ENABLE(mixed-case,
|
||||
[ --enable-mixed-case tic should assume mixed-case filenames],
|
||||
@ -568,7 +575,10 @@ dnl for separate build, this is good enough for "sh $(top_srcdir)/misc/shlib"
|
||||
NCURSES_SHLIB2="sh -c"
|
||||
AC_SUBST(NCURSES_SHLIB2)
|
||||
|
||||
ADA_SUBDIRS="include gen src samples"
|
||||
ADA_SUBDIRS="gen src"
|
||||
if test "x$cf_with_tests" != "xno" ; then
|
||||
ADA_SUBDIRS="$ADA_SUBDIRS samples"
|
||||
fi
|
||||
for cf_dir in $ADA_SUBDIRS
|
||||
do
|
||||
SUB_MAKEFILES="$SUB_MAKEFILES $cf_dir/Makefile"
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
|
||||
/*
|
||||
Version Control
|
||||
$Id: gen.c,v 1.53 2010/05/01 17:08:30 tom Exp $
|
||||
$Id: gen.c,v 1.54 2010/09/04 21:19:50 tom Exp $
|
||||
--------------------------------------------------------------------------*/
|
||||
/*
|
||||
This program generates various record structures and constants from the
|
||||
@ -57,6 +57,7 @@
|
||||
#include <menu.h>
|
||||
#include <form.h>
|
||||
|
||||
#define UChar(c) ((unsigned char)(c))
|
||||
#define RES_NAME "Reserved"
|
||||
|
||||
static const char *model = "";
|
||||
@ -445,13 +446,14 @@ keydef(const char *name, const char *old_name, int value, int mode)
|
||||
if (mode == 0) /* Generate the new name */
|
||||
printf(" %-30s : constant Special_Key_Code := 8#%3o#;\n", name, value);
|
||||
else
|
||||
{ /* generate the old name, but only if it doesn't conflict with the old
|
||||
* name (Ada95 isn't case sensitive!)
|
||||
*/
|
||||
{
|
||||
const char *s = old_name;
|
||||
const char *t = name;
|
||||
|
||||
while (*s && *t && (toupper(*s++) == toupper(*t++)));
|
||||
/* generate the old name, but only if it doesn't conflict with the old
|
||||
* name (Ada95 isn't case sensitive!)
|
||||
*/
|
||||
while (*s && *t && (toupper(UChar(*s++)) == toupper(UChar(*t++))));
|
||||
if (*s || *t)
|
||||
printf(" %-16s : Special_Key_Code renames %s;\n", old_name, name);
|
||||
}
|
||||
@ -771,7 +773,7 @@ acs_def(const char *name, chtype *a)
|
||||
int c = a - &acs_map[0];
|
||||
|
||||
printf(" %-24s : constant Character := ", name);
|
||||
if (isprint(c) && (c != '`'))
|
||||
if (isprint(UChar(c)) && (c != '`'))
|
||||
printf("'%c';\n", c);
|
||||
else
|
||||
printf("Character'Val (%d);\n", c);
|
||||
|
||||
6
INSTALL
6
INSTALL
@ -25,7 +25,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: INSTALL,v 1.146 2010/07/03 22:50:50 tom Exp $
|
||||
-- $Id: INSTALL,v 1.147 2010/09/04 20:57:46 tom Exp $
|
||||
---------------------------------------------------------------------
|
||||
How to install Ncurses/Terminfo on your system
|
||||
---------------------------------------------------------------------
|
||||
@ -1025,6 +1025,10 @@ SUMMARY OF CONFIGURE OPTIONS:
|
||||
programs (e.g., tic). The test applications will still be built if you
|
||||
type "make", though not if you simply do "make install".
|
||||
|
||||
--without-tests
|
||||
Tell the configure script to suppress the build of ncurses' test
|
||||
programs.
|
||||
|
||||
--without-xterm-new
|
||||
Tell the configure script to use "xterm-old" for the entry used in
|
||||
the terminfo database. This will work with variations such as
|
||||
|
||||
6
NEWS
6
NEWS
@ -25,7 +25,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.1585 2010/08/28 20:52:23 tom Exp $
|
||||
-- $Id: NEWS,v 1.1586 2010/09/04 21:13:55 tom Exp $
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
This is a log of changes that ncurses has gone through since Zeyd started
|
||||
@ -45,6 +45,10 @@ 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.
|
||||
|
||||
20100904
|
||||
+ add configure option --without-tests, to suppress building test
|
||||
programs (request by Frederic L W Meunier).
|
||||
|
||||
20100828
|
||||
+ modify nsterm, xnuppc and tek4115 to make sgr/sgr0 consistent -TD
|
||||
+ add check in terminfo source-reader to provide more informative
|
||||
|
||||
15
aclocal.m4
vendored
15
aclocal.m4
vendored
@ -28,7 +28,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.542 2010/08/14 23:37:19 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.544 2010/09/04 23:25:24 tom Exp $
|
||||
dnl Macros used in NCURSES auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -2572,7 +2572,7 @@ ifelse($1,,,[$1=$LIB_PREFIX])
|
||||
AC_SUBST(LIB_PREFIX)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_LIB_RULES version: 58 updated: 2010/08/14 19:00:32
|
||||
dnl CF_LIB_RULES version: 59 updated: 2010/09/04 19:24:20
|
||||
dnl ------------
|
||||
dnl Append definitions and rules for the given models to the subdirectory
|
||||
dnl Makefiles, and the recursion rule for the top-level Makefile. If the
|
||||
@ -2606,7 +2606,7 @@ if test -n "$TINFO_SUFFIX" ; then
|
||||
TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^t//'`
|
||||
;;
|
||||
w*)
|
||||
TINFO_NAME="${TINFO_NAME}/w"
|
||||
TINFO_NAME="${TINFO_NAME}w"
|
||||
TINFO_SUFFIX=`echo $TINFO_SUFFIX | sed 's/^w//'`
|
||||
;;
|
||||
esac
|
||||
@ -5246,7 +5246,7 @@ if test "$cf_cv_sizechange" != no ; then
|
||||
fi
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_SRC_MODULES version: 20 updated: 2008/12/27 12:30:03
|
||||
dnl CF_SRC_MODULES version: 21 updated: 2010/09/04 17:37:40
|
||||
dnl --------------
|
||||
dnl For each parameter, test if the source-directory exists, and if it contains
|
||||
dnl a 'modules' file. If so, add to the list $cf_cv_src_modules which we'll
|
||||
@ -5330,14 +5330,19 @@ for cf_dir in $cf_cv_src_modules
|
||||
do
|
||||
SRC_SUBDIRS="$SRC_SUBDIRS $cf_dir"
|
||||
done
|
||||
if test "x$cf_with_tests" != "xno" ; then
|
||||
SRC_SUBDIRS="$SRC_SUBDIRS test"
|
||||
fi
|
||||
test -z "$MAKE_TERMINFO" && SRC_SUBDIRS="$SRC_SUBDIRS misc"
|
||||
test "$cf_with_cxx_binding" != no && SRC_SUBDIRS="$SRC_SUBDIRS c++"
|
||||
|
||||
ADA_SUBDIRS=
|
||||
if test "$cf_cv_prog_gnat_correct" = yes && test -f $srcdir/Ada95/Makefile.in; then
|
||||
SRC_SUBDIRS="$SRC_SUBDIRS Ada95"
|
||||
ADA_SUBDIRS="gen src samples"
|
||||
ADA_SUBDIRS="gen src"
|
||||
if test "x$cf_with_tests" != "xno" ; then
|
||||
ADA_SUBDIRS="$ADA_SUBDIRS samples"
|
||||
fi
|
||||
fi
|
||||
|
||||
SUB_MAKEFILES=
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile.in,v 1.91 2010/05/15 20:04:40 tom Exp $
|
||||
# $Id: Makefile.in,v 1.92 2010/09/04 21:29:06 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. #
|
||||
# #
|
||||
@ -108,9 +108,11 @@ LIBNAME_LIBTOOL = @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.la
|
||||
LIBNAME_NORMAL = @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.a
|
||||
LIBNAME = @LIB_PREFIX@$(LIBROOT)@CXX_LIB_SUFFIX@
|
||||
|
||||
MY_LIBRARY = ../lib/$(LIBNAME)
|
||||
|
||||
LINK_FLAGS = @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)@LIB_SUFFIX@
|
||||
|
||||
LINK_LIBTOOL = @EXTRA_LDFLAGS@ -L../lib ../lib/$(LIBNAME)
|
||||
LINK_LIBTOOL = @EXTRA_LDFLAGS@ -L../lib $(MY_LIBRARY)
|
||||
LINK_NORMAL = $(LINK_FLAGS)
|
||||
LINK_DEBUG = $(LINK_FLAGS)
|
||||
LINK_PROFILE = $(LINK_FLAGS)
|
||||
@ -134,9 +136,9 @@ AUTO_SRC = \
|
||||
etip.h
|
||||
|
||||
all \
|
||||
libs :: $(AUTO_SRC) ../lib/$(LIBNAME)
|
||||
libs :: $(AUTO_SRC) $(MY_LIBRARY)
|
||||
|
||||
all :: demo$x
|
||||
@MAKE_TESTS@all :: demo$x
|
||||
|
||||
sources : $(AUTO_SRC)
|
||||
|
||||
@ -174,7 +176,7 @@ $(MODEL)/demo$o : $(srcdir)/demo.cc \
|
||||
$(cursesf_h) $(cursesm_h) $(cursesapp_h)
|
||||
|
||||
demo$x: $(OBJS_DEMO) \
|
||||
../lib/$(LIBNAME) \
|
||||
$(MY_LIBRARY) \
|
||||
@TEST_DEPS@
|
||||
@ECHO_LINK@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT)
|
||||
|
||||
@ -186,8 +188,8 @@ $(DESTDIR)$(libdir) :
|
||||
mkdir -p $@
|
||||
|
||||
install \
|
||||
install.libs:: ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
|
||||
$(LIBTOOL_INSTALL) $(INSTALL_LIB) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)/$(LIBNAME)
|
||||
install.libs:: $(MY_LIBRARY) $(DESTDIR)$(libdir)
|
||||
$(LIBTOOL_INSTALL) $(INSTALL_LIB) $(MY_LIBRARY) $(DESTDIR)$(libdir)/$(LIBNAME)
|
||||
|
||||
uninstall \
|
||||
uninstall.libs::
|
||||
@ -199,7 +201,7 @@ mostlyclean ::
|
||||
clean :: mostlyclean
|
||||
-sh -c "if test -n '$x' ; then $(MAKE) clean x=''; fi"
|
||||
-rm -rf $(MODEL)/SunWS_cache
|
||||
-$(LIBTOOL_CLEAN) rm -f demo$x $(AUTO_SRC) ../lib/$(LIBNAME) $(LIB_OBJS) $(OBJS_DEMO)
|
||||
-$(LIBTOOL_CLEAN) rm -f demo$x $(AUTO_SRC) $(MY_LIBRARY) $(LIB_OBJS) $(OBJS_DEMO)
|
||||
-rm -rf .libs
|
||||
|
||||
distclean :: clean
|
||||
|
||||
21
configure.in
21
configure.in
@ -28,14 +28,14 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: configure.in,v 1.503 2010/08/07 20:00:17 tom Exp $
|
||||
dnl $Id: configure.in,v 1.506 2010/09/04 21:49: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.503 $)
|
||||
AC_REVISION($Revision: 1.506 $)
|
||||
AC_INIT(ncurses/base/lib_initscr.c)
|
||||
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
|
||||
|
||||
@ -136,6 +136,13 @@ AC_ARG_WITH(progs,
|
||||
[cf_with_progs=yes])
|
||||
AC_MSG_RESULT($cf_with_progs)
|
||||
|
||||
AC_MSG_CHECKING(if you want to build test-programs)
|
||||
AC_ARG_WITH(tests,
|
||||
[ --without-tests suppress build with test-programs],
|
||||
[cf_with_tests=$withval],
|
||||
[cf_with_tests=yes])
|
||||
AC_MSG_RESULT($cf_with_tests)
|
||||
|
||||
AC_MSG_CHECKING(if you wish to install curses.h)
|
||||
AC_ARG_WITH(curses-h,
|
||||
[ --without-curses-h install curses.h as ncurses.h only],
|
||||
@ -1879,6 +1886,13 @@ then
|
||||
fi
|
||||
AC_SUBST(TIC_PATH)
|
||||
|
||||
if test "x$cf_with_tests" != xno ; then
|
||||
MAKE_TESTS=
|
||||
else
|
||||
MAKE_TESTS="#"
|
||||
fi
|
||||
AC_SUBST(MAKE_TESTS)
|
||||
|
||||
AC_OUTPUT( \
|
||||
include/MKterm.h.awk \
|
||||
include/curses.head:include/curses.h.in \
|
||||
@ -1887,7 +1901,9 @@ AC_OUTPUT( \
|
||||
include/unctrl.h \
|
||||
$SUB_MAKEFILES \
|
||||
Makefile,[
|
||||
if test "x$cf_with_tests" != xno ; then
|
||||
CF_PRG_RULES([$srcdir/test/mk-test.awk ECHO_LINK="$ECHO_LINK"], test)
|
||||
fi
|
||||
CF_LIB_RULES($SRC_SUBDIRS)
|
||||
|
||||
if test "x$cf_with_ada" != xno ; then
|
||||
@ -1946,6 +1962,7 @@ cf_cv_system_name="$cf_cv_system_name"
|
||||
cf_with_ada="$cf_with_ada"
|
||||
cf_with_cxx_binding="$cf_with_cxx_binding"
|
||||
cf_with_manpages="$cf_with_manpages"
|
||||
cf_with_tests="$cf_with_tests"
|
||||
host="$host"
|
||||
target="$target"
|
||||
|
||||
|
||||
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.771 2010/08/28 15:35:26 tom Exp $
|
||||
# $Id: dist.mk,v 1.772 2010/09/04 16:03:54 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 = 20100828
|
||||
NCURSES_PATCH = 20100904
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* Copyright (c) 2009 Free Software Foundation, Inc. *
|
||||
* Copyright (c) 2009,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 *
|
||||
@ -34,7 +34,7 @@
|
||||
|
||||
#include <transform.h>
|
||||
|
||||
MODULE_ID("$Id: transform.c,v 1.1 2009/03/14 19:08:28 tom Exp $")
|
||||
MODULE_ID("$Id: transform.c,v 1.2 2010/09/04 21:16:17 tom Exp $")
|
||||
|
||||
#ifdef SUFFIX_IGNORED
|
||||
static void
|
||||
@ -51,7 +51,7 @@ trim_suffix(const char *a, unsigned *len)
|
||||
unsigned n;
|
||||
trim = TRUE;
|
||||
for (n = first; n < *len; ++n) {
|
||||
if (tolower(a[n]) != tolower(ignore[n - first])) {
|
||||
if (tolower(UChar(a[n])) != tolower(UChar(ignore[n - first]))) {
|
||||
trim = FALSE;
|
||||
break;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user