From: Thomas E. Dickey Date: Sun, 13 Apr 2014 00:46:18 +0000 (+0000) Subject: ncurses 5.9 - patch 20140412 X-Git-Tag: v6.0~63 X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=63e3cafac136d773331dee15633f1c9ef08c5493;hp=0a402bd0b857c98eb9f254cb5e798394aa8dbdf8 ncurses 5.9 - patch 20140412 + modify configure script: + drop the -no-gcc option from Intel compiler, from lynx changes. + extend the --with-hashed-db configure option to simplify building with different versions of Berkeley database using FreeBSD ports. + improve initialization for MinGW port (patch by Juergen Pfeifer): + enforce Windows-style path-separator if cross-compiling, + add a driver-name method to each of the drivers, + allow the Windows driver name to match "unknown", ignoring case, + lengthen the built-in name for the Windows console driver to "#win32console", and + move the comparison of driver-names allowing abbreviation, e.g., to "#win32con" into the Windows console driver. --- diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4 index fc9c0a86..16773e03 100644 --- a/Ada95/aclocal.m4 +++ b/Ada95/aclocal.m4 @@ -28,7 +28,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey dnl -dnl $Id: aclocal.m4,v 1.78 2014/02/10 00:41:59 tom Exp $ +dnl $Id: aclocal.m4,v 1.79 2014/04/12 22:30:34 tom Exp $ dnl Macros used in NCURSES Ada95 auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -1579,7 +1579,7 @@ CPPFLAGS="-I. -I../include $CPPFLAGS" AC_SUBST(CPPFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_INTEL_COMPILER version: 5 updated: 2013/02/10 10:41:05 +dnl CF_INTEL_COMPILER version: 6 updated: 2014/03/17 13:13:07 dnl ----------------- dnl Check if the given compiler is really the Intel compiler for Linux. It dnl tries to imitate gcc, but does not return an error when it finds a mismatch @@ -1608,7 +1608,7 @@ if test "$ifelse([$1],,[$1],GCC)" = yes ; then make an error #endif ],[ifelse([$2],,INTEL_COMPILER,[$2])=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +cf_save_CFLAGS="$cf_save_CFLAGS -we147" ],[]) ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS" AC_MSG_RESULT($ifelse([$2],,INTEL_COMPILER,[$2])) diff --git a/Ada95/configure b/Ada95/configure index f9c4b05e..429918e1 100644 --- a/Ada95/configure +++ b/Ada95/configure @@ -10012,7 +10012,7 @@ if { (eval echo "$as_me:10003: \"$ac_compile\"") >&5 echo "$as_me:10012: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +cf_save_CFLAGS="$cf_save_CFLAGS -we147" else echo "$as_me: failed program was:" >&5 diff --git a/INSTALL b/INSTALL index 9b0ac23d..40979483 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2013,2014 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 -- @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: INSTALL,v 1.168 2013/08/03 23:15:23 tom Exp $ +-- $Id: INSTALL,v 1.170 2014/04/12 23:10:33 tom Exp $ --------------------------------------------------------------------- How to install Ncurses/Terminfo on your system --------------------------------------------------------------------- @@ -833,10 +833,15 @@ SUMMARY OF CONFIGURE OPTIONS: filesystem-based terminfo entries. Use the parameter value to give the install-prefix used for the - datbase, e.g., + database, e.g., --with-hashed-db=/usr/local/BigBase to find the corresponding include- and lib-directories under the - given directory. + given directory. Alternatively, you can specify a directory leaf + name, e.g., + --with-hashed-db=db4 + to make the configure script look for files in a subdirectory such as + /usr/include/db4/db.h + /usr/lib/db4/libdb.so See also the --enable-getcap option. diff --git a/NEWS b/NEWS index 68175781..f448df5f 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.2187 2014/03/29 23:49:01 tom Exp $ +-- $Id: NEWS,v 1.2191 2014/04/12 16:23:01 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,20 @@ 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. +20140412 + + modify configure script: + + drop the -no-gcc option from Intel compiler, from lynx changes. + + extend the --with-hashed-db configure option to simplify building + with different versions of Berkeley database using FreeBSD ports. + + improve initialization for MinGW port (patch by Juergen Pfeifer): + + enforce Windows-style path-separator if cross-compiling, + + add a driver-name method to each of the drivers, + + allow the Windows driver name to match "unknown", ignoring case, + + lengthen the built-in name for the Windows console driver to + "#win32console", and + + move the comparison of driver-names allowing abbreviation, e.g., + to "#win32con" into the Windows console driver. + 20140329 + add check in tic for mismatch between ccc and initp/initc + cancel ccc in putty-256color and konsole-256color for consistency @@ -150,7 +164,7 @@ it is not possible to add this information. recognized by clang. 20131116 - + add special case to configure script to move _XOPEN_SOURCE_EXTENDED + + add special case to configure script to move _XOPEN_SOURCE_EXTENDED definition from CPPFLAGS to CFLAGS if it happens to be needed for Solaris, because g++ errors with that definition (report by Jean-Pierre Flori, Sage #15268). @@ -563,7 +577,7 @@ it is not possible to add this information. a null-pointer check in _nc_mvcur_resume. + correct display of double-width characters with MinGW port (report by Erwin Waterlander). - + replace MinGW's wcrtomb(), fixing a problem with _nc_viscbuf + + replace MinGW's wcrtomb(), fixing a problem with _nc_viscbuf > fixes based on Coverity report: + correct coloring in test/bs.c + correct check for 8-bit value in _nc_insert_ch(). @@ -652,7 +666,7 @@ it is not possible to add this information. first corrects pattern used for Mac OS X's customization of gcc. 20121017 - + fix change to _nc_scroll_optimize(), which incorrectly freed memory + + fix change to _nc_scroll_optimize(), which incorrectly freed memory (Redhat #866989). 20121013 @@ -1005,7 +1019,7 @@ it is not possible to add this information. + make sgr for aaa-unk, aaa-rv agree with other caps -TD + make sgr for avt-ns agree with other caps -TD + amend fix intended to separate fixups for acsc to allow "tic -cv" to - give verbose warnings (cf: 20110730). + give verbose warnings (cf: 20110730). + modify misc/gen-edit.sh to make the location of the tabset directory consistent with misc/Makefile.in, i.e., using ${datadir}/tabset (Debian #653435, patch by Sven Joachim). @@ -1037,7 +1051,7 @@ it is not possible to add this information. + drop mk-dlls.sh script. + change recommended regular expression library. + modify rain.c to allow for threaded configuraton. - + modify tset.c to allow for case when size-change logic is not used. + + modify tset.c to allow for case when size-change logic is not used. 20111231 + modify toe's report when -a and -s options are combined, to add @@ -4434,7 +4448,7 @@ it is not possible to add this information. However that did find a coding error in Assume_Default_Colors(). + modify several terminfo entries to ensure xterm mouse and cursor visibility are reset in rs2 string: hurd, putty, gnome, - konsole-base, mlterm, Eterm, screen (Debian #265784, Debian #55637). + konsole-base, mlterm, Eterm, screen (Debian #265784, Debian #55637). The xterm entries are left alone - old ones for compatibility, and the new ones do not require this change. -TD diff --git a/aclocal.m4 b/aclocal.m4 index e73959ec..69f1e12e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -28,7 +28,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: aclocal.m4,v 1.686 2014/02/10 00:37:02 tom Exp $ +dnl $Id: aclocal.m4,v 1.688 2014/04/12 22:28:53 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -1533,6 +1533,40 @@ ifelse([$5],,AC_MSG_WARN(Cannot find $3 library),[$5]) fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_FIND_SUB_INCDIR version: 1 updated: 2014/04/12 16:47:01 +dnl ------------------ +dnl Find an include-directory with the given leaf-name. This is useful for +dnl example with FreeBSD ports, which use this convention to distinguish +dnl different versions of the same port. +AC_DEFUN([CF_FIND_SUB_INCDIR],[ + CF_SUBDIR_PATH(cf_search,$1,include) + for cf_item in $cf_search + do + case $cf_item in #(vi + */$1) + CF_ADD_INCDIR($cf_item) + ;; + esac + done +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_FIND_SUB_LIBDIR version: 1 updated: 2014/04/12 16:47:01 +dnl ------------------ +dnl Find a library-directory with the given leaf-name. This is useful for +dnl example with FreeBSD ports, which use this convention to distinguish +dnl different versions of the same port. +AC_DEFUN([CF_FIND_SUB_LIBDIR],[ + CF_SUBDIR_PATH(cf_search,$1,lib) + for cf_item in $cf_search + do + case $cf_item in #(vi + */$1) + CF_ADD_LIBDIR($cf_item) + ;; + esac + done +])dnl +dnl --------------------------------------------------------------------------- dnl CF_FIXUP_ADAFLAGS version: 1 updated: 2012/03/31 18:48:10 dnl ----------------- dnl make ADAFLAGS consistent with CFLAGS @@ -2585,7 +2619,7 @@ AC_LANG_RESTORE AC_SUBST(EXTRA_CXXFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_HASHED_DB version: 4 updated: 2010/05/29 16:31:02 +dnl CF_HASHED_DB version: 5 updated: 2014/04/12 16:47:01 dnl ------------ dnl Look for an instance of the Berkeley hashed database. dnl @@ -2600,6 +2634,16 @@ yes|*able*) #(vi if test -d "$1" ; then CF_ADD_INCDIR($1/include) CF_ADD_LIBDIR($1/lib) + else + case "$1" in #(vi + ./*|../*|/*) + AC_MSG_WARN(no such directory $1) + ;; #(vi + *) + CF_FIND_SUB_INCDIR($1) + CF_FIND_SUB_LIBDIR($1) + ;; + esac fi esac ]) @@ -2692,7 +2736,7 @@ done ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_HASHED_DB_VERSION version: 3 updated: 2007/12/01 15:01:37 +dnl CF_HASHED_DB_VERSION version: 4 updated: 2014/04/12 16:47:01 dnl -------------------- dnl Given that we have the header file for hashed database, find the version dnl information. @@ -2701,7 +2745,7 @@ AC_DEFUN([CF_HASHED_DB_VERSION], AC_CACHE_CHECK(for version of db, cf_cv_hashed_db_version,[ cf_cv_hashed_db_version=unknown -for cf_db_version in 1 2 3 4 5 +for cf_db_version in 1 2 3 4 5 6 do CF_MSG_LOG(checking for db version $cf_db_version) AC_TRY_COMPILE([ @@ -2809,7 +2853,7 @@ CPPFLAGS="-I. -I../include $CPPFLAGS" AC_SUBST(CPPFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_INTEL_COMPILER version: 5 updated: 2013/02/10 10:41:05 +dnl CF_INTEL_COMPILER version: 6 updated: 2014/03/17 13:13:07 dnl ----------------- dnl Check if the given compiler is really the Intel compiler for Linux. It dnl tries to imitate gcc, but does not return an error when it finds a mismatch @@ -2838,7 +2882,7 @@ if test "$ifelse([$1],,[$1],GCC)" = yes ; then make an error #endif ],[ifelse([$2],,INTEL_COMPILER,[$2])=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +cf_save_CFLAGS="$cf_save_CFLAGS -we147" ],[]) ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS" AC_MSG_RESULT($ifelse([$2],,INTEL_COMPILER,[$2])) diff --git a/configure b/configure index 2a9bb7d0..1cf7922d 100755 --- a/configure +++ b/configure @@ -12292,7 +12292,7 @@ if { (eval echo "$as_me:12283: \"$ac_compile\"") >&5 echo "$as_me:12292: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +cf_save_CFLAGS="$cf_save_CFLAGS -we147" else echo "$as_me: failed program was:" >&5 @@ -12507,7 +12507,7 @@ if { (eval echo "$as_me:12498: \"$ac_compile\"") >&5 echo "$as_me:12507: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_CPLUSPLUS=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +cf_save_CFLAGS="$cf_save_CFLAGS -we147" else echo "$as_me: failed program was:" >&5 @@ -17813,26 +17813,272 @@ echo "${as_me:-configure}:17808: testing adding $cf_add_libdir to library-path . done fi + else + case "$with_hashed_db" in #(vi + ./*|../*|/*) + { echo "$as_me:17819: WARNING: no such directory $with_hashed_db" >&5 +echo "$as_me: WARNING: no such directory $with_hashed_db" >&2;} + ;; #(vi + *) + +cf_search= + +test "x/usr" != "x$prefix" && \ +test -d "/usr" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for include-directories under /usr" + test -d /usr/include && cf_search="$cf_search /usr/include" + test -d /usr/include/$with_hashed_db && cf_search="$cf_search /usr/include/$with_hashed_db" + test -d /usr/include/$with_hashed_db/include && cf_search="$cf_search /usr/include/$with_hashed_db/include" + test -d /usr/$with_hashed_db/include && cf_search="$cf_search /usr/$with_hashed_db/include" + test -d /usr/$with_hashed_db/include/$with_hashed_db && cf_search="$cf_search /usr/$with_hashed_db/include/$with_hashed_db" +} + +test "x$prefix" != "xNONE" && \ +test -d "$prefix" && \ + { + test -n "$verbose" && echo " ... testing for include-directories under $prefix" + test -d $prefix/include && cf_search="$cf_search $prefix/include" + test -d $prefix/include/$with_hashed_db && cf_search="$cf_search $prefix/include/$with_hashed_db" + test -d $prefix/include/$with_hashed_db/include && cf_search="$cf_search $prefix/include/$with_hashed_db/include" + test -d $prefix/$with_hashed_db/include && cf_search="$cf_search $prefix/$with_hashed_db/include" + test -d $prefix/$with_hashed_db/include/$with_hashed_db && cf_search="$cf_search $prefix/$with_hashed_db/include/$with_hashed_db" +} + +test "x/usr/local" != "x$prefix" && \ +test -d "/usr/local" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for include-directories under /usr/local" + test -d /usr/local/include && cf_search="$cf_search /usr/local/include" + test -d /usr/local/include/$with_hashed_db && cf_search="$cf_search /usr/local/include/$with_hashed_db" + test -d /usr/local/include/$with_hashed_db/include && cf_search="$cf_search /usr/local/include/$with_hashed_db/include" + test -d /usr/local/$with_hashed_db/include && cf_search="$cf_search /usr/local/$with_hashed_db/include" + test -d /usr/local/$with_hashed_db/include/$with_hashed_db && cf_search="$cf_search /usr/local/$with_hashed_db/include/$with_hashed_db" +} + +test "x/opt" != "x$prefix" && \ +test -d "/opt" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for include-directories under /opt" + test -d /opt/include && cf_search="$cf_search /opt/include" + test -d /opt/include/$with_hashed_db && cf_search="$cf_search /opt/include/$with_hashed_db" + test -d /opt/include/$with_hashed_db/include && cf_search="$cf_search /opt/include/$with_hashed_db/include" + test -d /opt/$with_hashed_db/include && cf_search="$cf_search /opt/$with_hashed_db/include" + test -d /opt/$with_hashed_db/include/$with_hashed_db && cf_search="$cf_search /opt/$with_hashed_db/include/$with_hashed_db" +} + +test "x$HOME" != "x$prefix" && \ +test -d "$HOME" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for include-directories under $HOME" + test -d $HOME/include && cf_search="$cf_search $HOME/include" + test -d $HOME/include/$with_hashed_db && cf_search="$cf_search $HOME/include/$with_hashed_db" + test -d $HOME/include/$with_hashed_db/include && cf_search="$cf_search $HOME/include/$with_hashed_db/include" + test -d $HOME/$with_hashed_db/include && cf_search="$cf_search $HOME/$with_hashed_db/include" + test -d $HOME/$with_hashed_db/include/$with_hashed_db && cf_search="$cf_search $HOME/$with_hashed_db/include/$with_hashed_db" +} + + for cf_item in $cf_search + do + case $cf_item in #(vi + */$with_hashed_db) + +if test -n "$cf_item" ; then + for cf_add_incdir in $cf_item + do + while test $cf_add_incdir != /usr/include + do + if test -d $cf_add_incdir + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi + + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +#line 17910 "configure" +#include "confdefs.h" +#include +int +main () +{ +printf("Hello") + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:17922: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:17925: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:17928: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17931: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_incdir=yes +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi + + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +echo "${as_me:-configure}:17948: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + fi + done + done +fi + + ;; + esac + done + +cf_search= + +test "x/usr" != "x$prefix" && \ +test -d "/usr" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for lib-directories under /usr" + test -d /usr/lib && cf_search="$cf_search /usr/lib" + test -d /usr/lib/$with_hashed_db && cf_search="$cf_search /usr/lib/$with_hashed_db" + test -d /usr/lib/$with_hashed_db/lib && cf_search="$cf_search /usr/lib/$with_hashed_db/lib" + test -d /usr/$with_hashed_db/lib && cf_search="$cf_search /usr/$with_hashed_db/lib" + test -d /usr/$with_hashed_db/lib/$with_hashed_db && cf_search="$cf_search /usr/$with_hashed_db/lib/$with_hashed_db" +} + +test "x$prefix" != "xNONE" && \ +test -d "$prefix" && \ + { + test -n "$verbose" && echo " ... testing for lib-directories under $prefix" + test -d $prefix/lib && cf_search="$cf_search $prefix/lib" + test -d $prefix/lib/$with_hashed_db && cf_search="$cf_search $prefix/lib/$with_hashed_db" + test -d $prefix/lib/$with_hashed_db/lib && cf_search="$cf_search $prefix/lib/$with_hashed_db/lib" + test -d $prefix/$with_hashed_db/lib && cf_search="$cf_search $prefix/$with_hashed_db/lib" + test -d $prefix/$with_hashed_db/lib/$with_hashed_db && cf_search="$cf_search $prefix/$with_hashed_db/lib/$with_hashed_db" +} + +test "x/usr/local" != "x$prefix" && \ +test -d "/usr/local" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for lib-directories under /usr/local" + test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" + test -d /usr/local/lib/$with_hashed_db && cf_search="$cf_search /usr/local/lib/$with_hashed_db" + test -d /usr/local/lib/$with_hashed_db/lib && cf_search="$cf_search /usr/local/lib/$with_hashed_db/lib" + test -d /usr/local/$with_hashed_db/lib && cf_search="$cf_search /usr/local/$with_hashed_db/lib" + test -d /usr/local/$with_hashed_db/lib/$with_hashed_db && cf_search="$cf_search /usr/local/$with_hashed_db/lib/$with_hashed_db" +} + +test "x/opt" != "x$prefix" && \ +test -d "/opt" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for lib-directories under /opt" + test -d /opt/lib && cf_search="$cf_search /opt/lib" + test -d /opt/lib/$with_hashed_db && cf_search="$cf_search /opt/lib/$with_hashed_db" + test -d /opt/lib/$with_hashed_db/lib && cf_search="$cf_search /opt/lib/$with_hashed_db/lib" + test -d /opt/$with_hashed_db/lib && cf_search="$cf_search /opt/$with_hashed_db/lib" + test -d /opt/$with_hashed_db/lib/$with_hashed_db && cf_search="$cf_search /opt/$with_hashed_db/lib/$with_hashed_db" +} + +test "x$HOME" != "x$prefix" && \ +test -d "$HOME" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for lib-directories under $HOME" + test -d $HOME/lib && cf_search="$cf_search $HOME/lib" + test -d $HOME/lib/$with_hashed_db && cf_search="$cf_search $HOME/lib/$with_hashed_db" + test -d $HOME/lib/$with_hashed_db/lib && cf_search="$cf_search $HOME/lib/$with_hashed_db/lib" + test -d $HOME/$with_hashed_db/lib && cf_search="$cf_search $HOME/$with_hashed_db/lib" + test -d $HOME/$with_hashed_db/lib/$with_hashed_db && cf_search="$cf_search $HOME/$with_hashed_db/lib/$with_hashed_db" +} + + for cf_item in $cf_search + do + case $cf_item in #(vi + */$with_hashed_db) + +if test -n "$cf_item" ; then + for cf_add_libdir in $cf_item + do + if test $cf_add_libdir = /usr/lib ; then + : + elif test -d $cf_add_libdir + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +echo "${as_me:-configure}:18048: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi + + ;; + esac + done + + ;; + esac fi esac -echo "$as_me:17819: checking for db.h" >&5 +echo "$as_me:18065: checking for db.h" >&5 echo $ECHO_N "checking for db.h... $ECHO_C" >&6 if test "${ac_cv_header_db_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 17825 "configure" +#line 18071 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:17829: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18075: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:17835: \$? = $ac_status" >&5 + echo "$as_me:18081: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -17851,11 +18097,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:17854: result: $ac_cv_header_db_h" >&5 +echo "$as_me:18100: result: $ac_cv_header_db_h" >&5 echo "${ECHO_T}$ac_cv_header_db_h" >&6 if test $ac_cv_header_db_h = yes; then -echo "$as_me:17858: checking for version of db" >&5 +echo "$as_me:18104: checking for version of db" >&5 echo $ECHO_N "checking for version of db... $ECHO_C" >&6 if test "${cf_cv_hashed_db_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17863,13 +18109,13 @@ else cf_cv_hashed_db_version=unknown -for cf_db_version in 1 2 3 4 5 +for cf_db_version in 1 2 3 4 5 6 do -echo "${as_me:-configure}:17869: testing checking for db version $cf_db_version ..." 1>&5 +echo "${as_me:-configure}:18115: testing checking for db version $cf_db_version ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 17872 "configure" +#line 18118 "configure" #include "confdefs.h" $ac_includes_default @@ -17899,16 +18145,16 @@ DBT *foo = 0 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17902: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18148: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17905: \$? = $ac_status" >&5 + echo "$as_me:18151: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17908: \"$ac_try\"") >&5 + { (eval echo "$as_me:18154: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17911: \$? = $ac_status" >&5 + echo "$as_me:18157: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_hashed_db_version=$cf_db_version @@ -17922,16 +18168,16 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:17925: result: $cf_cv_hashed_db_version" >&5 +echo "$as_me:18171: result: $cf_cv_hashed_db_version" >&5 echo "${ECHO_T}$cf_cv_hashed_db_version" >&6 if test "$cf_cv_hashed_db_version" = unknown ; then - { { echo "$as_me:17929: error: Cannot determine version of db" >&5 + { { echo "$as_me:18175: error: Cannot determine version of db" >&5 echo "$as_me: error: Cannot determine version of db" >&2;} { (exit 1); exit 1; }; } else -echo "$as_me:17934: checking for db libraries" >&5 +echo "$as_me:18180: checking for db libraries" >&5 echo $ECHO_N "checking for db libraries... $ECHO_C" >&6 if test "${cf_cv_hashed_db_libs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17945,10 +18191,10 @@ do LIBS="-l$cf_db_libs $LIBS" fi -echo "${as_me:-configure}:17948: testing checking for library "$cf_db_libs" ..." 1>&5 +echo "${as_me:-configure}:18194: testing checking for library "$cf_db_libs" ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 17951 "configure" +#line 18197 "configure" #include "confdefs.h" $ac_includes_default @@ -18003,16 +18249,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18006: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18252: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18009: \$? = $ac_status" >&5 + echo "$as_me:18255: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18012: \"$ac_try\"") >&5 + { (eval echo "$as_me:18258: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18015: \$? = $ac_status" >&5 + echo "$as_me:18261: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test -n "$cf_db_libs" ; then @@ -18032,11 +18278,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:18035: result: $cf_cv_hashed_db_libs" >&5 +echo "$as_me:18281: result: $cf_cv_hashed_db_libs" >&5 echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6 if test "$cf_cv_hashed_db_libs" = unknown ; then - { { echo "$as_me:18039: error: Cannot determine library for db" >&5 + { { echo "$as_me:18285: error: Cannot determine library for db" >&5 echo "$as_me: error: Cannot determine library for db" >&2;} { (exit 1); exit 1; }; } elif test "$cf_cv_hashed_db_libs" != default ; then @@ -18046,7 +18292,7 @@ fi else - { { echo "$as_me:18049: error: Cannot find db.h" >&5 + { { echo "$as_me:18295: error: Cannot find db.h" >&5 echo "$as_me: error: Cannot find db.h" >&2;} { (exit 1); exit 1; }; } @@ -18061,7 +18307,7 @@ fi # Just in case, check if the C compiler has a bool type. -echo "$as_me:18064: checking if we should include stdbool.h" >&5 +echo "$as_me:18310: checking if we should include stdbool.h" >&5 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 if test "${cf_cv_header_stdbool_h+set}" = set; then @@ -18069,7 +18315,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 18072 "configure" +#line 18318 "configure" #include "confdefs.h" int @@ -18081,23 +18327,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18084: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18330: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18087: \$? = $ac_status" >&5 + echo "$as_me:18333: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18090: \"$ac_try\"") >&5 + { (eval echo "$as_me:18336: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18093: \$? = $ac_status" >&5 + echo "$as_me:18339: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=0 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 18100 "configure" +#line 18346 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -18113,16 +18359,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18116: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18362: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18119: \$? = $ac_status" >&5 + echo "$as_me:18365: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18122: \"$ac_try\"") >&5 + { (eval echo "$as_me:18368: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18125: \$? = $ac_status" >&5 + echo "$as_me:18371: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -18136,13 +18382,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:18139: result: yes" >&5 +then echo "$as_me:18385: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:18141: result: no" >&5 +else echo "$as_me:18387: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:18145: checking for builtin bool type" >&5 +echo "$as_me:18391: checking for builtin bool type" >&5 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 if test "${cf_cv_cc_bool_type+set}" = set; then @@ -18150,7 +18396,7 @@ if test "${cf_cv_cc_bool_type+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 18153 "configure" +#line 18399 "configure" #include "confdefs.h" #include @@ -18165,16 +18411,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18168: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18414: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18171: \$? = $ac_status" >&5 + echo "$as_me:18417: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18174: \"$ac_try\"") >&5 + { (eval echo "$as_me:18420: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18177: \$? = $ac_status" >&5 + echo "$as_me:18423: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cc_bool_type=1 else @@ -18187,9 +18433,9 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_cc_bool_type" = 1 -then echo "$as_me:18190: result: yes" >&5 +then echo "$as_me:18436: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:18192: result: no" >&5 +else echo "$as_me:18438: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -18211,7 +18457,7 @@ os2*) #(vi cf_stdcpp_libname=stdc++ ;; esac -echo "$as_me:18214: checking for library $cf_stdcpp_libname" >&5 +echo "$as_me:18460: checking for library $cf_stdcpp_libname" >&5 echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6 if test "${cf_cv_libstdcpp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18220,7 +18466,7 @@ else cf_save="$LIBS" LIBS="-l$cf_stdcpp_libname $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 18223 "configure" +#line 18469 "configure" #include "confdefs.h" #include @@ -18236,16 +18482,16 @@ strstreambuf foo(buf, sizeof(buf)) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18239: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18485: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18242: \$? = $ac_status" >&5 + echo "$as_me:18488: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18245: \"$ac_try\"") >&5 + { (eval echo "$as_me:18491: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18248: \$? = $ac_status" >&5 + echo "$as_me:18494: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_libstdcpp=yes else @@ -18257,12 +18503,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save" fi -echo "$as_me:18260: result: $cf_cv_libstdcpp" >&5 +echo "$as_me:18506: result: $cf_cv_libstdcpp" >&5 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 test "$cf_cv_libstdcpp" = yes && CXXLIBS="-l$cf_stdcpp_libname $CXXLIBS" fi - echo "$as_me:18265: checking whether $CXX understands -c and -o together" >&5 + echo "$as_me:18511: checking whether $CXX understands -c and -o together" >&5 echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6 if test "${cf_cv_prog_CXX_c_o+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18278,15 +18524,15 @@ CF_EOF # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -if { (eval echo "$as_me:18281: \"$ac_try\"") >&5 +if { (eval echo "$as_me:18527: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18284: \$? = $ac_status" >&5 + echo "$as_me:18530: \$? = $ac_status" >&5 (exit $ac_status); } && - test -f conftest2.$ac_objext && { (eval echo "$as_me:18286: \"$ac_try\"") >&5 + test -f conftest2.$ac_objext && { (eval echo "$as_me:18532: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18289: \$? = $ac_status" >&5 + echo "$as_me:18535: \$? = $ac_status" >&5 (exit $ac_status); }; then eval cf_cv_prog_CXX_c_o=yes @@ -18297,10 +18543,10 @@ rm -rf conftest* fi if test $cf_cv_prog_CXX_c_o = yes; then - echo "$as_me:18300: result: yes" >&5 + echo "$as_me:18546: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:18303: result: no" >&5 + echo "$as_me:18549: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -18320,12 +18566,12 @@ os2*) #(vi ;; esac if test "$GXX" = yes; then - echo "$as_me:18323: checking for lib$cf_gpp_libname" >&5 + echo "$as_me:18569: checking for lib$cf_gpp_libname" >&5 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 cf_save="$LIBS" LIBS="-l$cf_gpp_libname $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 18328 "configure" +#line 18574 "configure" #include "confdefs.h" #include <$cf_gpp_libname/builtin.h> @@ -18339,16 +18585,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18342: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18588: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18345: \$? = $ac_status" >&5 + echo "$as_me:18591: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18348: \"$ac_try\"") >&5 + { (eval echo "$as_me:18594: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18351: \$? = $ac_status" >&5 + echo "$as_me:18597: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes CXXLIBS="-l$cf_gpp_libname $CXXLIBS" @@ -18369,7 +18615,7 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 18372 "configure" +#line 18618 "configure" #include "confdefs.h" #include @@ -18383,16 +18629,16 @@ two_arg_error_handler_t foo2 = lib_error_handler } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18386: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18632: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18389: \$? = $ac_status" >&5 + echo "$as_me:18635: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18392: \"$ac_try\"") >&5 + { (eval echo "$as_me:18638: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18395: \$? = $ac_status" >&5 + echo "$as_me:18641: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cxx_library=yes CXXLIBS="-l$cf_gpp_libname $CXXLIBS" @@ -18410,7 +18656,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save" - echo "$as_me:18413: result: $cf_cxx_library" >&5 + echo "$as_me:18659: result: $cf_cxx_library" >&5 echo "${ECHO_T}$cf_cxx_library" >&6 fi @@ -18426,7 +18672,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return -echo "$as_me:18429: checking how to run the C++ preprocessor" >&5 +echo "$as_me:18675: checking how to run the C++ preprocessor" >&5 echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 if test -z "$CXXCPP"; then if test "${ac_cv_prog_CXXCPP+set}" = set; then @@ -18443,18 +18689,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 18446 "configure" +#line 18692 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:18451: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18697: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:18457: \$? = $ac_status" >&5 + echo "$as_me:18703: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18477,17 +18723,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 18480 "configure" +#line 18726 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:18484: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18730: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:18490: \$? = $ac_status" >&5 + echo "$as_me:18736: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18524,7 +18770,7 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:18527: result: $CXXCPP" >&5 +echo "$as_me:18773: result: $CXXCPP" >&5 echo "${ECHO_T}$CXXCPP" >&6 ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes @@ -18534,18 +18780,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 18537 "configure" +#line 18783 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:18542: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18788: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:18548: \$? = $ac_status" >&5 + echo "$as_me:18794: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18568,17 +18814,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 18571 "configure" +#line 18817 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:18575: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18821: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:18581: \$? = $ac_status" >&5 + echo "$as_me:18827: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18606,7 +18852,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:18609: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 + { { echo "$as_me:18855: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -18621,23 +18867,23 @@ ac_main_return=return for ac_header in typeinfo do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:18624: checking for $ac_header" >&5 +echo "$as_me:18870: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 18630 "configure" +#line 18876 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18634: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18880: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:18640: \$? = $ac_status" >&5 + echo "$as_me:18886: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18656,7 +18902,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:18659: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:18905: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:18918: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 18678 "configure" +#line 18924 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18682: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:18928: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:18688: \$? = $ac_status" >&5 + echo "$as_me:18934: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_cxx_preproc_warn_flag @@ -18704,7 +18950,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:18707: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:18953: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 + echo "$as_me:18964: checking if iostream uses std-namespace" >&5 echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 18721 "configure" +#line 18967 "configure" #include "confdefs.h" #include @@ -18735,16 +18981,16 @@ cerr << "testing" << endl; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18738: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18984: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18741: \$? = $ac_status" >&5 + echo "$as_me:18987: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18744: \"$ac_try\"") >&5 + { (eval echo "$as_me:18990: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18747: \$? = $ac_status" >&5 + echo "$as_me:18993: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_iostream_namespace=yes else @@ -18753,7 +18999,7 @@ cat conftest.$ac_ext >&5 cf_iostream_namespace=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:18756: result: $cf_iostream_namespace" >&5 + echo "$as_me:19002: result: $cf_iostream_namespace" >&5 echo "${ECHO_T}$cf_iostream_namespace" >&6 if test "$cf_iostream_namespace" = yes ; then @@ -18764,7 +19010,7 @@ EOF fi fi -echo "$as_me:18767: checking if we should include stdbool.h" >&5 +echo "$as_me:19013: checking if we should include stdbool.h" >&5 echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6 if test "${cf_cv_header_stdbool_h+set}" = set; then @@ -18772,7 +19018,7 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 18775 "configure" +#line 19021 "configure" #include "confdefs.h" int @@ -18784,23 +19030,23 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18787: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19033: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18790: \$? = $ac_status" >&5 + echo "$as_me:19036: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18793: \"$ac_try\"") >&5 + { (eval echo "$as_me:19039: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18796: \$? = $ac_status" >&5 + echo "$as_me:19042: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=0 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 18803 "configure" +#line 19049 "configure" #include "confdefs.h" #ifndef __BEOS__ @@ -18816,16 +19062,16 @@ bool foo = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18819: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19065: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18822: \$? = $ac_status" >&5 + echo "$as_me:19068: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18825: \"$ac_try\"") >&5 + { (eval echo "$as_me:19071: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18828: \$? = $ac_status" >&5 + echo "$as_me:19074: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_header_stdbool_h=1 else @@ -18839,13 +19085,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_header_stdbool_h" = 1 -then echo "$as_me:18842: result: yes" >&5 +then echo "$as_me:19088: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:18844: result: no" >&5 +else echo "$as_me:19090: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:18848: checking for builtin bool type" >&5 +echo "$as_me:19094: checking for builtin bool type" >&5 echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6 if test "${cf_cv_builtin_bool+set}" = set; then @@ -18853,7 +19099,7 @@ if test "${cf_cv_builtin_bool+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 18856 "configure" +#line 19102 "configure" #include "confdefs.h" #include @@ -18868,16 +19114,16 @@ bool x = false } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:18871: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19117: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18874: \$? = $ac_status" >&5 + echo "$as_me:19120: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18877: \"$ac_try\"") >&5 + { (eval echo "$as_me:19123: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18880: \$? = $ac_status" >&5 + echo "$as_me:19126: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_builtin_bool=1 else @@ -18890,13 +19136,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi if test "$cf_cv_builtin_bool" = 1 -then echo "$as_me:18893: result: yes" >&5 +then echo "$as_me:19139: result: yes" >&5 echo "${ECHO_T}yes" >&6 -else echo "$as_me:18895: result: no" >&5 +else echo "$as_me:19141: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:18899: checking for size of bool" >&5 +echo "$as_me:19145: checking for size of bool" >&5 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 if test "${cf_cv_type_of_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -18907,7 +19153,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 18910 "configure" +#line 19156 "configure" #include "confdefs.h" #include @@ -18949,15 +19195,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:18952: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19198: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18955: \$? = $ac_status" >&5 + echo "$as_me:19201: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:18957: \"$ac_try\"") >&5 + { (eval echo "$as_me:19203: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18960: \$? = $ac_status" >&5 + echo "$as_me:19206: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_of_bool=`cat cf_test.out` if test -z "$cf_cv_type_of_bool"; then @@ -18975,18 +19221,18 @@ fi fi rm -f cf_test.out -echo "$as_me:18978: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:19224: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 if test "$cf_cv_type_of_bool" = unknown ; then case .$NCURSES_BOOL in #(vi .auto|.) NCURSES_BOOL=unsigned;; esac - { echo "$as_me:18984: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:19230: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} cf_cv_type_of_bool=$NCURSES_BOOL fi -echo "$as_me:18989: checking for special defines needed for etip.h" >&5 +echo "$as_me:19235: checking for special defines needed for etip.h" >&5 echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6 cf_save_CXXFLAGS="$CXXFLAGS" cf_result="none" @@ -19004,7 +19250,7 @@ do test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" cat >conftest.$ac_ext <<_ACEOF -#line 19007 "configure" +#line 19253 "configure" #include "confdefs.h" #include @@ -19018,16 +19264,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19021: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19267: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19024: \$? = $ac_status" >&5 + echo "$as_me:19270: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19027: \"$ac_try\"") >&5 + { (eval echo "$as_me:19273: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19030: \$? = $ac_status" >&5 + echo "$as_me:19276: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$cf_math" && cat >>confdefs.h <&5 +echo "$as_me:19297: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 CXXFLAGS="$cf_save_CXXFLAGS" if test -n "$CXX"; then -echo "$as_me:19056: checking if $CXX accepts parameter initialization" >&5 +echo "$as_me:19302: checking if $CXX accepts parameter initialization" >&5 echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6 if test "${cf_cv_cpp_param_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19070,7 +19316,7 @@ ac_main_return=return cf_cv_cpp_param_init=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 19073 "configure" +#line 19319 "configure" #include "confdefs.h" class TEST { @@ -19089,15 +19335,15 @@ int main() { } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:19092: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19338: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19095: \$? = $ac_status" >&5 + echo "$as_me:19341: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:19097: \"$ac_try\"") >&5 + { (eval echo "$as_me:19343: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19100: \$? = $ac_status" >&5 + echo "$as_me:19346: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_param_init=yes else @@ -19116,7 +19362,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:19119: result: $cf_cv_cpp_param_init" >&5 +echo "$as_me:19365: result: $cf_cv_cpp_param_init" >&5 echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 fi test "$cf_cv_cpp_param_init" = yes && @@ -19126,7 +19372,7 @@ EOF if test -n "$CXX"; then -echo "$as_me:19129: checking if $CXX accepts static_cast" >&5 +echo "$as_me:19375: checking if $CXX accepts static_cast" >&5 echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6 if test "${cf_cv_cpp_static_cast+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19140,7 +19386,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat >conftest.$ac_ext <<_ACEOF -#line 19143 "configure" +#line 19389 "configure" #include "confdefs.h" class NCursesPanel @@ -19184,16 +19430,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19187: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19433: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19190: \$? = $ac_status" >&5 + echo "$as_me:19436: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19193: \"$ac_try\"") >&5 + { (eval echo "$as_me:19439: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19196: \$? = $ac_status" >&5 + echo "$as_me:19442: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_cpp_static_cast=yes else @@ -19211,7 +19457,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return fi -echo "$as_me:19214: result: $cf_cv_cpp_static_cast" >&5 +echo "$as_me:19460: result: $cf_cv_cpp_static_cast" >&5 echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 fi @@ -19260,7 +19506,7 @@ else else if test "$cf_cv_header_stdbool_h" = 1 ; then -echo "$as_me:19263: checking for size of bool" >&5 +echo "$as_me:19509: checking for size of bool" >&5 echo $ECHO_N "checking for size of bool... $ECHO_C" >&6 if test "${cf_cv_type_of_bool+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19271,7 +19517,7 @@ else cf_cv_type_of_bool=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 19274 "configure" +#line 19520 "configure" #include "confdefs.h" #include @@ -19313,15 +19559,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:19316: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19562: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19319: \$? = $ac_status" >&5 + echo "$as_me:19565: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:19321: \"$ac_try\"") >&5 + { (eval echo "$as_me:19567: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19324: \$? = $ac_status" >&5 + echo "$as_me:19570: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_of_bool=`cat cf_test.out` if test -z "$cf_cv_type_of_bool"; then @@ -19339,25 +19585,25 @@ fi fi rm -f cf_test.out -echo "$as_me:19342: result: $cf_cv_type_of_bool" >&5 +echo "$as_me:19588: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 if test "$cf_cv_type_of_bool" = unknown ; then case .$NCURSES_BOOL in #(vi .auto|.) NCURSES_BOOL=unsigned;; esac - { echo "$as_me:19348: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 + { echo "$as_me:19594: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;} cf_cv_type_of_bool=$NCURSES_BOOL fi else - echo "$as_me:19354: checking for fallback type of bool" >&5 + echo "$as_me:19600: checking for fallback type of bool" >&5 echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6 case "$host_cpu" in #(vi i?86) cf_cv_type_of_bool=char ;; #(vi *) cf_cv_type_of_bool=int ;; esac - echo "$as_me:19360: result: $cf_cv_type_of_bool" >&5 + echo "$as_me:19606: result: $cf_cv_type_of_bool" >&5 echo "${ECHO_T}$cf_cv_type_of_bool" >&6 fi fi @@ -19386,7 +19632,7 @@ if test -f "${srcdir}/Ada95/Makefile.in" ; then if test "$cf_with_ada" != "no" ; then if test "$with_libtool" != "no"; then - { echo "$as_me:19389: WARNING: libtool does not support Ada - disabling feature" >&5 + { echo "$as_me:19635: WARNING: libtool does not support Ada - disabling feature" >&5 echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} cf_with_ada=no fi @@ -19397,7 +19643,7 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} cf_ada_make=gnatmake # Extract the first word of "$cf_ada_make", so it can be a program name with args. set dummy $cf_ada_make; ac_word=$2 -echo "$as_me:19400: checking for $ac_word" >&5 +echo "$as_me:19646: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_gnat_exists+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19412,7 +19658,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_gnat_exists="yes" -echo "$as_me:19415: found $ac_dir/$ac_word" >&5 +echo "$as_me:19661: found $ac_dir/$ac_word" >&5 break done @@ -19421,10 +19667,10 @@ fi fi gnat_exists=$ac_cv_prog_gnat_exists if test -n "$gnat_exists"; then - echo "$as_me:19424: result: $gnat_exists" >&5 + echo "$as_me:19670: result: $gnat_exists" >&5 echo "${ECHO_T}$gnat_exists" >&6 else - echo "$as_me:19427: result: no" >&5 + echo "$as_me:19673: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -19433,12 +19679,12 @@ if test "$ac_cv_prog_gnat_exists" = no; then cf_cv_prog_gnat_correct=no else -echo "$as_me:19436: checking for gnat version" >&5 +echo "$as_me:19682: checking for gnat version" >&5 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ grep '[0-9].[0-9][0-9]*' |\ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` -echo "$as_me:19441: result: $cf_gnat_version" >&5 +echo "$as_me:19687: result: $cf_gnat_version" >&5 echo "${ECHO_T}$cf_gnat_version" >&6 case $cf_gnat_version in #(vi @@ -19446,7 +19692,7 @@ case $cf_gnat_version in #(vi cf_cv_prog_gnat_correct=yes ;; *) - { echo "$as_me:19449: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + { echo "$as_me:19695: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} cf_cv_prog_gnat_correct=no ;; @@ -19454,7 +19700,7 @@ esac # Extract the first word of "m4", so it can be a program name with args. set dummy m4; ac_word=$2 -echo "$as_me:19457: checking for $ac_word" >&5 +echo "$as_me:19703: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_M4_exists+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19469,7 +19715,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_M4_exists="yes" -echo "$as_me:19472: found $ac_dir/$ac_word" >&5 +echo "$as_me:19718: found $ac_dir/$ac_word" >&5 break done @@ -19478,10 +19724,10 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:19481: result: $M4_exists" >&5 + echo "$as_me:19727: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:19484: result: no" >&5 + echo "$as_me:19730: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -19490,7 +19736,7 @@ fi echo Ada95 binding required program m4 not found. Ada95 binding disabled. fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:19493: checking if GNAT works" >&5 + echo "$as_me:19739: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -rf conftest* *~conftest* @@ -19518,7 +19764,7 @@ else fi rm -rf conftest* *~conftest* - echo "$as_me:19521: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:19767: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi fi @@ -19527,7 +19773,7 @@ fi ADAFLAGS="$ADAFLAGS -gnatpn" - echo "$as_me:19530: checking optimization options for ADAFLAGS" >&5 + echo "$as_me:19776: checking optimization options for ADAFLAGS" >&5 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 case "$CFLAGS" in *-g*) @@ -19544,10 +19790,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ;; esac - echo "$as_me:19547: result: $ADAFLAGS" >&5 + echo "$as_me:19793: result: $ADAFLAGS" >&5 echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:19550: checking if GNAT supports generics" >&5 +echo "$as_me:19796: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case $cf_gnat_version in #(vi 3.[1-9]*|[4-9].*) #(vi @@ -19557,7 +19803,7 @@ case $cf_gnat_version in #(vi cf_gnat_generics=no ;; esac -echo "$as_me:19560: result: $cf_gnat_generics" >&5 +echo "$as_me:19806: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -19569,7 +19815,7 @@ else cf_generic_objects= fi -echo "$as_me:19572: checking if GNAT supports SIGINT" >&5 +echo "$as_me:19818: checking if GNAT supports SIGINT" >&5 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 if test "${cf_cv_gnat_sigint+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19617,7 +19863,7 @@ fi rm -rf conftest* *~conftest* fi -echo "$as_me:19620: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:19866: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test $cf_cv_gnat_sigint = yes ; then @@ -19626,7 +19872,7 @@ else USE_GNAT_SIGINT="#" fi -echo "$as_me:19629: checking if GNAT pragma Unreferenced works" >&5 +echo "$as_me:19875: checking if GNAT pragma Unreferenced works" >&5 echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6 if test "${cf_cv_pragma_unreferenced+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19657,7 +19903,7 @@ fi rm -rf conftest* *~conftest* fi -echo "$as_me:19660: result: $cf_cv_pragma_unreferenced" >&5 +echo "$as_me:19906: result: $cf_cv_pragma_unreferenced" >&5 echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6 # if the pragma is supported, use it (needed in the Trace code). @@ -19670,7 +19916,7 @@ fi cf_gnat_libraries=no cf_gnat_projects=no -echo "$as_me:19673: checking if GNAT supports project files" >&5 +echo "$as_me:19919: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 case $cf_gnat_version in #(vi 3.[0-9]*) #(vi @@ -19738,14 +19984,14 @@ CF_EOF esac ;; esac -echo "$as_me:19741: result: $cf_gnat_projects" >&5 +echo "$as_me:19987: result: $cf_gnat_projects" >&5 echo "${ECHO_T}$cf_gnat_projects" >&6 if test $cf_gnat_projects = yes then - echo "$as_me:19746: checking if GNAT supports libraries" >&5 + echo "$as_me:19992: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:19748: result: $cf_gnat_libraries" >&5 + echo "$as_me:19994: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -19765,7 +20011,7 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:19768: checking for ada-compiler" >&5 +echo "$as_me:20014: checking for ada-compiler" >&5 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 # Check whether --with-ada-compiler or --without-ada-compiler was given. @@ -19776,12 +20022,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:19779: result: $cf_ada_compiler" >&5 +echo "$as_me:20025: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:19784: checking for ada-include" >&5 +echo "$as_me:20030: checking for ada-include" >&5 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 # Check whether --with-ada-include or --without-ada-include was given. @@ -19817,7 +20063,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:19820: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:20066: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -19826,10 +20072,10 @@ esac fi eval ADA_INCLUDE="$withval" -echo "$as_me:19829: result: $ADA_INCLUDE" >&5 +echo "$as_me:20075: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:19832: checking for ada-objects" >&5 +echo "$as_me:20078: checking for ada-objects" >&5 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 # Check whether --with-ada-objects or --without-ada-objects was given. @@ -19865,7 +20111,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:19868: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:20114: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -19874,10 +20120,10 @@ esac fi eval ADA_OBJECTS="$withval" -echo "$as_me:19877: result: $ADA_OBJECTS" >&5 +echo "$as_me:20123: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:19880: checking if an Ada95 shared-library should be built" >&5 +echo "$as_me:20126: checking if an Ada95 shared-library should be built" >&5 echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. @@ -19887,7 +20133,7 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:19890: result: $with_ada_sharedlib" >&5 +echo "$as_me:20136: result: $with_ada_sharedlib" >&5 echo "${ECHO_T}$with_ada_sharedlib" >&6 ADA_SHAREDLIB='lib$(LIB_NAME).so.1' @@ -19910,13 +20156,13 @@ fi # do this "late" to avoid conflict with header-checks if test "x$with_widec" = xyes ; then - echo "$as_me:19913: checking for wchar_t" >&5 + echo "$as_me:20159: checking for wchar_t" >&5 echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 if test "${ac_cv_type_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 19919 "configure" +#line 20165 "configure" #include "confdefs.h" $ac_includes_default int @@ -19931,16 +20177,16 @@ if (sizeof (wchar_t)) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19934: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20180: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19937: \$? = $ac_status" >&5 + echo "$as_me:20183: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19940: \"$ac_try\"") >&5 + { (eval echo "$as_me:20186: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19943: \$? = $ac_status" >&5 + echo "$as_me:20189: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_wchar_t=yes else @@ -19950,10 +20196,10 @@ ac_cv_type_wchar_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:19953: result: $ac_cv_type_wchar_t" >&5 +echo "$as_me:20199: result: $ac_cv_type_wchar_t" >&5 echo "${ECHO_T}$ac_cv_type_wchar_t" >&6 -echo "$as_me:19956: checking size of wchar_t" >&5 +echo "$as_me:20202: checking size of wchar_t" >&5 echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 if test "${ac_cv_sizeof_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -19962,7 +20208,7 @@ else if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line 19965 "configure" +#line 20211 "configure" #include "confdefs.h" $ac_includes_default int @@ -19974,21 +20220,21 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= 0)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:19977: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20223: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19980: \$? = $ac_status" >&5 + echo "$as_me:20226: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19983: \"$ac_try\"") >&5 + { (eval echo "$as_me:20229: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19986: \$? = $ac_status" >&5 + echo "$as_me:20232: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 19991 "configure" +#line 20237 "configure" #include "confdefs.h" $ac_includes_default int @@ -20000,16 +20246,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20003: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20249: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20006: \$? = $ac_status" >&5 + echo "$as_me:20252: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20009: \"$ac_try\"") >&5 + { (eval echo "$as_me:20255: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20012: \$? = $ac_status" >&5 + echo "$as_me:20258: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else @@ -20025,7 +20271,7 @@ cat conftest.$ac_ext >&5 ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 20028 "configure" +#line 20274 "configure" #include "confdefs.h" $ac_includes_default int @@ -20037,16 +20283,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) >= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20040: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20286: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20043: \$? = $ac_status" >&5 + echo "$as_me:20289: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20046: \"$ac_try\"") >&5 + { (eval echo "$as_me:20292: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20049: \$? = $ac_status" >&5 + echo "$as_me:20295: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else @@ -20062,7 +20308,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF -#line 20065 "configure" +#line 20311 "configure" #include "confdefs.h" $ac_includes_default int @@ -20074,16 +20320,16 @@ int _array_ [1 - 2 * !((sizeof (wchar_t)) <= $ac_mid)] } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:20077: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20323: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20080: \$? = $ac_status" >&5 + echo "$as_me:20326: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:20083: \"$ac_try\"") >&5 + { (eval echo "$as_me:20329: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20086: \$? = $ac_status" >&5 + echo "$as_me:20332: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else @@ -20096,12 +20342,12 @@ done ac_cv_sizeof_wchar_t=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:20099: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:20345: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line 20104 "configure" +#line 20350 "configure" #include "confdefs.h" $ac_includes_default int @@ -20117,15 +20363,15 @@ fclose (f); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:20120: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20366: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20123: \$? = $ac_status" >&5 + echo "$as_me:20369: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:20125: \"$ac_try\"") >&5 + { (eval echo "$as_me:20371: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20128: \$? = $ac_status" >&5 + echo "$as_me:20374: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_wchar_t=`cat conftest.val` else @@ -20141,7 +20387,7 @@ else ac_cv_sizeof_wchar_t=0 fi fi -echo "$as_me:20144: result: $ac_cv_sizeof_wchar_t" >&5 +echo "$as_me:20390: result: $ac_cv_sizeof_wchar_t" >&5 echo "${ECHO_T}$ac_cv_sizeof_wchar_t" >&6 cat >>confdefs.h <&5 +echo "$as_me:20408: checking for library subsets" >&5 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 LIB_SUBSETS= @@ -20200,7 +20446,7 @@ fi test "x$with_widec" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" test "x$with_ext_funcs" = xyes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" -echo "$as_me:20203: result: $LIB_SUBSETS" >&5 +echo "$as_me:20449: result: $LIB_SUBSETS" >&5 echo "${ECHO_T}$LIB_SUBSETS" >&6 ### Construct the list of include-directories to be generated @@ -20238,7 +20484,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:20241: checking default library suffix" >&5 +echo "$as_me:20487: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -20249,10 +20495,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:20252: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:20498: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:20255: checking default library-dependency suffix" >&5 +echo "$as_me:20501: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case X$DFT_LWR_MODEL in #(vi @@ -20307,10 +20553,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:20310: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:20556: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:20313: checking default object directory" >&5 +echo "$as_me:20559: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -20326,11 +20572,11 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:20329: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:20575: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 if test "x$cf_with_cxx" = xyes ; then -echo "$as_me:20333: checking c++ library-dependency suffix" >&5 +echo "$as_me:20579: checking c++ library-dependency suffix" >&5 echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 if test "$with_libtool" != "no"; then # libtool thinks it can make c++ shared libraries (perhaps only g++) @@ -20395,7 +20641,7 @@ else test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}" fi -echo "$as_me:20398: result: $CXX_LIB_SUFFIX" >&5 +echo "$as_me:20644: result: $CXX_LIB_SUFFIX" >&5 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 fi @@ -20560,19 +20806,19 @@ fi if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" then - echo "$as_me:20563: checking if linker supports switching between static/dynamic" >&5 + echo "$as_me:20809: 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 < int cf_ldflags_static(FILE *fp) { return fflush(fp); } EOF - if { (eval echo "$as_me:20572: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:20818: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20575: \$? = $ac_status" >&5 + echo "$as_me:20821: \$? = $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 @@ -20583,10 +20829,10 @@ EOF LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 20586 "configure" +#line 20832 "configure" #include "confdefs.h" -#line 20589 "configure" +#line 20835 "configure" #include int cf_ldflags_static(FILE *fp); @@ -20601,16 +20847,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:20604: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20850: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20607: \$? = $ac_status" >&5 + echo "$as_me:20853: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:20610: \"$ac_try\"") >&5 + { (eval echo "$as_me:20856: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20613: \$? = $ac_status" >&5 + echo "$as_me:20859: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # some linkers simply ignore the -dynamic @@ -20633,7 +20879,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f libconftest.* LIBS="$cf_save_LIBS" - echo "$as_me:20636: result: $cf_ldflags_static" >&5 + echo "$as_me:20882: result: $cf_ldflags_static" >&5 echo "${ECHO_T}$cf_ldflags_static" >&6 if test $cf_ldflags_static != yes @@ -20649,7 +20895,7 @@ fi ;; esac -echo "$as_me:20652: checking where we will install curses.h" >&5 +echo "$as_me:20898: checking where we will install curses.h" >&5 echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 includesubdir= @@ -20659,7 +20905,7 @@ if test "$with_overwrite" = no && \ then includesubdir="/ncurses${LIB_SUFFIX}" fi -echo "$as_me:20662: result: ${includedir}${includesubdir}" >&5 +echo "$as_me:20908: result: ${includedir}${includesubdir}" >&5 echo "${ECHO_T}${includedir}${includesubdir}" >&6 ### Resolve a conflict between normal and wide-curses by forcing applications @@ -20667,7 +20913,7 @@ echo "${ECHO_T}${includedir}${includesubdir}" >&6 if test "$with_overwrite" != no ; then if test "$NCURSES_LIBUTF8" = 1 ; then NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' - { echo "$as_me:20670: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + { echo "$as_me:20916: 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 @@ -20685,7 +20931,7 @@ EOF ### Construct the list of subdirectories for which we'll customize makefiles ### with the appropriate compile-rules. -echo "$as_me:20688: checking for src modules" >&5 +echo "$as_me:20934: checking for src modules" >&5 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 # dependencies and linker-arguments for test-programs @@ -20750,7 +20996,7 @@ EOF fi fi done -echo "$as_me:20753: result: $cf_cv_src_modules" >&5 +echo "$as_me:20999: result: $cf_cv_src_modules" >&5 echo "${ECHO_T}$cf_cv_src_modules" >&6 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" @@ -20971,7 +21217,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:20974: checking for $ac_word" >&5 +echo "$as_me:21220: 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 @@ -20988,7 +21234,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:20991: found $ac_dir/$ac_word" >&5 + echo "$as_me:21237: found $ac_dir/$ac_word" >&5 break fi done @@ -21000,10 +21246,10 @@ fi TIC_PATH=$ac_cv_path_TIC_PATH if test -n "$TIC_PATH"; then - echo "$as_me:21003: result: $TIC_PATH" >&5 + echo "$as_me:21249: result: $TIC_PATH" >&5 echo "${ECHO_T}$TIC_PATH" >&6 else - echo "$as_me:21006: result: no" >&5 + echo "$as_me:21252: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -21011,7 +21257,7 @@ if test -n "$FALLBACK_LIST" then if test "$TIC_PATH" = unknown then - { echo "$as_me:21014: WARNING: no tic program found for fallbacks" >&5 + { echo "$as_me:21260: WARNING: no tic program found for fallbacks" >&5 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} fi fi @@ -21037,7 +21283,7 @@ solaris2*) #(vi *-D_XOPEN_SOURCE_EXTENDED*) test -n "$verbose" && echo " moving _XOPEN_SOURCE_EXTENDED to work around g++ problem" 1>&6 -echo "${as_me:-configure}:21040: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 +echo "${as_me:-configure}:21286: testing moving _XOPEN_SOURCE_EXTENDED to work around g++ problem ..." 1>&5 CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" CPPFLAGS=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/-D_XOPEN_SOURCE_EXTENDED//'` @@ -21155,7 +21401,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:21158: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:21404: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -21331,7 +21577,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:21334: error: ambiguous option: $1 + { { echo "$as_me:21580: 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;} @@ -21350,7 +21596,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:21353: error: unrecognized option: $1 + -*) { { echo "$as_me:21599: 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;} @@ -21461,7 +21707,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:21464: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:21710: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -21896,7 +22142,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:21899: creating $ac_file" >&5 + { echo "$as_me:22145: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -21914,7 +22160,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:21917: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:22163: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -21927,7 +22173,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:21930: error: cannot find input file: $f" >&5 + { { echo "$as_me:22176: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -21943,7 +22189,7 @@ cat >>$CONFIG_STATUS <<\EOF if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' $ac_item` if test -z "$ac_used"; then - { echo "$as_me:21946: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:22192: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&2;} @@ -21952,7 +22198,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:21955: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:22201: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&2;} @@ -21989,7 +22235,7 @@ s,@INSTALL@,$ac_INSTALL,;t t ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:21992: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:22238: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&5 echo "$as_me: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&2;} @@ -22000,7 +22246,7 @@ $ac_seen" >&2;} egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out if test -s $tmp/out; then ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` - { echo "$as_me:22003: WARNING: Some variables may not be substituted: + { echo "$as_me:22249: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -22049,7 +22295,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:22052: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:22298: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -22060,7 +22306,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:22063: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:22309: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -22073,7 +22319,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:22076: error: cannot find input file: $f" >&5 + { { echo "$as_me:22322: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -22131,7 +22377,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:22134: $ac_file is unchanged" >&5 + { echo "$as_me:22380: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -22434,7 +22680,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ cygdll|msysdll|mingw) #(vi test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6 -echo "${as_me:-configure}:22437: testing overriding CXX_MODEL to SHARED ..." 1>&5 +echo "${as_me:-configure}:22683: testing overriding CXX_MODEL to SHARED ..." 1>&5 with_shared_cxx=yes ;; diff --git a/dist.mk b/dist.mk index cd1856d4..88e533c5 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.979 2014/03/26 19:51:51 tom Exp $ +# $Id: dist.mk,v 1.981 2014/04/11 08:17:46 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 = 20140329 +NCURSES_PATCH = 20140412 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/include/hashed_db.h b/include/hashed_db.h index 4dd39331..1ae29b08 100644 --- a/include/hashed_db.h +++ b/include/hashed_db.h @@ -31,7 +31,7 @@ ****************************************************************************/ /* - * $Id: hashed_db.h,v 1.5 2006/08/19 15:58:34 tom Exp $ + * $Id: hashed_db.h,v 1.6 2014/04/12 22:41:10 tom Exp $ */ #ifndef HASHED_DB_H @@ -41,6 +41,8 @@ #if USE_HASHED_DB +#define DB_DBM_HSEARCH 0 /* quiet gcc -Wundef with db6 */ + #include #ifndef DBN_SUFFIX diff --git a/ncurses/base/lib_driver.c b/ncurses/base/lib_driver.c index 4f4b8ce5..fb63b3cd 100644 --- a/ncurses/base/lib_driver.c +++ b/ncurses/base/lib_driver.c @@ -33,7 +33,7 @@ #include -MODULE_ID("$Id: lib_driver.c,v 1.5 2014/03/08 20:32:59 tom Exp $") +MODULE_ID("$Id: lib_driver.c,v 1.6 2014/04/11 08:21:23 jpf Exp $") typedef struct DriverEntry { const char *name; @@ -43,7 +43,7 @@ typedef struct DriverEntry { static DRIVER_ENTRY DriverTable[] = { #ifdef __MINGW32__ - {"win32con", &_nc_WIN_DRIVER}, + {"win32console", &_nc_WIN_DRIVER}, #endif {"tinfo", &_nc_TINFO_DRIVER} /* must be last */ }; @@ -63,24 +63,12 @@ _nc_get_driver(TERMINAL_CONTROL_BLOCK * TCB, const char *name, int *errret) for (i = 0; i < SIZEOF(DriverTable); i++) { res = DriverTable[i].driver; - /* - * Use "#" (a character which cannot begin a terminal's name) to - * select specific driver from the table. - * - * In principle, we could have more than one non-terminfo driver, - * e.g., "win32gui". - */ - if (name != 0 && *name == '#') { - size_t n = strlen(name + 1); - if (n != 0 - && strncmp(name + 1, DriverTable[i].name, n)) { - continue; + if (strcmp(DriverTable[i].name, res->td_name(TCB)) == 0) { + if (res->td_CanHandle(TCB, name, errret)) { + use = res; + break; } } - if (res->td_CanHandle(TCB, name, errret)) { - use = res; - break; - } } if (use != 0) { TCB->drv = use; diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h index 6d3a861b..5f16c995 100644 --- a/ncurses/curses.priv.h +++ b/ncurses/curses.priv.h @@ -34,7 +34,7 @@ ****************************************************************************/ /* - * $Id: curses.priv.h,v 1.531 2014/03/08 19:58:54 tom Exp $ + * $Id: curses.priv.h,v 1.533 2014/04/13 00:16:21 tom Exp $ * * curses.priv.h * @@ -179,6 +179,18 @@ extern int errno; #define USE_SIGWINCH 0 #endif +/* + * When building in the MSYS2 environment, the automatic discovery of + * the path separator in configure doesn't work properly. So, if building + * for MinGW, we enforce the correct Windows PATH separator + */ +#ifdef __MINGW32__ +# ifdef NCURSES_PATHSEP +# undef NCURSES_PATHSEP +# endif +# define NCURSES_PATHSEP ';' +#endif + /* * If desired, one can configure this, disabling environment variables that * point to custom terminfo/termcap locations. @@ -2226,6 +2238,7 @@ typedef struct _termInfo typedef struct term_driver { bool isTerminfo; + const char* (*td_name)(struct DriverTCB*); bool (*td_CanHandle)(struct DriverTCB*, const char*, int*); void (*td_init)(struct DriverTCB*); void (*td_release)(struct DriverTCB*); diff --git a/ncurses/tinfo/tinfo_driver.c b/ncurses/tinfo/tinfo_driver.c index e36541f3..785847bd 100644 --- a/ncurses/tinfo/tinfo_driver.c +++ b/ncurses/tinfo/tinfo_driver.c @@ -50,7 +50,7 @@ # endif #endif -MODULE_ID("$Id: tinfo_driver.c,v 1.33 2014/03/08 20:33:38 tom Exp $") +MODULE_ID("$Id: tinfo_driver.c,v 1.37 2014/04/13 00:17:08 tom Exp $") /* * SCO defines TIOCGSIZE and the corresponding struct. Other systems (SunOS, @@ -106,6 +106,13 @@ drv_doupdate(TERMINAL_CONTROL_BLOCK * TCB) return TINFO_DOUPDATE(TCB->csp); } +static const char * +drv_Name(TERMINAL_CONTROL_BLOCK * TCB) +{ + (void) TCB; + return "tinfo"; +} + static bool drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, const char *tname, int *errret) { @@ -114,6 +121,8 @@ drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, const char *tname, int *errret) TERMINAL *termp; SCREEN *sp; + T((T_CALLED("tinfo::drv_CanHandle(%p)"), TCB)); + assert(TCB != 0 && tname != 0); termp = (TERMINAL *) TCB; sp = TCB->csp; @@ -169,7 +178,7 @@ drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, const char *tname, int *errret) ret_error1(TGETENT_YES, "I can't handle hardcopy terminals.\n", tname); } - return result; + returnBool(result); } static int @@ -1001,7 +1010,7 @@ drv_initacs(TERMINAL_CONTROL_BLOCK * TCB, chtype *real_map, chtype *fake_map) size_t i; for (i = 1; i < ACS_LEN; ++i) { if (real_map[i] == 0) { - real_map[i] = i; + real_map[i] = (chtype) i; if (real_map != fake_map) { if (sp != 0) sp->_screen_acs_map[i] = TRUE; @@ -1303,6 +1312,7 @@ drv_kyExist(TERMINAL_CONTROL_BLOCK * TCB, int key) NCURSES_EXPORT_VAR (TERM_DRIVER) _nc_TINFO_DRIVER = { TRUE, + drv_Name, /* Name */ drv_CanHandle, /* CanHandle */ drv_init, /* init */ drv_release, /* release */ diff --git a/ncurses/win32con/win_driver.c b/ncurses/win32con/win_driver.c index bcb24f02..f819fd8c 100644 --- a/ncurses/win32con/win_driver.c +++ b/ncurses/win32con/win_driver.c @@ -39,7 +39,7 @@ #include #define CUR my_term.type. -MODULE_ID("$Id: win_driver.c,v 1.28 2014/03/08 21:44:53 tom Exp $") +MODULE_ID("$Id: win_driver.c,v 1.31 2014/04/13 00:16:07 tom Exp $") #define WINMAGIC NCDRV_MAGIC(NCDRV_WINCONSOLE) @@ -379,6 +379,13 @@ restore_original_screen(TERMINAL_CONTROL_BLOCK * TCB) return result; } +static const char * +drv_name(TERMINAL_CONTROL_BLOCK * TCB) +{ + (void) TCB; + return "win32console"; +} + static int drv_doupdate(TERMINAL_CONTROL_BLOCK * TCB) { @@ -508,44 +515,36 @@ drv_CanHandle(TERMINAL_CONTROL_BLOCK * TCB, T((T_CALLED("win32con::drv_CanHandle(%p)"), TCB)); - assert(TCB != 0); - assert(tname != 0); + assert((TCB != 0) && (tname != 0)); TCB->magic = WINMAGIC; - if (*tname == 0 || *tname == 0 || *tname == '#') { - code = TRUE; - } else { - TERMINAL my_term; - int status; - code = FALSE; -#if (NCURSES_USE_DATABASE || NCURSES_USE_TERMCAP) - status = _nc_setup_tinfo(tname, &my_term.type); -#else - status = TGETENT_NO; -#endif - if (status != TGETENT_YES) { - const TERMTYPE *fallback = _nc_fallback(tname); - - if (fallback) { - my_term.type = *fallback; - status = TGETENT_YES; - } else if (!strcmp(tname, "unknown")) { - code = TRUE; - } - } - if (status == TGETENT_YES) { - if (generic_type || hard_copy) - code = TRUE; + if (tname == 0 || *tname == 0) + code = TRUE; + else if (tname != 0 && *tname == '#') { + /* + * Use "#" (a character which cannot begin a terminal's name) to + * select specific driver from the table. + * + * In principle, we could have more than one non-terminfo driver, + * e.g., "win32gui". + */ + size_t n = strlen(tname + 1); + if (n != 0 + && (strncmp(tname + 1, "win32console", n) == 0)) { + code = TRUE; } + } else if (tname != 0 && stricmp(tname, "unknown") == 0) { + code = TRUE; } - if (code) { - if ((TCB->term.type.Booleans) == 0) { - _nc_init_termtype(&(TCB->term.type)); - } + /* + * This is intentional, to avoid unnecessary breakage of applications + * using symbols. + */ + if (code && (TCB->term.type.Booleans == 0)) { + _nc_init_termtype(&(TCB->term.type)); } - returnBool(code); } @@ -1608,6 +1607,7 @@ drv_keyok(TERMINAL_CONTROL_BLOCK * TCB, int keycode, int flag) NCURSES_EXPORT_VAR (TERM_DRIVER) _nc_WIN_DRIVER = { FALSE, + drv_name, /* Name */ drv_CanHandle, /* CanHandle */ drv_init, /* init */ drv_release, /* release */ diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index b60dd37e..442e73b2 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9-20140329) unstable; urgency=low +ncurses6 (5.9-20140412) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Wed, 26 Mar 2014 15:51:51 -0400 + -- Thomas E. Dickey Fri, 11 Apr 2014 04:17:46 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index b60dd37e..442e73b2 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9-20140329) unstable; urgency=low +ncurses6 (5.9-20140412) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Wed, 26 Mar 2014 15:51:51 -0400 + -- Thomas E. Dickey Fri, 11 Apr 2014 04:17:46 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index d6e28d12..2e9fd13c 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9-20140329) unstable; urgency=low +ncurses6 (5.9-20140412) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Wed, 26 Mar 2014 15:51:51 -0400 + -- Thomas E. Dickey Fri, 11 Apr 2014 04:17:46 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 1a901a14..fb0d2ab5 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.34 2014/03/26 19:51:51 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.36 2014/04/11 08:17:46 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "5" !define VERSION_MINOR "9" !define VERSION_YYYY "2014" -!define VERSION_MMDD "0329" +!define VERSION_MMDD "0412" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 367a4c5b..2a40683c 100644 --- a/package/mingw-ncurses.spec +++ b/package/mingw-ncurses.spec @@ -3,7 +3,7 @@ Summary: shared libraries for terminal handling Name: mingw32-ncurses6 Version: 5.9 -Release: 20140329 +Release: 20140412 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index ab76bc93..cc6fbf2a 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 5.9 -Release: 20140329 +Release: 20140412 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/test/aclocal.m4 b/test/aclocal.m4 index 86d3ee45..a01d4e25 100644 --- a/test/aclocal.m4 +++ b/test/aclocal.m4 @@ -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.94 2014/02/10 00:43:27 tom Exp $ +dnl $Id: aclocal.m4,v 1.95 2014/04/12 22:32:11 tom Exp $ dnl dnl Author: Thomas E. Dickey dnl @@ -1622,7 +1622,7 @@ AC_DEFUN([CF_INHERIT_SCRIPT], test -f $1 || ( test -f ../$1 && cp ../$1 ./ ) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_INTEL_COMPILER version: 5 updated: 2013/02/10 10:41:05 +dnl CF_INTEL_COMPILER version: 6 updated: 2014/03/17 13:13:07 dnl ----------------- dnl Check if the given compiler is really the Intel compiler for Linux. It dnl tries to imitate gcc, but does not return an error when it finds a mismatch @@ -1651,7 +1651,7 @@ if test "$ifelse([$1],,[$1],GCC)" = yes ; then make an error #endif ],[ifelse([$2],,INTEL_COMPILER,[$2])=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +cf_save_CFLAGS="$cf_save_CFLAGS -we147" ],[]) ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS" AC_MSG_RESULT($ifelse([$2],,INTEL_COMPILER,[$2])) diff --git a/test/configure b/test/configure index 3fb46e8f..e0838f8c 100755 --- a/test/configure +++ b/test/configure @@ -15067,7 +15067,7 @@ if { (eval echo "$as_me:15058: \"$ac_compile\"") >&5 echo "$as_me:15067: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +cf_save_CFLAGS="$cf_save_CFLAGS -we147" else echo "$as_me: failed program was:" >&5