diff --git a/packages/devel/ncurses/meta b/packages/devel/ncurses/meta index a563bfb2a8..e87a89bda5 100644 --- a/packages/devel/ncurses/meta +++ b/packages/devel/ncurses/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="ncurses" -PKG_VERSION="5.8" +PKG_VERSION="5.9" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="MIT" diff --git a/packages/devel/ncurses/patches/ncurses-5.8-00_ncurses_upstream_fixes-20110402.patch b/packages/devel/ncurses/patches/ncurses-5.8-00_ncurses_upstream_fixes-20110402.patch deleted file mode 100644 index f541d7cee2..0000000000 --- a/packages/devel/ncurses/patches/ncurses-5.8-00_ncurses_upstream_fixes-20110402.patch +++ /dev/null @@ -1,38717 +0,0 @@ -diff -Naur ncurses-5.8/aclocal.m4 ncurses-5.8-20110402/aclocal.m4 ---- ncurses-5.8/aclocal.m4 2011-02-21 02:40:21.000000000 +0100 -+++ ncurses-5.8-20110402/aclocal.m4 2011-04-01 01:35:38.000000000 +0200 -@@ -28,7 +28,7 @@ - dnl - dnl Author: Thomas E. Dickey 1995-on - dnl --dnl $Id: aclocal.m4,v 1.549 2011/02/21 01:40:21 tom Exp $ -+dnl $Id: aclocal.m4,v 1.553 2011/03/31 23:35:38 tom Exp $ - dnl Macros used in NCURSES auto-configuration script. - dnl - dnl These macros are maintained separately from NCURSES. The copyright on -@@ -1769,10 +1769,12 @@ - AC_SUBST(EXTRA_CFLAGS) - ])dnl - dnl --------------------------------------------------------------------------- --dnl CF_GNAT_GENERICS version: 1 updated: 2010/11/13 14:15:18 -+dnl CF_GNAT_GENERICS version: 2 updated: 2011/03/23 20:24:41 - dnl ---------------- - AC_DEFUN([CF_GNAT_GENERICS], - [ -+AC_REQUIRE([CF_GNAT_VERSION]) -+ - AC_MSG_CHECKING(if GNAT supports generics) - case $cf_gnat_version in #(vi - 3.[[1-9]]*|[[4-9]].*) #(vi -@@ -1826,28 +1828,92 @@ - AC_SUBST(PRAGMA_UNREF) - ])dnl - dnl --------------------------------------------------------------------------- --dnl CF_GNAT_PROJECTS version: 1 updated: 2010/11/13 14:15:18 -+dnl CF_GNAT_PROJECTS version: 2 updated: 2011/03/23 20:24:41 - dnl ---------------- -+dnl GNAT projects are configured with ".gpr" project files. -+dnl GNAT libraries are a further development, using the project feature. - AC_DEFUN([CF_GNAT_PROJECTS], - [ -+AC_REQUIRE([CF_GNAT_VERSION]) -+ -+cf_gnat_libraries=no -+cf_gnat_projects=no -+ - AC_MSG_CHECKING(if GNAT supports project files) - case $cf_gnat_version in #(vi - 3.[[0-9]]*) #(vi -- cf_gnat_projects=no - ;; - *) - case $cf_cv_system_name in #(vi - cygwin*) #(vi -- cf_gnat_projects=no - ;; - *) -- cf_gnat_projects=yes -+ mkdir conftest.src conftest.bin conftest.lib -+ cd conftest.src -+ rm -rf conftest* *~conftest* -+ cat >>library.gpr <>confpackage.ads <>confpackage.adb <&AC_FD_CC 2>&1 ) ; then -+ cf_gnat_projects=yes -+ fi -+ cd .. -+ if test -f conftest.lib/confpackage.ali -+ then -+ cf_gnat_libraries=yes -+ fi -+ rm -rf conftest* *~conftest* - ;; - esac - ;; - esac - AC_MSG_RESULT($cf_gnat_projects) - -+if test $cf_gnat_projects = yes -+then -+ AC_MSG_CHECKING(if GNAT supports libraries) -+ AC_MSG_RESULT($cf_gnat_libraries) -+fi -+ - if test "$cf_gnat_projects" = yes - then - USE_OLD_MAKERULES="#" -@@ -1857,11 +1923,66 @@ - USE_GNAT_PROJECTS="#" - fi - -+if test "$cf_gnat_libraries" = yes -+then -+ USE_GNAT_LIBRARIES="" -+else -+ USE_GNAT_LIBRARIES="#" -+fi -+ - AC_SUBST(USE_OLD_MAKERULES) - AC_SUBST(USE_GNAT_PROJECTS) -+AC_SUBST(USE_GNAT_LIBRARIES) -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_GNAT_SIGINT version: 1 updated: 2011/03/27 20:07:59 -+dnl -------------- -+dnl Check if gnat supports SIGINT, and presumably tasking. For the latter, it -+dnl is noted that gnat may compile a tasking unit even for configurations which -+dnl fail at runtime. -+AC_DEFUN([CF_GNAT_SIGINT],[ -+AC_CACHE_CHECK(if GNAT supports SIGINT,cf_cv_gnat_sigint,[ -+CF_GNAT_TRY_LINK([with Ada.Interrupts.Names; -+ -+package ConfTest is -+ -+ pragma Warnings (Off); -- the next pragma exists since 3.11p -+ pragma Unreserve_All_Interrupts; -+ pragma Warnings (On); -+ -+ protected Process is -+ procedure Stop; -+ function Continue return Boolean; -+ pragma Attach_Handler (Stop, Ada.Interrupts.Names.SIGINT); -+ private -+ Done : Boolean := False; -+ end Process; -+ -+end ConfTest;], -+[package body ConfTest is -+ protected body Process is -+ procedure Stop is -+ begin -+ Done := True; -+ end Stop; -+ function Continue return Boolean is -+ begin -+ return not Done; -+ end Continue; -+ end Process; -+end ConfTest;], -+ [cf_cv_gnat_sigint=yes], -+ [cf_cv_gnat_sigint=no])]) -+ -+if test $cf_cv_gnat_sigint = yes ; then -+ USE_GNAT_SIGINT="" -+else -+ USE_GNAT_SIGINT="#" -+fi -+AC_SUBST(USE_GNAT_SIGINT) - ])dnl - dnl --------------------------------------------------------------------------- --dnl CF_GNAT_TRY_LINK version: 2 updated: 2010/08/14 18:25:37 -+dnl CF_GNAT_TRY_LINK version: 3 updated: 2011/03/19 14:47:45 - dnl ---------------- - dnl Verify that a test program compiles/links with GNAT. - dnl $cf_ada_make is set to the program that compiles/links -@@ -1873,7 +1994,7 @@ - dnl $4 is the shell command to execute if not successful - AC_DEFUN([CF_GNAT_TRY_LINK], - [ --rm -rf conftest* -+rm -rf conftest* *~conftest* - cat >>conftest.ads <>conftest.ads </dev/null | sed -e 's,[[ ]]*$,,'` -+ cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[[ ]]*$,,'` - case "$cf_result" in - .*k) - cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` -diff -Naur ncurses-5.8/Ada95/aclocal.m4 ncurses-5.8-20110402/Ada95/aclocal.m4 ---- ncurses-5.8/Ada95/aclocal.m4 2011-01-22 20:46:50.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/aclocal.m4 2011-04-01 01:32:36.000000000 +0200 -@@ -28,7 +28,7 @@ - dnl - dnl Author: Thomas E. Dickey - dnl --dnl $Id: aclocal.m4,v 1.20 2011/01/22 19:46:50 tom Exp $ -+dnl $Id: aclocal.m4,v 1.24 2011/03/31 23:32:36 tom Exp $ - dnl Macros used in NCURSES Ada95 auto-configuration script. - dnl - dnl These macros are maintained separately from NCURSES. The copyright on -@@ -1040,10 +1040,12 @@ - AC_SUBST(EXTRA_CFLAGS) - ])dnl - dnl --------------------------------------------------------------------------- --dnl CF_GNAT_GENERICS version: 1 updated: 2010/11/13 14:15:18 -+dnl CF_GNAT_GENERICS version: 2 updated: 2011/03/23 20:24:41 - dnl ---------------- - AC_DEFUN([CF_GNAT_GENERICS], - [ -+AC_REQUIRE([CF_GNAT_VERSION]) -+ - AC_MSG_CHECKING(if GNAT supports generics) - case $cf_gnat_version in #(vi - 3.[[1-9]]*|[[4-9]].*) #(vi -@@ -1068,6 +1070,53 @@ - AC_SUBST(cf_generic_objects) - ])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_GNAT_SIGINT version: 1 updated: 2011/03/27 20:07:59 -+dnl -------------- -+dnl Check if gnat supports SIGINT, and presumably tasking. For the latter, it -+dnl is noted that gnat may compile a tasking unit even for configurations which -+dnl fail at runtime. -+AC_DEFUN([CF_GNAT_SIGINT],[ -+AC_CACHE_CHECK(if GNAT supports SIGINT,cf_cv_gnat_sigint,[ -+CF_GNAT_TRY_LINK([with Ada.Interrupts.Names; -+ -+package ConfTest is -+ -+ pragma Warnings (Off); -- the next pragma exists since 3.11p -+ pragma Unreserve_All_Interrupts; -+ pragma Warnings (On); -+ -+ protected Process is -+ procedure Stop; -+ function Continue return Boolean; -+ pragma Attach_Handler (Stop, Ada.Interrupts.Names.SIGINT); -+ private -+ Done : Boolean := False; -+ end Process; -+ -+end ConfTest;], -+[package body ConfTest is -+ protected body Process is -+ procedure Stop is -+ begin -+ Done := True; -+ end Stop; -+ function Continue return Boolean is -+ begin -+ return not Done; -+ end Continue; -+ end Process; -+end ConfTest;], -+ [cf_cv_gnat_sigint=yes], -+ [cf_cv_gnat_sigint=no])]) -+ -+if test $cf_cv_gnat_sigint = yes ; then -+ USE_GNAT_SIGINT="" -+else -+ USE_GNAT_SIGINT="#" -+fi -+AC_SUBST(USE_GNAT_SIGINT) -+])dnl -+dnl --------------------------------------------------------------------------- - dnl CF_GNAT_PRAGMA_UNREF version: 1 updated: 2010/06/19 15:22:18 - dnl -------------------- - dnl Check if the gnat pragma "Unreferenced" works. -@@ -1097,28 +1146,92 @@ - AC_SUBST(PRAGMA_UNREF) - ])dnl - dnl --------------------------------------------------------------------------- --dnl CF_GNAT_PROJECTS version: 1 updated: 2010/11/13 14:15:18 -+dnl CF_GNAT_PROJECTS version: 2 updated: 2011/03/23 20:24:41 - dnl ---------------- -+dnl GNAT projects are configured with ".gpr" project files. -+dnl GNAT libraries are a further development, using the project feature. - AC_DEFUN([CF_GNAT_PROJECTS], - [ -+AC_REQUIRE([CF_GNAT_VERSION]) -+ -+cf_gnat_libraries=no -+cf_gnat_projects=no -+ - AC_MSG_CHECKING(if GNAT supports project files) - case $cf_gnat_version in #(vi - 3.[[0-9]]*) #(vi -- cf_gnat_projects=no - ;; - *) - case $cf_cv_system_name in #(vi - cygwin*) #(vi -- cf_gnat_projects=no - ;; - *) -- cf_gnat_projects=yes -+ mkdir conftest.src conftest.bin conftest.lib -+ cd conftest.src -+ rm -rf conftest* *~conftest* -+ cat >>library.gpr <>confpackage.ads <>confpackage.adb <&AC_FD_CC 2>&1 ) ; then -+ cf_gnat_projects=yes -+ fi -+ cd .. -+ if test -f conftest.lib/confpackage.ali -+ then -+ cf_gnat_libraries=yes -+ fi -+ rm -rf conftest* *~conftest* - ;; - esac - ;; - esac - AC_MSG_RESULT($cf_gnat_projects) - -+if test $cf_gnat_projects = yes -+then -+ AC_MSG_CHECKING(if GNAT supports libraries) -+ AC_MSG_RESULT($cf_gnat_libraries) -+fi -+ - if test "$cf_gnat_projects" = yes - then - USE_OLD_MAKERULES="#" -@@ -1128,11 +1241,19 @@ - USE_GNAT_PROJECTS="#" - fi - -+if test "$cf_gnat_libraries" = yes -+then -+ USE_GNAT_LIBRARIES="" -+else -+ USE_GNAT_LIBRARIES="#" -+fi -+ - AC_SUBST(USE_OLD_MAKERULES) - AC_SUBST(USE_GNAT_PROJECTS) -+AC_SUBST(USE_GNAT_LIBRARIES) - ])dnl - dnl --------------------------------------------------------------------------- --dnl CF_GNAT_TRY_LINK version: 2 updated: 2010/08/14 18:25:37 -+dnl CF_GNAT_TRY_LINK version: 3 updated: 2011/03/19 14:47:45 - dnl ---------------- - dnl Verify that a test program compiles/links with GNAT. - dnl $cf_ada_make is set to the program that compiles/links -@@ -1144,7 +1265,7 @@ - dnl $4 is the shell command to execute if not successful - AC_DEFUN([CF_GNAT_TRY_LINK], - [ --rm -rf conftest* -+rm -rf conftest* *~conftest* - cat >>conftest.ads <>conftest.ads </dev/null | sed -e 's,[[ ]]*$,,'` -+ cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[[ ]]*$,,'` - case "$cf_result" in - .*k) - cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` -@@ -1914,7 +2032,7 @@ - echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC - ])dnl - dnl --------------------------------------------------------------------------- --dnl CF_NCURSES_ADDON version: 3 updated: 2010/10/23 15:54:49 -+dnl CF_NCURSES_ADDON version: 4 updated: 2011/03/27 17:10:13 - dnl ---------------- - dnl Configure an ncurses add-on, built outside the ncurses tree. - AC_DEFUN([CF_NCURSES_ADDON],[ -@@ -1939,8 +2057,8 @@ - cf_version=`$NCURSES_CONFIG --version` - - NCURSES_MAJOR=`echo "$cf_version" | sed -e 's/\..*//'` --NCURSES_MINOR=`echo "$cf_version" | sed -e 's/^[[0-9]]\+\.//' -e 's/\..*//'` --NCURSES_PATCH=`echo "$cf_version" | sed -e 's/^[[0-9]]\+\.[[0-9]]\+\.//'` -+NCURSES_MINOR=`echo "$cf_version" | sed -e 's/^[[0-9]][[0-9]]*\.//' -e 's/\..*//'` -+NCURSES_PATCH=`echo "$cf_version" | sed -e 's/^[[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\.//'` - - # ABI version is not available from headers - cf_cv_abi_version=`$NCURSES_CONFIG --abi-version` -@@ -1956,10 +2074,10 @@ - cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out" - AC_TRY_EVAL(cf_try) - if test -f conftest.out ; then -- cf_result=`cat conftest.out | sed -e "s/^.*AUTOCONF_$cf_name[[ ]]\+//"` -- eval NCURSES_$cf_name=$cf_result -- cat conftest.$ac_ext -- cat conftest.out -+ cf_result=`cat conftest.out | sed -e "s/^.*AUTOCONF_$cf_name[[ ]][[ ]]*//"` -+ eval NCURSES_$cf_name=\"$cf_result\" -+ # cat conftest.$ac_ext -+ # cat conftest.out - fi - done - -@@ -2428,7 +2546,7 @@ - esac - ])dnl - dnl --------------------------------------------------------------------------- --dnl CF_PKG_CONFIG version: 3 updated: 2009/01/25 10:55:09 -+dnl CF_PKG_CONFIG version: 4 updated: 2011/02/18 20:26:24 - dnl ------------- - dnl Check for the package-config program, unless disabled by command-line. - AC_DEFUN([CF_PKG_CONFIG], -@@ -2445,7 +2563,7 @@ - PKG_CONFIG=none - ;; - yes) #(vi -- AC_PATH_PROG(PKG_CONFIG, pkg-config, none) -+ AC_PATH_TOOL(PKG_CONFIG, pkg-config, none) - ;; - *) - PKG_CONFIG=$withval -@@ -3355,7 +3473,7 @@ - fi - ]) - dnl --------------------------------------------------------------------------- --dnl CF_XOPEN_SOURCE version: 34 updated: 2010/05/26 05:38:42 -+dnl CF_XOPEN_SOURCE version: 35 updated: 2011/02/20 20:37:37 - dnl --------------- - dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, - dnl or adapt to the vendor's definitions to get equivalent functionality, -@@ -3374,6 +3492,9 @@ - aix[[456]]*) #(vi - cf_xopen_source="-D_ALL_SOURCE" - ;; -+cygwin) #(vi -+ cf_XOPEN_SOURCE=600 -+ ;; - darwin[[0-8]].*) #(vi - cf_xopen_source="-D_APPLE_C_SOURCE" - ;; -diff -Naur ncurses-5.8/Ada95/configure ncurses-5.8-20110402/Ada95/configure ---- ncurses-5.8/Ada95/configure 2011-01-15 22:51:23.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/configure 2011-04-01 01:34:47.000000000 +0200 -@@ -1,7 +1,7 @@ - #! /bin/sh --# From configure.in Revision: 1.21 . -+# From configure.in Revision: 1.30 . - # Guess values for system-dependent variables and create Makefiles. --# Generated by Autoconf 2.52.20101001. -+# Generated by Autoconf 2.52.20101002. - # - # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 - # Free Software Foundation, Inc. -@@ -657,9 +657,11 @@ - --with-build-ldflags=XXX the build linker-flags ($BUILD_LDFLAGS) - --with-build-libs=XXX the build libraries (${BUILD_LIBS}) - Options to Specify the Libraries Built/Used: -+ --with-shared generate shared C-objects (needed for --with-ada-sharedlib) - --enable-widec compile with wide-char/UTF-8 code - --with-curses-dir=DIR directory in which (n)curses is installed - --with-shlib-version=X Specify rel or abi version for shared libs -+ --enable-rpath-link link sample programs with rpath option - Fine-Tuning Your Configuration: - --enable-broken_linker compile with broken-linker support code - --disable-largefile omit support for large files -@@ -755,7 +757,7 @@ - running configure, to aid debugging if configure makes a mistake. - - It was created by $as_me, which was --generated by GNU Autoconf 2.52.20101001. Invocation command line was -+generated by GNU Autoconf 2.52.20101002. Invocation command line was - - $ $0 $@ - -@@ -879,7 +881,7 @@ - fi - for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then -- { echo "$as_me:882: loading site script $ac_site_file" >&5 -+ { echo "$as_me:884: loading site script $ac_site_file" >&5 - echo "$as_me: loading site script $ac_site_file" >&6;} - cat "$ac_site_file" >&5 - . "$ac_site_file" -@@ -890,7 +892,7 @@ - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then -- { echo "$as_me:893: loading cache $cache_file" >&5 -+ { echo "$as_me:895: loading cache $cache_file" >&5 - echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; -@@ -898,7 +900,7 @@ - esac - fi - else -- { echo "$as_me:901: creating cache $cache_file" >&5 -+ { echo "$as_me:903: creating cache $cache_file" >&5 - echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file - fi -@@ -914,21 +916,21 @@ - eval ac_new_val="\$ac_env_${ac_var}_value" - case $ac_old_set,$ac_new_set in - set,) -- { echo "$as_me:917: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+ { echo "$as_me:919: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 - echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) -- { echo "$as_me:921: error: \`$ac_var' was not set in the previous run" >&5 -+ { echo "$as_me:923: error: \`$ac_var' was not set in the previous run" >&5 - echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:927: error: \`$ac_var' has changed since the previous run:" >&5 -+ { echo "$as_me:929: error: \`$ac_var' has changed since the previous run:" >&5 - echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:929: former value: $ac_old_val" >&5 -+ { echo "$as_me:931: former value: $ac_old_val" >&5 - echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:931: current value: $ac_new_val" >&5 -+ { echo "$as_me:933: current value: $ac_new_val" >&5 - echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: - fi;; -@@ -947,9 +949,9 @@ - fi - done - if $ac_cache_corrupted; then -- { echo "$as_me:950: error: changes in the environment can compromise the build" >&5 -+ { echo "$as_me:952: error: changes in the environment can compromise the build" >&5 - echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { echo "$as_me:952: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -+ { { echo "$as_me:954: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 - echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -970,10 +972,10 @@ - echo "#! $SHELL" >conftest.sh - echo "exit 0" >>conftest.sh - chmod +x conftest.sh --if { (echo "$as_me:973: PATH=\".;.\"; conftest.sh") >&5 -+if { (echo "$as_me:975: PATH=\".;.\"; conftest.sh") >&5 - (PATH=".;."; conftest.sh) 2>&5 - ac_status=$? -- echo "$as_me:976: \$? = $ac_status" >&5 -+ echo "$as_me:978: \$? = $ac_status" >&5 - (exit $ac_status); }; then - ac_path_separator=';' - else -@@ -1003,7 +1005,7 @@ - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:1006: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -+ { { echo "$as_me:1008: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 - echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} - { (exit 1); exit 1; }; } - fi -@@ -1013,11 +1015,11 @@ - - # Make sure we can run config.sub. - $ac_config_sub sun4 >/dev/null 2>&1 || -- { { echo "$as_me:1016: error: cannot run $ac_config_sub" >&5 -+ { { echo "$as_me:1018: error: cannot run $ac_config_sub" >&5 - echo "$as_me: error: cannot run $ac_config_sub" >&2;} - { (exit 1); exit 1; }; } - --echo "$as_me:1020: checking build system type" >&5 -+echo "$as_me:1022: checking build system type" >&5 - echo $ECHO_N "checking build system type... $ECHO_C" >&6 - if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -1026,23 +1028,23 @@ - test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` - test -z "$ac_cv_build_alias" && -- { { echo "$as_me:1029: error: cannot guess build type; you must specify one" >&5 -+ { { echo "$as_me:1031: error: cannot guess build type; you must specify one" >&5 - echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } - ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || -- { { echo "$as_me:1033: error: $ac_config_sub $ac_cv_build_alias failed." >&5 -+ { { echo "$as_me:1035: error: $ac_config_sub $ac_cv_build_alias failed." >&5 - echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} - { (exit 1); exit 1; }; } - - fi --echo "$as_me:1038: result: $ac_cv_build" >&5 -+echo "$as_me:1040: result: $ac_cv_build" >&5 - echo "${ECHO_T}$ac_cv_build" >&6 - build=$ac_cv_build - build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` - build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` - build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - --echo "$as_me:1045: checking host system type" >&5 -+echo "$as_me:1047: checking host system type" >&5 - echo $ECHO_N "checking host system type... $ECHO_C" >&6 - if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -1051,12 +1053,12 @@ - test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias - ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || -- { { echo "$as_me:1054: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -+ { { echo "$as_me:1056: error: $ac_config_sub $ac_cv_host_alias failed" >&5 - echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} - { (exit 1); exit 1; }; } - - fi --echo "$as_me:1059: result: $ac_cv_host" >&5 -+echo "$as_me:1061: result: $ac_cv_host" >&5 - echo "${ECHO_T}$ac_cv_host" >&6 - host=$ac_cv_host - host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -@@ -1064,7 +1066,7 @@ - host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then -- echo "$as_me:1067: checking target system type" >&5 -+ echo "$as_me:1069: checking target system type" >&5 - echo $ECHO_N "checking target system type... $ECHO_C" >&6 - if test "${ac_cv_target+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -1073,12 +1075,12 @@ - test "x$ac_cv_target_alias" = "x" && - ac_cv_target_alias=$ac_cv_host_alias - ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || -- { { echo "$as_me:1076: error: $ac_config_sub $ac_cv_target_alias failed" >&5 -+ { { echo "$as_me:1078: error: $ac_config_sub $ac_cv_target_alias failed" >&5 - echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} - { (exit 1); exit 1; }; } - - fi --echo "$as_me:1081: result: $ac_cv_target" >&5 -+echo "$as_me:1083: result: $ac_cv_target" >&5 - echo "${ECHO_T}$ac_cv_target" >&6 - target=$ac_cv_target - target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -@@ -1109,13 +1111,13 @@ - fi - - test -z "$system_name" && system_name="$cf_cv_system_name" --test -n "$cf_cv_system_name" && echo "$as_me:1112: result: Configuring for $cf_cv_system_name" >&5 -+test -n "$cf_cv_system_name" && echo "$as_me:1114: result: Configuring for $cf_cv_system_name" >&5 - echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 - - if test ".$system_name" != ".$cf_cv_system_name" ; then -- echo "$as_me:1116: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 -+ echo "$as_me:1118: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 - echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 -- { { echo "$as_me:1118: error: \"Please remove config.cache and try again.\"" >&5 -+ { { echo "$as_me:1120: error: \"Please remove config.cache and try again.\"" >&5 - echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -1123,7 +1125,7 @@ - # Check whether --with-system-type or --without-system-type was given. - if test "${with_system_type+set}" = set; then - withval="$with_system_type" -- { echo "$as_me:1126: WARNING: overriding system type to $withval" >&5 -+ { echo "$as_me:1128: WARNING: overriding system type to $withval" >&5 - echo "$as_me: WARNING: overriding system type to $withval" >&2;} - cf_cv_system_name=$withval - fi; -@@ -1133,7 +1135,7 @@ - - ### Default install-location - --echo "$as_me:1136: checking for prefix" >&5 -+echo "$as_me:1138: checking for prefix" >&5 - echo $ECHO_N "checking for prefix... $ECHO_C" >&6 - if test "x$prefix" = "xNONE" ; then - case "$cf_cv_system_name" in -@@ -1145,11 +1147,11 @@ - ;; - esac - fi --echo "$as_me:1148: result: $prefix" >&5 -+echo "$as_me:1150: result: $prefix" >&5 - echo "${ECHO_T}$prefix" >&6 - - if test "x$prefix" = "xNONE" ; then --echo "$as_me:1152: checking for default include-directory" >&5 -+echo "$as_me:1154: checking for default include-directory" >&5 - echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6 - test -n "$verbose" && echo 1>&6 - for cf_symbol in \ -@@ -1172,7 +1174,7 @@ - fi - test -n "$verbose" && echo " tested $cf_dir" 1>&6 - done --echo "$as_me:1175: result: $includedir" >&5 -+echo "$as_me:1177: result: $includedir" >&5 - echo "${ECHO_T}$includedir" >&6 - fi - -@@ -1186,7 +1188,7 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --echo "$as_me:1189: checking for $ac_word" >&5 -+echo "$as_me:1191: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -1201,7 +1203,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_CC="${ac_tool_prefix}gcc" --echo "$as_me:1204: found $ac_dir/$ac_word" >&5 -+echo "$as_me:1206: found $ac_dir/$ac_word" >&5 - break - done - -@@ -1209,10 +1211,10 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:1212: result: $CC" >&5 -+ echo "$as_me:1214: result: $CC" >&5 - echo "${ECHO_T}$CC" >&6 - else -- echo "$as_me:1215: result: no" >&5 -+ echo "$as_me:1217: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -1221,7 +1223,7 @@ - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --echo "$as_me:1224: checking for $ac_word" >&5 -+echo "$as_me:1226: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -1236,7 +1238,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_CC="gcc" --echo "$as_me:1239: found $ac_dir/$ac_word" >&5 -+echo "$as_me:1241: found $ac_dir/$ac_word" >&5 - break - done - -@@ -1244,10 +1246,10 @@ - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:1247: result: $ac_ct_CC" >&5 -+ echo "$as_me:1249: result: $ac_ct_CC" >&5 - echo "${ECHO_T}$ac_ct_CC" >&6 - else -- echo "$as_me:1250: result: no" >&5 -+ echo "$as_me:1252: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -1260,7 +1262,7 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. - set dummy ${ac_tool_prefix}cc; ac_word=$2 --echo "$as_me:1263: checking for $ac_word" >&5 -+echo "$as_me:1265: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -1275,7 +1277,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_CC="${ac_tool_prefix}cc" --echo "$as_me:1278: found $ac_dir/$ac_word" >&5 -+echo "$as_me:1280: found $ac_dir/$ac_word" >&5 - break - done - -@@ -1283,10 +1285,10 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:1286: result: $CC" >&5 -+ echo "$as_me:1288: result: $CC" >&5 - echo "${ECHO_T}$CC" >&6 - else -- echo "$as_me:1289: result: no" >&5 -+ echo "$as_me:1291: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -1295,7 +1297,7 @@ - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --echo "$as_me:1298: checking for $ac_word" >&5 -+echo "$as_me:1300: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -1310,7 +1312,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_CC="cc" --echo "$as_me:1313: found $ac_dir/$ac_word" >&5 -+echo "$as_me:1315: found $ac_dir/$ac_word" >&5 - break - done - -@@ -1318,10 +1320,10 @@ - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:1321: result: $ac_ct_CC" >&5 -+ echo "$as_me:1323: result: $ac_ct_CC" >&5 - echo "${ECHO_T}$ac_ct_CC" >&6 - else -- echo "$as_me:1324: result: no" >&5 -+ echo "$as_me:1326: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -1334,7 +1336,7 @@ - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --echo "$as_me:1337: checking for $ac_word" >&5 -+echo "$as_me:1339: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -1354,7 +1356,7 @@ - continue - fi - ac_cv_prog_CC="cc" --echo "$as_me:1357: found $ac_dir/$ac_word" >&5 -+echo "$as_me:1359: found $ac_dir/$ac_word" >&5 - break - done - -@@ -1376,10 +1378,10 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:1379: result: $CC" >&5 -+ echo "$as_me:1381: result: $CC" >&5 - echo "${ECHO_T}$CC" >&6 - else -- echo "$as_me:1382: result: no" >&5 -+ echo "$as_me:1384: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -1390,7 +1392,7 @@ - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:1393: checking for $ac_word" >&5 -+echo "$as_me:1395: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -1405,7 +1407,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" --echo "$as_me:1408: found $ac_dir/$ac_word" >&5 -+echo "$as_me:1410: found $ac_dir/$ac_word" >&5 - break - done - -@@ -1413,10 +1415,10 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:1416: result: $CC" >&5 -+ echo "$as_me:1418: result: $CC" >&5 - echo "${ECHO_T}$CC" >&6 - else -- echo "$as_me:1419: result: no" >&5 -+ echo "$as_me:1421: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -1429,7 +1431,7 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:1432: checking for $ac_word" >&5 -+echo "$as_me:1434: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -1444,7 +1446,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_CC="$ac_prog" --echo "$as_me:1447: found $ac_dir/$ac_word" >&5 -+echo "$as_me:1449: found $ac_dir/$ac_word" >&5 - break - done - -@@ -1452,10 +1454,10 @@ - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:1455: result: $ac_ct_CC" >&5 -+ echo "$as_me:1457: result: $ac_ct_CC" >&5 - echo "${ECHO_T}$ac_ct_CC" >&6 - else -- echo "$as_me:1458: result: no" >&5 -+ echo "$as_me:1460: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -1467,32 +1469,32 @@ - - fi - --test -z "$CC" && { { echo "$as_me:1470: error: no acceptable cc found in \$PATH" >&5 -+test -z "$CC" && { { echo "$as_me:1472: error: no acceptable cc found in \$PATH" >&5 - echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} - { (exit 1); exit 1; }; } - - # Provide some information about the compiler. --echo "$as_me:1475:" \ -+echo "$as_me:1477:" \ - "checking for C compiler version" >&5 - ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:1478: \"$ac_compiler --version &5\"") >&5 -+{ (eval echo "$as_me:1480: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 - ac_status=$? -- echo "$as_me:1481: \$? = $ac_status" >&5 -+ echo "$as_me:1483: \$? = $ac_status" >&5 - (exit $ac_status); } --{ (eval echo "$as_me:1483: \"$ac_compiler -v &5\"") >&5 -+{ (eval echo "$as_me:1485: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 - ac_status=$? -- echo "$as_me:1486: \$? = $ac_status" >&5 -+ echo "$as_me:1488: \$? = $ac_status" >&5 - (exit $ac_status); } --{ (eval echo "$as_me:1488: \"$ac_compiler -V &5\"") >&5 -+{ (eval echo "$as_me:1490: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 - ac_status=$? -- echo "$as_me:1491: \$? = $ac_status" >&5 -+ echo "$as_me:1493: \$? = $ac_status" >&5 - (exit $ac_status); } - - cat >conftest.$ac_ext <<_ACEOF --#line 1495 "configure" -+#line 1497 "configure" - #include "confdefs.h" - - int -@@ -1508,13 +1510,13 @@ - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --echo "$as_me:1511: checking for C compiler default output" >&5 -+echo "$as_me:1513: checking for C compiler default output" >&5 - echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 - ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` --if { (eval echo "$as_me:1514: \"$ac_link_default\"") >&5 -+if { (eval echo "$as_me:1516: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 - ac_status=$? -- echo "$as_me:1517: \$? = $ac_status" >&5 -+ echo "$as_me:1519: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is - # not robust to junk in `.', hence go to wildcards (a.*) only as a last -@@ -1537,34 +1539,34 @@ - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 --{ { echo "$as_me:1540: error: C compiler cannot create executables" >&5 -+{ { echo "$as_me:1542: error: C compiler cannot create executables" >&5 - echo "$as_me: error: C compiler cannot create executables" >&2;} - { (exit 77); exit 77; }; } - fi - - ac_exeext=$ac_cv_exeext --echo "$as_me:1546: result: $ac_file" >&5 -+echo "$as_me:1548: result: $ac_file" >&5 - echo "${ECHO_T}$ac_file" >&6 - - # Check the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. --echo "$as_me:1551: checking whether the C compiler works" >&5 -+echo "$as_me:1553: checking whether the C compiler works" >&5 - echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 - # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 - # If not cross compiling, check that we can run a simple program. - if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' -- { (eval echo "$as_me:1557: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:1559: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:1560: \$? = $ac_status" >&5 -+ echo "$as_me:1562: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else -- { { echo "$as_me:1567: error: cannot run C compiled programs. -+ { { echo "$as_me:1569: error: cannot run C compiled programs. - If you meant to cross compile, use \`--host'." >&5 - echo "$as_me: error: cannot run C compiled programs. - If you meant to cross compile, use \`--host'." >&2;} -@@ -1572,24 +1574,24 @@ - fi - fi - fi --echo "$as_me:1575: result: yes" >&5 -+echo "$as_me:1577: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - - rm -f a.out a.exe conftest$ac_cv_exeext - ac_clean_files=$ac_clean_files_save - # Check the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. --echo "$as_me:1582: checking whether we are cross compiling" >&5 -+echo "$as_me:1584: checking whether we are cross compiling" >&5 - echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 --echo "$as_me:1584: result: $cross_compiling" >&5 -+echo "$as_me:1586: result: $cross_compiling" >&5 - echo "${ECHO_T}$cross_compiling" >&6 - --echo "$as_me:1587: checking for executable suffix" >&5 -+echo "$as_me:1589: checking for executable suffix" >&5 - echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 --if { (eval echo "$as_me:1589: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:1591: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:1592: \$? = $ac_status" >&5 -+ echo "$as_me:1594: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -@@ -1605,25 +1607,25 @@ - esac - done - else -- { { echo "$as_me:1608: error: cannot compute EXEEXT: cannot compile and link" >&5 -+ { { echo "$as_me:1610: error: cannot compute EXEEXT: cannot compile and link" >&5 - echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} - { (exit 1); exit 1; }; } - fi - - rm -f conftest$ac_cv_exeext --echo "$as_me:1614: result: $ac_cv_exeext" >&5 -+echo "$as_me:1616: result: $ac_cv_exeext" >&5 - echo "${ECHO_T}$ac_cv_exeext" >&6 - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --echo "$as_me:1620: checking for object suffix" >&5 -+echo "$as_me:1622: checking for object suffix" >&5 - echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 - if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 1626 "configure" -+#line 1628 "configure" - #include "confdefs.h" - - int -@@ -1635,10 +1637,10 @@ - } - _ACEOF - rm -f conftest.o conftest.obj --if { (eval echo "$as_me:1638: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:1640: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:1641: \$? = $ac_status" >&5 -+ echo "$as_me:1643: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do - case $ac_file in -@@ -1650,24 +1652,24 @@ - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 --{ { echo "$as_me:1653: error: cannot compute OBJEXT: cannot compile" >&5 -+{ { echo "$as_me:1655: error: cannot compute OBJEXT: cannot compile" >&5 - echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} - { (exit 1); exit 1; }; } - fi - - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --echo "$as_me:1660: result: $ac_cv_objext" >&5 -+echo "$as_me:1662: result: $ac_cv_objext" >&5 - echo "${ECHO_T}$ac_cv_objext" >&6 - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT --echo "$as_me:1664: checking whether we are using the GNU C compiler" >&5 -+echo "$as_me:1666: checking whether we are using the GNU C compiler" >&5 - echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 - if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 1670 "configure" -+#line 1672 "configure" - #include "confdefs.h" - - int -@@ -1682,16 +1684,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:1685: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:1687: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:1688: \$? = $ac_status" >&5 -+ echo "$as_me:1690: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:1691: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:1693: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:1694: \$? = $ac_status" >&5 -+ echo "$as_me:1696: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_compiler_gnu=yes - else -@@ -1703,19 +1705,19 @@ - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --echo "$as_me:1706: result: $ac_cv_c_compiler_gnu" >&5 -+echo "$as_me:1708: result: $ac_cv_c_compiler_gnu" >&5 - echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 - GCC=`test $ac_compiler_gnu = yes && echo yes` - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS - CFLAGS="-g" --echo "$as_me:1712: checking whether $CC accepts -g" >&5 -+echo "$as_me:1714: checking whether $CC accepts -g" >&5 - echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 - if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 1718 "configure" -+#line 1720 "configure" - #include "confdefs.h" - - int -@@ -1727,16 +1729,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:1730: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:1732: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:1733: \$? = $ac_status" >&5 -+ echo "$as_me:1735: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:1736: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:1738: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:1739: \$? = $ac_status" >&5 -+ echo "$as_me:1741: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_g=yes - else -@@ -1746,7 +1748,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:1749: result: $ac_cv_prog_cc_g" >&5 -+echo "$as_me:1751: result: $ac_cv_prog_cc_g" >&5 - echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 - if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -@@ -1773,16 +1775,16 @@ - #endif - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:1776: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:1778: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:1779: \$? = $ac_status" >&5 -+ echo "$as_me:1781: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:1782: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:1784: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:1785: \$? = $ac_status" >&5 -+ echo "$as_me:1787: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - ''\ -@@ -1794,7 +1796,7 @@ - 'void exit (int);' - do - cat >conftest.$ac_ext <<_ACEOF --#line 1797 "configure" -+#line 1799 "configure" - #include "confdefs.h" - #include - $ac_declaration -@@ -1807,16 +1809,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:1810: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:1812: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:1813: \$? = $ac_status" >&5 -+ echo "$as_me:1815: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:1816: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:1818: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:1819: \$? = $ac_status" >&5 -+ echo "$as_me:1821: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -1826,7 +1828,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF --#line 1829 "configure" -+#line 1831 "configure" - #include "confdefs.h" - $ac_declaration - int -@@ -1838,16 +1840,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:1841: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:1843: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:1844: \$? = $ac_status" >&5 -+ echo "$as_me:1846: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:1847: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:1849: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:1850: \$? = $ac_status" >&5 -+ echo "$as_me:1852: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -1877,11 +1879,11 @@ - - GCC_VERSION=none - if test "$GCC" = yes ; then -- echo "$as_me:1880: checking version of $CC" >&5 -+ echo "$as_me:1882: checking version of $CC" >&5 - echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 - GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" - test -z "$GCC_VERSION" && GCC_VERSION=unknown -- echo "$as_me:1884: result: $GCC_VERSION" >&5 -+ echo "$as_me:1886: result: $GCC_VERSION" >&5 - echo "${ECHO_T}$GCC_VERSION" >&6 - fi - -@@ -1891,7 +1893,7 @@ - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_main_return=return --echo "$as_me:1894: checking how to run the C preprocessor" >&5 -+echo "$as_me:1896: checking how to run the C preprocessor" >&5 - echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then -@@ -1912,18 +1914,18 @@ - # 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 1915 "configure" -+#line 1917 "configure" - #include "confdefs.h" - #include - Syntax error - _ACEOF --if { (eval echo "$as_me:1920: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:1922: \"$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:1926: \$? = $ac_status" >&5 -+ echo "$as_me:1928: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -1946,17 +1948,17 @@ - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF --#line 1949 "configure" -+#line 1951 "configure" - #include "confdefs.h" - #include - _ACEOF --if { (eval echo "$as_me:1953: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:1955: \"$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:1959: \$? = $ac_status" >&5 -+ echo "$as_me:1961: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -1993,7 +1995,7 @@ - else - ac_cv_prog_CPP=$CPP - fi --echo "$as_me:1996: result: $CPP" >&5 -+echo "$as_me:1998: result: $CPP" >&5 - echo "${ECHO_T}$CPP" >&6 - ac_preproc_ok=false - for ac_c_preproc_warn_flag in '' yes -@@ -2003,18 +2005,18 @@ - # 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 2006 "configure" -+#line 2008 "configure" - #include "confdefs.h" - #include - Syntax error - _ACEOF --if { (eval echo "$as_me:2011: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:2013: \"$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:2017: \$? = $ac_status" >&5 -+ echo "$as_me:2019: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -2037,17 +2039,17 @@ - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF --#line 2040 "configure" -+#line 2042 "configure" - #include "confdefs.h" - #include - _ACEOF --if { (eval echo "$as_me:2044: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:2046: \"$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:2050: \$? = $ac_status" >&5 -+ echo "$as_me:2052: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -2075,7 +2077,7 @@ - if $ac_preproc_ok; then - : - else -- { { echo "$as_me:2078: error: C preprocessor \"$CPP\" fails sanity check" >&5 -+ { { echo "$as_me:2080: error: C preprocessor \"$CPP\" fails sanity check" >&5 - echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -2088,14 +2090,14 @@ - ac_main_return=return - - if test $ac_cv_c_compiler_gnu = yes; then -- echo "$as_me:2091: checking whether $CC needs -traditional" >&5 -+ echo "$as_me:2093: checking whether $CC needs -traditional" >&5 - echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 - if test "${ac_cv_prog_gcc_traditional+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_pattern="Autoconf.*'x'" - cat >conftest.$ac_ext <<_ACEOF --#line 2098 "configure" -+#line 2100 "configure" - #include "confdefs.h" - #include - int Autoconf = TIOCGETP; -@@ -2110,7 +2112,7 @@ - - if test $ac_cv_prog_gcc_traditional = no; then - cat >conftest.$ac_ext <<_ACEOF --#line 2113 "configure" -+#line 2115 "configure" - #include "confdefs.h" - #include - int Autoconf = TCGETA; -@@ -2123,14 +2125,14 @@ - - fi - fi --echo "$as_me:2126: result: $ac_cv_prog_gcc_traditional" >&5 -+echo "$as_me:2128: result: $ac_cv_prog_gcc_traditional" >&5 - echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 - if test $ac_cv_prog_gcc_traditional = yes; then - CC="$CC -traditional" - fi - fi - --echo "$as_me:2133: checking whether $CC understands -c and -o together" >&5 -+echo "$as_me:2135: checking whether $CC understands -c and -o together" >&5 - echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6 - if test "${cf_cv_prog_CC_c_o+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -2146,15 +2148,15 @@ - # We do the test twice because some compilers refuse to overwrite an - # existing .o file with -o, though they will create one. - ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' --if { (eval echo "$as_me:2149: \"$ac_try\"") >&5 -+if { (eval echo "$as_me:2151: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:2152: \$? = $ac_status" >&5 -+ echo "$as_me:2154: \$? = $ac_status" >&5 - (exit $ac_status); } && -- test -f conftest2.$ac_objext && { (eval echo "$as_me:2154: \"$ac_try\"") >&5 -+ test -f conftest2.$ac_objext && { (eval echo "$as_me:2156: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:2157: \$? = $ac_status" >&5 -+ echo "$as_me:2159: \$? = $ac_status" >&5 - (exit $ac_status); }; - then - eval cf_cv_prog_CC_c_o=yes -@@ -2165,19 +2167,19 @@ - - fi - if test $cf_cv_prog_CC_c_o = yes; then -- echo "$as_me:2168: result: yes" >&5 -+ echo "$as_me:2170: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - else -- echo "$as_me:2171: result: no" >&5 -+ echo "$as_me:2173: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:2175: checking for POSIXized ISC" >&5 -+echo "$as_me:2177: checking for POSIXized ISC" >&5 - echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6 - if test -d /etc/conf/kconfig.d && - grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 - then -- echo "$as_me:2180: result: yes" >&5 -+ echo "$as_me:2182: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - ISC=yes # If later tests want to check for ISC. - -@@ -2191,12 +2193,12 @@ - CC="$CC -Xp" - fi - else -- echo "$as_me:2194: result: no" >&5 -+ echo "$as_me:2196: result: no" >&5 - echo "${ECHO_T}no" >&6 - ISC= - fi - --echo "$as_me:2199: checking for ${CC:-cc} option to accept ANSI C" >&5 -+echo "$as_me:2201: checking for ${CC:-cc} option to accept ANSI C" >&5 - echo $ECHO_N "checking for ${CC:-cc} option to accept ANSI C... $ECHO_C" >&6 - if test "${cf_cv_ansi_cc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -2300,7 +2302,7 @@ - fi - - cat >conftest.$ac_ext <<_ACEOF --#line 2303 "configure" -+#line 2305 "configure" - #include "confdefs.h" - - #ifndef CC_HAS_PROTOS -@@ -2321,16 +2323,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:2324: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:2326: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:2327: \$? = $ac_status" >&5 -+ echo "$as_me:2329: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:2330: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:2332: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:2333: \$? = $ac_status" >&5 -+ echo "$as_me:2335: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ansi_cc="$cf_arg"; break - else -@@ -2343,7 +2345,7 @@ - CPPFLAGS="$cf_save_CPPFLAGS" - - fi --echo "$as_me:2346: result: $cf_cv_ansi_cc" >&5 -+echo "$as_me:2348: result: $cf_cv_ansi_cc" >&5 - echo "${ECHO_T}$cf_cv_ansi_cc" >&6 - - if test "$cf_cv_ansi_cc" != "no"; then -@@ -2436,7 +2438,7 @@ - fi - - if test "$cf_cv_ansi_cc" = "no"; then -- { { echo "$as_me:2439: error: Your compiler does not appear to recognize prototypes. -+ { { echo "$as_me:2441: error: Your compiler does not appear to recognize prototypes. - You have the following choices: - a. adjust your compiler options - b. get an up-to-date compiler -@@ -2483,7 +2485,7 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:2486: checking for $ac_word" >&5 -+echo "$as_me:2488: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -2498,7 +2500,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_AWK="$ac_prog" --echo "$as_me:2501: found $ac_dir/$ac_word" >&5 -+echo "$as_me:2503: found $ac_dir/$ac_word" >&5 - break - done - -@@ -2506,21 +2508,21 @@ - fi - AWK=$ac_cv_prog_AWK - if test -n "$AWK"; then -- echo "$as_me:2509: result: $AWK" >&5 -+ echo "$as_me:2511: result: $AWK" >&5 - echo "${ECHO_T}$AWK" >&6 - else -- echo "$as_me:2512: result: no" >&5 -+ echo "$as_me:2514: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - - test -n "$AWK" && break - done - --test -z "$AWK" && { { echo "$as_me:2519: error: No awk program found" >&5 -+test -z "$AWK" && { { echo "$as_me:2521: error: No awk program found" >&5 - echo "$as_me: error: No awk program found" >&2;} - { (exit 1); exit 1; }; } - --echo "$as_me:2523: checking for egrep" >&5 -+echo "$as_me:2525: checking for egrep" >&5 - echo $ECHO_N "checking for egrep... $ECHO_C" >&6 - if test "${ac_cv_prog_egrep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -2530,11 +2532,11 @@ - else ac_cv_prog_egrep='egrep' - fi - fi --echo "$as_me:2533: result: $ac_cv_prog_egrep" >&5 -+echo "$as_me:2535: result: $ac_cv_prog_egrep" >&5 - echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep - --test -z "$EGREP" && { { echo "$as_me:2537: error: No egrep program found" >&5 -+test -z "$EGREP" && { { echo "$as_me:2539: error: No egrep program found" >&5 - echo "$as_me: error: No egrep program found" >&2;} - { (exit 1); exit 1; }; } - -@@ -2550,7 +2552,7 @@ - # AFS /usr/afsws/bin/install, which mishandles nonexistent args - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # ./install, which can be erroneously created by make from ./install.sh. --echo "$as_me:2553: checking for a BSD compatible install" >&5 -+echo "$as_me:2555: checking for a BSD compatible install" >&5 - echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 - if test -z "$INSTALL"; then - if test "${ac_cv_path_install+set}" = set; then -@@ -2599,7 +2601,7 @@ - INSTALL=$ac_install_sh - fi - fi --echo "$as_me:2602: result: $INSTALL" >&5 -+echo "$as_me:2604: result: $INSTALL" >&5 - echo "${ECHO_T}$INSTALL" >&6 - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. -@@ -2610,18 +2612,18 @@ - - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - --echo "$as_me:2613: checking whether ln -s works" >&5 -+echo "$as_me:2615: checking whether ln -s works" >&5 - echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 - LN_S=$as_ln_s - if test "$LN_S" = "ln -s"; then -- echo "$as_me:2617: result: yes" >&5 -+ echo "$as_me:2619: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - else -- echo "$as_me:2620: result: no, using $LN_S" >&5 -+ echo "$as_me:2622: result: no, using $LN_S" >&5 - echo "${ECHO_T}no, using $LN_S" >&6 - fi - --echo "$as_me:2624: checking if $LN_S -f options work" >&5 -+echo "$as_me:2626: checking if $LN_S -f options work" >&5 - echo $ECHO_N "checking if $LN_S -f options work... $ECHO_C" >&6 - - rm -f conf$$.src conf$$dst -@@ -2633,12 +2635,12 @@ - cf_prog_ln_sf=no - fi - rm -f conf$$.dst conf$$src --echo "$as_me:2636: result: $cf_prog_ln_sf" >&5 -+echo "$as_me:2638: result: $cf_prog_ln_sf" >&5 - echo "${ECHO_T}$cf_prog_ln_sf" >&6 - - test "$cf_prog_ln_sf" = yes && LN_S="$LN_S -f" - --echo "$as_me:2641: checking for long file names" >&5 -+echo "$as_me:2643: checking for long file names" >&5 - echo $ECHO_N "checking for long file names... $ECHO_C" >&6 - if test "${ac_cv_sys_long_file_names+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -2677,7 +2679,7 @@ - rm -rf $ac_xdir 2>/dev/null - done - fi --echo "$as_me:2680: result: $ac_cv_sys_long_file_names" >&5 -+echo "$as_me:2682: result: $ac_cv_sys_long_file_names" >&5 - echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 - if test $ac_cv_sys_long_file_names = yes; then - -@@ -2689,7 +2691,7 @@ - - # if we find pkg-config, check if we should install the ".pc" files. - --echo "$as_me:2692: checking if you want to use pkg-config" >&5 -+echo "$as_me:2694: checking if you want to use pkg-config" >&5 - echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 - - # Check whether --with-pkg-config or --without-pkg-config was given. -@@ -2699,7 +2701,7 @@ - else - cf_pkg_config=yes - fi; --echo "$as_me:2702: result: $cf_pkg_config" >&5 -+echo "$as_me:2704: result: $cf_pkg_config" >&5 - echo "${ECHO_T}$cf_pkg_config" >&6 - - case $cf_pkg_config in #(vi -@@ -2707,9 +2709,10 @@ - PKG_CONFIG=none - ;; - yes) #(vi -- # Extract the first word of "pkg-config", so it can be a program name with args. --set dummy pkg-config; ac_word=$2 --echo "$as_me:2712: checking for $ac_word" >&5 -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -+echo "$as_me:2715: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -2726,25 +2729,70 @@ - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" -- echo "$as_me:2729: found $ac_dir/$ac_word" >&5 -+ echo "$as_me:2732: found $ac_dir/$ac_word" >&5 - break - fi - done - -- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="none" - ;; - esac - fi - PKG_CONFIG=$ac_cv_path_PKG_CONFIG - - if test -n "$PKG_CONFIG"; then -- echo "$as_me:2741: result: $PKG_CONFIG" >&5 -+ echo "$as_me:2743: result: $PKG_CONFIG" >&5 - echo "${ECHO_T}$PKG_CONFIG" >&6 - else -- echo "$as_me:2744: result: no" >&5 -+ echo "$as_me:2746: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+fi -+if test -z "$ac_cv_path_PKG_CONFIG"; then -+ ac_pt_PKG_CONFIG=$PKG_CONFIG -+ # Extract the first word of "pkg-config", so it can be a program name with args. -+set dummy pkg-config; ac_word=$2 -+echo "$as_me:2755: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $ac_pt_PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ ac_save_IFS=$IFS; IFS=$ac_path_separator -+ac_dummy="$PATH" -+for ac_dir in $ac_dummy; do -+ IFS=$ac_save_IFS -+ test -z "$ac_dir" && ac_dir=. -+ if $as_executable_p "$ac_dir/$ac_word"; then -+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" -+ echo "$as_me:2772: found $ac_dir/$ac_word" >&5 -+ break -+fi -+done -+ -+ test -z "$ac_cv_path_ac_pt_PKG_CONFIG" && ac_cv_path_ac_pt_PKG_CONFIG="none" -+ ;; -+esac -+fi -+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -+ -+if test -n "$ac_pt_PKG_CONFIG"; then -+ echo "$as_me:2784: result: $ac_pt_PKG_CONFIG" >&5 -+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 -+else -+ echo "$as_me:2787: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -+ PKG_CONFIG=$ac_pt_PKG_CONFIG -+else -+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+fi -+ - ;; - *) - PKG_CONFIG=$withval -@@ -2779,7 +2827,7 @@ - PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` - ;; - *) -- { { echo "$as_me:2782: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 -+ { { echo "$as_me:2830: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 - echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -2787,8 +2835,8 @@ - - fi - --if test "$PKG_CONFIG" != no ; then -- echo "$as_me:2791: checking if we should install .pc files for $PKG_CONFIG" >&5 -+if test "$PKG_CONFIG" != none ; then -+ echo "$as_me:2839: checking if we should install .pc files for $PKG_CONFIG" >&5 - echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C" >&6 - - # Leave this as something that can be overridden in the environment. -@@ -2805,18 +2853,18 @@ - else - enable_pc_files=no - fi; -- echo "$as_me:2808: result: $enable_pc_files" >&5 -+ echo "$as_me:2856: result: $enable_pc_files" >&5 - echo "${ECHO_T}$enable_pc_files" >&6 - else -- echo "$as_me:2811: result: no" >&5 -+ echo "$as_me:2859: result: no" >&5 - echo "${ECHO_T}no" >&6 -- { echo "$as_me:2813: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5 -+ { echo "$as_me:2861: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5 - echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;} - enable_pc_files=no - fi - fi - --echo "$as_me:2819: checking if you want to build test-programs" >&5 -+echo "$as_me:2867: checking if you want to build test-programs" >&5 - echo $ECHO_N "checking if you want to build test-programs... $ECHO_C" >&6 - - # Check whether --with-tests or --without-tests was given. -@@ -2826,10 +2874,10 @@ - else - cf_with_tests=yes - fi; --echo "$as_me:2829: result: $cf_with_tests" >&5 -+echo "$as_me:2877: result: $cf_with_tests" >&5 - echo "${ECHO_T}$cf_with_tests" >&6 - --echo "$as_me:2832: checking if we should assume mixed-case filenames" >&5 -+echo "$as_me:2880: checking if we should assume mixed-case filenames" >&5 - echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6 - - # Check whether --enable-mixed-case or --disable-mixed-case was given. -@@ -2839,11 +2887,11 @@ - else - enable_mixedcase=auto - fi; --echo "$as_me:2842: result: $enable_mixedcase" >&5 -+echo "$as_me:2890: result: $enable_mixedcase" >&5 - echo "${ECHO_T}$enable_mixedcase" >&6 - if test "$enable_mixedcase" = "auto" ; then - --echo "$as_me:2846: checking if filesystem supports mixed-case filenames" >&5 -+echo "$as_me:2894: checking if filesystem supports mixed-case filenames" >&5 - echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 - if test "${cf_cv_mixedcase+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -2870,7 +2918,7 @@ - fi - - fi --echo "$as_me:2873: result: $cf_cv_mixedcase" >&5 -+echo "$as_me:2921: result: $cf_cv_mixedcase" >&5 - echo "${ECHO_T}$cf_cv_mixedcase" >&6 - test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF - #define MIXEDCASE_FILENAMES 1 -@@ -2887,7 +2935,7 @@ - fi - - # do this after mixed-case option (tags/TAGS is not as important as tic). --echo "$as_me:2890: checking whether ${MAKE-make} sets \${MAKE}" >&5 -+echo "$as_me:2938: checking whether ${MAKE-make} sets \${MAKE}" >&5 - echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 - set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` - if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then -@@ -2907,11 +2955,11 @@ - rm -f conftest.make - fi - if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then -- echo "$as_me:2910: result: yes" >&5 -+ echo "$as_me:2958: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - SET_MAKE= - else -- echo "$as_me:2914: result: no" >&5 -+ echo "$as_me:2962: result: no" >&5 - echo "${ECHO_T}no" >&6 - SET_MAKE="MAKE=${MAKE-make}" - fi -@@ -2920,7 +2968,7 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:2923: checking for $ac_word" >&5 -+echo "$as_me:2971: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_CTAGS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -2935,7 +2983,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_CTAGS="$ac_prog" --echo "$as_me:2938: found $ac_dir/$ac_word" >&5 -+echo "$as_me:2986: found $ac_dir/$ac_word" >&5 - break - done - -@@ -2943,10 +2991,10 @@ - fi - CTAGS=$ac_cv_prog_CTAGS - if test -n "$CTAGS"; then -- echo "$as_me:2946: result: $CTAGS" >&5 -+ echo "$as_me:2994: result: $CTAGS" >&5 - echo "${ECHO_T}$CTAGS" >&6 - else -- echo "$as_me:2949: result: no" >&5 -+ echo "$as_me:2997: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -2957,7 +3005,7 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:2960: checking for $ac_word" >&5 -+echo "$as_me:3008: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_ETAGS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -2972,7 +3020,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ETAGS="$ac_prog" --echo "$as_me:2975: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3023: found $ac_dir/$ac_word" >&5 - break - done - -@@ -2980,10 +3028,10 @@ - fi - ETAGS=$ac_cv_prog_ETAGS - if test -n "$ETAGS"; then -- echo "$as_me:2983: result: $ETAGS" >&5 -+ echo "$as_me:3031: result: $ETAGS" >&5 - echo "${ECHO_T}$ETAGS" >&6 - else -- echo "$as_me:2986: result: no" >&5 -+ echo "$as_me:3034: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -2992,7 +3040,7 @@ - - # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. - set dummy ${CTAGS:-ctags}; ac_word=$2 --echo "$as_me:2995: checking for $ac_word" >&5 -+echo "$as_me:3043: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -3007,7 +3055,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_MAKE_LOWER_TAGS="yes" --echo "$as_me:3010: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3058: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3016,17 +3064,17 @@ - fi - MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS - if test -n "$MAKE_LOWER_TAGS"; then -- echo "$as_me:3019: result: $MAKE_LOWER_TAGS" >&5 -+ echo "$as_me:3067: result: $MAKE_LOWER_TAGS" >&5 - echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 - else -- echo "$as_me:3022: result: no" >&5 -+ echo "$as_me:3070: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - - if test "$cf_cv_mixedcase" = yes ; then - # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. - set dummy ${ETAGS:-etags}; ac_word=$2 --echo "$as_me:3029: checking for $ac_word" >&5 -+echo "$as_me:3077: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -3041,7 +3089,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_MAKE_UPPER_TAGS="yes" --echo "$as_me:3044: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3092: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3050,10 +3098,10 @@ - fi - MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS - if test -n "$MAKE_UPPER_TAGS"; then -- echo "$as_me:3053: result: $MAKE_UPPER_TAGS" >&5 -+ echo "$as_me:3101: result: $MAKE_UPPER_TAGS" >&5 - echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 - else -- echo "$as_me:3056: result: no" >&5 -+ echo "$as_me:3104: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3073,7 +3121,7 @@ - MAKE_LOWER_TAGS="#" - fi - --echo "$as_me:3076: checking for makeflags variable" >&5 -+echo "$as_me:3124: checking for makeflags variable" >&5 - echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 - if test "${cf_cv_makeflags+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -3087,7 +3135,7 @@ - all : - @ echo '.$cf_option' - CF_EOF -- cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | sed -e 's,[ ]*$,,'` -+ cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[ ]*$,,'` - case "$cf_result" in - .*k) - cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` -@@ -3107,13 +3155,13 @@ - rm -f cf_makeflags.tmp - - fi --echo "$as_me:3110: result: $cf_cv_makeflags" >&5 -+echo "$as_me:3158: result: $cf_cv_makeflags" >&5 - echo "${ECHO_T}$cf_cv_makeflags" >&6 - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. - set dummy ${ac_tool_prefix}ranlib; ac_word=$2 --echo "$as_me:3116: checking for $ac_word" >&5 -+echo "$as_me:3164: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -3128,7 +3176,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" --echo "$as_me:3131: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3179: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3136,10 +3184,10 @@ - fi - RANLIB=$ac_cv_prog_RANLIB - if test -n "$RANLIB"; then -- echo "$as_me:3139: result: $RANLIB" >&5 -+ echo "$as_me:3187: result: $RANLIB" >&5 - echo "${ECHO_T}$RANLIB" >&6 - else -- echo "$as_me:3142: result: no" >&5 -+ echo "$as_me:3190: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3148,7 +3196,7 @@ - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 --echo "$as_me:3151: checking for $ac_word" >&5 -+echo "$as_me:3199: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -3163,7 +3211,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_RANLIB="ranlib" --echo "$as_me:3166: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3214: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3172,10 +3220,10 @@ - fi - ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB - if test -n "$ac_ct_RANLIB"; then -- echo "$as_me:3175: result: $ac_ct_RANLIB" >&5 -+ echo "$as_me:3223: result: $ac_ct_RANLIB" >&5 - echo "${ECHO_T}$ac_ct_RANLIB" >&6 - else -- echo "$as_me:3178: result: no" >&5 -+ echo "$as_me:3226: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3187,7 +3235,7 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. - set dummy ${ac_tool_prefix}ld; ac_word=$2 --echo "$as_me:3190: checking for $ac_word" >&5 -+echo "$as_me:3238: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -3202,7 +3250,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_LD="${ac_tool_prefix}ld" --echo "$as_me:3205: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3253: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3210,10 +3258,10 @@ - fi - LD=$ac_cv_prog_LD - if test -n "$LD"; then -- echo "$as_me:3213: result: $LD" >&5 -+ echo "$as_me:3261: result: $LD" >&5 - echo "${ECHO_T}$LD" >&6 - else -- echo "$as_me:3216: result: no" >&5 -+ echo "$as_me:3264: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3222,7 +3270,7 @@ - ac_ct_LD=$LD - # Extract the first word of "ld", so it can be a program name with args. - set dummy ld; ac_word=$2 --echo "$as_me:3225: checking for $ac_word" >&5 -+echo "$as_me:3273: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_ac_ct_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -3237,7 +3285,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_LD="ld" --echo "$as_me:3240: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3288: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3246,10 +3294,10 @@ - fi - ac_ct_LD=$ac_cv_prog_ac_ct_LD - if test -n "$ac_ct_LD"; then -- echo "$as_me:3249: result: $ac_ct_LD" >&5 -+ echo "$as_me:3297: result: $ac_ct_LD" >&5 - echo "${ECHO_T}$ac_ct_LD" >&6 - else -- echo "$as_me:3252: result: no" >&5 -+ echo "$as_me:3300: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3261,7 +3309,7 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. - set dummy ${ac_tool_prefix}ar; ac_word=$2 --echo "$as_me:3264: checking for $ac_word" >&5 -+echo "$as_me:3312: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -3276,7 +3324,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_AR="${ac_tool_prefix}ar" --echo "$as_me:3279: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3327: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3284,10 +3332,10 @@ - fi - AR=$ac_cv_prog_AR - if test -n "$AR"; then -- echo "$as_me:3287: result: $AR" >&5 -+ echo "$as_me:3335: result: $AR" >&5 - echo "${ECHO_T}$AR" >&6 - else -- echo "$as_me:3290: result: no" >&5 -+ echo "$as_me:3338: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3296,7 +3344,7 @@ - ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. - set dummy ar; ac_word=$2 --echo "$as_me:3299: checking for $ac_word" >&5 -+echo "$as_me:3347: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_ac_ct_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -3311,7 +3359,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_AR="ar" --echo "$as_me:3314: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3362: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3320,10 +3368,10 @@ - fi - ac_ct_AR=$ac_cv_prog_ac_ct_AR - if test -n "$ac_ct_AR"; then -- echo "$as_me:3323: result: $ac_ct_AR" >&5 -+ echo "$as_me:3371: result: $ac_ct_AR" >&5 - echo "${ECHO_T}$ac_ct_AR" >&6 - else -- echo "$as_me:3326: result: no" >&5 -+ echo "$as_me:3374: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3335,7 +3383,7 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. - set dummy ${ac_tool_prefix}ar; ac_word=$2 --echo "$as_me:3338: checking for $ac_word" >&5 -+echo "$as_me:3386: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -3350,7 +3398,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_AR="${ac_tool_prefix}ar" --echo "$as_me:3353: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3401: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3358,10 +3406,10 @@ - fi - AR=$ac_cv_prog_AR - if test -n "$AR"; then -- echo "$as_me:3361: result: $AR" >&5 -+ echo "$as_me:3409: result: $AR" >&5 - echo "${ECHO_T}$AR" >&6 - else -- echo "$as_me:3364: result: no" >&5 -+ echo "$as_me:3412: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3370,7 +3418,7 @@ - ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. - set dummy ar; ac_word=$2 --echo "$as_me:3373: checking for $ac_word" >&5 -+echo "$as_me:3421: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_ac_ct_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -3385,7 +3433,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_ac_ct_AR="ar" --echo "$as_me:3388: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3436: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3394,10 +3442,10 @@ - fi - ac_ct_AR=$ac_cv_prog_ac_ct_AR - if test -n "$ac_ct_AR"; then -- echo "$as_me:3397: result: $ac_ct_AR" >&5 -+ echo "$as_me:3445: result: $ac_ct_AR" >&5 - echo "${ECHO_T}$ac_ct_AR" >&6 - else -- echo "$as_me:3400: result: no" >&5 -+ echo "$as_me:3448: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3406,7 +3454,7 @@ - AR="$ac_cv_prog_AR" - fi - --echo "$as_me:3409: checking for options to update archives" >&5 -+echo "$as_me:3457: checking for options to update archives" >&5 - echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6 - if test "${cf_cv_ar_flags+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -3429,13 +3477,13 @@ - rm -f conftest.a - - cat >conftest.$ac_ext <&5 -+ if { (eval echo "$as_me:3483: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:3438: \$? = $ac_status" >&5 -+ echo "$as_me:3486: \$? = $ac_status" >&5 - (exit $ac_status); } ; then - echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 - $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null -@@ -3446,7 +3494,7 @@ - else - test -n "$verbose" && echo " cannot compile test-program" 1>&6 - --echo "${as_me:-configure}:3449: testing cannot compile test-program ..." 1>&5 -+echo "${as_me:-configure}:3497: testing cannot compile test-program ..." 1>&5 - - break - fi -@@ -3454,7 +3502,7 @@ - rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext - - fi --echo "$as_me:3457: result: $cf_cv_ar_flags" >&5 -+echo "$as_me:3505: result: $cf_cv_ar_flags" >&5 - echo "${ECHO_T}$cf_cv_ar_flags" >&6 - - if test -n "$ARFLAGS" ; then -@@ -3465,7 +3513,7 @@ - ARFLAGS=$cf_cv_ar_flags - fi - --echo "$as_me:3468: checking if you have specified an install-prefix" >&5 -+echo "$as_me:3516: checking if you have specified an install-prefix" >&5 - echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6 - - # Check whether --with-install-prefix or --without-install-prefix was given. -@@ -3478,7 +3526,7 @@ - ;; - esac - fi; --echo "$as_me:3481: result: $DESTDIR" >&5 -+echo "$as_me:3529: result: $DESTDIR" >&5 - echo "${ECHO_T}$DESTDIR" >&6 - - ############################################################################### -@@ -3506,7 +3554,7 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:3509: checking for $ac_word" >&5 -+echo "$as_me:3557: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_prog_BUILD_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -3521,7 +3569,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_BUILD_CC="$ac_prog" --echo "$as_me:3524: found $ac_dir/$ac_word" >&5 -+echo "$as_me:3572: found $ac_dir/$ac_word" >&5 - break - done - -@@ -3529,10 +3577,10 @@ - fi - BUILD_CC=$ac_cv_prog_BUILD_CC - if test -n "$BUILD_CC"; then -- echo "$as_me:3532: result: $BUILD_CC" >&5 -+ echo "$as_me:3580: result: $BUILD_CC" >&5 - echo "${ECHO_T}$BUILD_CC" >&6 - else -- echo "$as_me:3535: result: no" >&5 -+ echo "$as_me:3583: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -3540,12 +3588,12 @@ - done - - fi; -- echo "$as_me:3543: checking for native build C compiler" >&5 -+ echo "$as_me:3591: checking for native build C compiler" >&5 - echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6 -- echo "$as_me:3545: result: $BUILD_CC" >&5 -+ echo "$as_me:3593: result: $BUILD_CC" >&5 - echo "${ECHO_T}$BUILD_CC" >&6 - -- echo "$as_me:3548: checking for native build C preprocessor" >&5 -+ echo "$as_me:3596: checking for native build C preprocessor" >&5 - echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6 - - # Check whether --with-build-cpp or --without-build-cpp was given. -@@ -3555,10 +3603,10 @@ - else - BUILD_CPP='${BUILD_CC} -E' - fi; -- echo "$as_me:3558: result: $BUILD_CPP" >&5 -+ echo "$as_me:3606: result: $BUILD_CPP" >&5 - echo "${ECHO_T}$BUILD_CPP" >&6 - -- echo "$as_me:3561: checking for native build C flags" >&5 -+ echo "$as_me:3609: checking for native build C flags" >&5 - echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6 - - # Check whether --with-build-cflags or --without-build-cflags was given. -@@ -3566,10 +3614,10 @@ - withval="$with_build_cflags" - BUILD_CFLAGS="$withval" - fi; -- echo "$as_me:3569: result: $BUILD_CFLAGS" >&5 -+ echo "$as_me:3617: result: $BUILD_CFLAGS" >&5 - echo "${ECHO_T}$BUILD_CFLAGS" >&6 - -- echo "$as_me:3572: checking for native build C preprocessor-flags" >&5 -+ echo "$as_me:3620: checking for native build C preprocessor-flags" >&5 - echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6 - - # Check whether --with-build-cppflags or --without-build-cppflags was given. -@@ -3577,10 +3625,10 @@ - withval="$with_build_cppflags" - BUILD_CPPFLAGS="$withval" - fi; -- echo "$as_me:3580: result: $BUILD_CPPFLAGS" >&5 -+ echo "$as_me:3628: result: $BUILD_CPPFLAGS" >&5 - echo "${ECHO_T}$BUILD_CPPFLAGS" >&6 - -- echo "$as_me:3583: checking for native build linker-flags" >&5 -+ echo "$as_me:3631: checking for native build linker-flags" >&5 - echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6 - - # Check whether --with-build-ldflags or --without-build-ldflags was given. -@@ -3588,10 +3636,10 @@ - withval="$with_build_ldflags" - BUILD_LDFLAGS="$withval" - fi; -- echo "$as_me:3591: result: $BUILD_LDFLAGS" >&5 -+ echo "$as_me:3639: result: $BUILD_LDFLAGS" >&5 - echo "${ECHO_T}$BUILD_LDFLAGS" >&6 - -- echo "$as_me:3594: checking for native build linker-libraries" >&5 -+ echo "$as_me:3642: checking for native build linker-libraries" >&5 - echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6 - - # Check whether --with-build-libs or --without-build-libs was given. -@@ -3599,7 +3647,7 @@ - withval="$with_build_libs" - BUILD_LIBS="$withval" - fi; -- echo "$as_me:3602: result: $BUILD_LIBS" >&5 -+ echo "$as_me:3650: result: $BUILD_LIBS" >&5 - echo "${ECHO_T}$BUILD_LIBS" >&6 - - # this assumes we're on Unix. -@@ -3609,7 +3657,7 @@ - : ${BUILD_CC:='${CC}'} - - if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then -- { { echo "$as_me:3612: error: Cross-build requires two compilers. -+ { { echo "$as_me:3660: error: Cross-build requires two compilers. - Use --with-build-cc to specify the native compiler." >&5 - echo "$as_me: error: Cross-build requires two compilers. - Use --with-build-cc to specify the native compiler." >&2;} -@@ -3633,23 +3681,38 @@ - ### Use "--without-normal --with-shared" to allow the default model to be - ### shared, for example. - cf_list_models="" --echo "$as_me:3636: checking for specified models" >&5 -+ -+echo "$as_me:3685: checking if you want to build shared C-objects" >&5 -+echo $ECHO_N "checking if you want to build shared C-objects... $ECHO_C" >&6 -+ -+# Check whether --with-shared or --without-shared was given. -+if test "${with_shared+set}" = set; then -+ withval="$with_shared" -+ with_shared=$withval -+else -+ with_shared=no -+fi; -+echo "$as_me:3695: result: $with_shared" >&5 -+echo "${ECHO_T}$with_shared" >&6 -+test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" -+ -+echo "$as_me:3699: checking for specified models" >&5 - echo $ECHO_N "checking for specified models... $ECHO_C" >&6 - test -z "$cf_list_models" && cf_list_models=normal --echo "$as_me:3639: result: $cf_list_models" >&5 -+echo "$as_me:3702: result: $cf_list_models" >&5 - echo "${ECHO_T}$cf_list_models" >&6 - - ### Use the first model as the default, and save its suffix for use in building - ### up test-applications. --echo "$as_me:3644: checking for default model" >&5 -+echo "$as_me:3707: checking for default model" >&5 - echo $ECHO_N "checking for default model... $ECHO_C" >&6 - DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'` --echo "$as_me:3647: result: $DFT_LWR_MODEL" >&5 -+echo "$as_me:3710: result: $DFT_LWR_MODEL" >&5 - echo "${ECHO_T}$DFT_LWR_MODEL" >&6 - - DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - --echo "$as_me:3652: checking for specific curses-directory" >&5 -+echo "$as_me:3715: checking for specific curses-directory" >&5 - echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6 - - # Check whether --with-curses-dir or --without-curses-dir was given. -@@ -3659,7 +3722,7 @@ - else - cf_cv_curses_dir=no - fi; --echo "$as_me:3662: result: $cf_cv_curses_dir" >&5 -+echo "$as_me:3725: result: $cf_cv_curses_dir" >&5 - echo "${ECHO_T}$cf_cv_curses_dir" >&6 - - if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) -@@ -3690,7 +3753,7 @@ - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - *) -- { { echo "$as_me:3693: error: expected a pathname, not \"$withval\"" >&5 -+ { { echo "$as_me:3756: error: expected a pathname, not \"$withval\"" >&5 - echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -3723,7 +3786,7 @@ - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF --#line 3726 "configure" -+#line 3789 "configure" - #include "confdefs.h" - #include - int -@@ -3735,16 +3798,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:3738: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:3801: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:3741: \$? = $ac_status" >&5 -+ echo "$as_me:3804: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:3744: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:3807: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:3747: \$? = $ac_status" >&5 -+ echo "$as_me:3810: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -3761,7 +3824,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:3764: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:3827: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -3795,7 +3858,7 @@ - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 - --echo "${as_me:-configure}:3798: testing adding $cf_add_libdir to library-path ..." 1>&5 -+echo "${as_me:-configure}:3861: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi -@@ -3806,7 +3869,7 @@ - fi - fi - --echo "$as_me:3809: checking if you want wide-character code" >&5 -+echo "$as_me:3872: checking if you want wide-character code" >&5 - echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6 - - # Check whether --enable-widec or --disable-widec was given. -@@ -3816,11 +3879,11 @@ - else - with_widec=no - fi; --echo "$as_me:3819: result: $with_widec" >&5 -+echo "$as_me:3882: result: $with_widec" >&5 - echo "${ECHO_T}$with_widec" >&6 - if test "$with_widec" = yes ; then - --echo "$as_me:3823: checking for multibyte character support" >&5 -+echo "$as_me:3886: checking for multibyte character support" >&5 - echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6 - if test "${cf_cv_utf8_lib+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -3828,7 +3891,7 @@ - - cf_save_LIBS="$LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 3831 "configure" -+#line 3894 "configure" - #include "confdefs.h" - - #include -@@ -3841,16 +3904,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:3844: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:3907: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:3847: \$? = $ac_status" >&5 -+ echo "$as_me:3910: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:3850: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:3913: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:3853: \$? = $ac_status" >&5 -+ echo "$as_me:3916: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_utf8_lib=yes - else -@@ -3862,12 +3925,12 @@ - cf_cv_header_path_utf8= - cf_cv_library_path_utf8= - --echo "${as_me:-configure}:3865: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 -+echo "${as_me:-configure}:3928: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 - - cf_save_LIBS="$LIBS" - - cat >conftest.$ac_ext <<_ACEOF --#line 3870 "configure" -+#line 3933 "configure" - #include "confdefs.h" - - #include -@@ -3880,16 +3943,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:3883: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:3946: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:3886: \$? = $ac_status" >&5 -+ echo "$as_me:3949: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:3889: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:3952: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:3892: \$? = $ac_status" >&5 -+ echo "$as_me:3955: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_find_linkage_utf8=yes -@@ -3903,7 +3966,7 @@ - LIBS="-lutf8 $cf_save_LIBS" - - cat >conftest.$ac_ext <<_ACEOF --#line 3906 "configure" -+#line 3969 "configure" - #include "confdefs.h" - - #include -@@ -3916,16 +3979,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:3919: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:3982: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:3922: \$? = $ac_status" >&5 -+ echo "$as_me:3985: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:3925: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:3988: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:3928: \$? = $ac_status" >&5 -+ echo "$as_me:3991: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_find_linkage_utf8=yes -@@ -3942,9 +4005,9 @@ - - test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 - --echo "${as_me:-configure}:3945: testing find linkage for utf8 library ..." 1>&5 -+echo "${as_me:-configure}:4008: testing find linkage for utf8 library ..." 1>&5 - --echo "${as_me:-configure}:3947: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 -+echo "${as_me:-configure}:4010: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 - - cf_save_CPPFLAGS="$CPPFLAGS" - cf_test_CPPFLAGS="$CPPFLAGS" -@@ -4057,11 +4120,11 @@ - if test -d $cf_cv_header_path_utf8 ; then - test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 - --echo "${as_me:-configure}:4060: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 -+echo "${as_me:-configure}:4123: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 - - CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" - cat >conftest.$ac_ext <<_ACEOF --#line 4064 "configure" -+#line 4127 "configure" - #include "confdefs.h" - - #include -@@ -4074,21 +4137,21 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:4077: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:4140: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:4080: \$? = $ac_status" >&5 -+ echo "$as_me:4143: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:4083: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:4146: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:4086: \$? = $ac_status" >&5 -+ echo "$as_me:4149: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 - --echo "${as_me:-configure}:4091: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 -+echo "${as_me:-configure}:4154: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 - - cf_cv_find_linkage_utf8=maybe - cf_test_CPPFLAGS="$CPPFLAGS" -@@ -4106,7 +4169,7 @@ - - if test "$cf_cv_find_linkage_utf8" = maybe ; then - --echo "${as_me:-configure}:4109: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 -+echo "${as_me:-configure}:4172: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 - - cf_save_LIBS="$LIBS" - cf_save_LDFLAGS="$LDFLAGS" -@@ -4203,13 +4266,13 @@ - if test -d $cf_cv_library_path_utf8 ; then - test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 - --echo "${as_me:-configure}:4206: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 -+echo "${as_me:-configure}:4269: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 - - CPPFLAGS="$cf_test_CPPFLAGS" - LIBS="-lutf8 $cf_save_LIBS" - LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" - cat >conftest.$ac_ext <<_ACEOF --#line 4212 "configure" -+#line 4275 "configure" - #include "confdefs.h" - - #include -@@ -4222,21 +4285,21 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:4225: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:4288: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:4228: \$? = $ac_status" >&5 -+ echo "$as_me:4291: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:4231: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:4294: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:4234: \$? = $ac_status" >&5 -+ echo "$as_me:4297: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 - --echo "${as_me:-configure}:4239: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 -+echo "${as_me:-configure}:4302: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 - - cf_cv_find_linkage_utf8=yes - cf_cv_library_file_utf8="-lutf8" -@@ -4278,7 +4341,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:4281: result: $cf_cv_utf8_lib" >&5 -+echo "$as_me:4344: result: $cf_cv_utf8_lib" >&5 - echo "${ECHO_T}$cf_cv_utf8_lib" >&6 - - # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between -@@ -4312,7 +4375,7 @@ - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF --#line 4315 "configure" -+#line 4378 "configure" - #include "confdefs.h" - #include - int -@@ -4324,16 +4387,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:4327: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:4390: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:4330: \$? = $ac_status" >&5 -+ echo "$as_me:4393: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:4333: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:4396: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:4336: \$? = $ac_status" >&5 -+ echo "$as_me:4399: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -4350,7 +4413,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:4353: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:4416: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -4384,7 +4447,7 @@ - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 - --echo "${as_me:-configure}:4387: testing adding $cf_add_libdir to library-path ..." 1>&5 -+echo "${as_me:-configure}:4450: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi -@@ -4402,7 +4465,7 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:4405: checking for $ac_word" >&5 -+echo "$as_me:4468: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -4419,7 +4482,7 @@ - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" -- echo "$as_me:4422: found $ac_dir/$ac_word" >&5 -+ echo "$as_me:4485: found $ac_dir/$ac_word" >&5 - break - fi - done -@@ -4430,10 +4493,10 @@ - NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG - - if test -n "$NCURSES_CONFIG"; then -- echo "$as_me:4433: result: $NCURSES_CONFIG" >&5 -+ echo "$as_me:4496: result: $NCURSES_CONFIG" >&5 - echo "${ECHO_T}$NCURSES_CONFIG" >&6 - else -- echo "$as_me:4436: result: no" >&5 -+ echo "$as_me:4499: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -4448,7 +4511,7 @@ - - # even with config script, some packages use no-override for curses.h - --echo "$as_me:4451: checking if we have identified curses headers" >&5 -+echo "$as_me:4514: checking if we have identified curses headers" >&5 - echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 - if test "${cf_cv_ncurses_header+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -4462,7 +4525,7 @@ - ncurses.h - do - cat >conftest.$ac_ext <<_ACEOF --#line 4465 "configure" -+#line 4528 "configure" - #include "confdefs.h" - #include <${cf_header}> - int -@@ -4474,16 +4537,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:4477: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:4540: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:4480: \$? = $ac_status" >&5 -+ echo "$as_me:4543: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:4483: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:4546: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:4486: \$? = $ac_status" >&5 -+ echo "$as_me:4549: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ncurses_header=$cf_header; break - else -@@ -4494,11 +4557,11 @@ - done - - fi --echo "$as_me:4497: result: $cf_cv_ncurses_header" >&5 -+echo "$as_me:4560: result: $cf_cv_ncurses_header" >&5 - echo "${ECHO_T}$cf_cv_ncurses_header" >&6 - - if test "$cf_cv_ncurses_header" = none ; then -- { { echo "$as_me:4501: error: No curses header-files found" >&5 -+ { { echo "$as_me:4564: error: No curses header-files found" >&5 - echo "$as_me: error: No curses header-files found" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -4508,23 +4571,23 @@ - for ac_header in $cf_cv_ncurses_header - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:4511: checking for $ac_header" >&5 -+echo "$as_me:4574: 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 4517 "configure" -+#line 4580 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:4521: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:4584: \"$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:4527: \$? = $ac_status" >&5 -+ echo "$as_me:4590: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -4543,7 +4606,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:4546: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:4609: 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 <conftest.$ac_ext <<_ACEOF --#line 4599 "configure" -+#line 4662 "configure" - #include "confdefs.h" - #include - int -@@ -4608,16 +4671,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:4611: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:4674: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:4614: \$? = $ac_status" >&5 -+ echo "$as_me:4677: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:4617: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:4680: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:4620: \$? = $ac_status" >&5 -+ echo "$as_me:4683: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -4634,7 +4697,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:4637: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:4700: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -4651,7 +4714,7 @@ - - } - --echo "$as_me:4654: checking for $cf_ncuhdr_root header in include-path" >&5 -+echo "$as_me:4717: checking for $cf_ncuhdr_root header in include-path" >&5 - echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 - if test "${cf_cv_ncurses_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -4663,7 +4726,7 @@ - do - - cat >conftest.$ac_ext <<_ACEOF --#line 4666 "configure" -+#line 4729 "configure" - #include "confdefs.h" - - #define _XOPEN_SOURCE_EXTENDED -@@ -4695,16 +4758,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:4698: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:4761: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:4701: \$? = $ac_status" >&5 -+ echo "$as_me:4764: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:4704: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:4767: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:4707: \$? = $ac_status" >&5 -+ echo "$as_me:4770: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ncurses_h=$cf_header - -@@ -4719,14 +4782,14 @@ - done - - fi --echo "$as_me:4722: result: $cf_cv_ncurses_h" >&5 -+echo "$as_me:4785: result: $cf_cv_ncurses_h" >&5 - echo "${ECHO_T}$cf_cv_ncurses_h" >&6 - - if test "$cf_cv_ncurses_h" != no ; then - cf_cv_ncurses_header=$cf_cv_ncurses_h - else - --echo "$as_me:4729: checking for $cf_ncuhdr_root include-path" >&5 -+echo "$as_me:4792: checking for $cf_ncuhdr_root include-path" >&5 - echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 - if test "${cf_cv_ncurses_h2+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -4866,7 +4929,7 @@ - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF --#line 4869 "configure" -+#line 4932 "configure" - #include "confdefs.h" - #include - int -@@ -4878,16 +4941,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:4881: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:4944: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:4884: \$? = $ac_status" >&5 -+ echo "$as_me:4947: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:4887: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:4950: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:4890: \$? = $ac_status" >&5 -+ echo "$as_me:4953: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -4904,7 +4967,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:4907: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:4970: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -4925,7 +4988,7 @@ - do - - cat >conftest.$ac_ext <<_ACEOF --#line 4928 "configure" -+#line 4991 "configure" - #include "confdefs.h" - - #include <$cf_header> -@@ -4949,16 +5012,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:4952: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:5015: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:4955: \$? = $ac_status" >&5 -+ echo "$as_me:5018: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:4958: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5021: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:4961: \$? = $ac_status" >&5 -+ echo "$as_me:5024: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ncurses_h2=$cf_header - -@@ -4979,12 +5042,12 @@ - CPPFLAGS="$cf_save2_CPPFLAGS" - test "$cf_cv_ncurses_h2" != no && break - done -- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:4982: error: not found" >&5 -+ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:5045: error: not found" >&5 - echo "$as_me: error: not found" >&2;} - { (exit 1); exit 1; }; } - - fi --echo "$as_me:4987: result: $cf_cv_ncurses_h2" >&5 -+echo "$as_me:5050: result: $cf_cv_ncurses_h2" >&5 - echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 - - cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` -@@ -5017,7 +5080,7 @@ - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF --#line 5020 "configure" -+#line 5083 "configure" - #include "confdefs.h" - #include - int -@@ -5029,16 +5092,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:5032: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:5095: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:5035: \$? = $ac_status" >&5 -+ echo "$as_me:5098: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:5038: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5101: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5041: \$? = $ac_status" >&5 -+ echo "$as_me:5104: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -5055,7 +5118,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:5058: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:5121: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -5098,7 +5161,7 @@ - ;; - esac - --echo "$as_me:5101: checking for terminfo header" >&5 -+echo "$as_me:5164: checking for terminfo header" >&5 - echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 - if test "${cf_cv_term_header+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -5116,7 +5179,7 @@ - for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" - do - cat >conftest.$ac_ext <<_ACEOF --#line 5119 "configure" -+#line 5182 "configure" - #include "confdefs.h" - #include - #include <${cf_cv_ncurses_header:-curses.h}> -@@ -5131,16 +5194,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:5134: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:5197: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:5137: \$? = $ac_status" >&5 -+ echo "$as_me:5200: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:5140: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5203: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5143: \$? = $ac_status" >&5 -+ echo "$as_me:5206: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_term_header="$cf_test" -@@ -5156,7 +5219,7 @@ - done - - fi --echo "$as_me:5159: result: $cf_cv_term_header" >&5 -+echo "$as_me:5222: result: $cf_cv_term_header" >&5 - echo "${ECHO_T}$cf_cv_term_header" >&6 - - # Set definitions to allow ifdef'ing to accommodate subdirectories -@@ -5190,7 +5253,7 @@ - #define NCURSES 1 - EOF - --echo "$as_me:5193: checking for ncurses version" >&5 -+echo "$as_me:5256: checking for ncurses version" >&5 - echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 - if test "${cf_cv_ncurses_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -5216,10 +5279,10 @@ - #endif - EOF - cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" -- { (eval echo "$as_me:5219: \"$cf_try\"") >&5 -+ { (eval echo "$as_me:5282: \"$cf_try\"") >&5 - (eval $cf_try) 2>&5 - ac_status=$? -- echo "$as_me:5222: \$? = $ac_status" >&5 -+ echo "$as_me:5285: \$? = $ac_status" >&5 - (exit $ac_status); } - if test -f conftest.out ; then - cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` -@@ -5229,7 +5292,7 @@ - - else - cat >conftest.$ac_ext <<_ACEOF --#line 5232 "configure" -+#line 5295 "configure" - #include "confdefs.h" - - #include <${cf_cv_ncurses_header:-curses.h}> -@@ -5254,15 +5317,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:5257: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5320: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5260: \$? = $ac_status" >&5 -+ echo "$as_me:5323: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:5262: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5325: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5265: \$? = $ac_status" >&5 -+ echo "$as_me:5328: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_ncurses_version=`cat $cf_tempfile` -@@ -5276,7 +5339,7 @@ - rm -f $cf_tempfile - - fi --echo "$as_me:5279: result: $cf_cv_ncurses_version" >&5 -+echo "$as_me:5342: result: $cf_cv_ncurses_version" >&5 - echo "${ECHO_T}$cf_cv_ncurses_version" >&6 - test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF - #define NCURSES 1 -@@ -5288,7 +5351,7 @@ - # to link gpm. - cf_ncurses_LIBS="" - cf_ncurses_SAVE="$LIBS" --echo "$as_me:5291: checking for Gpm_Open in -lgpm" >&5 -+echo "$as_me:5354: checking for Gpm_Open in -lgpm" >&5 - echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 - if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -5296,7 +5359,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lgpm $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 5299 "configure" -+#line 5362 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -5315,16 +5378,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5318: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5381: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5321: \$? = $ac_status" >&5 -+ echo "$as_me:5384: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5324: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5387: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5327: \$? = $ac_status" >&5 -+ echo "$as_me:5390: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gpm_Gpm_Open=yes - else -@@ -5335,10 +5398,10 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:5338: result: $ac_cv_lib_gpm_Gpm_Open" >&5 -+echo "$as_me:5401: result: $ac_cv_lib_gpm_Gpm_Open" >&5 - echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 - if test $ac_cv_lib_gpm_Gpm_Open = yes; then -- echo "$as_me:5341: checking for initscr in -lgpm" >&5 -+ echo "$as_me:5404: checking for initscr in -lgpm" >&5 - echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 - if test "${ac_cv_lib_gpm_initscr+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -5346,7 +5409,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lgpm $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 5349 "configure" -+#line 5412 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -5365,16 +5428,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5368: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5431: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5371: \$? = $ac_status" >&5 -+ echo "$as_me:5434: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5374: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5437: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5377: \$? = $ac_status" >&5 -+ echo "$as_me:5440: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gpm_initscr=yes - else -@@ -5385,7 +5448,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:5388: result: $ac_cv_lib_gpm_initscr" >&5 -+echo "$as_me:5451: result: $ac_cv_lib_gpm_initscr" >&5 - echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 - if test $ac_cv_lib_gpm_initscr = yes; then - LIBS="$cf_ncurses_SAVE" -@@ -5400,7 +5463,7 @@ - # This is only necessary if you are linking against an obsolete - # version of ncurses (but it should do no harm, since it's static). - if test "$cf_nculib_root" = ncurses ; then -- echo "$as_me:5403: checking for tgoto in -lmytinfo" >&5 -+ echo "$as_me:5466: checking for tgoto in -lmytinfo" >&5 - echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 - if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -5408,7 +5471,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lmytinfo $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 5411 "configure" -+#line 5474 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -5427,16 +5490,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5430: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5493: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5433: \$? = $ac_status" >&5 -+ echo "$as_me:5496: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5436: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5499: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5439: \$? = $ac_status" >&5 -+ echo "$as_me:5502: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_mytinfo_tgoto=yes - else -@@ -5447,7 +5510,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:5450: result: $ac_cv_lib_mytinfo_tgoto" >&5 -+echo "$as_me:5513: result: $ac_cv_lib_mytinfo_tgoto" >&5 - echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 - if test $ac_cv_lib_mytinfo_tgoto = yes; then - cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" -@@ -5466,13 +5529,13 @@ - - eval 'cf_cv_have_lib_'$cf_nculib_root'=no' - cf_libdir="" -- echo "$as_me:5469: checking for initscr" >&5 -+ echo "$as_me:5532: checking for initscr" >&5 - echo $ECHO_N "checking for initscr... $ECHO_C" >&6 - if test "${ac_cv_func_initscr+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 5475 "configure" -+#line 5538 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char initscr (); below. */ -@@ -5503,16 +5566,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5506: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5569: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5509: \$? = $ac_status" >&5 -+ echo "$as_me:5572: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5512: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5575: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5515: \$? = $ac_status" >&5 -+ echo "$as_me:5578: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_initscr=yes - else -@@ -5522,18 +5585,18 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:5525: result: $ac_cv_func_initscr" >&5 -+echo "$as_me:5588: result: $ac_cv_func_initscr" >&5 - echo "${ECHO_T}$ac_cv_func_initscr" >&6 - if test $ac_cv_func_initscr = yes; then - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' - else - - cf_save_LIBS="$LIBS" -- echo "$as_me:5532: checking for initscr in -l$cf_nculib_root" >&5 -+ echo "$as_me:5595: checking for initscr in -l$cf_nculib_root" >&5 - echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 - LIBS="-l$cf_nculib_root $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 5536 "configure" -+#line 5599 "configure" - #include "confdefs.h" - #include <${cf_cv_ncurses_header:-curses.h}> - int -@@ -5545,25 +5608,25 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5548: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5611: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5551: \$? = $ac_status" >&5 -+ echo "$as_me:5614: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5554: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5617: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5557: \$? = $ac_status" >&5 -+ echo "$as_me:5620: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- echo "$as_me:5559: result: yes" >&5 -+ echo "$as_me:5622: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' - - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 --echo "$as_me:5566: result: no" >&5 -+echo "$as_me:5629: result: no" >&5 - echo "${ECHO_T}no" >&6 - - cf_search= -@@ -5653,11 +5716,11 @@ - - for cf_libdir in $cf_search - do -- echo "$as_me:5656: checking for -l$cf_nculib_root in $cf_libdir" >&5 -+ echo "$as_me:5719: checking for -l$cf_nculib_root in $cf_libdir" >&5 - echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 - LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 5660 "configure" -+#line 5723 "configure" - #include "confdefs.h" - #include <${cf_cv_ncurses_header:-curses.h}> - int -@@ -5669,25 +5732,25 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5672: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5735: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5675: \$? = $ac_status" >&5 -+ echo "$as_me:5738: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5678: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5741: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5681: \$? = $ac_status" >&5 -+ echo "$as_me:5744: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- echo "$as_me:5683: result: yes" >&5 -+ echo "$as_me:5746: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' - break - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 --echo "$as_me:5690: result: no" >&5 -+echo "$as_me:5753: result: no" >&5 - echo "${ECHO_T}no" >&6 - LIBS="$cf_save_LIBS" - fi -@@ -5702,7 +5765,7 @@ - eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root - - if test $cf_found_library = no ; then -- { { echo "$as_me:5705: error: Cannot link $cf_nculib_root library" >&5 -+ { { echo "$as_me:5768: error: Cannot link $cf_nculib_root library" >&5 - echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -5710,7 +5773,7 @@ - fi - - if test -n "$cf_ncurses_LIBS" ; then -- echo "$as_me:5713: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 -+ echo "$as_me:5776: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 - echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 - cf_ncurses_SAVE="$LIBS" - for p in $cf_ncurses_LIBS ; do -@@ -5720,7 +5783,7 @@ - fi - done - cat >conftest.$ac_ext <<_ACEOF --#line 5723 "configure" -+#line 5786 "configure" - #include "confdefs.h" - #include <${cf_cv_ncurses_header:-curses.h}> - int -@@ -5732,23 +5795,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:5735: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:5798: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:5738: \$? = $ac_status" >&5 -+ echo "$as_me:5801: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:5741: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5804: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5744: \$? = $ac_status" >&5 -+ echo "$as_me:5807: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- echo "$as_me:5746: result: yes" >&5 -+ echo "$as_me:5809: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 --echo "$as_me:5751: result: no" >&5 -+echo "$as_me:5814: result: no" >&5 - echo "${ECHO_T}no" >&6 - LIBS="$cf_ncurses_SAVE" - fi -@@ -5772,7 +5835,7 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:5775: checking for $ac_word" >&5 -+echo "$as_me:5838: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 - if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -5789,7 +5852,7 @@ - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" -- echo "$as_me:5792: found $ac_dir/$ac_word" >&5 -+ echo "$as_me:5855: found $ac_dir/$ac_word" >&5 - break - fi - done -@@ -5800,10 +5863,10 @@ - NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG - - if test -n "$NCURSES_CONFIG"; then -- echo "$as_me:5803: result: $NCURSES_CONFIG" >&5 -+ echo "$as_me:5866: result: $NCURSES_CONFIG" >&5 - echo "${ECHO_T}$NCURSES_CONFIG" >&6 - else -- echo "$as_me:5806: result: no" >&5 -+ echo "$as_me:5869: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -5818,7 +5881,7 @@ - - # even with config script, some packages use no-override for curses.h - --echo "$as_me:5821: checking if we have identified curses headers" >&5 -+echo "$as_me:5884: checking if we have identified curses headers" >&5 - echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6 - if test "${cf_cv_ncurses_header+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -5832,7 +5895,7 @@ - ncurses.h - do - cat >conftest.$ac_ext <<_ACEOF --#line 5835 "configure" -+#line 5898 "configure" - #include "confdefs.h" - #include <${cf_header}> - int -@@ -5844,16 +5907,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:5847: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:5910: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:5850: \$? = $ac_status" >&5 -+ echo "$as_me:5913: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:5853: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:5916: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5856: \$? = $ac_status" >&5 -+ echo "$as_me:5919: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ncurses_header=$cf_header; break - else -@@ -5864,11 +5927,11 @@ - done - - fi --echo "$as_me:5867: result: $cf_cv_ncurses_header" >&5 -+echo "$as_me:5930: result: $cf_cv_ncurses_header" >&5 - echo "${ECHO_T}$cf_cv_ncurses_header" >&6 - - if test "$cf_cv_ncurses_header" = none ; then -- { { echo "$as_me:5871: error: No curses header-files found" >&5 -+ { { echo "$as_me:5934: error: No curses header-files found" >&5 - echo "$as_me: error: No curses header-files found" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -5878,23 +5941,23 @@ - for ac_header in $cf_cv_ncurses_header - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:5881: checking for $ac_header" >&5 -+echo "$as_me:5944: 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 5887 "configure" -+#line 5950 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:5891: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:5954: \"$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:5897: \$? = $ac_status" >&5 -+ echo "$as_me:5960: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -5913,7 +5976,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:5916: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:5979: 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 <conftest.$ac_ext <<_ACEOF --#line 5969 "configure" -+#line 6032 "configure" - #include "confdefs.h" - #include - int -@@ -5978,16 +6041,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:5981: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:6044: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:5984: \$? = $ac_status" >&5 -+ echo "$as_me:6047: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:5987: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6050: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:5990: \$? = $ac_status" >&5 -+ echo "$as_me:6053: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -6004,7 +6067,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:6007: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:6070: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -6021,7 +6084,7 @@ - - } - --echo "$as_me:6024: checking for $cf_ncuhdr_root header in include-path" >&5 -+echo "$as_me:6087: checking for $cf_ncuhdr_root header in include-path" >&5 - echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6 - if test "${cf_cv_ncurses_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -6033,7 +6096,7 @@ - do - - cat >conftest.$ac_ext <<_ACEOF --#line 6036 "configure" -+#line 6099 "configure" - #include "confdefs.h" - - #include <$cf_header> -@@ -6057,16 +6120,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:6060: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:6123: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:6063: \$? = $ac_status" >&5 -+ echo "$as_me:6126: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:6066: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6129: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6069: \$? = $ac_status" >&5 -+ echo "$as_me:6132: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ncurses_h=$cf_header - -@@ -6081,14 +6144,14 @@ - done - - fi --echo "$as_me:6084: result: $cf_cv_ncurses_h" >&5 -+echo "$as_me:6147: result: $cf_cv_ncurses_h" >&5 - echo "${ECHO_T}$cf_cv_ncurses_h" >&6 - - if test "$cf_cv_ncurses_h" != no ; then - cf_cv_ncurses_header=$cf_cv_ncurses_h - else - --echo "$as_me:6091: checking for $cf_ncuhdr_root include-path" >&5 -+echo "$as_me:6154: checking for $cf_ncuhdr_root include-path" >&5 - echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6 - if test "${cf_cv_ncurses_h2+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -6228,7 +6291,7 @@ - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF --#line 6231 "configure" -+#line 6294 "configure" - #include "confdefs.h" - #include - int -@@ -6240,16 +6303,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:6243: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:6306: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:6246: \$? = $ac_status" >&5 -+ echo "$as_me:6309: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:6249: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6312: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6252: \$? = $ac_status" >&5 -+ echo "$as_me:6315: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -6266,7 +6329,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:6269: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:6332: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -6287,7 +6350,7 @@ - do - - cat >conftest.$ac_ext <<_ACEOF --#line 6290 "configure" -+#line 6353 "configure" - #include "confdefs.h" - - #include <$cf_header> -@@ -6311,16 +6374,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:6314: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:6377: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:6317: \$? = $ac_status" >&5 -+ echo "$as_me:6380: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:6320: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6383: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6323: \$? = $ac_status" >&5 -+ echo "$as_me:6386: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ncurses_h2=$cf_header - -@@ -6341,12 +6404,12 @@ - CPPFLAGS="$cf_save2_CPPFLAGS" - test "$cf_cv_ncurses_h2" != no && break - done -- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6344: error: not found" >&5 -+ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6407: error: not found" >&5 - echo "$as_me: error: not found" >&2;} - { (exit 1); exit 1; }; } - - fi --echo "$as_me:6349: result: $cf_cv_ncurses_h2" >&5 -+echo "$as_me:6412: result: $cf_cv_ncurses_h2" >&5 - echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 - - cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` -@@ -6379,7 +6442,7 @@ - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF --#line 6382 "configure" -+#line 6445 "configure" - #include "confdefs.h" - #include - int -@@ -6391,16 +6454,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:6394: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:6457: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:6397: \$? = $ac_status" >&5 -+ echo "$as_me:6460: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:6400: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6463: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6403: \$? = $ac_status" >&5 -+ echo "$as_me:6466: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -6417,7 +6480,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:6420: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:6483: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -6460,7 +6523,7 @@ - ;; - esac - --echo "$as_me:6463: checking for terminfo header" >&5 -+echo "$as_me:6526: checking for terminfo header" >&5 - echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6 - if test "${cf_cv_term_header+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -6478,7 +6541,7 @@ - for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" - do - cat >conftest.$ac_ext <<_ACEOF --#line 6481 "configure" -+#line 6544 "configure" - #include "confdefs.h" - #include - #include <${cf_cv_ncurses_header:-curses.h}> -@@ -6493,16 +6556,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:6496: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:6559: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:6499: \$? = $ac_status" >&5 -+ echo "$as_me:6562: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:6502: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6565: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6505: \$? = $ac_status" >&5 -+ echo "$as_me:6568: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_term_header="$cf_test" -@@ -6518,7 +6581,7 @@ - done - - fi --echo "$as_me:6521: result: $cf_cv_term_header" >&5 -+echo "$as_me:6584: result: $cf_cv_term_header" >&5 - echo "${ECHO_T}$cf_cv_term_header" >&6 - - # Set definitions to allow ifdef'ing to accommodate subdirectories -@@ -6552,7 +6615,7 @@ - #define NCURSES 1 - EOF - --echo "$as_me:6555: checking for ncurses version" >&5 -+echo "$as_me:6618: checking for ncurses version" >&5 - echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6 - if test "${cf_cv_ncurses_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -6578,10 +6641,10 @@ - #endif - EOF - cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" -- { (eval echo "$as_me:6581: \"$cf_try\"") >&5 -+ { (eval echo "$as_me:6644: \"$cf_try\"") >&5 - (eval $cf_try) 2>&5 - ac_status=$? -- echo "$as_me:6584: \$? = $ac_status" >&5 -+ echo "$as_me:6647: \$? = $ac_status" >&5 - (exit $ac_status); } - if test -f conftest.out ; then - cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` -@@ -6591,7 +6654,7 @@ - - else - cat >conftest.$ac_ext <<_ACEOF --#line 6594 "configure" -+#line 6657 "configure" - #include "confdefs.h" - - #include <${cf_cv_ncurses_header:-curses.h}> -@@ -6616,15 +6679,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:6619: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:6682: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:6622: \$? = $ac_status" >&5 -+ echo "$as_me:6685: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:6624: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6687: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6627: \$? = $ac_status" >&5 -+ echo "$as_me:6690: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_ncurses_version=`cat $cf_tempfile` -@@ -6638,7 +6701,7 @@ - rm -f $cf_tempfile - - fi --echo "$as_me:6641: result: $cf_cv_ncurses_version" >&5 -+echo "$as_me:6704: result: $cf_cv_ncurses_version" >&5 - echo "${ECHO_T}$cf_cv_ncurses_version" >&6 - test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF - #define NCURSES 1 -@@ -6650,7 +6713,7 @@ - # to link gpm. - cf_ncurses_LIBS="" - cf_ncurses_SAVE="$LIBS" --echo "$as_me:6653: checking for Gpm_Open in -lgpm" >&5 -+echo "$as_me:6716: checking for Gpm_Open in -lgpm" >&5 - echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6 - if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -6658,7 +6721,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lgpm $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 6661 "configure" -+#line 6724 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -6677,16 +6740,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:6680: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:6743: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:6683: \$? = $ac_status" >&5 -+ echo "$as_me:6746: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:6686: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6749: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6689: \$? = $ac_status" >&5 -+ echo "$as_me:6752: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gpm_Gpm_Open=yes - else -@@ -6697,10 +6760,10 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:6700: result: $ac_cv_lib_gpm_Gpm_Open" >&5 -+echo "$as_me:6763: result: $ac_cv_lib_gpm_Gpm_Open" >&5 - echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6 - if test $ac_cv_lib_gpm_Gpm_Open = yes; then -- echo "$as_me:6703: checking for initscr in -lgpm" >&5 -+ echo "$as_me:6766: checking for initscr in -lgpm" >&5 - echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6 - if test "${ac_cv_lib_gpm_initscr+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -6708,7 +6771,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lgpm $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 6711 "configure" -+#line 6774 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -6727,16 +6790,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:6730: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:6793: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:6733: \$? = $ac_status" >&5 -+ echo "$as_me:6796: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:6736: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6799: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6739: \$? = $ac_status" >&5 -+ echo "$as_me:6802: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gpm_initscr=yes - else -@@ -6747,7 +6810,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:6750: result: $ac_cv_lib_gpm_initscr" >&5 -+echo "$as_me:6813: result: $ac_cv_lib_gpm_initscr" >&5 - echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6 - if test $ac_cv_lib_gpm_initscr = yes; then - LIBS="$cf_ncurses_SAVE" -@@ -6762,7 +6825,7 @@ - # This is only necessary if you are linking against an obsolete - # version of ncurses (but it should do no harm, since it's static). - if test "$cf_nculib_root" = ncurses ; then -- echo "$as_me:6765: checking for tgoto in -lmytinfo" >&5 -+ echo "$as_me:6828: checking for tgoto in -lmytinfo" >&5 - echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6 - if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -6770,7 +6833,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lmytinfo $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 6773 "configure" -+#line 6836 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -6789,16 +6852,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:6792: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:6855: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:6795: \$? = $ac_status" >&5 -+ echo "$as_me:6858: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:6798: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6861: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6801: \$? = $ac_status" >&5 -+ echo "$as_me:6864: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_mytinfo_tgoto=yes - else -@@ -6809,7 +6872,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:6812: result: $ac_cv_lib_mytinfo_tgoto" >&5 -+echo "$as_me:6875: result: $ac_cv_lib_mytinfo_tgoto" >&5 - echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 - if test $ac_cv_lib_mytinfo_tgoto = yes; then - cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" -@@ -6828,13 +6891,13 @@ - - eval 'cf_cv_have_lib_'$cf_nculib_root'=no' - cf_libdir="" -- echo "$as_me:6831: checking for initscr" >&5 -+ echo "$as_me:6894: checking for initscr" >&5 - echo $ECHO_N "checking for initscr... $ECHO_C" >&6 - if test "${ac_cv_func_initscr+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 6837 "configure" -+#line 6900 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char initscr (); below. */ -@@ -6865,16 +6928,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:6868: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:6931: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:6871: \$? = $ac_status" >&5 -+ echo "$as_me:6934: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:6874: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6937: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6877: \$? = $ac_status" >&5 -+ echo "$as_me:6940: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_initscr=yes - else -@@ -6884,18 +6947,18 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:6887: result: $ac_cv_func_initscr" >&5 -+echo "$as_me:6950: result: $ac_cv_func_initscr" >&5 - echo "${ECHO_T}$ac_cv_func_initscr" >&6 - if test $ac_cv_func_initscr = yes; then - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' - else - - cf_save_LIBS="$LIBS" -- echo "$as_me:6894: checking for initscr in -l$cf_nculib_root" >&5 -+ echo "$as_me:6957: checking for initscr in -l$cf_nculib_root" >&5 - echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6 - LIBS="-l$cf_nculib_root $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 6898 "configure" -+#line 6961 "configure" - #include "confdefs.h" - #include <${cf_cv_ncurses_header:-curses.h}> - int -@@ -6907,25 +6970,25 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:6910: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:6973: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:6913: \$? = $ac_status" >&5 -+ echo "$as_me:6976: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:6916: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:6979: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:6919: \$? = $ac_status" >&5 -+ echo "$as_me:6982: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- echo "$as_me:6921: result: yes" >&5 -+ echo "$as_me:6984: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' - - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 --echo "$as_me:6928: result: no" >&5 -+echo "$as_me:6991: result: no" >&5 - echo "${ECHO_T}no" >&6 - - cf_search= -@@ -7015,11 +7078,11 @@ - - for cf_libdir in $cf_search - do -- echo "$as_me:7018: checking for -l$cf_nculib_root in $cf_libdir" >&5 -+ echo "$as_me:7081: checking for -l$cf_nculib_root in $cf_libdir" >&5 - echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6 - LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 7022 "configure" -+#line 7085 "configure" - #include "confdefs.h" - #include <${cf_cv_ncurses_header:-curses.h}> - int -@@ -7031,25 +7094,25 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:7034: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:7097: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:7037: \$? = $ac_status" >&5 -+ echo "$as_me:7100: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:7040: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7103: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7043: \$? = $ac_status" >&5 -+ echo "$as_me:7106: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- echo "$as_me:7045: result: yes" >&5 -+ echo "$as_me:7108: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' - break - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 --echo "$as_me:7052: result: no" >&5 -+echo "$as_me:7115: result: no" >&5 - echo "${ECHO_T}no" >&6 - LIBS="$cf_save_LIBS" - fi -@@ -7064,7 +7127,7 @@ - eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root - - if test $cf_found_library = no ; then -- { { echo "$as_me:7067: error: Cannot link $cf_nculib_root library" >&5 -+ { { echo "$as_me:7130: error: Cannot link $cf_nculib_root library" >&5 - echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -7072,7 +7135,7 @@ - fi - - if test -n "$cf_ncurses_LIBS" ; then -- echo "$as_me:7075: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 -+ echo "$as_me:7138: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 - echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6 - cf_ncurses_SAVE="$LIBS" - for p in $cf_ncurses_LIBS ; do -@@ -7082,7 +7145,7 @@ - fi - done - cat >conftest.$ac_ext <<_ACEOF --#line 7085 "configure" -+#line 7148 "configure" - #include "confdefs.h" - #include <${cf_cv_ncurses_header:-curses.h}> - int -@@ -7094,23 +7157,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:7097: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:7160: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:7100: \$? = $ac_status" >&5 -+ echo "$as_me:7163: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:7103: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7166: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7106: \$? = $ac_status" >&5 -+ echo "$as_me:7169: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- echo "$as_me:7108: result: yes" >&5 -+ echo "$as_me:7171: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 --echo "$as_me:7113: result: no" >&5 -+echo "$as_me:7176: result: no" >&5 - echo "${ECHO_T}no" >&6 - LIBS="$cf_ncurses_SAVE" - fi -@@ -7132,8 +7195,8 @@ - cf_version=`$NCURSES_CONFIG --version` - - NCURSES_MAJOR=`echo "$cf_version" | sed -e 's/\..*//'` --NCURSES_MINOR=`echo "$cf_version" | sed -e 's/^[0-9]\+\.//' -e 's/\..*//'` --NCURSES_PATCH=`echo "$cf_version" | sed -e 's/^[0-9]\+\.[0-9]\+\.//'` -+NCURSES_MINOR=`echo "$cf_version" | sed -e 's/^[0-9][0-9]*\.//' -e 's/\..*//'` -+NCURSES_PATCH=`echo "$cf_version" | sed -e 's/^[0-9][0-9]*\.[0-9][0-9]*\.//'` - - # ABI version is not available from headers - cf_cv_abi_version=`$NCURSES_CONFIG --abi-version` -@@ -7147,16 +7210,16 @@ - AUTOCONF_$cf_name NCURSES_VERSION_$cf_name - CF_EOF - cf_try="$ac_cpp conftest.$ac_ext 2>&5 | fgrep AUTOCONF_$cf_name >conftest.out" -- { (eval echo "$as_me:7150: \"$cf_try\"") >&5 -+ { (eval echo "$as_me:7213: \"$cf_try\"") >&5 - (eval $cf_try) 2>&5 - ac_status=$? -- echo "$as_me:7153: \$? = $ac_status" >&5 -+ echo "$as_me:7216: \$? = $ac_status" >&5 - (exit $ac_status); } - if test -f conftest.out ; then -- cf_result=`cat conftest.out | sed -e "s/^.*AUTOCONF_$cf_name[ ]\+//"` -- eval NCURSES_$cf_name=$cf_result -- cat conftest.$ac_ext -- cat conftest.out -+ cf_result=`cat conftest.out | sed -e "s/^.*AUTOCONF_$cf_name[ ][ ]*//"` -+ eval NCURSES_$cf_name=\"$cf_result\" -+ # cat conftest.$ac_ext -+ # cat conftest.out - fi - done - -@@ -7168,7 +7231,7 @@ - - cf_cv_timestamp=`date` - --echo "$as_me:7171: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 -+echo "$as_me:7234: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 - echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 - - case $cf_cv_system_name in #(vi -@@ -7191,7 +7254,7 @@ - test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT='' - fi - --echo "$as_me:7194: checking for default loader flags" >&5 -+echo "$as_me:7257: checking for default loader flags" >&5 - echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 - case $DFT_LWR_MODEL in - normal) LD_MODEL='' ;; -@@ -7199,11 +7262,11 @@ - profile) LD_MODEL='-pg';; - shared) LD_MODEL='' ;; - esac --echo "$as_me:7202: result: $LD_MODEL" >&5 -+echo "$as_me:7265: result: $LD_MODEL" >&5 - echo "${ECHO_T}$LD_MODEL" >&6 - - LD_RPATH_OPT= --echo "$as_me:7206: checking for an rpath option" >&5 -+echo "$as_me:7269: checking for an rpath option" >&5 - echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 - case $cf_cv_system_name in #(vi - irix*) #(vi -@@ -7234,17 +7297,17 @@ - *) - ;; - esac --echo "$as_me:7237: result: $LD_RPATH_OPT" >&5 -+echo "$as_me:7300: result: $LD_RPATH_OPT" >&5 - echo "${ECHO_T}$LD_RPATH_OPT" >&6 - - case "x$LD_RPATH_OPT" in #(vi - x-R*) -- echo "$as_me:7242: checking if we need a space after rpath option" >&5 -+ echo "$as_me:7305: checking if we need a space after rpath option" >&5 - echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 - cf_save_LIBS="$LIBS" - LIBS="${LD_RPATH_OPT}$libdir $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 7247 "configure" -+#line 7310 "configure" - #include "confdefs.h" - - int -@@ -7256,16 +7319,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:7259: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:7322: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:7262: \$? = $ac_status" >&5 -+ echo "$as_me:7325: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:7265: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7328: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7268: \$? = $ac_status" >&5 -+ echo "$as_me:7331: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_rpath_space=no - else -@@ -7275,7 +7338,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS="$cf_save_LIBS" -- echo "$as_me:7278: result: $cf_rpath_space" >&5 -+ echo "$as_me:7341: result: $cf_rpath_space" >&5 - echo "${ECHO_T}$cf_rpath_space" >&6 - test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " - ;; -@@ -7290,7 +7353,7 @@ - cf_ld_rpath_opt= - test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" - -- echo "$as_me:7293: checking if release/abi version should be used for shared libs" >&5 -+ echo "$as_me:7356: checking if release/abi version should be used for shared libs" >&5 - echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 - - # Check whether --with-shlib-version or --without-shlib-version was given. -@@ -7305,7 +7368,7 @@ - cf_cv_shlib_version=$withval - ;; - *) -- { { echo "$as_me:7308: error: option value must be one of: rel, abi, auto or no" >&5 -+ { { echo "$as_me:7371: error: option value must be one of: rel, abi, auto or no" >&5 - echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -7314,7 +7377,7 @@ - else - cf_cv_shlib_version=auto - fi; -- echo "$as_me:7317: result: $cf_cv_shlib_version" >&5 -+ echo "$as_me:7380: result: $cf_cv_shlib_version" >&5 - echo "${ECHO_T}$cf_cv_shlib_version" >&6 - - cf_cv_rm_so_locs=no -@@ -7323,14 +7386,14 @@ - CC_SHARED_OPTS= - if test "$GCC" = yes - then -- echo "$as_me:7326: checking which $CC option to use" >&5 -+ echo "$as_me:7389: checking which $CC option to use" >&5 - echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 - cf_save_CFLAGS="$CFLAGS" - for CC_SHARED_OPTS in -fPIC -fpic '' - do - CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" - cat >conftest.$ac_ext <<_ACEOF --#line 7333 "configure" -+#line 7396 "configure" - #include "confdefs.h" - #include - int -@@ -7342,16 +7405,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:7345: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:7408: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:7348: \$? = $ac_status" >&5 -+ echo "$as_me:7411: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:7351: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7414: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7354: \$? = $ac_status" >&5 -+ echo "$as_me:7417: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -7360,7 +7423,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - done -- echo "$as_me:7363: result: $CC_SHARED_OPTS" >&5 -+ echo "$as_me:7426: result: $CC_SHARED_OPTS" >&5 - echo "${ECHO_T}$CC_SHARED_OPTS" >&6 - CFLAGS="$cf_save_CFLAGS" - fi -@@ -7402,7 +7465,7 @@ - MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' - test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi - cf_cv_shlib_version_infix=yes -- echo "$as_me:7405: checking if ld -search_paths_first works" >&5 -+ echo "$as_me:7468: checking if ld -search_paths_first works" >&5 - echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 - if test "${cf_cv_ldflags_search_paths_first+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -7411,7 +7474,7 @@ - cf_save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -Wl,-search_paths_first" - cat >conftest.$ac_ext <<_ACEOF --#line 7414 "configure" -+#line 7477 "configure" - #include "confdefs.h" - - int -@@ -7423,16 +7486,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:7426: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:7489: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:7429: \$? = $ac_status" >&5 -+ echo "$as_me:7492: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:7432: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7495: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7435: \$? = $ac_status" >&5 -+ echo "$as_me:7498: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ldflags_search_paths_first=yes - else -@@ -7443,7 +7506,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$cf_save_LDFLAGS - fi --echo "$as_me:7446: result: $cf_cv_ldflags_search_paths_first" >&5 -+echo "$as_me:7509: result: $cf_cv_ldflags_search_paths_first" >&5 - echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 - if test $cf_cv_ldflags_search_paths_first = yes; then - LDFLAGS="$LDFLAGS -Wl,-search_paths_first" -@@ -7623,7 +7686,7 @@ - do - CFLAGS="$cf_shared_opts $cf_save_CFLAGS" - cat >conftest.$ac_ext <<_ACEOF --#line 7626 "configure" -+#line 7689 "configure" - #include "confdefs.h" - #include - int -@@ -7635,16 +7698,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:7638: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:7701: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:7641: \$? = $ac_status" >&5 -+ echo "$as_me:7704: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:7644: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7707: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7647: \$? = $ac_status" >&5 -+ echo "$as_me:7710: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -7681,7 +7744,7 @@ - test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes - ;; - *) -- { echo "$as_me:7684: WARNING: ignored --with-shlib-version" >&5 -+ { echo "$as_me:7747: WARNING: ignored --with-shlib-version" >&5 - echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} - ;; - esac -@@ -7692,6 +7755,29 @@ - MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}" - fi - -+# The test/sample programs in the original tree link using rpath option. -+# Make it optional for packagers. -+if test -n "$LOCAL_LDFLAGS" -+then -+ echo "$as_me:7762: checking if you want to link sample programs with rpath option" >&5 -+echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6 -+ -+# Check whether --enable-rpath-link or --disable-rpath-link was given. -+if test "${enable_rpath_link+set}" = set; then -+ enableval="$enable_rpath_link" -+ with_rpath_link=$enableval -+else -+ with_rpath_link=yes -+fi; -+ echo "$as_me:7772: result: $with_rpath_link" >&5 -+echo "${ECHO_T}$with_rpath_link" >&6 -+ if test "$with_rpath_link" = no -+ then -+ LOCAL_LDFLAGS= -+ LOCAL_LDFLAGS2= -+ fi -+fi -+ - ############################################################################### - - case $cf_cv_system_name in -@@ -7700,7 +7786,7 @@ - esac - - ### use option --enable-broken-linker to force on use of broken-linker support --echo "$as_me:7703: checking if you want broken-linker support code" >&5 -+echo "$as_me:7789: checking if you want broken-linker support code" >&5 - echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 - - # Check whether --enable-broken_linker or --disable-broken_linker was given. -@@ -7710,7 +7796,7 @@ - else - with_broken_linker=${BROKEN_LINKER:-no} - fi; --echo "$as_me:7713: result: $with_broken_linker" >&5 -+echo "$as_me:7799: result: $with_broken_linker" >&5 - echo "${ECHO_T}$with_broken_linker" >&6 - - BROKEN_LINKER=0 -@@ -7730,7 +7816,7 @@ - BROKEN_LINKER=1 - test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 - --echo "${as_me:-configure}:7733: testing cygwin linker is broken anyway ..." 1>&5 -+echo "${as_me:-configure}:7819: testing cygwin linker is broken anyway ..." 1>&5 - - ;; - esac -@@ -7746,6 +7832,9 @@ - aix[456]*) #(vi - cf_xopen_source="-D_ALL_SOURCE" - ;; -+cygwin) #(vi -+ cf_XOPEN_SOURCE=600 -+ ;; - darwin[0-8].*) #(vi - cf_xopen_source="-D_APPLE_C_SOURCE" - ;; -@@ -7771,14 +7860,14 @@ - ;; - linux*|gnu*|mint*|k*bsd*-gnu) #(vi - --echo "$as_me:7774: checking if we must define _GNU_SOURCE" >&5 -+echo "$as_me:7863: checking if we must define _GNU_SOURCE" >&5 - echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 - if test "${cf_cv_gnu_source+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 7781 "configure" -+#line 7870 "configure" - #include "confdefs.h" - #include - int -@@ -7793,16 +7882,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:7796: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:7885: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:7799: \$? = $ac_status" >&5 -+ echo "$as_me:7888: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:7802: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7891: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7805: \$? = $ac_status" >&5 -+ echo "$as_me:7894: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_gnu_source=no - else -@@ -7811,7 +7900,7 @@ - cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - cat >conftest.$ac_ext <<_ACEOF --#line 7814 "configure" -+#line 7903 "configure" - #include "confdefs.h" - #include - int -@@ -7826,16 +7915,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:7829: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:7918: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:7832: \$? = $ac_status" >&5 -+ echo "$as_me:7921: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:7835: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:7924: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7838: \$? = $ac_status" >&5 -+ echo "$as_me:7927: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_gnu_source=no - else -@@ -7850,7 +7939,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:7853: result: $cf_cv_gnu_source" >&5 -+echo "$as_me:7942: result: $cf_cv_gnu_source" >&5 - echo "${ECHO_T}$cf_cv_gnu_source" >&6 - test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - -@@ -7880,14 +7969,14 @@ - cf_xopen_source="-D__EXTENSIONS__" - ;; - *) -- echo "$as_me:7883: checking if we should define _XOPEN_SOURCE" >&5 -+ echo "$as_me:7972: checking if we should define _XOPEN_SOURCE" >&5 - echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6 - if test "${cf_cv_xopen_source+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 7890 "configure" -+#line 7979 "configure" - #include "confdefs.h" - #include - int -@@ -7902,16 +7991,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:7905: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:7994: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:7908: \$? = $ac_status" >&5 -+ echo "$as_me:7997: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:7911: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8000: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7914: \$? = $ac_status" >&5 -+ echo "$as_me:8003: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_xopen_source=no - else -@@ -7920,7 +8009,7 @@ - cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - cat >conftest.$ac_ext <<_ACEOF --#line 7923 "configure" -+#line 8012 "configure" - #include "confdefs.h" - #include - int -@@ -7935,16 +8024,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:7938: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8027: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:7941: \$? = $ac_status" >&5 -+ echo "$as_me:8030: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:7944: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8033: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:7947: \$? = $ac_status" >&5 -+ echo "$as_me:8036: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_xopen_source=no - else -@@ -7959,7 +8048,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:7962: result: $cf_cv_xopen_source" >&5 -+echo "$as_me:8051: result: $cf_cv_xopen_source" >&5 - echo "${ECHO_T}$cf_cv_xopen_source" >&6 - if test "$cf_cv_xopen_source" != no ; then - -@@ -8066,16 +8155,16 @@ - sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` - --echo "$as_me:8069: checking if we should define _POSIX_C_SOURCE" >&5 -+echo "$as_me:8158: checking if we should define _POSIX_C_SOURCE" >&5 - echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 - if test "${cf_cv_posix_c_source+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - --echo "${as_me:-configure}:8075: testing if the symbol is already defined go no further ..." 1>&5 -+echo "${as_me:-configure}:8164: testing if the symbol is already defined go no further ..." 1>&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 8078 "configure" -+#line 8167 "configure" - #include "confdefs.h" - #include - int -@@ -8090,16 +8179,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8093: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8182: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8096: \$? = $ac_status" >&5 -+ echo "$as_me:8185: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8099: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8188: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8102: \$? = $ac_status" >&5 -+ echo "$as_me:8191: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_posix_c_source=no - else -@@ -8120,7 +8209,7 @@ - esac - if test "$cf_want_posix_source" = yes ; then - cat >conftest.$ac_ext <<_ACEOF --#line 8123 "configure" -+#line 8212 "configure" - #include "confdefs.h" - #include - int -@@ -8135,16 +8224,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8138: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8227: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8141: \$? = $ac_status" >&5 -+ echo "$as_me:8230: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8144: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8233: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8147: \$? = $ac_status" >&5 -+ echo "$as_me:8236: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -8155,15 +8244,15 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - fi - --echo "${as_me:-configure}:8158: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 -+echo "${as_me:-configure}:8247: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 - - CFLAGS="$cf_trim_CFLAGS" - CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" - --echo "${as_me:-configure}:8163: testing if the second compile does not leave our definition intact error ..." 1>&5 -+echo "${as_me:-configure}:8252: testing if the second compile does not leave our definition intact error ..." 1>&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 8166 "configure" -+#line 8255 "configure" - #include "confdefs.h" - #include - int -@@ -8178,16 +8267,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8181: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8270: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8184: \$? = $ac_status" >&5 -+ echo "$as_me:8273: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8187: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8276: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8190: \$? = $ac_status" >&5 -+ echo "$as_me:8279: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -8203,7 +8292,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:8206: result: $cf_cv_posix_c_source" >&5 -+echo "$as_me:8295: result: $cf_cv_posix_c_source" >&5 - echo "${ECHO_T}$cf_cv_posix_c_source" >&6 - - if test "$cf_cv_posix_c_source" != no ; then -@@ -8382,7 +8471,7 @@ - fi; - if test "$enable_largefile" != no; then - -- echo "$as_me:8385: checking for special C compiler options needed for large files" >&5 -+ echo "$as_me:8474: checking for special C compiler options needed for large files" >&5 - echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 - if test "${ac_cv_sys_largefile_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -8394,7 +8483,7 @@ - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. - cat >conftest.$ac_ext <<_ACEOF --#line 8397 "configure" -+#line 8486 "configure" - #include "confdefs.h" - #include - /* Check that off_t can represent 2**63 - 1 correctly. -@@ -8414,16 +8503,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8417: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8506: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8420: \$? = $ac_status" >&5 -+ echo "$as_me:8509: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8423: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8512: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8426: \$? = $ac_status" >&5 -+ echo "$as_me:8515: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -8433,16 +8522,16 @@ - rm -f conftest.$ac_objext - CC="$CC -n32" - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8436: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8525: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8439: \$? = $ac_status" >&5 -+ echo "$as_me:8528: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8442: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8531: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8445: \$? = $ac_status" >&5 -+ echo "$as_me:8534: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sys_largefile_CC=' -n32'; break - else -@@ -8456,13 +8545,13 @@ - rm -f conftest.$ac_ext - fi - fi --echo "$as_me:8459: result: $ac_cv_sys_largefile_CC" >&5 -+echo "$as_me:8548: result: $ac_cv_sys_largefile_CC" >&5 - echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 - if test "$ac_cv_sys_largefile_CC" != no; then - CC=$CC$ac_cv_sys_largefile_CC - fi - -- echo "$as_me:8465: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -+ echo "$as_me:8554: checking for _FILE_OFFSET_BITS value needed for large files" >&5 - echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 - if test "${ac_cv_sys_file_offset_bits+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -8470,7 +8559,7 @@ - while :; do - ac_cv_sys_file_offset_bits=no - cat >conftest.$ac_ext <<_ACEOF --#line 8473 "configure" -+#line 8562 "configure" - #include "confdefs.h" - #include - /* Check that off_t can represent 2**63 - 1 correctly. -@@ -8490,16 +8579,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8493: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8582: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8496: \$? = $ac_status" >&5 -+ echo "$as_me:8585: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8499: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8588: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8502: \$? = $ac_status" >&5 -+ echo "$as_me:8591: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -8508,7 +8597,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF --#line 8511 "configure" -+#line 8600 "configure" - #include "confdefs.h" - #define _FILE_OFFSET_BITS 64 - #include -@@ -8529,16 +8618,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8532: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8621: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8535: \$? = $ac_status" >&5 -+ echo "$as_me:8624: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8538: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8627: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8541: \$? = $ac_status" >&5 -+ echo "$as_me:8630: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sys_file_offset_bits=64; break - else -@@ -8549,7 +8638,7 @@ - break - done - fi --echo "$as_me:8552: result: $ac_cv_sys_file_offset_bits" >&5 -+echo "$as_me:8641: result: $ac_cv_sys_file_offset_bits" >&5 - echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 - if test "$ac_cv_sys_file_offset_bits" != no; then - -@@ -8559,7 +8648,7 @@ - - fi - rm -rf conftest* -- echo "$as_me:8562: checking for _LARGE_FILES value needed for large files" >&5 -+ echo "$as_me:8651: checking for _LARGE_FILES value needed for large files" >&5 - echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 - if test "${ac_cv_sys_large_files+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -8567,7 +8656,7 @@ - while :; do - ac_cv_sys_large_files=no - cat >conftest.$ac_ext <<_ACEOF --#line 8570 "configure" -+#line 8659 "configure" - #include "confdefs.h" - #include - /* Check that off_t can represent 2**63 - 1 correctly. -@@ -8587,16 +8676,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8590: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8679: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8593: \$? = $ac_status" >&5 -+ echo "$as_me:8682: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8596: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8685: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8599: \$? = $ac_status" >&5 -+ echo "$as_me:8688: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -8605,7 +8694,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF --#line 8608 "configure" -+#line 8697 "configure" - #include "confdefs.h" - #define _LARGE_FILES 1 - #include -@@ -8626,16 +8715,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8629: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8718: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8632: \$? = $ac_status" >&5 -+ echo "$as_me:8721: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8635: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8724: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8638: \$? = $ac_status" >&5 -+ echo "$as_me:8727: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sys_large_files=1; break - else -@@ -8646,7 +8735,7 @@ - break - done - fi --echo "$as_me:8649: result: $ac_cv_sys_large_files" >&5 -+echo "$as_me:8738: result: $ac_cv_sys_large_files" >&5 - echo "${ECHO_T}$ac_cv_sys_large_files" >&6 - if test "$ac_cv_sys_large_files" != no; then - -@@ -8659,7 +8748,7 @@ - fi - - if test "$enable_largefile" != no ; then -- echo "$as_me:8662: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -+ echo "$as_me:8751: checking for _LARGEFILE_SOURCE value needed for large files" >&5 - echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 - if test "${ac_cv_sys_largefile_source+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -8667,7 +8756,7 @@ - while :; do - ac_cv_sys_largefile_source=no - cat >conftest.$ac_ext <<_ACEOF --#line 8670 "configure" -+#line 8759 "configure" - #include "confdefs.h" - #include - int -@@ -8679,16 +8768,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8682: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8771: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8685: \$? = $ac_status" >&5 -+ echo "$as_me:8774: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8688: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8777: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8691: \$? = $ac_status" >&5 -+ echo "$as_me:8780: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break - else -@@ -8697,7 +8786,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF --#line 8700 "configure" -+#line 8789 "configure" - #include "confdefs.h" - #define _LARGEFILE_SOURCE 1 - #include -@@ -8710,16 +8799,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8713: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8802: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8716: \$? = $ac_status" >&5 -+ echo "$as_me:8805: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8719: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8808: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8722: \$? = $ac_status" >&5 -+ echo "$as_me:8811: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sys_largefile_source=1; break - else -@@ -8730,7 +8819,7 @@ - break - done - fi --echo "$as_me:8733: result: $ac_cv_sys_largefile_source" >&5 -+echo "$as_me:8822: result: $ac_cv_sys_largefile_source" >&5 - echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 - if test "$ac_cv_sys_largefile_source" != no; then - -@@ -8744,13 +8833,13 @@ - # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug - # in glibc 2.1.3, but that breaks too many other things. - # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. --echo "$as_me:8747: checking for fseeko" >&5 -+echo "$as_me:8836: checking for fseeko" >&5 - echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 - if test "${ac_cv_func_fseeko+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 8753 "configure" -+#line 8842 "configure" - #include "confdefs.h" - #include - int -@@ -8762,16 +8851,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:8765: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:8854: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:8768: \$? = $ac_status" >&5 -+ echo "$as_me:8857: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:8771: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8860: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8774: \$? = $ac_status" >&5 -+ echo "$as_me:8863: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_fseeko=yes - else -@@ -8781,7 +8870,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:8784: result: $ac_cv_func_fseeko" >&5 -+echo "$as_me:8873: result: $ac_cv_func_fseeko" >&5 - echo "${ECHO_T}$ac_cv_func_fseeko" >&6 - if test $ac_cv_func_fseeko = yes; then - -@@ -8802,14 +8891,14 @@ - test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE " - test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits " - -- echo "$as_me:8805: checking whether to use struct dirent64" >&5 -+ echo "$as_me:8894: checking whether to use struct dirent64" >&5 - echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 - if test "${cf_cv_struct_dirent64+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 8812 "configure" -+#line 8901 "configure" - #include "confdefs.h" - - #include -@@ -8830,16 +8919,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:8833: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:8922: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:8836: \$? = $ac_status" >&5 -+ echo "$as_me:8925: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:8839: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:8928: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:8842: \$? = $ac_status" >&5 -+ echo "$as_me:8931: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_struct_dirent64=yes - else -@@ -8850,7 +8939,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:8853: result: $cf_cv_struct_dirent64" >&5 -+echo "$as_me:8942: result: $cf_cv_struct_dirent64" >&5 - echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 - test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF - #define HAVE_STRUCT_DIRENT64 1 -@@ -8859,7 +8948,7 @@ - fi - - ### Enable compiling-in rcs id's --echo "$as_me:8862: checking if RCS identifiers should be compiled-in" >&5 -+echo "$as_me:8951: checking if RCS identifiers should be compiled-in" >&5 - echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 - - # Check whether --with-rcs-ids or --without-rcs-ids was given. -@@ -8869,7 +8958,7 @@ - else - with_rcs_ids=no - fi; --echo "$as_me:8872: result: $with_rcs_ids" >&5 -+echo "$as_me:8961: result: $with_rcs_ids" >&5 - echo "${ECHO_T}$with_rcs_ids" >&6 - test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF - #define USE_RCS_IDS 1 -@@ -8878,7 +8967,7 @@ - ############################################################################### - - ### Note that some functions (such as const) are normally disabled anyway. --echo "$as_me:8881: checking if you want to build with function extensions" >&5 -+echo "$as_me:8970: checking if you want to build with function extensions" >&5 - echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 - - # Check whether --enable-ext-funcs or --disable-ext-funcs was given. -@@ -8888,7 +8977,7 @@ - else - with_ext_funcs=yes - fi; --echo "$as_me:8891: result: $with_ext_funcs" >&5 -+echo "$as_me:8980: result: $with_ext_funcs" >&5 - echo "${ECHO_T}$with_ext_funcs" >&6 - if test "$with_ext_funcs" = yes ; then - NCURSES_EXT_FUNCS=1 -@@ -8905,7 +8994,7 @@ - fi - - ### use option --enable-const to turn on use of const beyond that in XSI. --echo "$as_me:8908: checking for extended use of const keyword" >&5 -+echo "$as_me:8997: checking for extended use of const keyword" >&5 - echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 - - # Check whether --enable-const or --disable-const was given. -@@ -8915,7 +9004,7 @@ - else - with_ext_const=no - fi; --echo "$as_me:8918: result: $with_ext_const" >&5 -+echo "$as_me:9007: result: $with_ext_const" >&5 - echo "${ECHO_T}$with_ext_const" >&6 - NCURSES_CONST='/*nothing*/' - if test "$with_ext_const" = yes ; then -@@ -8925,7 +9014,7 @@ - ############################################################################### - # These options are relatively safe to experiment with. - --echo "$as_me:8928: checking if you want all development code" >&5 -+echo "$as_me:9017: checking if you want all development code" >&5 - echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 - - # Check whether --with-develop or --without-develop was given. -@@ -8935,7 +9024,7 @@ - else - with_develop=no - fi; --echo "$as_me:8938: result: $with_develop" >&5 -+echo "$as_me:9027: result: $with_develop" >&5 - echo "${ECHO_T}$with_develop" >&6 - - ############################################################################### -@@ -8944,7 +9033,7 @@ - # This is still experimental (20080329), but should ultimately be moved to - # the script-block --with-normal, etc. - --echo "$as_me:8947: checking if you want to link with the pthread library" >&5 -+echo "$as_me:9036: checking if you want to link with the pthread library" >&5 - echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 - - # Check whether --with-pthread or --without-pthread was given. -@@ -8954,27 +9043,27 @@ - else - with_pthread=no - fi; --echo "$as_me:8957: result: $with_pthread" >&5 -+echo "$as_me:9046: result: $with_pthread" >&5 - echo "${ECHO_T}$with_pthread" >&6 - - if test "$with_pthread" != no ; then -- echo "$as_me:8961: checking for pthread.h" >&5 -+ echo "$as_me:9050: checking for pthread.h" >&5 - echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 - if test "${ac_cv_header_pthread_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 8967 "configure" -+#line 9056 "configure" - #include "confdefs.h" - #include - _ACEOF --if { (eval echo "$as_me:8971: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:9060: \"$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:8977: \$? = $ac_status" >&5 -+ echo "$as_me:9066: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -8993,7 +9082,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:8996: result: $ac_cv_header_pthread_h" >&5 -+echo "$as_me:9085: result: $ac_cv_header_pthread_h" >&5 - echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 - if test $ac_cv_header_pthread_h = yes; then - -@@ -9001,12 +9090,12 @@ - #define HAVE_PTHREADS_H 1 - EOF - -- echo "$as_me:9004: checking if we can link with the pthread library" >&5 -+ echo "$as_me:9093: checking if we can link with the pthread library" >&5 - echo $ECHO_N "checking if we can link with the pthread library... $ECHO_C" >&6 - cf_save_LIBS="$LIBS" - LIBS="-lpthread $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 9009 "configure" -+#line 9098 "configure" - #include "confdefs.h" - - #include -@@ -9022,16 +9111,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:9025: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:9114: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:9028: \$? = $ac_status" >&5 -+ echo "$as_me:9117: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:9031: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9120: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9034: \$? = $ac_status" >&5 -+ echo "$as_me:9123: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - with_pthread=yes - else -@@ -9041,7 +9130,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS="$cf_save_LIBS" -- echo "$as_me:9044: result: $with_pthread" >&5 -+ echo "$as_me:9133: result: $with_pthread" >&5 - echo "${ECHO_T}$with_pthread" >&6 - - if test "$with_pthread" = yes ; then -@@ -9051,7 +9140,7 @@ - EOF - - else -- { { echo "$as_me:9054: error: Cannot link with pthread library" >&5 -+ { { echo "$as_me:9143: error: Cannot link with pthread library" >&5 - echo "$as_me: error: Cannot link with pthread library" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -9060,7 +9149,7 @@ - - fi - --echo "$as_me:9063: checking if you want to use weak-symbols for pthreads" >&5 -+echo "$as_me:9152: checking if you want to use weak-symbols for pthreads" >&5 - echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 - - # Check whether --enable-weak-symbols or --disable-weak-symbols was given. -@@ -9070,18 +9159,18 @@ - else - use_weak_symbols=no - fi; --echo "$as_me:9073: result: $use_weak_symbols" >&5 -+echo "$as_me:9162: result: $use_weak_symbols" >&5 - echo "${ECHO_T}$use_weak_symbols" >&6 - if test "$use_weak_symbols" = yes ; then - --echo "$as_me:9077: checking if $CC supports weak symbols" >&5 -+echo "$as_me:9166: checking if $CC supports weak symbols" >&5 - echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 - if test "${cf_cv_weak_symbols+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 9084 "configure" -+#line 9173 "configure" - #include "confdefs.h" - - #include -@@ -9107,16 +9196,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9110: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9199: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9113: \$? = $ac_status" >&5 -+ echo "$as_me:9202: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9116: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9205: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9119: \$? = $ac_status" >&5 -+ echo "$as_me:9208: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_weak_symbols=yes - else -@@ -9127,7 +9216,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:9130: result: $cf_cv_weak_symbols" >&5 -+echo "$as_me:9219: result: $cf_cv_weak_symbols" >&5 - echo "${ECHO_T}$cf_cv_weak_symbols" >&6 - - else -@@ -9153,11 +9242,76 @@ - fi - fi - -+# OpenSUSE is installing ncurses6, using reentrant option. -+echo "$as_me:9246: checking for _nc_TABSIZE" >&5 -+echo $ECHO_N "checking for _nc_TABSIZE... $ECHO_C" >&6 -+if test "${ac_cv_func__nc_TABSIZE+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+#line 9252 "configure" -+#include "confdefs.h" -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char _nc_TABSIZE (); below. */ -+#include -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char _nc_TABSIZE (); -+char (*f) (); -+ -+int -+main () -+{ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub__nc_TABSIZE) || defined (__stub____nc_TABSIZE) -+choke me -+#else -+f = _nc_TABSIZE; -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:9283: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:9286: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:9289: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:9292: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_func__nc_TABSIZE=yes -+else -+ echo "$as_me: failed program was:" >&5 -+cat conftest.$ac_ext >&5 -+ac_cv_func__nc_TABSIZE=no -+fi -+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:9302: result: $ac_cv_func__nc_TABSIZE" >&5 -+echo "${ECHO_T}$ac_cv_func__nc_TABSIZE" >&6 -+if test $ac_cv_func__nc_TABSIZE = yes; then -+ assume_reentrant=yes -+else -+ assume_reentrant=no -+fi -+ - # Reentrant code has to be opaque; there's little advantage to making ncurses - # opaque outside of that, so there is no --enable-opaque option. We can use - # this option without --with-pthreads, but this will be always set for - # pthreads. --echo "$as_me:9160: checking if you want experimental reentrant code" >&5 -+echo "$as_me:9314: checking if you want experimental reentrant code" >&5 - echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6 - - # Check whether --enable-reentrant or --disable-reentrant was given. -@@ -9165,9 +9319,9 @@ - enableval="$enable_reentrant" - with_reentrant=$enableval - else -- with_reentrant=no -+ with_reentrant=$assume_reentrant - fi; --echo "$as_me:9170: result: $with_reentrant" >&5 -+echo "$as_me:9324: result: $with_reentrant" >&5 - echo "${ECHO_T}$with_reentrant" >&6 - if test "$with_reentrant" = yes ; then - cf_cv_enable_reentrant=1 -@@ -9176,7 +9330,7 @@ - # remove pthread library from $LIBS - LIBS=`echo "$LIBS" | sed -e 's/-lpthread[ ]//g' -e 's/-lpthread$//'` - -- else -+ elif test "$assume_reentrant" = no ; then - LIB_SUFFIX="t${LIB_SUFFIX}" - fi - cat >>confdefs.h <<\EOF -@@ -9189,7 +9343,7 @@ - - ### Allow using a different wrap-prefix - if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then -- echo "$as_me:9192: checking for prefix used to wrap public variables" >&5 -+ echo "$as_me:9346: checking for prefix used to wrap public variables" >&5 - echo $ECHO_N "checking for prefix used to wrap public variables... $ECHO_C" >&6 - - # Check whether --with-wrap-prefix or --without-wrap-prefix was given. -@@ -9199,7 +9353,7 @@ - else - NCURSES_WRAP_PREFIX=_nc_ - fi; -- echo "$as_me:9202: result: $NCURSES_WRAP_PREFIX" >&5 -+ echo "$as_me:9356: result: $NCURSES_WRAP_PREFIX" >&5 - echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 - else - NCURSES_WRAP_PREFIX=_nc_ -@@ -9212,7 +9366,7 @@ - ############################################################################### - - ### use option --disable-echo to suppress full display compiling commands --echo "$as_me:9215: checking if you want to display full commands during build" >&5 -+echo "$as_me:9369: checking if you want to display full commands during build" >&5 - echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6 - - # Check whether --enable-echo or --disable-echo was given. -@@ -9227,11 +9381,11 @@ - else - ECHO_LINK='@ echo linking $@ ... ;' - fi --echo "$as_me:9230: result: $with_echo" >&5 -+echo "$as_me:9384: result: $with_echo" >&5 - echo "${ECHO_T}$with_echo" >&6 - - ### use option --enable-warnings to turn on all gcc warnings --echo "$as_me:9234: checking if you want to see compiler warnings" >&5 -+echo "$as_me:9388: checking if you want to see compiler warnings" >&5 - echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6 - - # Check whether --enable-warnings or --disable-warnings was given. -@@ -9239,10 +9393,11 @@ - enableval="$enable_warnings" - with_warnings=$enableval - fi; --echo "$as_me:9242: result: $with_warnings" >&5 -+echo "$as_me:9396: result: $with_warnings" >&5 - echo "${ECHO_T}$with_warnings" >&6 - - if test "x$with_warnings" = "xyes"; then -+ - ADAFLAGS="$ADAFLAGS -gnatg" - - INTEL_COMPILER=no -@@ -9250,12 +9405,12 @@ - if test "$GCC" = yes ; then - case $host_os in - linux*|gnu*) -- echo "$as_me:9253: checking if this is really Intel C compiler" >&5 -+ echo "$as_me:9408: checking if this is really Intel C compiler" >&5 - echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 - cf_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -no-gcc" - cat >conftest.$ac_ext <<_ACEOF --#line 9258 "configure" -+#line 9413 "configure" - #include "confdefs.h" - - int -@@ -9272,16 +9427,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9275: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:9430: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9278: \$? = $ac_status" >&5 -+ echo "$as_me:9433: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9281: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9436: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9284: \$? = $ac_status" >&5 -+ echo "$as_me:9439: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - INTEL_COMPILER=yes - cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" -@@ -9292,14 +9447,14 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - CFLAGS="$cf_save_CFLAGS" -- echo "$as_me:9295: result: $INTEL_COMPILER" >&5 -+ echo "$as_me:9450: result: $INTEL_COMPILER" >&5 - echo "${ECHO_T}$INTEL_COMPILER" >&6 - ;; - esac - fi - - cat > conftest.$ac_ext <&5 -+ { echo "$as_me:9474: checking for $CC warning options..." >&5 - echo "$as_me: checking for $CC warning options..." >&6;} - cf_save_CFLAGS="$CFLAGS" - EXTRA_CFLAGS="-Wall" -@@ -9332,12 +9487,12 @@ - wd981 - do - CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" -- if { (eval echo "$as_me:9335: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:9490: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9338: \$? = $ac_status" >&5 -+ echo "$as_me:9493: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- test -n "$verbose" && echo "$as_me:9340: result: ... -$cf_opt" >&5 -+ test -n "$verbose" && echo "$as_me:9495: result: ... -$cf_opt" >&5 - echo "${ECHO_T}... -$cf_opt" >&6 - EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" - fi -@@ -9346,7 +9501,7 @@ - - elif test "$GCC" = yes - then -- { echo "$as_me:9349: checking for $CC warning options..." >&5 -+ { echo "$as_me:9504: checking for $CC warning options..." >&5 - echo "$as_me: checking for $CC warning options..." >&6;} - cf_save_CFLAGS="$CFLAGS" - EXTRA_CFLAGS= -@@ -9366,12 +9521,12 @@ - Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum - do - CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" -- if { (eval echo "$as_me:9369: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:9524: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9372: \$? = $ac_status" >&5 -+ echo "$as_me:9527: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- test -n "$verbose" && echo "$as_me:9374: result: ... -$cf_opt" >&5 -+ test -n "$verbose" && echo "$as_me:9529: result: ... -$cf_opt" >&5 - echo "${ECHO_T}... -$cf_opt" >&6 - case $cf_opt in #(vi - Wcast-qual) #(vi -@@ -9382,7 +9537,7 @@ - [34].*) - test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 - --echo "${as_me:-configure}:9385: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 -+echo "${as_me:-configure}:9540: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 - - continue;; - esac -@@ -9415,10 +9570,10 @@ - EOF - if test "$GCC" = yes - then -- { echo "$as_me:9418: checking for $CC __attribute__ directives..." >&5 -+ { echo "$as_me:9573: checking for $CC __attribute__ directives..." >&5 - echo "$as_me: checking for $CC __attribute__ directives..." >&6;} - cat > conftest.$ac_ext <&5 -+ if { (eval echo "$as_me:9625: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9473: \$? = $ac_status" >&5 -+ echo "$as_me:9628: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- test -n "$verbose" && echo "$as_me:9475: result: ... $cf_attribute" >&5 -+ test -n "$verbose" && echo "$as_me:9630: result: ... $cf_attribute" >&5 - echo "${ECHO_T}... $cf_attribute" >&6 - cat conftest.h >>confdefs.h - case $cf_attribute in #(vi -@@ -9508,7 +9663,7 @@ - fi - - ### use option --enable-assertions to turn on generation of assertion code --echo "$as_me:9511: checking if you want to enable runtime assertions" >&5 -+echo "$as_me:9666: checking if you want to enable runtime assertions" >&5 - echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6 - - # Check whether --enable-assertions or --disable-assertions was given. -@@ -9518,7 +9673,7 @@ - else - with_assertions=no - fi; --echo "$as_me:9521: result: $with_assertions" >&5 -+echo "$as_me:9676: result: $with_assertions" >&5 - echo "${ECHO_T}$with_assertions" >&6 - if test -n "$GCC" - then -@@ -9530,7 +9685,9 @@ - - CPPFLAGS="$CPPFLAGS -DNDEBUG" - else -- ADAFLAGS="$ADAFLAGS -gnata" -+ -+ ADAFLAGS="$ADAFLAGS -gnata" -+ - fi - fi - -@@ -9570,7 +9727,7 @@ - ;; - esac - --echo "$as_me:9573: checking whether to add trace feature to all models" >&5 -+echo "$as_me:9730: checking whether to add trace feature to all models" >&5 - echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6 - - # Check whether --with-trace or --without-trace was given. -@@ -9580,7 +9737,7 @@ - else - cf_with_trace=$cf_all_traces - fi; --echo "$as_me:9583: result: $cf_with_trace" >&5 -+echo "$as_me:9740: result: $cf_with_trace" >&5 - echo "${ECHO_T}$cf_with_trace" >&6 - - if test "$cf_with_trace" = yes ; then -@@ -9673,13 +9830,13 @@ - *mingw32*) #(vi - ;; - *) --echo "$as_me:9676: checking for gettimeofday" >&5 -+echo "$as_me:9833: checking for gettimeofday" >&5 - echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6 - if test "${ac_cv_func_gettimeofday+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 9682 "configure" -+#line 9839 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gettimeofday (); below. */ -@@ -9710,16 +9867,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:9713: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:9870: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:9716: \$? = $ac_status" >&5 -+ echo "$as_me:9873: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:9719: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9876: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9722: \$? = $ac_status" >&5 -+ echo "$as_me:9879: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_gettimeofday=yes - else -@@ -9729,7 +9886,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:9732: result: $ac_cv_func_gettimeofday" >&5 -+echo "$as_me:9889: result: $ac_cv_func_gettimeofday" >&5 - echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 - if test $ac_cv_func_gettimeofday = yes; then - cat >>confdefs.h <<\EOF -@@ -9738,7 +9895,7 @@ - - else - --echo "$as_me:9741: checking for gettimeofday in -lbsd" >&5 -+echo "$as_me:9898: checking for gettimeofday in -lbsd" >&5 - echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 - if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -9746,7 +9903,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lbsd $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 9749 "configure" -+#line 9906 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -9765,16 +9922,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:9768: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:9925: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:9771: \$? = $ac_status" >&5 -+ echo "$as_me:9928: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:9774: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:9931: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9777: \$? = $ac_status" >&5 -+ echo "$as_me:9934: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_bsd_gettimeofday=yes - else -@@ -9785,7 +9942,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:9788: result: $ac_cv_lib_bsd_gettimeofday" >&5 -+echo "$as_me:9945: result: $ac_cv_lib_bsd_gettimeofday" >&5 - echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 - if test $ac_cv_lib_bsd_gettimeofday = yes; then - cat >>confdefs.h <<\EOF -@@ -9800,13 +9957,13 @@ - esac - - ### Checks for header files. --echo "$as_me:9803: checking for ANSI C header files" >&5 -+echo "$as_me:9960: checking for ANSI C header files" >&5 - echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 - if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 9809 "configure" -+#line 9966 "configure" - #include "confdefs.h" - #include - #include -@@ -9814,13 +9971,13 @@ - #include - - _ACEOF --if { (eval echo "$as_me:9817: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:9974: \"$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:9823: \$? = $ac_status" >&5 -+ echo "$as_me:9980: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -9842,7 +9999,7 @@ - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF --#line 9845 "configure" -+#line 10002 "configure" - #include "confdefs.h" - #include - -@@ -9860,7 +10017,7 @@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF --#line 9863 "configure" -+#line 10020 "configure" - #include "confdefs.h" - #include - -@@ -9881,7 +10038,7 @@ - : - else - cat >conftest.$ac_ext <<_ACEOF --#line 9884 "configure" -+#line 10041 "configure" - #include "confdefs.h" - #include - #if ((' ' & 0x0FF) == 0x020) -@@ -9907,15 +10064,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:9910: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:10067: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:9913: \$? = $ac_status" >&5 -+ echo "$as_me:10070: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:9915: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10072: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9918: \$? = $ac_status" >&5 -+ echo "$as_me:10075: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -9928,7 +10085,7 @@ - fi - fi - fi --echo "$as_me:9931: result: $ac_cv_header_stdc" >&5 -+echo "$as_me:10088: result: $ac_cv_header_stdc" >&5 - echo "${ECHO_T}$ac_cv_header_stdc" >&6 - if test $ac_cv_header_stdc = yes; then - -@@ -9941,13 +10098,13 @@ - ac_header_dirent=no - for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` --echo "$as_me:9944: checking for $ac_hdr that defines DIR" >&5 -+echo "$as_me:10101: checking for $ac_hdr that defines DIR" >&5 - echo $ECHO_N "checking for $ac_hdr that defines DIR... $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 9950 "configure" -+#line 10107 "configure" - #include "confdefs.h" - #include - #include <$ac_hdr> -@@ -9962,16 +10119,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:9965: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10122: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:9968: \$? = $ac_status" >&5 -+ echo "$as_me:10125: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:9971: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10128: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:9974: \$? = $ac_status" >&5 -+ echo "$as_me:10131: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" - else -@@ -9981,7 +10138,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:9984: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:10141: 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:10154: checking for opendir in -ldir" >&5 - echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 - if test "${ac_cv_lib_dir_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -10002,7 +10159,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldir $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 10005 "configure" -+#line 10162 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -10021,16 +10178,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:10024: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:10181: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:10027: \$? = $ac_status" >&5 -+ echo "$as_me:10184: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:10030: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10187: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10033: \$? = $ac_status" >&5 -+ echo "$as_me:10190: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dir_opendir=yes - else -@@ -10041,14 +10198,14 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:10044: result: $ac_cv_lib_dir_opendir" >&5 -+echo "$as_me:10201: result: $ac_cv_lib_dir_opendir" >&5 - echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 - if test $ac_cv_lib_dir_opendir = yes; then - LIBS="$LIBS -ldir" - fi - - else -- echo "$as_me:10051: checking for opendir in -lx" >&5 -+ echo "$as_me:10208: checking for opendir in -lx" >&5 - echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 - if test "${ac_cv_lib_x_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -10056,7 +10213,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lx $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 10059 "configure" -+#line 10216 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -10075,16 +10232,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:10078: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:10235: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:10081: \$? = $ac_status" >&5 -+ echo "$as_me:10238: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:10084: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10241: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10087: \$? = $ac_status" >&5 -+ echo "$as_me:10244: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_x_opendir=yes - else -@@ -10095,7 +10252,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:10098: result: $ac_cv_lib_x_opendir" >&5 -+echo "$as_me:10255: result: $ac_cv_lib_x_opendir" >&5 - echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 - if test $ac_cv_lib_x_opendir = yes; then - LIBS="$LIBS -lx" -@@ -10103,13 +10260,13 @@ - - fi - --echo "$as_me:10106: checking whether time.h and sys/time.h may both be included" >&5 -+echo "$as_me:10263: checking whether time.h and sys/time.h may both be included" >&5 - echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 - if test "${ac_cv_header_time+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 10112 "configure" -+#line 10269 "configure" - #include "confdefs.h" - #include - #include -@@ -10125,16 +10282,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10128: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10285: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10131: \$? = $ac_status" >&5 -+ echo "$as_me:10288: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10134: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10291: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10137: \$? = $ac_status" >&5 -+ echo "$as_me:10294: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_time=yes - else -@@ -10144,7 +10301,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:10147: result: $ac_cv_header_time" >&5 -+echo "$as_me:10304: result: $ac_cv_header_time" >&5 - echo "${ECHO_T}$ac_cv_header_time" >&6 - if test $ac_cv_header_time = yes; then - -@@ -10162,7 +10319,7 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_main_return=return - --echo "$as_me:10165: checking for $CC option to accept ANSI C" >&5 -+echo "$as_me:10322: checking for $CC option to accept ANSI C" >&5 - echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 - if test "${ac_cv_prog_cc_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -10170,7 +10327,7 @@ - ac_cv_prog_cc_stdc=no - ac_save_CC=$CC - cat >conftest.$ac_ext <<_ACEOF --#line 10173 "configure" -+#line 10330 "configure" - #include "confdefs.h" - #include - #include -@@ -10219,16 +10376,16 @@ - do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10222: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10379: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10225: \$? = $ac_status" >&5 -+ echo "$as_me:10382: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10228: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10385: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10231: \$? = $ac_status" >&5 -+ echo "$as_me:10388: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg - break -@@ -10245,21 +10402,21 @@ - - case "x$ac_cv_prog_cc_stdc" in - x|xno) -- echo "$as_me:10248: result: none needed" >&5 -+ echo "$as_me:10405: result: none needed" >&5 - echo "${ECHO_T}none needed" >&6 ;; - *) -- echo "$as_me:10251: result: $ac_cv_prog_cc_stdc" >&5 -+ echo "$as_me:10408: result: $ac_cv_prog_cc_stdc" >&5 - echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; - esac - --echo "$as_me:10256: checking for an ANSI C-conforming const" >&5 -+echo "$as_me:10413: checking for an ANSI C-conforming const" >&5 - echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 - if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 10262 "configure" -+#line 10419 "configure" - #include "confdefs.h" - - int -@@ -10317,16 +10474,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10320: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10477: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10323: \$? = $ac_status" >&5 -+ echo "$as_me:10480: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10326: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10483: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10329: \$? = $ac_status" >&5 -+ echo "$as_me:10486: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_const=yes - else -@@ -10336,7 +10493,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:10339: result: $ac_cv_c_const" >&5 -+echo "$as_me:10496: result: $ac_cv_c_const" >&5 - echo "${ECHO_T}$ac_cv_c_const" >&6 - if test $ac_cv_c_const = no; then - -@@ -10348,7 +10505,7 @@ - - ### Checks for external-data - --echo "$as_me:10351: checking if data-only library module links" >&5 -+echo "$as_me:10508: checking if data-only library module links" >&5 - echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 - if test "${cf_cv_link_dataonly+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -10356,20 +10513,20 @@ - - rm -f conftest.a - cat >conftest.$ac_ext <&5 -+ if { (eval echo "$as_me:10519: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10365: \$? = $ac_status" >&5 -+ echo "$as_me:10522: \$? = $ac_status" >&5 - (exit $ac_status); } ; then - mv conftest.o data.o && \ - ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null - fi - rm -f conftest.$ac_ext data.o - cat >conftest.$ac_ext <&5 -+ if { (eval echo "$as_me:10542: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10388: \$? = $ac_status" >&5 -+ echo "$as_me:10545: \$? = $ac_status" >&5 - (exit $ac_status); }; then - mv conftest.o func.o && \ - ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null -@@ -10398,7 +10555,7 @@ - cf_cv_link_dataonly=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 10401 "configure" -+#line 10558 "configure" - #include "confdefs.h" - - int main() -@@ -10409,15 +10566,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:10412: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:10569: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:10415: \$? = $ac_status" >&5 -+ echo "$as_me:10572: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:10417: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10574: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10420: \$? = $ac_status" >&5 -+ echo "$as_me:10577: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_link_dataonly=yes - else -@@ -10432,7 +10589,7 @@ - - fi - --echo "$as_me:10435: result: $cf_cv_link_dataonly" >&5 -+echo "$as_me:10592: result: $cf_cv_link_dataonly" >&5 - echo "${ECHO_T}$cf_cv_link_dataonly" >&6 - - if test "$cf_cv_link_dataonly" = no ; then -@@ -10445,7 +10602,7 @@ - - ### Checks for library functions. - --echo "$as_me:10448: checking for working mkstemp" >&5 -+echo "$as_me:10605: checking for working mkstemp" >&5 - echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 - if test "${cf_cv_func_mkstemp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -10453,13 +10610,13 @@ - - rm -rf conftest* - if test "$cross_compiling" = yes; then -- echo "$as_me:10456: checking for mkstemp" >&5 -+ echo "$as_me:10613: checking for mkstemp" >&5 - echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 - if test "${ac_cv_func_mkstemp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 10462 "configure" -+#line 10619 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char mkstemp (); below. */ -@@ -10490,16 +10647,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:10493: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:10650: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:10496: \$? = $ac_status" >&5 -+ echo "$as_me:10653: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:10499: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10656: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10502: \$? = $ac_status" >&5 -+ echo "$as_me:10659: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_mkstemp=yes - else -@@ -10509,12 +10666,12 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:10512: result: $ac_cv_func_mkstemp" >&5 -+echo "$as_me:10669: result: $ac_cv_func_mkstemp" >&5 - echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 - - else - cat >conftest.$ac_ext <<_ACEOF --#line 10517 "configure" -+#line 10674 "configure" - #include "confdefs.h" - - #include -@@ -10552,15 +10709,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:10555: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:10712: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:10558: \$? = $ac_status" >&5 -+ echo "$as_me:10715: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:10560: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10717: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10563: \$? = $ac_status" >&5 -+ echo "$as_me:10720: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_func_mkstemp=yes - -@@ -10575,7 +10732,7 @@ - fi - - fi --echo "$as_me:10578: result: $cf_cv_func_mkstemp" >&5 -+echo "$as_me:10735: result: $cf_cv_func_mkstemp" >&5 - echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 - if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then - cat >>confdefs.h <<\EOF -@@ -10584,13 +10741,13 @@ - - fi - --echo "$as_me:10587: checking return type of signal handlers" >&5 -+echo "$as_me:10744: checking return type of signal handlers" >&5 - echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 - if test "${ac_cv_type_signal+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 10593 "configure" -+#line 10750 "configure" - #include "confdefs.h" - #include - #include -@@ -10612,16 +10769,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:10615: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:10772: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:10618: \$? = $ac_status" >&5 -+ echo "$as_me:10775: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:10621: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:10778: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:10624: \$? = $ac_status" >&5 -+ echo "$as_me:10781: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_signal=void - else -@@ -10631,7 +10788,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:10634: result: $ac_cv_type_signal" >&5 -+echo "$as_me:10791: result: $ac_cv_type_signal" >&5 - echo "${ECHO_T}$ac_cv_type_signal" >&6 - - cat >>confdefs.h <&5 -+echo "$as_me:10808: 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 -@@ -10663,7 +10820,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_gnat_exists="yes" --echo "$as_me:10666: found $ac_dir/$ac_word" >&5 -+echo "$as_me:10823: found $ac_dir/$ac_word" >&5 - break - done - -@@ -10672,10 +10829,10 @@ - fi - gnat_exists=$ac_cv_prog_gnat_exists - if test -n "$gnat_exists"; then -- echo "$as_me:10675: result: $gnat_exists" >&5 -+ echo "$as_me:10832: result: $gnat_exists" >&5 - echo "${ECHO_T}$gnat_exists" >&6 - else -- echo "$as_me:10678: result: no" >&5 -+ echo "$as_me:10835: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -10683,12 +10840,12 @@ - cf_ada_make= - else - --echo "$as_me:10686: checking for gnat version" >&5 -+echo "$as_me:10843: 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:10691: result: $cf_gnat_version" >&5 -+echo "$as_me:10848: result: $cf_gnat_version" >&5 - echo "${ECHO_T}$cf_gnat_version" >&6 - - case $cf_gnat_version in #(vi -@@ -10696,66 +10853,15 @@ - cf_cv_prog_gnat_correct=yes - ;; - *) -- { echo "$as_me:10699: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 -+ { echo "$as_me:10856: 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 - ;; - esac - --echo "$as_me:10705: 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 -- cf_gnat_generics=yes -- ;; --*) -- cf_gnat_generics=no -- ;; --esac --echo "$as_me:10715: result: $cf_gnat_generics" >&5 --echo "${ECHO_T}$cf_gnat_generics" >&6 -- --if test "$cf_gnat_generics" = yes --then -- cf_compile_generics=generics -- cf_generic_objects="\${GENOBJS}" --else -- cf_compile_generics= -- cf_generic_objects= --fi -- --echo "$as_me:10727: 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 -- cf_gnat_projects=no -- ;; --*) -- case $cf_cv_system_name in #(vi -- cygwin*) #(vi -- cf_gnat_projects=no -- ;; -- *) -- cf_gnat_projects=yes -- ;; -- esac -- ;; --esac --echo "$as_me:10744: result: $cf_gnat_projects" >&5 --echo "${ECHO_T}$cf_gnat_projects" >&6 -- --if test "$cf_gnat_projects" = yes --then -- USE_OLD_MAKERULES="#" -- USE_GNAT_PROJECTS="" --else -- USE_OLD_MAKERULES="" -- USE_GNAT_PROJECTS="#" --fi -- - # Extract the first word of "m4", so it can be a program name with args. - set dummy m4; ac_word=$2 --echo "$as_me:10758: checking for $ac_word" >&5 -+echo "$as_me:10864: 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 -@@ -10770,7 +10876,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_M4_exists="yes" --echo "$as_me:10773: found $ac_dir/$ac_word" >&5 -+echo "$as_me:10879: found $ac_dir/$ac_word" >&5 - break - done - -@@ -10779,10 +10885,10 @@ - fi - M4_exists=$ac_cv_prog_M4_exists - if test -n "$M4_exists"; then -- echo "$as_me:10782: result: $M4_exists" >&5 -+ echo "$as_me:10888: result: $M4_exists" >&5 - echo "${ECHO_T}$M4_exists" >&6 - else -- echo "$as_me:10785: result: no" >&5 -+ echo "$as_me:10891: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -10791,10 +10897,10 @@ - echo Ada95 binding required program m4 not found. Ada95 binding disabled. - fi - if test "$cf_cv_prog_gnat_correct" = yes; then -- echo "$as_me:10794: checking if GNAT works" >&5 -+ echo "$as_me:10900: checking if GNAT works" >&5 - echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 - --rm -rf conftest* -+rm -rf conftest* *~conftest* - cat >>conftest.ads <&5 -+ echo "$as_me:10928: result: $cf_cv_prog_gnat_correct" >&5 - echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 - fi - fi - - if test "$cf_cv_prog_gnat_correct" = yes; then - -- ADAFLAGS="$ADAFLAGS -O3 -gnatpn" -+ # make ADAFLAGS consistent with CFLAGS -+ case "$CFLAGS" in -+ *-g*) -+ -+ ADAFLAGS="$ADAFLAGS -g" -+ -+ ;; -+ esac -+ case "$CFLAGS" in -+ *-O*) -+ -+ ADAFLAGS="$ADAFLAGS -O3" -+ -+ ;; -+ esac -+ -+echo "$as_me:10951: 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 -+ cf_gnat_generics=yes -+ ;; -+*) -+ cf_gnat_generics=no -+ ;; -+esac -+echo "$as_me:10961: result: $cf_gnat_generics" >&5 -+echo "${ECHO_T}$cf_gnat_generics" >&6 -+ -+if test "$cf_gnat_generics" = yes -+then -+ cf_compile_generics=generics -+ cf_generic_objects="\${GENOBJS}" -+else -+ cf_compile_generics= -+ cf_generic_objects= -+fi - --echo "$as_me:10831: checking if GNAT pragma Unreferenced works" >&5 -+echo "$as_me:10973: 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 -+else -+ -+rm -rf conftest* *~conftest* -+cat >>conftest.ads <>conftest.adb <&5 2>&1 ) ; then -+ cf_cv_gnat_sigint=yes -+else -+ cf_cv_gnat_sigint=no -+fi -+rm -rf conftest* *~conftest* -+ -+fi -+echo "$as_me:11021: result: $cf_cv_gnat_sigint" >&5 -+echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 -+ -+if test $cf_cv_gnat_sigint = yes ; then -+ USE_GNAT_SIGINT="" -+else -+ USE_GNAT_SIGINT="#" -+fi -+ -+echo "$as_me:11030: 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 - else - --rm -rf conftest* -+rm -rf conftest* *~conftest* - cat >>conftest.ads <&5 -+echo "$as_me:11061: 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). -@@ -10869,7 +11068,105 @@ - PRAGMA_UNREF=FALSE - fi - --echo "$as_me:10872: checking for ada-compiler" >&5 -+cf_gnat_libraries=no -+cf_gnat_projects=no -+ -+echo "$as_me:11074: 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 -+ ;; -+*) -+ case $cf_cv_system_name in #(vi -+ cygwin*) #(vi -+ ;; -+ *) -+ mkdir conftest.src conftest.bin conftest.lib -+ cd conftest.src -+ rm -rf conftest* *~conftest* -+ cat >>library.gpr <>confpackage.ads <>confpackage.adb <&5 2>&1 ) ; then -+ cf_gnat_projects=yes -+ fi -+ cd .. -+ if test -f conftest.lib/confpackage.ali -+ then -+ cf_gnat_libraries=yes -+ fi -+ rm -rf conftest* *~conftest* -+ ;; -+ esac -+ ;; -+esac -+echo "$as_me:11142: result: $cf_gnat_projects" >&5 -+echo "${ECHO_T}$cf_gnat_projects" >&6 -+ -+if test $cf_gnat_projects = yes -+then -+ echo "$as_me:11147: checking if GNAT supports libraries" >&5 -+echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 -+ echo "$as_me:11149: result: $cf_gnat_libraries" >&5 -+echo "${ECHO_T}$cf_gnat_libraries" >&6 -+fi -+ -+if test "$cf_gnat_projects" = yes -+then -+ USE_OLD_MAKERULES="#" -+ USE_GNAT_PROJECTS="" -+else -+ USE_OLD_MAKERULES="" -+ USE_GNAT_PROJECTS="#" -+fi -+ -+if test "$cf_gnat_libraries" = yes -+then -+ USE_GNAT_LIBRARIES="" -+else -+ USE_GNAT_LIBRARIES="#" -+fi -+ -+echo "$as_me:11169: 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. -@@ -10880,12 +11177,12 @@ - cf_ada_compiler=gnatmake - fi; - --echo "$as_me:10883: result: $cf_ada_compiler" >&5 -+echo "$as_me:11180: result: $cf_ada_compiler" >&5 - echo "${ECHO_T}$cf_ada_compiler" >&6 - - cf_ada_package=terminal_interface - --echo "$as_me:10888: checking for ada-include" >&5 -+echo "$as_me:11185: 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. -@@ -10921,7 +11218,7 @@ - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - *) -- { { echo "$as_me:10924: error: expected a pathname, not \"$withval\"" >&5 -+ { { echo "$as_me:11221: error: expected a pathname, not \"$withval\"" >&5 - echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -10930,10 +11227,10 @@ - fi - ADA_INCLUDE="$withval" - --echo "$as_me:10933: result: $ADA_INCLUDE" >&5 -+echo "$as_me:11230: result: $ADA_INCLUDE" >&5 - echo "${ECHO_T}$ADA_INCLUDE" >&6 - --echo "$as_me:10936: checking for ada-objects" >&5 -+echo "$as_me:11233: 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. -@@ -10969,7 +11266,7 @@ - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - *) -- { { echo "$as_me:10972: error: expected a pathname, not \"$withval\"" >&5 -+ { { echo "$as_me:11269: error: expected a pathname, not \"$withval\"" >&5 - echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -10978,10 +11275,10 @@ - fi - ADA_OBJECTS="$withval" - --echo "$as_me:10981: result: $ADA_OBJECTS" >&5 -+echo "$as_me:11278: result: $ADA_OBJECTS" >&5 - echo "${ECHO_T}$ADA_OBJECTS" >&6 - --echo "$as_me:10984: checking if an Ada95 shared-library should be built" >&5 -+echo "$as_me:11281: 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. -@@ -10991,7 +11288,7 @@ - else - with_ada_sharedlib=no - fi; --echo "$as_me:10994: result: $with_ada_sharedlib" >&5 -+echo "$as_me:11291: result: $with_ada_sharedlib" >&5 - echo "${ECHO_T}$with_ada_sharedlib" >&6 - - ADA_SHAREDLIB='lib$(LIB_NAME).so.1' -@@ -11006,7 +11303,15 @@ - fi - fi - -+ else -+ { { echo "$as_me:11307: error: No usable Ada compiler found" >&5 -+echo "$as_me: error: No usable Ada compiler found" >&2;} -+ { (exit 1); exit 1; }; } - fi -+else -+ { { echo "$as_me:11312: error: The Ada compiler is needed for this package" >&5 -+echo "$as_me: error: The Ada compiler is needed for this package" >&2;} -+ { (exit 1); exit 1; }; } - fi - - ################################################################################ -@@ -11049,7 +11354,7 @@ - fi - - ### Build up pieces for makefile rules --echo "$as_me:11052: checking default library suffix" >&5 -+echo "$as_me:11357: checking default library suffix" >&5 - echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 - - case $DFT_LWR_MODEL in -@@ -11060,10 +11365,10 @@ - shared) DFT_ARG_SUFFIX='' ;; - esac - test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" --echo "$as_me:11063: result: $DFT_ARG_SUFFIX" >&5 -+echo "$as_me:11368: result: $DFT_ARG_SUFFIX" >&5 - echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 - --echo "$as_me:11066: checking default library-dependency suffix" >&5 -+echo "$as_me:11371: checking default library-dependency suffix" >&5 - echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 - - case $DFT_LWR_MODEL in #(vi -@@ -11116,10 +11421,10 @@ - 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:11119: result: $DFT_DEP_SUFFIX" >&5 -+echo "$as_me:11424: result: $DFT_DEP_SUFFIX" >&5 - echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 - --echo "$as_me:11122: checking default object directory" >&5 -+echo "$as_me:11427: checking default object directory" >&5 - echo $ECHO_N "checking default object directory... $ECHO_C" >&6 - - case $DFT_LWR_MODEL in -@@ -11135,7 +11440,7 @@ - DFT_OBJ_SUBDIR='obj_s' ;; - esac - esac --echo "$as_me:11138: result: $DFT_OBJ_SUBDIR" >&5 -+echo "$as_me:11443: result: $DFT_OBJ_SUBDIR" >&5 - echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 - - ### Set up low-level terminfo dependencies for makefiles. -@@ -11254,7 +11559,7 @@ - - NCURSES_SHLIB2="sh -c" - --ADA_SUBDIRS="include gen src" -+ADA_SUBDIRS="include gen src doc" - if test "x$cf_with_tests" != "xno" ; then - ADA_SUBDIRS="$ADA_SUBDIRS samples" - fi -@@ -11267,7 +11572,10 @@ - - EXTERNAL_TREE= - --ac_config_files="$ac_config_files $SUB_MAKEFILES Makefile" -+# match layout used by make-tar.sh -+ADAHTML_DIR=../doc/ada -+ -+ac_config_files="$ac_config_files $SUB_MAKEFILES doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in Makefile" - ac_config_commands="$ac_config_commands default" - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -11348,7 +11656,7 @@ - : ${CONFIG_STATUS=./config.status} - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:11351: creating $CONFIG_STATUS" >&5 -+{ echo "$as_me:11659: creating $CONFIG_STATUS" >&5 - echo "$as_me: creating $CONFIG_STATUS" >&6;} - cat >$CONFIG_STATUS <<_ACEOF - #! $SHELL -@@ -11480,7 +11788,7 @@ - cat >>$CONFIG_STATUS <&5 - echo "$as_me: error: ambiguous option: $1 - Try \`$0 --help' for more information." >&2;} -@@ -11543,7 +11851,7 @@ - ac_need_defaults=false;; - - # This is an error. -- -*) { { echo "$as_me:11546: error: unrecognized option: $1 -+ -*) { { echo "$as_me:11854: 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;} -@@ -11562,7 +11870,7 @@ - ## Running config.status. ## - ## ----------------------- ## - --This file was extended by $as_me 2.52.20101001, executed with -+This file was extended by $as_me 2.52.20101002, executed with - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS -@@ -11610,10 +11918,11 @@ - case "$ac_config_target" in - # Handling of arguments. - "$SUB_MAKEFILES" ) CONFIG_FILES="$CONFIG_FILES $SUB_MAKEFILES" ;; -+ "doc/adacurses${DFT_ARG_SUFFIX}-config.1" ) CONFIG_FILES="$CONFIG_FILES doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in" ;; - "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:11616: error: invalid argument: $ac_config_target" >&5 -+ *) { { echo "$as_me:11925: error: invalid argument: $ac_config_target" >&5 - echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -@@ -11725,6 +12034,7 @@ - s,@INSTALL_DATA@,$INSTALL_DATA,;t t - s,@LN_S@,$LN_S,;t t - s,@PKG_CONFIG@,$PKG_CONFIG,;t t -+s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t - s,@PKG_CONFIG_LIBDIR@,$PKG_CONFIG_LIBDIR,;t t - s,@SET_MAKE@,$SET_MAKE,;t t - s,@CTAGS@,$CTAGS,;t t -@@ -11780,17 +12090,19 @@ - s,@cf_cv_enable_reentrant@,$cf_cv_enable_reentrant,;t t - s,@NCURSES_WRAP_PREFIX@,$NCURSES_WRAP_PREFIX,;t t - s,@ECHO_LINK@,$ECHO_LINK,;t t -+s,@ADAFLAGS@,$ADAFLAGS,;t t - s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t - s,@ADA_TRACE@,$ADA_TRACE,;t t - s,@gnat_exists@,$gnat_exists,;t t -+s,@M4_exists@,$M4_exists,;t t -+s,@cf_ada_make@,$cf_ada_make,;t t - s,@cf_compile_generics@,$cf_compile_generics,;t t - s,@cf_generic_objects@,$cf_generic_objects,;t t -+s,@USE_GNAT_SIGINT@,$USE_GNAT_SIGINT,;t t -+s,@PRAGMA_UNREF@,$PRAGMA_UNREF,;t t - s,@USE_OLD_MAKERULES@,$USE_OLD_MAKERULES,;t t - s,@USE_GNAT_PROJECTS@,$USE_GNAT_PROJECTS,;t t --s,@M4_exists@,$M4_exists,;t t --s,@cf_ada_make@,$cf_ada_make,;t t --s,@ADAFLAGS@,$ADAFLAGS,;t t --s,@PRAGMA_UNREF@,$PRAGMA_UNREF,;t t -+s,@USE_GNAT_LIBRARIES@,$USE_GNAT_LIBRARIES,;t t - s,@cf_ada_compiler@,$cf_ada_compiler,;t t - s,@cf_ada_package@,$cf_ada_package,;t t - s,@ADA_INCLUDE@,$ADA_INCLUDE,;t t -@@ -11810,6 +12122,7 @@ - s,@ADA_SUBDIRS@,$ADA_SUBDIRS,;t t - s,@NCURSES_TREE@,$NCURSES_TREE,;t t - s,@EXTERNAL_TREE@,$EXTERNAL_TREE,;t t -+s,@ADAHTML_DIR@,$ADAHTML_DIR,;t t - CEOF - - EOF -@@ -11924,7 +12237,7 @@ - esac - - if test x"$ac_file" != x-; then -- { echo "$as_me:11927: creating $ac_file" >&5 -+ { echo "$as_me:12240: creating $ac_file" >&5 - echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi -@@ -11942,7 +12255,7 @@ - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:11945: error: cannot find input file: $f" >&5 -+ test -f "$f" || { { echo "$as_me:12258: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; -@@ -11955,7 +12268,7 @@ - echo $srcdir/$f - else - # /dev/null tree -- { { echo "$as_me:11958: error: cannot find input file: $f" >&5 -+ { { echo "$as_me:12271: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; -@@ -12021,7 +12334,7 @@ - * ) ac_file_in=$ac_file.in ;; - esac - -- test x"$ac_file" != x- && { echo "$as_me:12024: creating $ac_file" >&5 -+ test x"$ac_file" != x- && { echo "$as_me:12337: creating $ac_file" >&5 - echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the -@@ -12032,7 +12345,7 @@ - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:12035: error: cannot find input file: $f" >&5 -+ test -f "$f" || { { echo "$as_me:12348: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; -@@ -12045,7 +12358,7 @@ - echo $srcdir/$f - else - # /dev/null tree -- { { echo "$as_me:12048: error: cannot find input file: $f" >&5 -+ { { echo "$as_me:12361: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; -@@ -12103,7 +12416,7 @@ - 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:12106: $ac_file is unchanged" >&5 -+ { echo "$as_me:12419: $ac_file is unchanged" >&5 - echo "$as_me: $ac_file is unchanged" >&6;} - else - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -diff -Naur ncurses-5.8/Ada95/configure.in ncurses-5.8-20110402/Ada95/configure.in ---- ncurses-5.8/Ada95/configure.in 2010-11-06 23:11:21.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/configure.in 2011-04-01 00:49:22.000000000 +0200 -@@ -1,5 +1,5 @@ - dnl*************************************************************************** --dnl Copyright (c) 2010 Free Software Foundation, Inc. * -+dnl Copyright (c) 2010,2011 Free Software Foundation, Inc. * - dnl * - dnl Permission is hereby granted, free of charge, to any person obtaining a * - dnl copy of this software and associated documentation files (the * -@@ -28,14 +28,14 @@ - dnl - dnl Author: Thomas E. Dickey - dnl --dnl $Id: configure.in,v 1.21 2010/11/06 22:11:21 tom Exp $ -+dnl $Id: configure.in,v 1.30 2011/03/31 22:49:22 tom Exp $ - dnl Process this file with autoconf to produce a configure script. - dnl - dnl See http://invisible-island.net/autoconf/ for additional information. - dnl - dnl --------------------------------------------------------------------------- - AC_PREREQ(2.13.20020210) --AC_REVISION($Revision: 1.21 $) -+AC_REVISION($Revision: 1.30 $) - AC_INIT(gen/gen.c) - AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) - -@@ -76,7 +76,7 @@ - # if we find pkg-config, check if we should install the ".pc" files. - CF_PKG_CONFIG - --if test "$PKG_CONFIG" != no ; then -+if test "$PKG_CONFIG" != none ; then - AC_MSG_CHECKING(if we should install .pc files for $PKG_CONFIG) - - # Leave this as something that can be overridden in the environment. -@@ -160,6 +160,15 @@ - ### Use "--without-normal --with-shared" to allow the default model to be - ### shared, for example. - cf_list_models="" -+ -+AC_MSG_CHECKING(if you want to build shared C-objects) -+AC_ARG_WITH(shared, -+ [ --with-shared generate shared C-objects (needed for --with-ada-sharedlib)], -+ [with_shared=$withval], -+ [with_shared=no]) -+AC_MSG_RESULT($with_shared) -+test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared" -+ - AC_MSG_CHECKING(for specified models) - test -z "$cf_list_models" && cf_list_models=normal - AC_MSG_RESULT($cf_list_models) -@@ -206,6 +215,23 @@ - - CF_SHARED_OPTS - -+# The test/sample programs in the original tree link using rpath option. -+# Make it optional for packagers. -+if test -n "$LOCAL_LDFLAGS" -+then -+ AC_MSG_CHECKING(if you want to link sample programs with rpath option) -+ AC_ARG_ENABLE(rpath-link, -+ [ --enable-rpath-link link sample programs with rpath option], -+ [with_rpath_link=$enableval], -+ [with_rpath_link=yes]) -+ AC_MSG_RESULT($with_rpath_link) -+ if test "$with_rpath_link" = no -+ then -+ LOCAL_LDFLAGS= -+ LOCAL_LDFLAGS2= -+ fi -+fi -+ - ############################################################################### - CF_HELP_MESSAGE(Fine-Tuning Your Configuration:) - -@@ -324,6 +350,9 @@ - fi - AC_SUBST(PTHREAD) - -+# OpenSUSE is installing ncurses6, using reentrant option. -+AC_CHECK_FUNC(_nc_TABSIZE,[assume_reentrant=yes], [assume_reentrant=no]) -+ - # Reentrant code has to be opaque; there's little advantage to making ncurses - # opaque outside of that, so there is no --enable-opaque option. We can use - # this option without --with-pthreads, but this will be always set for -@@ -332,13 +361,13 @@ - AC_ARG_ENABLE(reentrant, - [ --enable-reentrant compile with experimental reentrant code], - [with_reentrant=$enableval], -- [with_reentrant=no]) -+ [with_reentrant=$assume_reentrant]) - AC_MSG_RESULT($with_reentrant) - if test "$with_reentrant" = yes ; then - cf_cv_enable_reentrant=1 - if test $cf_cv_weak_symbols = yes ; then - CF_REMOVE_LIB(LIBS,$LIBS,pthread) -- else -+ elif test "$assume_reentrant" = no ; then - LIB_SUFFIX="t${LIB_SUFFIX}" - fi - AC_DEFINE(USE_REENTRANT) -@@ -386,7 +415,7 @@ - AC_MSG_RESULT($with_warnings) - - if test "x$with_warnings" = "xyes"; then -- ADAFLAGS="$ADAFLAGS -gnatg" -+ CF_ADD_ADAFLAGS(-gnatg) - CF_GCC_WARNINGS(Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum) - fi - CF_GCC_ATTRIBUTES -@@ -405,7 +434,7 @@ - AC_DEFINE(NDEBUG) - CPPFLAGS="$CPPFLAGS -DNDEBUG" - else -- ADAFLAGS="$ADAFLAGS -gnata" -+ CF_ADD_ADAFLAGS(-gnata) - fi - fi - -@@ -491,9 +520,23 @@ - if test "$cf_with_ada" != "no" ; then - CF_PROG_GNAT - if test "$cf_cv_prog_gnat_correct" = yes; then -- CF_ADD_ADAFLAGS(-O3 -gnatpn) - -+ # make ADAFLAGS consistent with CFLAGS -+ case "$CFLAGS" in -+ *-g*) -+ CF_ADD_ADAFLAGS(-g) -+ ;; -+ esac -+ case "$CFLAGS" in -+ *-O*) -+ CF_ADD_ADAFLAGS(-O3) -+ ;; -+ esac -+ -+ CF_GNAT_GENERICS -+ CF_GNAT_SIGINT - CF_GNAT_PRAGMA_UNREF -+ CF_GNAT_PROJECTS - - CF_WITH_ADA_COMPILER - -@@ -503,7 +546,11 @@ - CF_WITH_ADA_INCLUDE - CF_WITH_ADA_OBJECTS - CF_WITH_ADA_SHAREDLIB -+ else -+ AC_MSG_ERROR(No usable Ada compiler found) - fi -+else -+ AC_MSG_ERROR(The Ada compiler is needed for this package) - fi - - ################################################################################ -@@ -575,7 +622,7 @@ - NCURSES_SHLIB2="sh -c" - AC_SUBST(NCURSES_SHLIB2) - --ADA_SUBDIRS="include gen src" -+ADA_SUBDIRS="include gen src doc" - if test "x$cf_with_tests" != "xno" ; then - ADA_SUBDIRS="$ADA_SUBDIRS samples" - fi -@@ -591,8 +638,13 @@ - EXTERNAL_TREE= - AC_SUBST(EXTERNAL_TREE) - -+# match layout used by make-tar.sh -+ADAHTML_DIR=../doc/ada -+AC_SUBST(ADAHTML_DIR) -+ - AC_OUTPUT( \ - $SUB_MAKEFILES \ -+ doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in \ - Makefile,[ - if test -z "$USE_OLD_MAKERULES" ; then - $AWK -f $srcdir/mk-1st.awk <$srcdir/src/modules >>src/Makefile -diff -Naur ncurses-5.8/Ada95/doc/Makefile.in ncurses-5.8-20110402/Ada95/doc/Makefile.in ---- ncurses-5.8/Ada95/doc/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/doc/Makefile.in 2011-03-26 20:26:17.000000000 +0100 -@@ -0,0 +1,81 @@ -+# $Id: Makefile.in,v 1.2 2011/03/26 19:26:17 tom Exp $ -+############################################################################## -+# Copyright (c) 2011 Free Software Foundation, Inc. # -+# # -+# Permission is hereby granted, free of charge, to any person obtaining a # -+# copy of this software and associated documentation files (the "Software"), # -+# to deal in the Software without restriction, including without limitation # -+# the rights to use, copy, modify, merge, publish, distribute, distribute # -+# with modifications, sublicense, and/or sell copies of the Software, and to # -+# permit persons to whom the Software is furnished to do so, subject to the # -+# following conditions: # -+# # -+# The above copyright notice and this permission notice shall be included in # -+# all copies or substantial portions of the Software. # -+# # -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # -+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # -+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL # -+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER # -+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING # -+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # -+# DEALINGS IN THE SOFTWARE. # -+# # -+# Except as contained in this notice, the name(s) of the above copyright # -+# holders shall not be used in advertising or otherwise to promote the sale, # -+# use or other dealings in this Software without prior written # -+# authorization. # -+############################################################################## -+# -+# Author: Thomas E. Dickey -+# -+# Makefile for AdaCurses manual pages. -+ -+SHELL = /bin/sh -+VPATH = @srcdir@ -+ -+DESTDIR = @DESTDIR@ -+srcdir = @srcdir@ -+prefix = @prefix@ -+exec_prefix = @exec_prefix@ -+datadir = @datadir@ -+mandir = @mandir@ -+ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+ -+DFT_ARG_SUFFIX = @DFT_ARG_SUFFIX@ -+ -+THIS = AdaCurses -+DOCDIR = $(DESTDIR)$(datadir)/doc/$(THIS) -+MANDIR = $(DESTDIR)$(mandir)/man1 -+ -+all \ -+sources \ -+depend \ -+tags : -+ -+$(DOCDIR) \ -+$(MANDIR) : -+ mkdir -p $@ -+ -+install install.man : $(MANDIR) -+ $(INSTALL_DATA) adacurses${DFT_ARG_SUFFIX}-config.1 $(MANDIR) -+ -+uninstall uninstall.man : -+ -rm -f $(MANDIR)/adacurses${DFT_ARG_SUFFIX}-config.1 -+ -+# HTML documentation is optional, usually in a separate package. -+install.html : $(DOCDIR) -+ cd $(srcdir) && tar -cf - *.htm* ada | tar -C $(DOCDIR) -xf - -+ -+uninstall.html : -+ -rm -rf $(DOCDIR) -+ -+mostlyclean : -+ -rm -f core tags TAGS *~ *.bak *.ln *.atac trace -+ -+clean: mostlyclean -+ -+distclean realclean: clean -+ -rm -f Makefile *-config.1 -diff -Naur ncurses-5.8/Ada95/gen/gen.c ncurses-5.8-20110402/Ada95/gen/gen.c ---- ncurses-5.8/Ada95/gen/gen.c 2010-09-04 23:19:50.000000000 +0200 -+++ ncurses-5.8-20110402/Ada95/gen/gen.c 2011-04-01 01:50:24.000000000 +0200 -@@ -1,5 +1,5 @@ - /**************************************************************************** -- * Copyright (c) 1998,2009,2010 Free Software Foundation, Inc. * -+ * Copyright (c) 1998,2010,2011 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 * -@@ -32,7 +32,7 @@ - - /* - Version Control -- $Id: gen.c,v 1.54 2010/09/04 21:19:50 tom Exp $ -+ $Id: gen.c,v 1.59 2011/03/31 23:50:24 tom Exp $ - --------------------------------------------------------------------------*/ - /* - This program generates various record structures and constants from the -@@ -124,7 +124,10 @@ - int len, /* size of the record in bytes */ - int bias) - { -- int i, n, l, cnt = 0, low, high; -+ const char *unused_name = "Unused"; -+ int long_bits = (8 * (int)sizeof(unsigned long)); -+ int len_bits = (8 * len); -+ int i, j, n, l, cnt = 0, low, high; - int width = strlen(RES_NAME) + 3; - unsigned long a; - unsigned long mask = 0; -@@ -144,8 +147,32 @@ - printf(" record\n"); - for (i = 0; nap[i].name != (char *)0; i++) - { -+ mask |= nap[i].attr; - printf(" %-*s : Boolean;\n", width, nap[i].name); - } -+ -+ /* -+ * Compute a mask for the unused bits in this target. -+ */ -+ mask = ~mask; -+ /* -+ * Bits in the biased area are unused by the target. -+ */ -+ for (j = 0; j < bias; ++j) -+ { -+ mask &= (unsigned long)(~(1L << j)); -+ } -+ /* -+ * Bits past the target's size are really unused. -+ */ -+ for (j = len_bits + bias; j < long_bits; ++j) -+ { -+ mask &= (unsigned long)(~(1L << j)); -+ } -+ if (mask != 0) -+ { -+ printf(" %-*s : Boolean;\n", width, unused_name); -+ } - printf(" end record;\n"); - printf(" pragma Convention (C, %s);\n\n", name); - -@@ -155,16 +182,22 @@ - for (i = 0; nap[i].name != (char *)0; i++) - { - a = nap[i].attr; -- mask |= a; - l = find_pos((char *)&a, sizeof(a), &low, &high); - if (l >= 0) - printf(" %-*s at 0 range %2d .. %2d;\n", width, nap[i].name, - low - bias, high - bias); - } -+ if (mask != 0) -+ { -+ l = find_pos((char *)&mask, sizeof(mask), &low, &high); -+ if (l >= 0) -+ printf(" %-*s at 0 range %2d .. %2d;\n", width, unused_name, -+ low - bias, high - bias); -+ } - i = 1; - n = cnt; - printf(" end record;\n"); -- printf(" for %s'Size use %d;\n", name, 8 * len); -+ printf(" for %s'Size use %d;\n", name, len_bits); - printf(" -- Please note: this rep. clause is generated and may be\n"); - printf(" -- different on your system."); - } -@@ -241,7 +274,10 @@ - gen_attr_set(const char *name) - { - /* All of the A_xxx symbols are defined in ncurses, but not all are nonzero -- * if "configure --enable-widec" is specified. -+ * if "configure --enable-widec" is not specified. Originally (in -+ * 1999-2000), the ifdef's also were needed since the proposed bit-layout -+ * for wide characters allocated 16-bits for A_CHARTEXT, leaving too few -+ * bits for a few of the A_xxx symbols. - */ - static const name_attribute_pair nap[] = - { -@@ -332,6 +368,7 @@ - {"Internal_Calls", TRACE_ICALLS}, - {"Character_Calls", TRACE_CCALLS}, - {"Termcap_TermInfo", TRACE_DATABASE}, -+ {"Attributes_And_Colors", TRACE_ATTRS}, - {(char *)0, 0} - }; - gen_reps(nap, name, sizeof(int), 0); -@@ -770,7 +807,7 @@ - static void - acs_def(const char *name, chtype *a) - { -- int c = a - &acs_map[0]; -+ int c = (int)(a - &acs_map[0]); - - printf(" %-24s : constant Character := ", name); - if (isprint(UChar(c)) && (c != '`')) -@@ -1278,12 +1315,6 @@ - printf(" Sizeof%-*s : constant Natural := %2ld; -- %s\n", - 12, "_bool", (long)sizeof(bool), "bool"); - -- /* In ncurses _maxy and _maxx needs an offset for the "public" -- * value -- */ -- printf(" Offset%-*s : constant Natural := %2d; -- %s\n", -- 12, "_XY", 1, "int"); -- printf("\n"); - printf(" type Curses_Bool is mod 2 ** Interfaces.C.%s'Size;\n", s_bool); - } - -diff -Naur ncurses-5.8/Ada95/gen/Makefile.in ncurses-5.8-20110402/Ada95/gen/Makefile.in ---- ncurses-5.8/Ada95/gen/Makefile.in 2011-01-22 20:47:09.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/gen/Makefile.in 2011-03-27 00:36:30.000000000 +0100 -@@ -28,7 +28,7 @@ - # - # Author: Juergen Pfeifer, 1996 - # --# $Id: Makefile.in,v 1.71 2011/01/22 19:47:09 tom Exp $ -+# $Id: Makefile.in,v 1.74 2011/03/26 23:36:30 tom Exp $ - # - .SUFFIXES: - -@@ -57,7 +57,7 @@ - HOST_CC = @BUILD_CC@ - CFLAGS = @CFLAGS@ - --CPPFLAGS = @ACPPFLAGS@ \ -+CPPFLAGS = @ACPPFLAGS@ @CPPFLAGS@ \ - -DHAVE_CONFIG_H -I$(srcdir) - - CCFLAGS = $(CPPFLAGS) $(CFLAGS) -@@ -88,7 +88,7 @@ - GENERATE = $(PROG_GENERATE) '@DFT_ARG_SUFFIX@' - DEL_ADAMODE = sed -e '/^\-\-\ \ \-\*\-\ ada\ \-\*\-.*/d' - --GNATHTML = `type -p gnathtml || type -p gnathtml.pl` -+GNATHTML = `type -p gnathtml || type -p gnathtml.pl 2>/dev/null` - GNATHP = www.gnat.com - - ################################################################################ -@@ -305,6 +305,7 @@ - $(DEL_ADAMODE) >$@ - - $(ADA_SRCDIR)/$(ABASE)-panels.ads: $(srcdir)/$(ABASE)-panels.ads.m4 \ -+ $(GEN_FILES4) \ - $(srcdir)/normal.m4 - $(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \ - $(srcdir)/$(ABASE)-panels.ads.m4 |\ -@@ -377,7 +378,7 @@ - - realclean :: distclean - --HTML_DIR = ../../doc/html/ada -+HTML_DIR = @ADAHTML_DIR@ - - instab.tmp : table.m4 $(GEN_SRC) - @rm -f $@ -@@ -405,6 +406,7 @@ - @rm -f instab.tmp - - adahtml: -+ test -n "$(GNATHTML)" || exit 1 - @find $(HTML_DIR) -type f -exec rm -f {} \; - @mkdir -p $(HTML_DIR) - cp -p ../src/*.ad[sb] . && chmod +w *.ad[sb] -diff -Naur ncurses-5.8/Ada95/gen/terminal_interface-curses.adb.m4 ncurses-5.8-20110402/Ada95/gen/terminal_interface-curses.adb.m4 ---- ncurses-5.8/Ada95/gen/terminal_interface-curses.adb.m4 2009-12-26 18:38:58.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/gen/terminal_interface-curses.adb.m4 2011-03-23 00:02:14.000000000 +0100 -@@ -9,7 +9,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -37,8 +37,8 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.6 $ ---- $Date: 2009/12/26 17:38:58 $ -+-- $Revision: 1.8 $ -+-- $Date: 2011/03/22 23:02:14 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with System; -@@ -1208,6 +1208,7 @@ - X : Column_Position; - begin - Get_Size (Win, Y, X); -+ pragma Unreferenced (X); - Change_Lines_Status (Win, 0, Positive (Y), True); - end Touch; - -@@ -1217,6 +1218,7 @@ - X : Column_Position; - begin - Get_Size (Win, Y, X); -+ pragma Unreferenced (X); - Change_Lines_Status (Win, 0, Positive (Y), False); - end Untouch; - -@@ -1352,10 +1354,8 @@ - function GetMaxX (W : Window) return C_Int; - pragma Import (C, GetMaxX, "getmaxx"); - -- Y : constant C_Int := GetMaxY (Win) -- + C_Int (Offset_XY); -- X : constant C_Int := GetMaxX (Win) -- + C_Int (Offset_XY); -+ Y : constant C_Int := GetMaxY (Win); -+ X : constant C_Int := GetMaxX (Win); - begin - Number_Of_Lines := Line_Count (Y); - Number_Of_Columns := Column_Count (X); -diff -Naur ncurses-5.8/Ada95/gen/terminal_interface-curses.ads.m4 ncurses-5.8-20110402/Ada95/gen/terminal_interface-curses.ads.m4 ---- ncurses-5.8/Ada95/gen/terminal_interface-curses.ads.m4 2009-12-26 18:38:58.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/gen/terminal_interface-curses.ads.m4 2011-03-20 00:05:56.000000000 +0100 -@@ -9,7 +9,7 @@ - -- S P E C -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -37,8 +37,8 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.42 $ ---- $Date: 2009/12/26 17:38:58 $ -+-- $Revision: 1.44 $ -+-- $Date: 2011/03/19 23:05:56 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - include(`Base_Defs') -@@ -52,8 +52,8 @@ - type Window is private; - Null_Window : constant Window; - -- type Line_Position is new Natural; -- line coordinate -- type Column_Position is new Natural; -- column coordinate -+ type Line_Position is new Integer; -- line coordinate -+ type Column_Position is new Integer; -- column coordinate - - subtype Line_Count is Line_Position range 1 .. Line_Position'Last; - -- Type to count lines. We do not allow null windows, so must be positive -@@ -461,7 +461,7 @@ - -- ALIAS(`getch()') - -- Get a character from the keyboard and echo it - if enabled - to the - -- window. -- -- If for any reason (i.e. a timeout) we couldn't get a character the -+ -- If for any reason (i.e. a timeout) we could not get a character the - -- returned keycode is Key_None. - pragma Inline (Get_Keystroke); - -@@ -659,7 +659,7 @@ - -- introduce the Timeout_Mode parameter. This should improve - -- readability. For Blocking and Non_Blocking, the Amount is not - -- evaluated. -- -- We don't inline this procedure. -+ -- We do not inline this procedure. - - -- ANCHOR(`notimeout()',`Set_Escape_Time_Mode') - procedure Set_Escape_Timer_Mode -@@ -940,7 +940,7 @@ - Top_Left_Column : out Column_Position; - Is_Not_A_Subwindow : out Boolean); - -- AKA -- -- Instead of placing -1 in the coordinates as return, we use a boolean -+ -- Instead of placing -1 in the coordinates as return, we use a Boolean - -- to return the info that the window has no parent. - pragma Inline (Get_Origin_Relative_To_Parent); - -@@ -1122,7 +1122,7 @@ - -- ALIAS(`mvwinchstr()') - -- ALIAS(`mvinchnstr()') - -- ALIAS(`mvinchstr()') -- -- We don't inline the Peek procedures -+ -- We do not inline the Peek procedures - - -- MANPAGE(`curs_getstr.3x') - -@@ -1171,7 +1171,7 @@ - Text : String; - Fmt : Label_Justification := Left); - -- AKA -- -- We don't inline this procedure -+ -- We do not inline this procedure - - -- ANCHOR(`slk_refresh()',`Refresh_Soft_Label_Key') - procedure Refresh_Soft_Label_Keys; -@@ -1273,7 +1273,7 @@ - function Key_Name (Key : Real_Key_Code) return String; - -- AKA - -- Same as function -- -- We don't inline this routine -+ -- We do not inline this routine - - -- ANCHOR(`unctrl()',`Un_Control') - procedure Un_Control (Ch : Attributed_Character; -@@ -1443,7 +1443,7 @@ - -- N.B.: to be more precise, this uses a ncurses specific enhancement of - -- ripoffline(), in which the Lines argument absolute value is the - -- number of lines to be ripped of. The official ripoffline() only -- -- uses the sign of Lines to rip of a single line from bottom or top. -+ -- uses the sign of Lines to remove a single line from bottom or top. - pragma Inline (Rip_Off_Lines); - - type Cursor_Visibility is (Invisible, Normal, Very_Visible); -@@ -1469,10 +1469,10 @@ - Dir : Transform_Direction := From_Screen); - -- This procedure transforms screen coordinates into coordinates relative - -- to the window and vice versa, depending on the Dir parameter. -- -- Screen coordinates are the position informations on the physical device. -+ -- Screen coordinates are the position information for the physical device. - -- An Curses_Exception will be raised if Line and Column are not in the - -- Window or if you pass the Null_Window as argument. -- -- We don't inline this procedure -+ -- We do not inline this procedure - - -- MANPAGE(`default_colors.3x') - -@@ -1529,7 +1529,7 @@ - -- Not implemented: printw, wprintw, mvprintw, mvwprintw, vwprintw, - -- vw_printw - -- Please use the Ada style Text_IO child packages for formatted -- -- printing. It doesn't make a lot of sense to map the printf style -+ -- printing. It does not make a lot of sense to map the printf style - -- C functions to Ada. - - -- MANPAGE(`curs_scanw.3x') -diff -Naur ncurses-5.8/Ada95/gen/terminal_interface-curses-aux.ads.m4 ncurses-5.8-20110402/Ada95/gen/terminal_interface-curses-aux.ads.m4 ---- ncurses-5.8/Ada95/gen/terminal_interface-curses-aux.ads.m4 2009-12-26 19:35:43.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/gen/terminal_interface-curses-aux.ads.m4 2011-03-19 13:37:41.000000000 +0100 -@@ -10,7 +10,7 @@ - -- S P E C -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2007,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -38,7 +38,7 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.17 $ -+-- $Revision: 1.18 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - include(`Base_Defs') -@@ -64,7 +64,7 @@ - -- This is how those constants are defined in ncurses. I see them also - -- exactly like this in all ETI implementations I ever tested. So it - -- could be that this is quite general, but please check with your curses. -- -- This is critical, because curses sometime mixes boolean returns with -+ -- This is critical, because curses sometime mixes Boolean returns with - -- returning an error status. - Curses_Ok : constant C_Int := CF_CURSES_OK; - Curses_Err : constant C_Int := CF_CURSES_ERR; -diff -Naur ncurses-5.8/Ada95/gen/terminal_interface-curses-forms-field_types.ads.m4 ncurses-5.8-20110402/Ada95/gen/terminal_interface-curses-forms-field_types.ads.m4 ---- ncurses-5.8/Ada95/gen/terminal_interface-curses-forms-field_types.ads.m4 2009-12-26 18:46:57.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/gen/terminal_interface-curses-forms-field_types.ads.m4 2011-03-19 00:10:43.000000000 +0100 -@@ -10,7 +10,7 @@ - -- S P E C -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -38,7 +38,7 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.15 $ -+-- $Revision: 1.16 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Interfaces.C; -@@ -101,15 +101,15 @@ - pragma Convention (C, Freearg_Function); - - type Field_Check_Function is access -- function (Fld : Field; Usr : System.Address) return C_Int; -+ function (Fld : Field; Usr : System.Address) return Curses_Bool; - pragma Convention (C, Field_Check_Function); - - type Char_Check_Function is access -- function (Ch : C_Int; Usr : System.Address) return C_Int; -+ function (Ch : C_Int; Usr : System.Address) return Curses_Bool; - pragma Convention (C, Char_Check_Function); - - type Choice_Function is access -- function (Fld : Field; Usr : System.Address) return C_Int; -+ function (Fld : Field; Usr : System.Address) return Curses_Bool; - pragma Convention (C, Choice_Function); - - -- +---------------------------------------------------------------------- -@@ -117,7 +117,7 @@ - -- | - type Low_Level_Field_Type is - record -- Status : Interfaces.C.short; -+ Status : Interfaces.C.unsigned_short; - Ref_Count : Interfaces.C.long; - Left, Right : System.Address; - Makearg : Makearg_Function; -@@ -159,7 +159,7 @@ - -- Any other value will raise a Form_Exception. - - function Make_Arg (Args : System.Address) return System.Address; -- pragma Convention (C, Make_Arg); -+ pragma Import (C, Make_Arg, "void_star_make_arg"); - -- This is the Makearg_Function for the internal low-level types - -- introduced by this binding. - -@@ -174,7 +174,7 @@ - -- introduced by this binding. - - function Field_Check_Router (Fld : Field; -- Usr : System.Address) return C_Int; -+ Usr : System.Address) return Curses_Bool; - pragma Convention (C, Field_Check_Router); - -- This is the Field_Check_Function for the internal low-level types - -- introduced to wrap the low-level types by a Field_Type derived -@@ -182,7 +182,7 @@ - -- function. - - function Char_Check_Router (Ch : C_Int; -- Usr : System.Address) return C_Int; -+ Usr : System.Address) return Curses_Bool; - pragma Convention (C, Char_Check_Router); - -- This is the Char_Check_Function for the internal low-level types - -- introduced to wrap the low-level types by a Field_Type derived -@@ -190,7 +190,7 @@ - -- function. - - function Next_Router (Fld : Field; -- Usr : System.Address) return C_Int; -+ Usr : System.Address) return Curses_Bool; - pragma Convention (C, Next_Router); - -- This is the Choice_Function for the internal low-level types - -- introduced to wrap the low-level types by a Field_Type derived -@@ -198,7 +198,7 @@ - -- function. - - function Prev_Router (Fld : Field; -- Usr : System.Address) return C_Int; -+ Usr : System.Address) return Curses_Bool; - pragma Convention (C, Prev_Router); - -- This is the Choice_Function for the internal low-level types - -- introduced to wrap the low-level types by a Field_Type derived -diff -Naur ncurses-5.8/Ada95/gen/terminal_interface-curses-mouse.ads.m4 ncurses-5.8-20110402/Ada95/gen/terminal_interface-curses-mouse.ads.m4 ---- ncurses-5.8/Ada95/gen/terminal_interface-curses-mouse.ads.m4 2009-12-26 18:38:58.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/gen/terminal_interface-curses-mouse.ads.m4 2011-03-19 13:35:58.000000000 +0100 -@@ -10,7 +10,7 @@ - -- S P E C -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -38,8 +38,8 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.28 $ ---- $Date: 2009/12/26 17:38:58 $ -+-- $Revision: 1.29 $ -+-- $Date: 2011/03/19 12:35:58 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - include(`Mouse_Base_Defs') -@@ -49,10 +49,6 @@ - pragma Preelaborate (Terminal_Interface.Curses.Mouse); - - -- MANPAGE(`curs_mouse.3x') -- -- Please note, that in ncurses-1.9.9e documentation mouse support -- -- is still marked as experimental. So also this binding will change -- -- if the ncurses methods change. -- -- - -- mouse_trafo, wmouse_trafo are implemented as Transform_Coordinates - -- in the parent package. - -- -@@ -99,7 +95,7 @@ - State : Button_State; - Mask : in out Event_Mask); - -- Stores the event described by the button and the state in the mask. -- -- Before you call this the first time, you should init the mask -+ -- Before you call this the first time, you should initialize the mask - -- with the Empty_Mask constant - pragma Inline (Register_Reportable_Event); - -@@ -108,7 +104,7 @@ - State : Button_States; - Mask : in out Event_Mask); - -- Register all events described by the Button and the State bitmap. -- -- Before you call this the first time, you should init the mask -+ -- Before you call this the first time, you should initialize the mask - -- with the Empty_Mask constant - - -- ANCHOR(`mousemask()',`Start_Mouse') -diff -Naur ncurses-5.8/Ada95/include/Makefile.in ncurses-5.8-20110402/Ada95/include/Makefile.in ---- ncurses-5.8/Ada95/include/Makefile.in 2010-11-27 22:45:27.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/include/Makefile.in 2011-03-20 00:39:59.000000000 +0100 -@@ -1,6 +1,6 @@ --# $Id: Makefile.in,v 1.2 2010/11/27 21:45:27 tom Exp $ -+# $Id: Makefile.in,v 1.3 2011/03/19 23:39:59 tom Exp $ - ############################################################################## --# Copyright (c) 2010 Free Software Foundation, Inc. # -+# Copyright (c) 2010,2011 Free Software Foundation, Inc. # - # # - # Permission is hereby granted, free of charge, to any person obtaining a # - # copy of this software and associated documentation files (the "Software"), # -@@ -65,6 +65,8 @@ - sources \ - install :: $(AUTO_SRC) - -+uninstall :: -+ - ncurses_def.h: $(srcdir)/ncurses_defs $(srcdir)/MKncurses_def.sh - AWK=$(AWK) sh $(srcdir)/MKncurses_def.sh $(srcdir)/ncurses_defs >$@ - -diff -Naur ncurses-5.8/Ada95/make-tar.sh ncurses-5.8-20110402/Ada95/make-tar.sh ---- ncurses-5.8/Ada95/make-tar.sh 2010-11-06 20:59:07.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/make-tar.sh 2011-03-26 20:07:38.000000000 +0100 -@@ -1,7 +1,7 @@ - #!/bin/sh --# $Id: make-tar.sh,v 1.6 2010/11/06 19:59:07 tom Exp $ -+# $Id: make-tar.sh,v 1.12 2011/03/26 19:07:38 tom Exp $ - ############################################################################## --# Copyright (c) 2010 Free Software Foundation, Inc. # -+# Copyright (c) 2010,2011 Free Software Foundation, Inc. # - # # - # Permission is hereby granted, free of charge, to any person obtaining a # - # copy of this software and associated documentation files (the "Software"), # -@@ -31,15 +31,53 @@ - # documentation. The reason for doing that is to simplify distributing the - # ada binding as a separate package. - -+CDPATH=: -+export CDPATH -+ - TARGET=`pwd` - - : ${ROOTNAME:=ncurses-Ada95} -+: ${PKG_NAME:=AdaCurses} - : ${DESTDIR:=$TARGET} - : ${TMPDIR:=/tmp} - --# This can be run from either the Ada95 subdirectory, or from the top-level -+grep_assign() { -+ grep_assign=`egrep "^$2\>" "$1" | sed -e "s/^$2[ ]*=[ ]*//" -e 's/"//g'` -+ eval $2=\"$grep_assign\" -+} -+ -+grep_patchdate() { -+ grep_assign ../dist.mk NCURSES_MAJOR -+ grep_assign ../dist.mk NCURSES_MINOR -+ grep_assign ../dist.mk NCURSES_PATCH -+} -+ -+# The rpm spec-file in the ncurses tree is a template. Fill in the version -+# information from dist.mk -+edit_specfile() { -+ sed \ -+ -e "s/\\/$NCURSES_MAJOR/g" \ -+ -e "s/\\/$NCURSES_MINOR/g" \ -+ -e "s/\\/$NCURSES_PATCH/g" $1 >$1.new -+ chmod u+w $1 -+ mv $1.new $1 -+} -+ -+make_changelog() { -+ test -f $1 && chmod u+w $1 -+ cat >$1 <MANIFEST ) - - cd $BUILD || exit - -+# Remove build-artifacts. -+find . -name RCS -exec rm -rf {} \; -+find $BUILD/$ROOTNAME -type d -exec rmdir {} \; 2>/dev/null -+find $BUILD/$ROOTNAME -type d -exec rmdir {} \; 2>/dev/null -+find $BUILD/$ROOTNAME -type d -exec rmdir {} \; 2>/dev/null -+ - # There is no need for this script in the tar file. - rm -f $ROOTNAME/make-tar.sh - - # Remove build-artifacts. --find . -name RCS -exec rm -rf {} \; - find . -name "*.gz" -exec rm -rf {} \; - - # Make the files writable... -@@ -88,3 +149,5 @@ - - pwd - ls -l $ROOTNAME.tar.gz -+ -+# vi:ts=4 sw=4 -diff -Naur ncurses-5.8/Ada95/package/AdaCurses-doc.spec ncurses-5.8-20110402/Ada95/package/AdaCurses-doc.spec ---- ncurses-5.8/Ada95/package/AdaCurses-doc.spec 1970-01-01 01:00:00.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/package/AdaCurses-doc.spec 2011-03-26 20:22:39.000000000 +0100 -@@ -0,0 +1,48 @@ -+Summary: AdaCurses - Ada95 binding documentation for ncurses -+%define AppProgram AdaCurses -+%define AppVersion MAJOR.MINOR -+%define AppRelease YYYYMMDD -+%define AppPackage %{AppProgram}-doc -+# $Id: AdaCurses-doc.spec,v 1.1 2011/03/26 19:22:39 tom Exp $ -+Name: %{AppPackage} -+Version: %{AppVersion} -+Release: %{AppRelease} -+License: MIT -+Group: Applications/Development -+URL: ftp://invisible-island.net/%{AppProgram} -+Source0: %{AppProgram}-%{AppRelease}.tgz -+Packager: Thomas Dickey -+ -+%description -+This is the Ada95 binding documentation from the ncurses MAJOR.MINOR -+distribution, for patch-date YYYYMMDD. -+%prep -+ -+%setup -q -n %{AppProgram}-%{AppRelease} -+ -+%build -+ -+INSTALL_PROGRAM='${INSTALL}' \ -+ ./configure \ -+ --target %{_target_platform} \ -+ --prefix=%{_prefix} \ -+ --datadir=%{_datadir} \ -+ --with-ada-sharedlib -+ -+%install -+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -+ -+(cd doc && make install.html DESTDIR=$RPM_BUILD_ROOT ) -+ -+%clean -+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -+ -+%files -+%defattr(-,root,root) -+%{_datadir}/doc/AdaCurses -+ -+%changelog -+# each patch should add its ChangeLog entries here -+ -+* Sat Mar 26 2010 Thomas Dickey -+- initial version -diff -Naur ncurses-5.8/Ada95/package/AdaCurses.spec ncurses-5.8-20110402/Ada95/package/AdaCurses.spec ---- ncurses-5.8/Ada95/package/AdaCurses.spec 1970-01-01 01:00:00.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/package/AdaCurses.spec 2011-04-01 02:08:32.000000000 +0200 -@@ -0,0 +1,78 @@ -+Summary: AdaCurses - Ada95 binding for ncurses -+%define AppProgram AdaCurses -+%define AppVersion MAJOR.MINOR -+%define AppRelease YYYYMMDD -+# $Id: AdaCurses.spec,v 1.12 2011/04/01 00:08:32 tom Exp $ -+Name: %{AppProgram} -+Version: %{AppVersion} -+Release: %{AppRelease} -+License: MIT -+Group: Applications/Development -+URL: ftp://invisible-island.net/%{AppProgram} -+Source0: %{AppProgram}-%{AppRelease}.tgz -+Packager: Thomas Dickey -+ -+%description -+This is the Ada95 binding from the ncurses MAJOR.MINOR distribution, for -+patch-date YYYYMMDD. -+ -+In addition to a library, this package installs sample programs in -+"bin/AdaCurses" to avoid conflict with other packages. -+%prep -+ -+%setup -q -n %{AppProgram}-%{AppRelease} -+ -+%build -+ -+%define ada_libdir %{_prefix}/lib/ada/adalib -+ -+INSTALL_PROGRAM='${INSTALL}' \ -+ ./configure \ -+ --target %{_target_platform} \ -+ --prefix=%{_prefix} \ -+ --bindir=%{_bindir} \ -+ --libdir=%{_libdir} \ -+ --mandir=%{_mandir} \ -+ --datadir=%{_datadir} \ -+ --disable-rpath-link \ -+ --with-shared \ -+ --with-ada-sharedlib -+ -+make -+ -+%install -+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -+ -+make install DESTDIR=$RPM_BUILD_ROOT -+ -+( cd samples && -+ make install.examples \ -+ DESTDIR=$RPM_BUILD_ROOT \ -+ BINDIR=$RPM_BUILD_ROOT%{_bindir}/%{AppProgram} -+) -+ -+%clean -+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -+ -+%files -+%defattr(-,root,root) -+%{_bindir}/adacurses*-config -+%{_bindir}/%{AppProgram}/* -+%{_libdir}/libAdaCurses.* -+%{ada_libdir}/libAdaCurses.* -+%{ada_libdir}/terminal_interface* -+%{_mandir}/man1/adacurses*-config.1* -+%{_datadir}/%{AppProgram}/* -+%{_datadir}/ada/adainclude/terminal_interface* -+ -+%changelog -+# each patch should add its ChangeLog entries here -+ -+* Thu Mar 31 2010 Thomas Dickey -+- use --with-shared option for consistency with --with-ada-sharelib -+- ensure that MY_DATADIR is set when installing examples -+- add ada_libdir symbol to handle special case where libdir is /usr/lib64 -+- use --disable-rpath-link to link sample programs without rpath -+ -+* Fri Mar 25 2010 Thomas Dickey -+- initial version -diff -Naur ncurses-5.8/Ada95/package/debian/compat ncurses-5.8-20110402/Ada95/package/debian/compat ---- ncurses-5.8/Ada95/package/debian/compat 1970-01-01 01:00:00.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/package/debian/compat 2010-04-20 21:47:10.000000000 +0200 -@@ -0,0 +1 @@ -+5 -diff -Naur ncurses-5.8/Ada95/package/debian/control ncurses-5.8-20110402/Ada95/package/debian/control ---- ncurses-5.8/Ada95/package/debian/control 1970-01-01 01:00:00.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/package/debian/control 2011-03-25 19:55:48.000000000 +0100 -@@ -0,0 +1,17 @@ -+Source: adacurses -+Maintainer: Thomas E. Dickey -+Section: misc -+Priority: optional -+Standards-Version: 3.8.4 -+Build-Depends: debhelper (>= 5) -+Homepage: http://invisible-island.net/adacurses/ -+ -+Package: adacurses -+Architecture: any -+Depends: ${shlibs:Depends}, ${misc:Depends} -+Description: AdaCurses - Ada95 binding for ncurses -+ This package installs as "adacurses" to avoid conflict with other packages. -+ This is the Ada95 binding from the ncurses distribution. -+ . -+ In addition to a library, this package installs sample programs in -+ "bin/AdaCurses" to avoid conflict with other packages. -diff -Naur ncurses-5.8/Ada95/package/debian/copyright ncurses-5.8-20110402/Ada95/package/debian/copyright ---- ncurses-5.8/Ada95/package/debian/copyright 1970-01-01 01:00:00.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/package/debian/copyright 2011-03-25 01:52:39.000000000 +0100 -@@ -0,0 +1,69 @@ -+Upstream source http://invisible-island.net/ncurses/ncurses-examples.html -+ -+Current ncurses maintainer: Thomas Dickey -+ -+------------------------------------------------------------------------------- -+ Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. -+ -+ Permission is hereby granted, free of charge, to any person obtaining a -+ copy of this software and associated documentation files (the -+ "Software"), to deal in the Software without restriction, including -+ without limitation the rights to use, copy, modify, merge, publish, -+ distribute, distribute with modifications, sublicense, and/or sell -+ copies of the Software, and to permit persons to whom the Software is -+ furnished to do so, subject to the following conditions: -+ -+ The above copyright notice and this permission notice shall be included -+ in all copies or substantial portions of the Software. -+ -+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -+ IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -+ THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ -+ Except as contained in this notice, the name(s) of the above copyright -+ holders shall not be used in advertising or otherwise to promote the -+ sale, use or other dealings in this Software without prior written -+ authorization. -+------------------------------------------------------------------------------- -+ -+Files: install-sh -+Copyright: 1994 X Consortium -+Licence: other-BSD -+ Permission is hereby granted, free of charge, to any person obtaining a copy -+ of this software and associated documentation files (the "Software"), to -+ deal in the Software without restriction, including without limitation the -+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -+ sell copies of the Software, and to permit persons to whom the Software is -+ furnished to do so, subject to the following conditions: -+ -+ The above copyright notice and this permission notice shall be included in -+ all copies or substantial portions of the Software. -+ -+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+ X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -+ TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ -+ Except as contained in this notice, the name of the X Consortium shall not -+ be used in advertising or otherwise to promote the sale, use or other deal- -+ ings in this Software without prior written authorization from the X Consor- -+ tium. -+ -+ FSF changes to this file are in the public domain. -+ -+ Calling this script install-sh is preferred over install.sh, to prevent -+ `make' implicit rules from creating a file called install from it -+ when there is no Makefile. -+ -+ This script is compatible with the BSD install script, but was written -+ from scratch. It can only install one file at a time, a restriction -+ shared with many OS's install programs. -+ -+On Debian systems, the complete text of the GNU General -+Public License can be found in '/usr/share/common-licenses/GPL-2' -diff -Naur ncurses-5.8/Ada95/package/debian/docs ncurses-5.8-20110402/Ada95/package/debian/docs ---- ncurses-5.8/Ada95/package/debian/docs 1970-01-01 01:00:00.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/package/debian/docs 2010-06-27 17:51:57.000000000 +0200 -@@ -0,0 +1 @@ -+README -diff -Naur ncurses-5.8/Ada95/package/debian/rules ncurses-5.8-20110402/Ada95/package/debian/rules ---- ncurses-5.8/Ada95/package/debian/rules 1970-01-01 01:00:00.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/package/debian/rules 2011-04-01 02:23:51.000000000 +0200 -@@ -0,0 +1,97 @@ -+#!/usr/bin/make -f -+# MAde with the aid of dh_make, by Craig Small -+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. -+# Some lines taken from debmake, by Cristoph Lameter. -+ -+# Uncomment this to turn on verbose mode. -+#export DH_VERBOSE=1 -+ -+# These are used for cross-compiling and for saving the configure script -+# from having to guess our platform (since we know it already) -+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -+ -+TARGET_DIR = $(CURDIR)/debian/adacurses -+SAMPLE_DIR = $(TARGET_DIR)/usr/bin/AdaCurses -+ -+CFLAGS = -+ -+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -+ CFLAGS += -O0 -+else -+ CFLAGS += -O2 -+endif -+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) -+ INSTALL_PROGRAM += -s -+endif -+ -+ -+configure: configure-stamp -+configure-stamp: -+ dh_testdir -+ -+ CFLAGS="$(CFLAGS)" ./configure \ -+ --host=$(DEB_HOST_GNU_TYPE) \ -+ --build=$(DEB_BUILD_GNU_TYPE) \ -+ --prefix=/usr \ -+ --disable-rpath-link \ -+ --with-shared \ -+ --with-ada-sharedlib -+ -+ touch configure-stamp -+ -+build: build-stamp -+build-stamp: configure-stamp -+ dh_testdir -+ -+ $(MAKE) -+ -+ touch build-stamp -+ -+clean: -+ dh_testdir -+ dh_testroot -+ -+ [ ! -f makefile ] || $(MAKE) distclean -+ -+ rm -f configure-stamp build-stamp install-stamp -+ -+ dh_clean -+ -+install: install-stamp -+install-stamp: build-stamp -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ -+ $(MAKE) install DESTDIR=$(TARGET_DIR) -+ -+ # FIXME: it would be nice to make these into separate packages -+ ( cd samples && $(MAKE) install.examples DESTDIR=$(TARGET_DIR) BINDIR=$(SAMPLE_DIR) ) -+ ( cd doc && $(MAKE) install.html DESTDIR=$(TARGET_DIR) ) -+ -+ touch install-stamp -+ -+# Build architecture-independent files here. -+binary-indep: build install -+# No binary-indep target. -+ -+# Build architecture-dependent files here. -+binary-arch: build install -+ dh_testdir -+ dh_testroot -+ dh_installdocs -+ dh_installexamples -+ dh_installchangelogs NEWS -+ dh_strip -+ dh_compress -+ dh_fixperms -+ dh_installdeb -+ dh_shlibdeps -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+.PHONY: build clean binary-indep binary-arch binary install install-stamp -diff -Naur ncurses-5.8/Ada95/package/debian/source/format ncurses-5.8-20110402/Ada95/package/debian/source/format ---- ncurses-5.8/Ada95/package/debian/source/format 1970-01-01 01:00:00.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/package/debian/source/format 2010-12-30 15:23:50.000000000 +0100 -@@ -0,0 +1 @@ -+3.0 (native) -diff -Naur ncurses-5.8/Ada95/package/debian/watch ncurses-5.8-20110402/Ada95/package/debian/watch ---- ncurses-5.8/Ada95/package/debian/watch 1970-01-01 01:00:00.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/package/debian/watch 2011-03-25 19:41:54.000000000 +0100 -@@ -0,0 +1,4 @@ -+version=3 -+ -+opts=passive ftp://invisible-island.net/AdaCurses/AdaCurses-([\d.]+)\.tgz \ -+ debian uupdate -diff -Naur ncurses-5.8/Ada95/samples/explain.txt ncurses-5.8-20110402/Ada95/samples/explain.txt ---- ncurses-5.8/Ada95/samples/explain.txt 1997-09-09 02:14:40.000000000 +0200 -+++ ncurses-5.8-20110402/Ada95/samples/explain.txt 2011-03-19 13:01:41.000000000 +0100 -@@ -54,13 +54,13 @@ - #HELP - #HELPKEYS - You may scroll with the Cursor Up/Down Keys. --You may leave the help with the Function Key labelled 'Quit'. -+You may leave the help with the Function Key labeled 'Quit'. - #INHELP - You are already in the help system. --You may leave the help with the Function Key labelled 'Quit'. -+You may leave the help with the Function Key labeled 'Quit'. - #MAIN - This is the main menu of the sample program for the ncurses Ada95 --binding. The main intention of the demo is not to demonstate or -+binding. The main intention of the demo is not to demonstrate or - test all the features of ncurses and it's subsystems, but to provide - to you some sample code how to use the binding with Ada95. - -@@ -86,23 +86,23 @@ - the item name and the description. - #MENU01 - This is a demo of the some of the menu layout options. One of them --is the spacing functionality. Just press the Key labelled "Flip" to -+is the spacing functionality. Just press the Key labeled "Flip" to - flip between the non-spaced and a spaced version of the menu. Please - note that this functionality is unique for ncurses and is not found - in the SVr4 menu implementation. - --This is a menu that sometimes doesn't fit into it's window and -+This is a menu that sometimes does not fit into it's window and - therefore it becomes a scroll menu. - - You can also see here very nicely the pattern matching functionality - of menus. Type for example a 'J' and you will be positioned to the - next item after the current starting with a 'J'. Any more characters - you type in make the pattern more specific. With CTRL-A and CTRL-Z --(for more details press the Key labelled "Keys") you can browse -+(for more details press the Key labeled "Keys") you can browse - through all the items matching the pattern. - - You may change the format of the menu. Just press one of the keys --labelled "4x1", "4x2" or "4x3" to get a menu with that many rows -+labeled "4x1", "4x2" or "4x3" to get a menu with that many rows - and columns. - - With the Keys "O-Row" or "O-Col" (they occupy the same label and -@@ -121,7 +121,7 @@ - switch on selection) you can change whether or not the descriptions - for each item should be displayed. Please not that this key is - not visible in the "4x3" layout mode, because in this case the --menu wouldn't fit on a typicall 80x24 screen. -+menu would not fit on a typical 80x24 screen. - - With the Keys "Disab" or "Enab" (they occupy the same label and - switch on selection) you can dis- or enable the selectability of -@@ -131,13 +131,13 @@ - The Keys "4x1", "4x2" and "4x3" will change the format of the menu. - Please note that this is a scrolling menu. You may also play with the - pattern matching functionality or try to change the format of the menu. --For more details press the Key labelled "Help". -+For more details press the Key labeled "Help". - #FORM00 - This is a demo of the forms package. - #FORM-PAD00 - Please note that this demo is far from being complete. It really shows - only a small part of the functionality of the forms package. Let's hope --the next version will have a richer demo (You wan't to contribute ?). -+the next version will have a richer demo (You want to contribute ?). - #NOTIMPL - Sorry this functionality of the demo is not implemented at the moment. - Remember this is a freeware project, so I can use only my very rare -@@ -149,13 +149,13 @@ - #CURSES-PAD00 - Please note that this demo is far from being complete. It really shows - only a small part of the functionality of the curses package. Let's hope --the next version will have a richer demo (You wan't to contribute ?). -+the next version will have a richer demo (You want to contribute ?). - #MOUSEKEYS - In this demo you may use this keys: - -- - Key labelled "Help" to get a help -- - Key labelled "Keys" is what you are reading now -- - Key labelled "Quit" to leave the demo -+ - Key labeled "Help" to get a help -+ - Key labeled "Keys" is what you are reading now -+ - Key labeled "Quit" to leave the demo - - You may click the mouse buttons at any location at the screen and look - at the protocol window ! -@@ -179,7 +179,7 @@ - You may press one of the three well known standard keys of this demo. - #ATTRIB-PAD00 - Again this is a more than simple demo and just here to give you the --sourcecode. Feel free to contribute more. -+source code. Feel free to contribute more. - #TEXTIO - #TEXTIOKEYS - #TEXTIO-PAD00 -diff -Naur ncurses-5.8/Ada95/samples/Makefile.in ncurses-5.8-20110402/Ada95/samples/Makefile.in ---- ncurses-5.8/Ada95/samples/Makefile.in 2010-11-27 22:45:27.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/samples/Makefile.in 2011-03-29 01:45:08.000000000 +0200 -@@ -1,5 +1,5 @@ - ############################################################################## --# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. # -+# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. # - # # - # Permission is hereby granted, free of charge, to any person obtaining a # - # copy of this software and associated documentation files (the "Software"), # -@@ -28,7 +28,7 @@ - # - # Author: Juergen Pfeifer, 1996 - # --# $Id: Makefile.in,v 1.40 2010/11/27 21:45:27 tom Exp $ -+# $Id: Makefile.in,v 1.46 2011/03/28 23:45:08 tom Exp $ - # - .SUFFIXES: - -@@ -41,6 +41,8 @@ - srcdir = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ -+bindir = @bindir@ -+datadir = @datadir@ - libdir = @libdir@ - includedir = @includedir@ - -@@ -74,6 +76,13 @@ - - RANLIB = @RANLIB@ - ################################################################################ -+BINDIR = $(DESTDIR)$(bindir) -+DATADIR = $(DESTDIR)$(datadir) -+LIBDIR = $(DESTDIR)$(libdir) -+ -+MY_DATADIR = $(DATADIR)/AdaCurses -+ -+################################################################################ - ada_srcdir=../src - - LD_FLAGS = @LD_MODEL@ $(LOCAL_LIBS) @LDFLAGS@ @LIBS@ @LOCAL_LDFLAGS2@ $(LDFLAGS) -@@ -88,11 +97,11 @@ - ABASE = $(ALIB)-curses - - CARGS =-cargs $(ADAFLAGS) --LARGS =-largs @TEST_ARG2@ $(LD_FLAGS) -L../lib -lAdaCurses @TEST_LIBS2@ -+LARGS =-largs -L../lib -lAdaCurses @TEST_ARG2@ $(LD_FLAGS) @TEST_LIBS2@ - --PROGS = tour rain ncurses -+PROGS = tour$x ncurses$x @USE_GNAT_SIGINT@ rain$x - --all :: tour$x rain$x ncurses$x -+all :: $(PROGS) - @echo made $@ - - sources : -@@ -107,15 +116,28 @@ - uninstall.libs :: - @echo made $@ - -+install.examples :: $(BINDIR) $(PROGS) -+ $(INSTALL) $(PROGS) $(BINDIR) -+ -+install.examples :: $(MY_DATADIR) -+ $(INSTALL_DATA) explain.txt $(MY_DATADIR) -+ -+uninstall.examples :: -+ -cd $(BINDIR) && rm -f $(PROGS) -+ -rmdir $(BINDIR) -+ -rm -f $(MY_DATADIR)/explain.txt -+ -rmdir $(MY_DATADIR) -+ -+$(BINDIR) \ -+$(MY_DATADIR) : -+ mkdir -p $@ -+ - ncurses$x : - $(ADAMAKE) $(ADAMAKEFLAGS) ncurses $(CARGS) $(LARGS) - --tour$x : explain.msg -+tour$x : - $(ADAMAKE) $(ADAMAKEFLAGS) tour $(CARGS) $(LARGS) - --explain.msg: $(srcdir)/explain.txt -- cp $(srcdir)/explain.txt $@ -- - rain$x : - $(ADAMAKE) $(ADAMAKEFLAGS) rain $(CARGS) $(LARGS) - -@@ -124,7 +146,7 @@ - - clean :: mostlyclean - rm -f *.o *.ali b_t*.* *.s $(PROGS) a.out core b_*_test.c *.xr[bs] \ -- explain.msg trace screendump b~*.ad[bs] -+ trace screendump b~*.ad[bs] - - distclean :: clean - rm -f Makefile -diff -Naur ncurses-5.8/Ada95/samples/ncurses2-acs_and_scroll.adb ncurses-5.8-20110402/Ada95/samples/ncurses2-acs_and_scroll.adb ---- ncurses-5.8/Ada95/samples/ncurses2-acs_and_scroll.adb 2009-12-26 18:38:58.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/samples/ncurses2-acs_and_scroll.adb 2011-03-23 01:33:00.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 2000-2008,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 2000-2009,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Eugene V. Melaragno 2000 - -- Version Control ---- $Revision: 1.9 $ ---- $Date: 2009/12/26 17:38:58 $ -+-- $Revision: 1.11 $ -+-- $Date: 2011/03/23 00:33:00 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - -- Windows and scrolling tester. -@@ -345,7 +345,7 @@ - return; - when KEY_UP => - i := i + si - 1; -- -- same as i := i - 1 because of Modulus arithetic, -+ -- same as i := i - 1 because of Modulus arithmetic, - -- on Line_Position, which is a Natural - -- the C version uses this form too, interestingly. - when KEY_DOWN => -@@ -452,19 +452,19 @@ - function delete_framed (fp : FrameA; showit : Boolean) return FrameA is - np : FrameA; - begin -- fp.last.next := fp.next; -- fp.next.last := fp.last; -+ fp.all.last.all.next := fp.all.next; -+ fp.all.next.all.last := fp.all.last; - - if showit then -- Erase (fp.wind); -- Refresh (fp.wind); -+ Erase (fp.all.wind); -+ Refresh (fp.all.wind); - end if; -- Delete (fp.wind); -+ Delete (fp.all.wind); - -- if fp = fp.next then -+ if fp = fp.all.next then - np := null; - else -- np := fp.next; -+ np := fp.all.next; - end if; - -- TODO free(fp); - return np; -@@ -494,64 +494,64 @@ - False, False, - Null_Window); - begin -- neww.wind := getwindow; -- if neww.wind = Null_Window then -+ neww.all.wind := getwindow; -+ if neww.all.wind = Null_Window then - exit; - -- was goto breakout; ha ha ha - else - - if current = null then -- neww.next := neww; -- neww.last := neww; -+ neww.all.next := neww; -+ neww.all.last := neww; - else -- neww.next := current.next; -- neww.last := current; -- neww.last.next := neww; -- neww.next.last := neww; -+ neww.all.next := current.all.next; -+ neww.all.last := current; -+ neww.all.last.all.next := neww; -+ neww.all.next.all.last := neww; - end if; - current := neww; - -- Set_KeyPad_Mode (current.wind, True); -- current.do_keypad := HaveKeyPad (current.wind); -- current.do_scroll := HaveScroll (current.wind); -+ Set_KeyPad_Mode (current.all.wind, True); -+ current.all.do_keypad := HaveKeyPad (current.all.wind); -+ current.all.do_scroll := HaveScroll (current.all.wind); - end if; - end; - when Character'Pos ('N') mod 16#20# => -- Ctrl('N') - if current /= null then -- current := current.next; -+ current := current.all.next; - end if; - when Character'Pos ('P') mod 16#20# => -- Ctrl('P') - if current /= null then -- current := current.last; -+ current := current.all.last; - end if; - when Character'Pos ('F') mod 16#20# => -- Ctrl('F') -- if current /= null and then HaveScroll (current.wind) then -- Scroll (current.wind, 1); -+ if current /= null and then HaveScroll (current.all.wind) then -+ Scroll (current.all.wind, 1); - end if; - when Character'Pos ('B') mod 16#20# => -- Ctrl('B') -- if current /= null and then HaveScroll (current.wind) then -+ if current /= null and then HaveScroll (current.all.wind) then - -- The C version of Scroll may return ERR which is ignored - -- we need to avoid the exception - -- with the 'and HaveScroll(current.wind)' -- Scroll (current.wind, -1); -+ Scroll (current.all.wind, -1); - end if; - when Character'Pos ('K') mod 16#20# => -- Ctrl('K') - if current /= null then -- current.do_keypad := not current.do_keypad; -- Set_KeyPad_Mode (current.wind, current.do_keypad); -+ current.all.do_keypad := not current.all.do_keypad; -+ Set_KeyPad_Mode (current.all.wind, current.all.do_keypad); - end if; - when Character'Pos ('S') mod 16#20# => -- Ctrl('S') - if current /= null then -- current.do_scroll := not current.do_scroll; -- Allow_Scrolling (current.wind, current.do_scroll); -+ current.all.do_scroll := not current.all.do_scroll; -+ Allow_Scrolling (current.all.wind, current.all.do_scroll); - end if; - when Character'Pos ('W') mod 16#20# => -- Ctrl('W') -- if current /= current.next then -+ if current /= current.all.next then - Create (f, Name => dumpfile); -- TODO error checking - if not Is_Open (f) then - raise Curses_Exception; - end if; -- Put_Window (current.wind, f); -+ Put_Window (current.all.wind, f); - Close (f); - current := delete_framed (current, True); - end if; -@@ -563,15 +563,15 @@ - Open (f, Mode => In_File, Name => dumpfile); - neww := new Frame'(null, null, False, False, Null_Window); - -- neww.next := current.next; -- neww.last := current; -- neww.last.next := neww; -- neww.next.last := neww; -+ neww.all.next := current.all.next; -+ neww.all.last := current; -+ neww.all.last.all.next := neww; -+ neww.all.next.all.last := neww; - -- neww.wind := Get_Window (f); -+ neww.all.wind := Get_Window (f); - Close (f); - -- Refresh (neww.wind); -+ Refresh (neww.all.wind); - end; - when Character'Pos ('X') mod 16#20# => -- Ctrl('X') - if current /= null then -@@ -587,7 +587,7 @@ - "to mark new corner"); - Refresh; - -- Get_Window_Position (current.wind, ul.y, ul.x); -+ Get_Window_Position (current.all.wind, ul.y, ul.x); - - selectcell (ul.y, ul.x, Lines - Botlines - 2, Columns - 2, - tmp, tmpbool); -@@ -595,43 +595,43 @@ - -- the C version had a goto. I refuse gotos. - Beep; - else -- Get_Size (current.wind, lr.y, lr.x); -+ Get_Size (current.all.wind, lr.y, lr.x); - lr.y := lr.y + ul.y - 1; - lr.x := lr.x + ul.x - 1; - Outerbox (ul, lr, False); - Refresh_Without_Update; - -- Get_Size (current.wind, my, mx); -+ Get_Size (current.all.wind, my, mx); - if my > tmp.y - ul.y then -- Get_Cursor_Position (current.wind, lr.y, lr.x); -- Move_Cursor (current.wind, tmp.y - ul.y + 1, 0); -- Clear_To_End_Of_Screen (current.wind); -- Move_Cursor (current.wind, lr.y, lr.x); -+ Get_Cursor_Position (current.all.wind, lr.y, lr.x); -+ Move_Cursor (current.all.wind, tmp.y - ul.y + 1, 0); -+ Clear_To_End_Of_Screen (current.all.wind); -+ Move_Cursor (current.all.wind, lr.y, lr.x); - end if; - if mx > tmp.x - ul.x then - for i in 0 .. my - 1 loop -- Move_Cursor (current.wind, i, tmp.x - ul.x + 1); -- Clear_To_End_Of_Line (current.wind); -+ Move_Cursor (current.all.wind, i, tmp.x - ul.x + 1); -+ Clear_To_End_Of_Line (current.all.wind); - end loop; - end if; -- Refresh_Without_Update (current.wind); -+ Refresh_Without_Update (current.all.wind); - - lr := tmp; - -- The C version passes invalid args to resize - -- which returns an ERR. For Ada we avoid the exception. - if lr.y /= ul.y and lr.x /= ul.x then -- Resize (current.wind, lr.y - ul.y + 0, -+ Resize (current.all.wind, lr.y - ul.y + 0, - lr.x - ul.x + 0); - end if; - -- Get_Window_Position (current.wind, ul.y, ul.x); -- Get_Size (current.wind, lr.y, lr.x); -+ Get_Window_Position (current.all.wind, ul.y, ul.x); -+ Get_Size (current.all.wind, lr.y, lr.x); - lr.y := lr.y + ul.y - 1; - lr.x := lr.x + ul.x - 1; - Outerbox (ul, lr, True); - Refresh_Without_Update; - -- Refresh_Without_Update (current.wind); -+ Refresh_Without_Update (current.all.wind); - Move_Cursor (Line => 0, Column => 0); - Clear_To_End_Of_Line; - Update_Screen; -@@ -647,30 +647,30 @@ - Refresh; - end; - when Key_Cursor_Up => -- newwin_move (current.wind, -1, 0); -+ newwin_move (current.all.wind, -1, 0); - when Key_Cursor_Down => -- newwin_move (current.wind, 1, 0); -+ newwin_move (current.all.wind, 1, 0); - when Key_Cursor_Left => -- newwin_move (current.wind, 0, -1); -+ newwin_move (current.all.wind, 0, -1); - when Key_Cursor_Right => -- newwin_move (current.wind, 0, 1); -+ newwin_move (current.all.wind, 0, 1); - when Key_Backspace | Key_Delete_Char => - declare - y : Line_Position; - x : Column_Position; - tmp : Line_Position; - begin -- Get_Cursor_Position (current.wind, y, x); -+ Get_Cursor_Position (current.all.wind, y, x); - -- x := x - 1; - -- I got tricked by the -1 = Max_Natural - 1 result - -- y := y - 1; - if not (x = 0 and y = 0) then - if x = 0 then - y := y - 1; -- Get_Size (current.wind, tmp, x); -+ Get_Size (current.all.wind, tmp, x); - end if; - x := x - 1; -- Delete_Character (current.wind, y, x); -+ Delete_Character (current.all.wind, y, x); - end if; - end; - when others => -@@ -678,7 +678,7 @@ - if current /= null then - declare - begin -- Add (current.wind, Ch => Code_To_Char (c)); -+ Add (current.all.wind, Ch => Code_To_Char (c)); - exception - when Curses_Exception => null; - -- this happens if we are at the -@@ -688,9 +688,9 @@ - Beep; - end if; - end case; -- newwin_report (current.wind); -+ newwin_report (current.all.wind); - if current /= null then -- usescr := current.wind; -+ usescr := current.all.wind; - else - usescr := Standard_Window; - end if; -diff -Naur ncurses-5.8/Ada95/samples/ncurses2-demo_forms.adb ncurses-5.8-20110402/Ada95/samples/ncurses2-demo_forms.adb ---- ncurses-5.8/Ada95/samples/ncurses2-demo_forms.adb 2006-06-25 16:24:40.000000000 +0200 -+++ ncurses-5.8-20110402/Ada95/samples/ncurses2-demo_forms.adb 2011-03-23 01:44:12.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 2000-2004,2006 Free Software Foundation, Inc. -- -+-- Copyright (c) 2000-2006,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Eugene V. Melaragno 2000 - -- Version Control ---- $Revision: 1.5 $ ---- $Date: 2006/06/25 14:24:40 $ -+-- $Revision: 1.6 $ -+-- $Date: 2011/03/23 00:44:12 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with ncurses2.util; use ncurses2.util; -@@ -451,19 +451,19 @@ - Refresh; - - -- describe the form -- f (1) := make_label (0, 15, "Sample Form"); -- f (2) := make_label (2, 0, "Last Name"); -- f (3) := make_field (3, 0, 1, 18, False); -- f (4) := make_label (2, 20, "First Name"); -- f (5) := make_field (3, 20, 1, 12, False); -- f (6) := make_label (2, 34, "Middle Name"); -- f (7) := make_field (3, 34, 1, 12, False); -- f (8) := make_label (5, 0, "Comments"); -- f (9) := make_field (6, 0, 4, 46, False); -- f (10) := make_label (5, 20, "Password:"); -- f (11) := make_field (5, 30, 1, 9, True); -- secure := f (11); -- f (12) := Null_Field; -+ f.all (1) := make_label (0, 15, "Sample Form"); -+ f.all (2) := make_label (2, 0, "Last Name"); -+ f.all (3) := make_field (3, 0, 1, 18, False); -+ f.all (4) := make_label (2, 20, "First Name"); -+ f.all (5) := make_field (3, 20, 1, 12, False); -+ f.all (6) := make_label (2, 34, "Middle Name"); -+ f.all (7) := make_field (3, 34, 1, 12, False); -+ f.all (8) := make_label (5, 0, "Comments"); -+ f.all (9) := make_field (6, 0, 4, 46, False); -+ f.all (10) := make_label (5, 20, "Password:"); -+ f.all (11) := make_field (5, 30, 1, 9, True); -+ secure := f.all (11); -+ f.all (12) := Null_Field; - - myform := New_Form (f); - -diff -Naur ncurses-5.8/Ada95/samples/ncurses2-demo_pad.adb ncurses-5.8-20110402/Ada95/samples/ncurses2-demo_pad.adb ---- ncurses-5.8/Ada95/samples/ncurses2-demo_pad.adb 2008-07-26 20:47:06.000000000 +0200 -+++ ncurses-5.8-20110402/Ada95/samples/ncurses2-demo_pad.adb 2011-03-23 01:44:12.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 2000-2006,2008 Free Software Foundation, Inc. -- -+-- Copyright (c) 2000-2008,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Eugene V. Melaragno 2000 - -- Version Control ---- $Revision: 1.7 $ ---- $Date: 2008/07/26 18:47:06 $ -+-- $Revision: 1.8 $ -+-- $Date: 2011/03/23 00:44:12 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with ncurses2.util; use ncurses2.util; -@@ -121,8 +121,8 @@ - retval.seconds := 0; - retval.microseconds := 0; - else -- retval.seconds := Integer (t.tv_sec); -- retval.microseconds := Integer (t.tv_usec); -+ retval.seconds := Integer (t.all.tv_sec); -+ retval.microseconds := Integer (t.all.tv_usec); - end if; - return retval; - end gettime; -diff -Naur ncurses-5.8/Ada95/samples/ncurses2-demo_panels.adb ncurses-5.8-20110402/Ada95/samples/ncurses2-demo_panels.adb ---- ncurses-5.8/Ada95/samples/ncurses2-demo_panels.adb 2008-08-31 01:35:01.000000000 +0200 -+++ ncurses-5.8-20110402/Ada95/samples/ncurses2-demo_panels.adb 2011-03-23 01:44:12.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 2000-2004,2008 Free Software Foundation, Inc. -- -+-- Copyright (c) 2000-2008,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Eugene V. Melaragno 2000 - -- Version Control ---- $Revision: 1.6 $ ---- $Date: 2008/08/30 23:35:01 $ -+-- $Revision: 1.7 $ -+-- $Date: 2011/03/23 00:44:12 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with ncurses2.util; use ncurses2.util; -@@ -139,7 +139,7 @@ - - procedure fill_panel (pan : Panel) is - win : constant Window := Panel_Window (pan); -- num : constant Character := Get_User_Data (pan) (2); -+ num : constant Character := Get_User_Data (pan).all (2); - tmp6 : String (1 .. 6) := "-panx-"; - maxy : Line_Count; - maxx : Column_Count; -diff -Naur ncurses-5.8/Ada95/samples/ncurses2-getopt.adb ncurses-5.8-20110402/Ada95/samples/ncurses2-getopt.adb ---- ncurses-5.8/Ada95/samples/ncurses2-getopt.adb 2008-07-26 20:46:44.000000000 +0200 -+++ ncurses-5.8-20110402/Ada95/samples/ncurses2-getopt.adb 2011-03-19 13:09:51.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 2000-2004,2008 Free Software Foundation, Inc. -- -+-- Copyright (c) 2000-2008,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Eugene V. Melaragno 2000 - -- Version Control ---- $Revision: 1.7 $ ---- $Date: 2008/07/26 18:46:44 $ -+-- $Revision: 1.8 $ -+-- $Date: 2011/03/19 12:09:51 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - -- A simplified version of the GNU getopt function -@@ -56,7 +56,7 @@ - -- also the user is not allowed to modify argv or argc - -- Doing so is Erroneous execution. - -- -- longoptions are not handled. -+ -- long options are not handled. - - procedure Qgetopt (retval : out Integer; - argc : Integer; -@@ -67,7 +67,7 @@ - -- ignored for ncurses, must be initialized to 1 by - -- the caller - Optarg : out stringa -- -- a garbage colector would be useful here. -+ -- a garbage collector would be useful here. - ) is - - package BS is new Ada.Strings.Bounded.Generic_Bounded_Length (200); -diff -Naur ncurses-5.8/Ada95/samples/ncurses2-menu_test.adb ncurses-5.8-20110402/Ada95/samples/ncurses2-menu_test.adb ---- ncurses-5.8/Ada95/samples/ncurses2-menu_test.adb 2006-06-25 16:24:40.000000000 +0200 -+++ ncurses-5.8-20110402/Ada95/samples/ncurses2-menu_test.adb 2011-03-23 01:39:28.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 2000-2004,2006 Free Software Foundation, Inc. -- -+-- Copyright (c) 2000-2006,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Eugene V. Melaragno 2000 - -- Version Control ---- $Revision: 1.6 $ ---- $Date: 2006/06/25 14:24:40 $ -+-- $Revision: 1.8 $ -+-- $Date: 2011/03/23 00:39:28 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with ncurses2.util; use ncurses2.util; -@@ -46,10 +46,10 @@ - with Terminal_Interface.Curses.Mouse; use Terminal_Interface.Curses.Mouse; - - procedure ncurses2.menu_test is -- function menu_virtualize (c : Key_Code) return Menu_Request_Code; -+ function menu_virtualize (c : Key_Code) return Key_Code; - procedure xAdd (l : Line_Position; c : Column_Position; s : String); - -- function menu_virtualize (c : Key_Code) return Menu_Request_Code is -+ function menu_virtualize (c : Key_Code) return Key_Code is - begin - case c is - when Character'Pos (newl) | Key_Exit => -@@ -110,7 +110,7 @@ - c1 : Key_Code; - - c : Driver_Result; -- r : Menu_Request_Code; -+ r : Key_Code; - begin - tmp := Start_Mouse; - xAdd (0, 0, "This is the menu test:"); -@@ -121,9 +121,9 @@ - Refresh; - - for i in animals'Range loop -- items_a (i) := New_Item (animals (i).all); -+ items_a.all (i) := New_Item (animals (i).all); - end loop; -- items_a (animals'Last + 1) := Null_Item; -+ items_a.all (animals'Last + 1) := Null_Item; - - m := New_Menu (items_a); - -diff -Naur ncurses-5.8/Ada95/samples/ncurses2-overlap_test.adb ncurses-5.8-20110402/Ada95/samples/ncurses2-overlap_test.adb ---- ncurses-5.8/Ada95/samples/ncurses2-overlap_test.adb 2004-08-21 23:37:00.000000000 +0200 -+++ ncurses-5.8-20110402/Ada95/samples/ncurses2-overlap_test.adb 2011-03-19 13:07:18.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 2000,2004 Free Software Foundation, Inc. -- -+-- Copyright (c) 2000-2004,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Eugene V. Melaragno 2000 - -- Version Control ---- $Revision: 1.4 $ ---- $Date: 2004/08/21 21:37:00 $ -+-- $Revision: 1.5 $ -+-- $Date: 2011/03/19 12:07:18 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with ncurses2.util; use ncurses2.util; -@@ -101,7 +101,7 @@ - - Move_Cursor (Line => 18, Column => 0); - Add (Str => "a = refresh A, then B, then doupdate. b = refresh B, " & -- "then A, then doupdaute"); -+ "then A, then doupdate"); - Add (Ch => newl); - Add (Str => "c = fill window A with letter A. d = fill window B " & - "with letter B."); -diff -Naur ncurses-5.8/Ada95/samples/ncurses2-slk_test.adb ncurses-5.8-20110402/Ada95/samples/ncurses2-slk_test.adb ---- ncurses-5.8/Ada95/samples/ncurses2-slk_test.adb 2009-12-26 18:38:58.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/samples/ncurses2-slk_test.adb 2011-03-19 13:03:08.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 2000-2006,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 2000-2009,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Eugene V. Melaragno 2000 - -- Version Control ---- $Revision: 1.8 $ ---- $Date: 2009/12/26 17:38:58 $ -+-- $Revision: 1.9 $ -+-- $Date: 2011/03/19 12:03:08 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with ncurses2.util; use ncurses2.util; -@@ -161,7 +161,7 @@ - when 'x' | 'q' => - exit; - -- the C version needed a goto, ha ha -- -- breaks exit the case not the loop because fall-throuh -+ -- breaks exit the case not the loop because fall-through - -- happens in C! - when others => - Beep; -diff -Naur ncurses-5.8/Ada95/samples/ncurses2-trace_set.adb ncurses-5.8-20110402/Ada95/samples/ncurses2-trace_set.adb ---- ncurses-5.8/Ada95/samples/ncurses2-trace_set.adb 2008-07-26 20:46:18.000000000 +0200 -+++ ncurses-5.8-20110402/Ada95/samples/ncurses2-trace_set.adb 2011-03-23 01:40:33.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 2000-2006,2008 Free Software Foundation, Inc. -- -+-- Copyright (c) 2000-2008,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Eugene V. Melaragno 2000 - -- Version Control ---- $Revision: 1.3 $ ---- $Date: 2008/07/26 18:46:18 $ -+-- $Revision: 1.5 $ -+-- $Date: 2011/03/23 00:40:33 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with ncurses2.util; use ncurses2.util; -@@ -50,14 +50,14 @@ - - procedure ncurses2.trace_set is - -- function menu_virtualize (c : Key_Code) return Menu_Request_Code; -+ function menu_virtualize (c : Key_Code) return Key_Code; - function subset (super, sub : Trace_Attribute_Set) return Boolean; - function trace_or (a, b : Trace_Attribute_Set) return Trace_Attribute_Set; - function trace_num (tlevel : Trace_Attribute_Set) return String; - function tracetrace (tlevel : Trace_Attribute_Set) return String; - function run_trace_menu (m : Menu; count : Integer) return Boolean; - -- function menu_virtualize (c : Key_Code) return Menu_Request_Code is -+ function menu_virtualize (c : Key_Code) return Key_Code is - begin - case c is - when Character'Pos (newl) | Key_Exit => -@@ -416,9 +416,9 @@ - Refresh; - - for n in t_tbl'Range loop -- items_a (n) := New_Item (t_tbl (n).name.all); -+ items_a.all (n) := New_Item (t_tbl (n).name.all); - end loop; -- items_a (t_tbl'Last + 1) := Null_Item; -+ items_a.all (t_tbl'Last + 1) := Null_Item; - - m := New_Menu (items_a); - -diff -Naur ncurses-5.8/Ada95/samples/sample.adb ncurses-5.8-20110402/Ada95/samples/sample.adb ---- ncurses-5.8/Ada95/samples/sample.adb 2008-09-27 16:42:40.000000000 +0200 -+++ ncurses-5.8-20110402/Ada95/samples/sample.adb 2011-03-23 01:44:12.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998,2008 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2008,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control ---- $Revision: 1.17 $ ---- $Date: 2008/09/27 14:42:40 $ -+-- $Revision: 1.18 $ -+-- $Date: 2011/03/23 00:44:12 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Text_IO; -@@ -143,7 +143,7 @@ - Ud.Set_User_Data (M, D1); - - I1 := new User_Data'(Data => 1174); -- Id.Set_User_Data (I (1), I1); -+ Id.Set_User_Data (I.all (1), I1); - - Set_Spacing (Men => M, Row => 2); - -@@ -156,7 +156,7 @@ - pragma Assert (D1 = D2); - pragma Assert (D1.Data = D2.Data); - -- Id.Get_User_Data (I (1), I2); -+ Id.Get_User_Data (I.all (1), I2); - pragma Assert (I1 = I2); - pragma Assert (I1.Data = I2.Data); - -diff -Naur ncurses-5.8/Ada95/samples/sample-curses_demo.adb ncurses-5.8-20110402/Ada95/samples/sample-curses_demo.adb ---- ncurses-5.8/Ada95/samples/sample-curses_demo.adb 2004-08-21 23:37:00.000000000 +0200 -+++ ncurses-5.8-20110402/Ada95/samples/sample-curses_demo.adb 2011-03-23 01:29:04.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998,2004 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2004,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control ---- $Revision: 1.15 $ ---- $Date: 2004/08/21 21:37:00 $ -+-- $Revision: 1.17 $ -+-- $Date: 2011/03/23 00:29:04 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Terminal_Interface.Curses; use Terminal_Interface.Curses; -@@ -61,7 +61,7 @@ - type User_Data_Access is access all User_Data; - package PUD is new Panels.User_Data (User_Data, User_Data_Access); - -- We use above instantiation of the generic User_Data package to -- -- demonstrate and test the use of the user data maechanism. -+ -- demonstrate and test the use of the user data mechanism. - - procedure Demo - is -@@ -122,9 +122,9 @@ - declare - O : Item_Option_Set; - begin -- Get_Options (Itm (2), O); -+ Get_Options (Itm.all (2), O); - O.Selectable := False; -- Set_Options (Itm (2), O); -+ Set_Options (Itm.all (2), O); - end; - end if; - -diff -Naur ncurses-5.8/Ada95/samples/sample-explanation.adb ncurses-5.8-20110402/Ada95/samples/sample-explanation.adb ---- ncurses-5.8/Ada95/samples/sample-explanation.adb 2009-12-26 18:38:58.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/samples/sample-explanation.adb 2011-03-26 23:33:29.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control ---- $Revision: 1.21 $ ---- $Date: 2009/12/26 17:38:58 $ -+-- $Revision: 1.26 $ -+-- $Date: 2011/03/26 22:33:29 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - -- Poor mans help system. This scans a sequential file for key lines and -@@ -58,7 +58,7 @@ - Help_Keys : constant String := "HELPKEYS"; - In_Help : constant String := "INHELP"; - -- File_Name : constant String := "explain.msg"; -+ File_Name : constant String := "explain.txt"; - F : File_Type; - - type Help_Line; -@@ -86,6 +86,8 @@ - function Search (Key : String) return Help_Line_Access; - procedure Release_Help (Root : in out Help_Line_Access); - -+ function Check_File (Name : String) return Boolean; -+ - procedure Explain (Key : String) - is - begin -@@ -126,7 +128,7 @@ - Add (W, Key); - Add (W, " not found."); - Add (W, Character'Val (10)); -- Add (W, "Press the Function key labelled 'Quit' key to continue."); -+ Add (W, "Press the Function key labeled 'Quit' key to continue."); - end Unknown_Key; - - procedure Redo -@@ -135,9 +137,9 @@ - begin - if Top_Line /= null then - for L in 0 .. (Height - 1) loop -- Add (W, L, 0, H.Line.all); -- exit when H.Next = null; -- H := H.Next; -+ Add (W, L, 0, H.all.Line.all); -+ exit when H.all.Next = null; -+ H := H.all.Next; - end loop; - else - Unknown_Key; -@@ -181,12 +183,12 @@ - L : Line_Position := 0; - begin - loop -- Add (W, L, 0, C.Line.all); -+ Add (W, L, 0, C.all.Line.all); - L := L + 1; -- exit when C.Next = null or else L = Height; -- C := C.Next; -+ exit when C.all.Next = null or else L = Height; -+ C := C.all.Next; - end loop; -- if C.Next /= null then -+ if C.all.Next /= null then - pragma Assert (L = Height); - More := True; - else -@@ -248,20 +250,20 @@ - if K in Special_Key_Code'Range then - case K is - when Key_Cursor_Down => -- if Current.Next /= null then -+ if Current.all.Next /= null then - Move_Cursor (W, Height - 1, 0); - Scroll (W, 1); -- Current := Current.Next; -- Top_Line := Top_Line.Next; -- Add (W, Current.Line.all); -+ Current := Current.all.Next; -+ Top_Line := Top_Line.all.Next; -+ Add (W, Current.all.Line.all); - end if; - when Key_Cursor_Up => -- if Top_Line.Prev /= null then -+ if Top_Line.all.Prev /= null then - Move_Cursor (W, 0, 0); - Scroll (W, -1); -- Top_Line := Top_Line.Prev; -- Current := Current.Prev; -- Add (W, Top_Line.Line.all); -+ Top_Line := Top_Line.all.Prev; -+ Current := Current.all.Prev; -+ Add (W, Top_Line.all.Line.all); - end if; - when QUIT_CODE => exit; - when others => null; -@@ -330,8 +332,8 @@ - Release_Help (Root); - Root := Current; - else -- Tail.Next := Current; -- Current.Prev := Tail; -+ Tail.all.Next := Current; -+ Current.all.Prev := Tail; - end if; - Tail := Current; - end loop; -@@ -347,8 +349,8 @@ - begin - loop - exit when Root = null; -- Next := Root.Next; -- Release_String (Root.Line); -+ Next := Root.all.Next; -+ Release_String (Root.all.Line); - Release_Help_Line (Root); - Root := Next; - end loop; -@@ -371,7 +373,7 @@ - begin - if H /= null then - loop -- T := T.Next; -+ T := T.all.Next; - exit when T = null; - N := N + 1; - end loop; -@@ -391,9 +393,9 @@ - P := New_Panel (W); - T := H; - loop -- Add (W, L + 1, 1, T.Line.all, Integer (Columns - 2)); -+ Add (W, L + 1, 1, T.all.Line.all, Integer (Columns - 2)); - L := L + 1; -- T := T.Next; -+ T := T.all.Next; - exit when T = null; - end loop; - T := H; -@@ -403,6 +405,26 @@ - end if; - end Notepad; - -+ function Check_File (Name : String) return Boolean is -+ The_File : File_Type; -+ begin -+ Open (The_File, In_File, Name); -+ Close (The_File); -+ return True; -+ exception -+ when Name_Error => -+ return False; -+ end Check_File; -+ - begin -- Open (F, In_File, File_Name); -+ if Check_File ("/usr/share/AdaCurses/" & File_Name) then -+ Open (F, In_File, "/usr/share/AdaCurses/" & File_Name); -+ elsif Check_File (File_Name) then -+ Open (F, In_File, File_Name); -+ else -+ Put_Line (Standard_Error, -+ "The file explain.txt was not found in the current directory." -+ ); -+ raise Name_Error; -+ end if; - end Sample.Explanation; -diff -Naur ncurses-5.8/Ada95/samples/sample-form_demo.adb ncurses-5.8-20110402/Ada95/samples/sample-form_demo.adb ---- ncurses-5.8/Ada95/samples/sample-form_demo.adb 2006-06-25 16:30:22.000000000 +0200 -+++ ncurses-5.8-20110402/Ada95/samples/sample-form_demo.adb 2011-03-23 01:44:12.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2006,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control ---- $Revision: 1.15 $ ---- $Date: 2006/06/25 14:30:22 $ -+-- $Revision: 1.16 $ -+-- $Date: 2011/03/23 00:44:12 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Terminal_Interface.Curses; use Terminal_Interface.Curses; -@@ -108,16 +108,16 @@ - Notepad ("FORM-PAD00"); - Default_Labels; - -- Set_Field_Type (FA (6), Enum_Field); -- Set_Field_Type (FA (7), I_F); -- Set_Field_Type (FA (8), Mft); -+ Set_Field_Type (FA.all (6), Enum_Field); -+ Set_Field_Type (FA.all (7), I_F); -+ Set_Field_Type (FA.all (8), Mft); - - F1 := new User_Data'(Data => 4711); -- Fld_U.Set_User_Data (FA (1), F1); -+ Fld_U.Set_User_Data (FA.all (1), F1); - - Fh.Drive_Me (Frm); - -- Fld_U.Get_User_Data (FA (1), F2); -+ Fld_U.Get_User_Data (FA.all (1), F2); - pragma Assert (F1 = F2); - pragma Assert (F1.Data = F2.Data); - -diff -Naur ncurses-5.8/Ada95/samples/sample-form_demo-aux.ads ncurses-5.8-20110402/Ada95/samples/sample-form_demo-aux.ads ---- ncurses-5.8/Ada95/samples/sample-form_demo-aux.ads 2009-12-26 18:44:09.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/samples/sample-form_demo-aux.ads 2011-03-19 13:17:32.000000000 +0100 -@@ -7,7 +7,7 @@ - -- S P E C -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -35,7 +35,7 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control ---- $Revision: 1.10 $ -+-- $Revision: 1.11 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Terminal_Interface.Curses; use Terminal_Interface.Curses; -@@ -49,7 +49,7 @@ - C : out Column_Count; - Y : out Line_Position; - X : out Column_Position); -- -- Calculate the geometry for a panel beeing able to be used to display -+ -- Calculate the geometry for a panel being able to be used to display - -- the menu. - - function Create (F : Form; -diff -Naur ncurses-5.8/Ada95/samples/sample-function_key_setting.adb ncurses-5.8-20110402/Ada95/samples/sample-function_key_setting.adb ---- ncurses-5.8/Ada95/samples/sample-function_key_setting.adb 2009-12-26 18:38:58.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/samples/sample-function_key_setting.adb 2011-03-23 01:44:12.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2004,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control ---- $Revision: 1.14 $ ---- $Date: 2009/12/26 17:38:58 $ -+-- $Revision: 1.15 $ -+-- $Date: 2011/03/23 00:44:12 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Ada.Unchecked_Deallocation; -@@ -88,18 +88,18 @@ - begin - -- Store the current labels in the environment - for I in 1 .. Number_Of_Keys loop -- Get_Soft_Label_Key (I, P.Labels (I)); -+ Get_Soft_Label_Key (I, P.all.Labels (I)); - if Reset then - Set_Soft_Label_Key (I, " "); - end if; - end loop; -- P.Prev := Top_Of_Stack; -+ P.all.Prev := Top_Of_Stack; - -- now store active help context and notepad -- P.Help := Active_Context; -- P.Notepad := Active_Notepad; -+ P.all.Help := Active_Context; -+ P.all.Notepad := Active_Notepad; - -- The notepad must now vanish and the new notepad is empty. -- if P.Notepad /= Null_Panel then -- Hide (P.Notepad); -+ if P.all.Notepad /= Null_Panel then -+ Hide (P.all.Notepad); - Update_Panels; - end if; - Active_Notepad := Null_Panel; -@@ -119,14 +119,14 @@ - raise Function_Key_Stack_Error; - else - for I in 1 .. Number_Of_Keys loop -- Set_Soft_Label_Key (I, P.Labels (I), Justification); -+ Set_Soft_Label_Key (I, P.all.Labels (I), Justification); - end loop; - pragma Assert (Active_Context /= null); - Release_String (Active_Context); -- Active_Context := P.Help; -+ Active_Context := P.all.Help; - Refresh_Soft_Label_Keys_Without_Update; -- Notepad_To_Context (P.Notepad); -- Top_Of_Stack := P.Prev; -+ Notepad_To_Context (P.all.Notepad); -+ Top_Of_Stack := P.all.Prev; - Release_Environment (P); - end if; - end Pop_Environment; -@@ -150,10 +150,10 @@ - else - loop - exit when P = null; -- if P.Help.all = Key then -+ if P.all.Help.all = Key then - return True; - else -- P := P.Prev; -+ P := P.all.Prev; - end if; - end loop; - return False; -diff -Naur ncurses-5.8/Ada95/samples/sample-function_key_setting.ads ncurses-5.8-20110402/Ada95/samples/sample-function_key_setting.ads ---- ncurses-5.8/Ada95/samples/sample-function_key_setting.ads 2009-12-26 18:44:09.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/samples/sample-function_key_setting.ads 2011-03-19 13:17:07.000000000 +0100 -@@ -7,7 +7,7 @@ - -- S P E C -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -35,7 +35,7 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control ---- $Revision: 1.10 $ -+-- $Revision: 1.11 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Terminal_Interface.Curses; use Terminal_Interface.Curses; -@@ -62,7 +62,7 @@ - -- Initialize the environment - - function Context return String; -- -- Return the current context identitfier -+ -- Return the current context identifier - - function Find_Context (Key : String) return Boolean; - -- Look for a context, return true if it is in the stack, -diff -Naur ncurses-5.8/Ada95/samples/sample-header_handler.adb ncurses-5.8-20110402/Ada95/samples/sample-header_handler.adb ---- ncurses-5.8/Ada95/samples/sample-header_handler.adb 2009-12-26 18:38:58.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/samples/sample-header_handler.adb 2011-03-23 00:54:38.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -35,14 +35,16 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control ---- $Revision: 1.17 $ ---- $Date: 2009/12/26 17:38:58 $ -+-- $Revision: 1.19 $ -+-- $Date: 2011/03/22 23:54:38 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Ada.Calendar; use Ada.Calendar; - with Terminal_Interface.Curses.Text_IO.Integer_IO; - with Sample.Manifest; use Sample.Manifest; - -+pragma Elaborate_All (Terminal_Interface.Curses.Text_Io.Integer_IO); -+ - -- This package handles the painting of the header line of the screen. - -- - package body Sample.Header_Handler is -@@ -169,7 +171,7 @@ - Pos := Columns - Column_Position (Title'Length); - Add (Win, 0, Pos / 2, Title); - -- In this phase we must not allow a physical update, because -- -- ncurses isn´t properly initialized at this point. -+ -- ncurses is not properly initialized at this point. - Internal_Update_Header_Window (False); - return 0; - else -diff -Naur ncurses-5.8/Ada95/samples/sample-helpers.adb ncurses-5.8-20110402/Ada95/samples/sample-helpers.adb ---- ncurses-5.8/Ada95/samples/sample-helpers.adb 2009-12-26 18:38:58.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/samples/sample-helpers.adb 2011-03-19 13:13:21.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -35,13 +35,13 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control ---- $Revision: 1.13 $ ---- $Date: 2009/12/26 17:38:58 $ -+-- $Revision: 1.14 $ -+-- $Date: 2011/03/19 12:13:21 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Sample.Explanation; use Sample.Explanation; - ---- This package contains some conveniant helper routines used throughout -+-- This package contains some convenient helper routines used throughout - -- this example. - -- - package body Sample.Helpers is -diff -Naur ncurses-5.8/Ada95/samples/sample-helpers.ads ncurses-5.8-20110402/Ada95/samples/sample-helpers.ads ---- ncurses-5.8/Ada95/samples/sample-helpers.ads 2009-12-26 18:44:36.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/samples/sample-helpers.ads 2011-03-19 13:18:15.000000000 +0100 -@@ -7,7 +7,7 @@ - -- S P E C -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -35,12 +35,12 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control ---- $Revision: 1.10 $ -+-- $Revision: 1.11 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Terminal_Interface.Curses; use Terminal_Interface.Curses; - ---- This package contains some conveniant helper routines used throughout -+-- This package contains some convenient helper routines used throughout - -- this example. - -- - package Sample.Helpers is -diff -Naur ncurses-5.8/Ada95/samples/sample-keyboard_handler.adb ncurses-5.8-20110402/Ada95/samples/sample-keyboard_handler.adb ---- ncurses-5.8/Ada95/samples/sample-keyboard_handler.adb 2006-06-25 16:30:22.000000000 +0200 -+++ ncurses-5.8-20110402/Ada95/samples/sample-keyboard_handler.adb 2011-03-23 01:34:24.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2006,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control ---- $Revision: 1.14 $ ---- $Date: 2006/06/25 14:30:22 $ -+-- $Revision: 1.16 $ -+-- $Date: 2011/03/23 00:34:24 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Ada.Strings; use Ada.Strings; -@@ -111,7 +111,7 @@ - Buffer : String (1 .. Positive (Columns - 11)); - Cmdc : String (1 .. 8); - begin -- Get_Buffer (Fld => FA (2), Str => Buffer); -+ Get_Buffer (Fld => FA.all (2), Str => Buffer); - Trim (Buffer, Left); - if Buffer (1) /= ' ' then - Cmdc := To_Upper (Buffer (Cmdc'Range)); -@@ -157,8 +157,8 @@ - end if; - end loop; - Enum_Field := Create (Enum_Info, True); -- Set_Field_Type (FA (2), Enum_Field); -- Set_Background (FA (2), Normal_Video); -+ Set_Field_Type (FA.all (2), Enum_Field); -+ Set_Background (FA.all (2), Normal_Video); - - Fh.Drive_Me (Frm, Lines - 3, 0); - Delete (Frm); -@@ -174,7 +174,7 @@ - Set_Timeout_Mode (Win, Delayed, 30000); - loop - K := Get_Keystroke (Win); -- if K = Key_None then -- a timeout occured -+ if K = Key_None then -- a timeout occurred - Update_Header_Window; - elsif K = 3 and then not In_Command then -- CTRL-C - K := Command; -diff -Naur ncurses-5.8/Ada95/samples/sample-menu_demo.adb ncurses-5.8-20110402/Ada95/samples/sample-menu_demo.adb ---- ncurses-5.8/Ada95/samples/sample-menu_demo.adb 2008-07-26 20:48:30.000000000 +0200 -+++ ncurses-5.8-20110402/Ada95/samples/sample-menu_demo.adb 2011-03-23 01:44:12.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2004,2008 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2008,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control ---- $Revision: 1.18 $ ---- $Date: 2008/07/26 18:48:30 $ -+-- $Revision: 1.19 $ -+-- $Date: 2011/03/23 00:44:12 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Terminal_Interface.Curses; use Terminal_Interface.Curses; -@@ -154,7 +154,7 @@ - O : Item_Option_Set; - begin - for J in I'Range loop -- Get_Options (I (J), O); -+ Get_Options (I.all (J), O); - O.Selectable := True; - if Hide_Long then - case J is -@@ -163,7 +163,7 @@ - when others => null; - end case; - end if; -- Set_Options (I (J), O); -+ Set_Options (I.all (J), O); - end loop; - end; - return False; -@@ -378,14 +378,14 @@ - Set_Pad_Character (M, '|'); - - MUD.Set_User_Data (M, U1); -- IUD.Set_User_Data (Itm (1), U3); -+ IUD.Set_User_Data (Itm.all (1), U3); - - Mh.Drive_Me (M); - - MUD.Get_User_Data (M, U2); - pragma Assert (U1 = U2 and U1.all = 4711); - -- IUD.Get_User_Data (Itm (1), U4); -+ IUD.Get_User_Data (Itm.all (1), U4); - pragma Assert (U3 = U4 and U3.all = 4712); - - Pop_Environment; -diff -Naur ncurses-5.8/Ada95/samples/sample-menu_demo-aux.ads ncurses-5.8-20110402/Ada95/samples/sample-menu_demo-aux.ads ---- ncurses-5.8/Ada95/samples/sample-menu_demo-aux.ads 2009-12-26 18:44:36.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/samples/sample-menu_demo-aux.ads 2011-03-19 13:17:59.000000000 +0100 -@@ -7,7 +7,7 @@ - -- S P E C -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -35,7 +35,7 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control ---- $Revision: 1.10 $ -+-- $Revision: 1.11 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Terminal_Interface.Curses; use Terminal_Interface.Curses; -@@ -49,7 +49,7 @@ - C : out Column_Count; - Y : out Line_Position; - X : out Column_Position); -- -- Calculate the geometry for a panel beeing able to be used to display -+ -- Calculate the geometry for a panel being able to be used to display - -- the menu. - - function Create (M : Menu; -diff -Naur ncurses-5.8/Ada95/samples/sample-text_io_demo.adb ncurses-5.8-20110402/Ada95/samples/sample-text_io_demo.adb ---- ncurses-5.8/Ada95/samples/sample-text_io_demo.adb 2006-06-25 16:30:22.000000000 +0200 -+++ ncurses-5.8-20110402/Ada95/samples/sample-text_io_demo.adb 2011-03-23 01:44:12.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2004,2006 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2006,2011 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 -- -@@ -35,18 +35,24 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control ---- $Revision: 1.16 $ ---- $Date: 2006/06/25 14:30:22 $ -+-- $Revision: 1.17 $ -+-- $Date: 2011/03/23 00:44:12 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Ada.Numerics.Generic_Elementary_Functions; -+ - with Ada.Numerics.Complex_Types; - use Ada.Numerics.Complex_Types; - --with Terminal_Interface.Curses; use Terminal_Interface.Curses; --with Terminal_Interface.Curses.Panels; use Terminal_Interface.Curses.Panels; -+with Terminal_Interface.Curses; -+use Terminal_Interface.Curses; -+ -+with Terminal_Interface.Curses.Panels; -+use Terminal_Interface.Curses.Panels; -+ - with Terminal_Interface.Curses.Text_IO; - use Terminal_Interface.Curses.Text_IO; -+ - with Terminal_Interface.Curses.Text_IO.Integer_IO; - with Terminal_Interface.Curses.Text_IO.Float_IO; - with Terminal_Interface.Curses.Text_IO.Enumeration_IO; -@@ -60,6 +66,14 @@ - with Sample.Keyboard_Handler; use Sample.Keyboard_Handler; - with Sample.Explanation; use Sample.Explanation; - -+pragma Elaborate_All (Terminal_Interface.Curses.Text_Io.Complex_IO); -+pragma Elaborate_All (Terminal_Interface.Curses.Text_Io.Decimal_IO); -+pragma Elaborate_All (Terminal_Interface.Curses.Text_Io.Enumeration_IO); -+pragma Elaborate_All (Terminal_Interface.Curses.Text_Io.Fixed_IO); -+pragma Elaborate_All (Terminal_Interface.Curses.Text_Io.Float_IO); -+pragma Elaborate_All (Terminal_Interface.Curses.Text_Io.Integer_IO); -+pragma Elaborate_All (Terminal_Interface.Curses.Text_Io.Modular_IO); -+ - package body Sample.Text_IO_Demo is - - type Weekday is (Sunday, -diff -Naur ncurses-5.8/Ada95/src/c_varargs_to_ada.c ncurses-5.8-20110402/Ada95/src/c_varargs_to_ada.c ---- ncurses-5.8/Ada95/src/c_varargs_to_ada.c 1970-01-01 01:00:00.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/src/c_varargs_to_ada.c 2011-03-19 20:07:39.000000000 +0100 -@@ -0,0 +1,117 @@ -+/**************************************************************************** -+ * Copyright (c) 2011 Free Software Foundation, Inc. * -+ * * -+ * Permission is hereby granted, free of charge, to any person obtaining a * -+ * copy of this software and associated documentation files (the * -+ * "Software"), to deal in the Software without restriction, including * -+ * without limitation the rights to use, copy, modify, merge, publish, * -+ * distribute, distribute with modifications, sublicense, and/or sell * -+ * copies of the Software, and to permit persons to whom the Software is * -+ * furnished to do so, subject to the following conditions: * -+ * * -+ * The above copyright notice and this permission notice shall be included * -+ * in all copies or substantial portions of the Software. * -+ * * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * -+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * -+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * -+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * -+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * -+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -+ * * -+ * Except as contained in this notice, the name(s) of the above copyright * -+ * holders shall not be used in advertising or otherwise to promote the * -+ * sale, use or other dealings in this Software without prior written * -+ * authorization. * -+ ****************************************************************************/ -+ -+/**************************************************************************** -+ * Author: Nicolas Boulenguez, 2011 * -+ ****************************************************************************/ -+ -+/* -+ Version Control -+ $Id: c_varargs_to_ada.c,v 1.4 2011/03/19 19:07:39 tom Exp $ -+ --------------------------------------------------------------------------*/ -+/* -+ */ -+ -+#include -+ -+int -+set_field_type_alnum(FIELD *field, -+ int minimum_width) -+{ -+ return set_field_type(field, TYPE_ALNUM, minimum_width); -+} -+ -+int -+set_field_type_alpha(FIELD *field, -+ int minimum_width) -+{ -+ return set_field_type(field, TYPE_ALPHA, minimum_width); -+} -+ -+int -+set_field_type_enum(FIELD *field, -+ char **value_list, -+ int case_sensitive, -+ int unique_match) -+{ -+ return set_field_type(field, TYPE_ENUM, value_list, case_sensitive, -+ unique_match); -+} -+ -+int -+set_field_type_integer(FIELD *field, -+ int precision, -+ long minimum, -+ long maximum) -+{ -+ return set_field_type(field, TYPE_INTEGER, precision, minimum, maximum); -+} -+ -+int -+set_field_type_numeric(FIELD *field, -+ int precision, -+ double minimum, -+ double maximum) -+{ -+ return set_field_type(field, TYPE_NUMERIC, precision, minimum, maximum); -+} -+ -+int -+set_field_type_regexp(FIELD *field, -+ char *regular_expression) -+{ -+ return set_field_type(field, TYPE_REGEXP, regular_expression); -+} -+ -+int -+set_field_type_ipv4(FIELD *field) -+{ -+ return set_field_type(field, TYPE_IPV4); -+} -+ -+int -+set_field_type_user(FIELD *field, -+ FIELDTYPE *fieldtype, -+ void *arg) -+{ -+ return set_field_type(field, fieldtype, arg); -+} -+ -+void * -+void_star_make_arg(va_list *list) -+{ -+ return va_arg(*list, void *); -+} -+ -+#ifdef TRACE -+void -+_traces(const char *fmt, char *arg) -+{ -+ _tracef(fmt, arg); -+} -+#endif -diff -Naur ncurses-5.8/Ada95/src/c_varargs_to_ada.h ncurses-5.8-20110402/Ada95/src/c_varargs_to_ada.h ---- ncurses-5.8/Ada95/src/c_varargs_to_ada.h 1970-01-01 01:00:00.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/src/c_varargs_to_ada.h 2011-03-19 20:07:41.000000000 +0100 -@@ -0,0 +1,73 @@ -+/**************************************************************************** -+ * Copyright (c) 2011 Free Software Foundation, Inc. * -+ * * -+ * Permission is hereby granted, free of charge, to any person obtaining a * -+ * copy of this software and associated documentation files (the * -+ * "Software"), to deal in the Software without restriction, including * -+ * without limitation the rights to use, copy, modify, merge, publish, * -+ * distribute, distribute with modifications, sublicense, and/or sell * -+ * copies of the Software, and to permit persons to whom the Software is * -+ * furnished to do so, subject to the following conditions: * -+ * * -+ * The above copyright notice and this permission notice shall be included * -+ * in all copies or substantial portions of the Software. * -+ * * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * -+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * -+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * -+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * -+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * -+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -+ * * -+ * Except as contained in this notice, the name(s) of the above copyright * -+ * holders shall not be used in advertising or otherwise to promote the * -+ * sale, use or other dealings in this Software without prior written * -+ * authorization. * -+ ****************************************************************************/ -+ -+/* $Id: c_varargs_to_ada.h,v 1.3 2011/03/19 19:07:41 tom Exp $ */ -+ -+#ifndef __C_VARARGS_TO_ADA_H -+#define __C_VARARGS_TO_ADA_H -+ -+#include -+ -+extern int set_field_type_alnum(FIELD * /* field */ , -+ int /* minimum_width */ ); -+ -+extern int set_field_type_alpha(FIELD * /* field */ , -+ int /* minimum_width */ ); -+ -+extern int set_field_type_enum(FIELD * /* field */ , -+ char ** /* value_list */ , -+ int /* case_sensitive */ , -+ int /* unique_match */ ); -+ -+extern int set_field_type_integer(FIELD * /* field */ , -+ int /* precision */ , -+ long /* minimum */ , -+ long /* maximum */ ); -+ -+extern int set_field_type_numeric(FIELD * /* field */ , -+ int /* precision */ , -+ double /* minimum */ , -+ double /* maximum */ ); -+ -+extern int set_field_type_regexp(FIELD * /* field */ , -+ char * /* regular_expression */ ); -+ -+extern int set_field_type_ipv4(FIELD * /* field */ ); -+ -+extern int set_field_type_user(FIELD * /* field */ , -+ FIELDTYPE * /* fieldtype */ , -+ void * /* arg */ ); -+ -+extern void *void_star_make_arg(va_list * /* list */ ); -+ -+#ifdef TRACE -+extern void _traces(const char * /* fmt */ -+ ,char * /* arg */ ); -+#endif -+ -+#endif /* __C_VARARGS_TO_ADA_H */ -diff -Naur ncurses-5.8/Ada95/src/library.gpr ncurses-5.8-20110402/Ada95/src/library.gpr ---- ncurses-5.8/Ada95/src/library.gpr 2010-11-27 23:15:04.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/src/library.gpr 2011-03-19 00:10:28.000000000 +0100 -@@ -1,5 +1,5 @@ - ------------------------------------------------------------------------------ ---- Copyright (c) 2010 Free Software Foundation, Inc. -- -+-- Copyright (c) 2010,2011 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: library.gpr,v 1.5 2010/11/27 22:15:04 tom Exp $ -+-- $Id: library.gpr,v 1.7 2011/03/18 23:10:28 Nicolas.Boulenguez Exp $ - -- http://gcc.gnu.org/onlinedocs/gnat_ugn_unw/Library-Projects.html - -- http://www.adaworld.com/debian/debian-ada-policy.html - project Library is -@@ -43,6 +43,7 @@ - for Source_Dirs use (Source_Dir & "/src", - Source_Dir2, - Build_Dir & "/src"); -+ for Library_Options use ("-lncurses", "-lpanel", "-lmenu", "-lform"); - package Compiler is - for Default_Switches ("Ada") use - ("-g", -@@ -51,5 +52,5 @@ - "-gnatVa", -- All validity checks - "-gnatwa"); -- Activate all optional errors - end Compiler; -- -+ for Languages use ("C", "Ada"); - end Library; -diff -Naur ncurses-5.8/Ada95/src/Makefile.in ncurses-5.8-20110402/Ada95/src/Makefile.in ---- ncurses-5.8/Ada95/src/Makefile.in 2010-11-27 23:14:16.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/src/Makefile.in 2011-03-31 11:46:16.000000000 +0200 -@@ -1,5 +1,5 @@ - ############################################################################## --# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. # -+# Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. # - # # - # Permission is hereby granted, free of charge, to any person obtaining a # - # copy of this software and associated documentation files (the "Software"), # -@@ -28,7 +28,7 @@ - # - # Author: Juergen Pfeifer, 1996 - # --# $Id: Makefile.in,v 1.53 2010/11/27 22:14:16 tom Exp $ -+# $Id: Makefile.in,v 1.60 2011/03/31 09:46:16 tom Exp $ - # - .SUFFIXES: - -@@ -44,7 +44,8 @@ - srcdir = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ --libdir = ${exec_prefix}/lib -+includedir = @includedir@ -+libdir = @libdir@ - - LIBDIR = $(DESTDIR)$(libdir) - ADA_INCLUDE = $(DESTDIR)@ADA_INCLUDE@ -@@ -61,7 +62,7 @@ - CC = @CC@ - CFLAGS = @CFLAGS@ - --CPPFLAGS = @ACPPFLAGS@ \ -+CPPFLAGS = @ACPPFLAGS@ @CPPFLAGS@ \ - -DHAVE_CONFIG_H -I$(srcdir) - - CCFLAGS = $(CPPFLAGS) $(CFLAGS) -@@ -217,11 +218,22 @@ - $(ADAPREP) -DADA_TRACE=@ADA_TRACE@ -DPRAGMA_UNREF=@PRAGMA_UNREF@ $(srcdir)/$(ABASE)-trace.adb_p $@ - - ############################################################################### -+C_OBJS = c_varargs_to_ada.o ncurses_compat.o -+ -+c_varargs_to_ada.o : $(srcdir)/c_varargs_to_ada.c -+ $(CC) $(CFLAGS_DEFAULT) -c -o $@ $(srcdir)/c_varargs_to_ada.c -+ -+ncurses_compat.o : $(srcdir)/ncurses_compat.c -+ $(CC) $(CFLAGS_DEFAULT) -c -o $@ $(srcdir)/ncurses_compat.c -+ -+############################################################################### -+ -+MIXED_OBJS = $(C_OBJS) @USE_OLD_MAKERULES@$(LIBOBJS) @cf_generic_objects@ - - @USE_OLD_MAKERULES@$(BUILD_DIR_LIB)/$(STATIC_LIBNAME) :: \ - @USE_OLD_MAKERULES@ $(BUILD_DIR_LIB) \ --@USE_OLD_MAKERULES@ $(LIBOBJS) @cf_generic_objects@ --@USE_OLD_MAKERULES@ $(AR) $(ARFLAGS) $@ $(LIBOBJS) @cf_generic_objects@ -+@USE_OLD_MAKERULES@ $(MIXED_OBJS) -+@USE_OLD_MAKERULES@ $(AR) $(ARFLAGS) $@ $(MIXED_OBJS) - - $(BUILD_DIR)/static-ali : ; mkdir -p $@ - $(BUILD_DIR)/static-obj : ; mkdir -p $@ -@@ -233,23 +245,25 @@ - - @USE_GNAT_PROJECTS@$(BUILD_DIR_LIB)/$(STATIC_LIBNAME) :: \ - @USE_GNAT_PROJECTS@ $(ABASE)-trace.adb \ -+@USE_GNAT_PROJECTS@ $(C_OBJS) \ - @USE_GNAT_PROJECTS@ $(STATIC_DIRS) - @USE_GNAT_PROJECTS@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=static -+@USE_GNAT_PROJECTS@ $(AR) $(ARFLAGS) $@ $(C_OBJS) - @USE_GNAT_PROJECTS@ --@USE_GNAT_PROJECTS@install \ --@USE_GNAT_PROJECTS@install.libs :: \ --@USE_GNAT_PROJECTS@ $(ADA_OBJECTS) --@USE_GNAT_PROJECTS@ $(INSTALL_LIB) \ --@USE_GNAT_PROJECTS@ $(BUILD_DIR)/static-ali/*.ali \ --@USE_GNAT_PROJECTS@ $(ADA_OBJECTS) -+@USE_GNAT_LIBRARIES@install \ -+@USE_GNAT_LIBRARIES@install.libs :: \ -+@USE_GNAT_LIBRARIES@ $(ADA_OBJECTS) -+@USE_GNAT_LIBRARIES@ $(INSTALL_LIB) \ -+@USE_GNAT_LIBRARIES@ $(BUILD_DIR)/static-ali/*.ali \ -+@USE_GNAT_LIBRARIES@ $(ADA_OBJECTS) - - uninstall \ - uninstall.libs :: - @rm -f $(ADA_OBJECTS)/$(STATIC_LIBNAME) - --@USE_GNAT_PROJECTS@uninstall \ --@USE_GNAT_PROJECTS@uninstall.libs :: --@USE_GNAT_PROJECTS@ @$(SHELL) -c 'for name in $(BUILD_DIR)/static-ali/*.ali ; do rm -f $(ADA_OBJECTS)/`basename $$name`; done' -+@USE_GNAT_LIBRARIES@uninstall \ -+@USE_GNAT_LIBRARIES@uninstall.libs :: -+@USE_GNAT_LIBRARIES@ @$(SHELL) -c 'for name in $(BUILD_DIR)/static-ali/*.ali ; do rm -f $(ADA_OBJECTS)/`basename $$name`; done' - - $(BUILD_DIR)/dynamic-ali : ; mkdir -p $@ - $(BUILD_DIR)/dynamic-obj : ; mkdir -p $@ -@@ -259,8 +273,9 @@ - $(BUILD_DIR)/dynamic-ali \ - $(BUILD_DIR)/dynamic-obj - --@MAKE_ADA_SHAREDLIB@all \ -+@MAKE_ADA_SHAREDLIB@all :: $(BUILD_DIR_LIB)/$(SHARED_LIBNAME) - @MAKE_ADA_SHAREDLIB@$(BUILD_DIR_LIB)/$(SHARED_LIBNAME) :: $(ABASE)-trace.adb $(SHARED_DIRS) -+@MAKE_ADA_SHAREDLIB@ cp $(MIXED_OBJS) $(BUILD_DIR)/dynamic-obj/ - @MAKE_ADA_SHAREDLIB@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=dynamic - - install \ -@@ -280,14 +295,14 @@ - $(SHELL) -c 'for name in $(SOURCE_DIR_SRC)/*.ad[sb] $(GENERATED_SOURCES); do rm -f $(ADA_INCLUDE)/`basename $$name`; done' - - @MAKE_ADA_SHAREDLIB@install \ --@MAKE_ADA_SHAREDLIB@install.libs :: $(ADA_OBJECTS) -+@MAKE_ADA_SHAREDLIB@install.libs :: $(ADA_OBJECTS) $(LIBDIR) - @MAKE_ADA_SHAREDLIB@ $(INSTALL_LIB) \ - @MAKE_ADA_SHAREDLIB@ $(BUILD_DIR)/dynamic-ali/* \ - @MAKE_ADA_SHAREDLIB@ $(ADA_OBJECTS) - @MAKE_ADA_SHAREDLIB@ $(INSTALL_LIB) \ - @MAKE_ADA_SHAREDLIB@ $(BUILD_DIR_LIB)/$(SHARED_LIBNAME) \ - @MAKE_ADA_SHAREDLIB@ $(LIBDIR) --@MAKE_ADA_SHAREDLIB@ cd $(LIBDIR) && ln -s $(SHARED_LIBNAME) $(SHARED_SYMLINK) -+@MAKE_ADA_SHAREDLIB@ cd $(LIBDIR) && $(LN_S) $(SHARED_LIBNAME) $(SHARED_SYMLINK) - @MAKE_ADA_SHAREDLIB@ - @MAKE_ADA_SHAREDLIB@uninstall \ - @MAKE_ADA_SHAREDLIB@uninstall.libs :: -diff -Naur ncurses-5.8/Ada95/src/ncurses_compat.c ncurses-5.8-20110402/Ada95/src/ncurses_compat.c ---- ncurses-5.8/Ada95/src/ncurses_compat.c 1970-01-01 01:00:00.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/src/ncurses_compat.c 2011-03-28 02:29:04.000000000 +0200 -@@ -0,0 +1,135 @@ -+/**************************************************************************** -+ * Copyright (c) 2011 Free Software Foundation, Inc. * -+ * * -+ * Permission is hereby granted, free of charge, to any person obtaining a * -+ * copy of this software and associated documentation files (the * -+ * "Software"), to deal in the Software without restriction, including * -+ * without limitation the rights to use, copy, modify, merge, publish, * -+ * distribute, distribute with modifications, sublicense, and/or sell * -+ * copies of the Software, and to permit persons to whom the Software is * -+ * furnished to do so, subject to the following conditions: * -+ * * -+ * The above copyright notice and this permission notice shall be included * -+ * in all copies or substantial portions of the Software. * -+ * * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * -+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * -+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * -+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * -+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * -+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * -+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -+ * * -+ * Except as contained in this notice, the name(s) of the above copyright * -+ * holders shall not be used in advertising or otherwise to promote the * -+ * sale, use or other dealings in this Software without prior written * -+ * authorization. * -+ ****************************************************************************/ -+ -+/**************************************************************************** -+ * Author: Thomas E. Dickey, 2011 * -+ ****************************************************************************/ -+ -+/* -+ Version Control -+ $Id: ncurses_compat.c,v 1.2 2011/03/28 00:29:04 tom Exp $ -+ --------------------------------------------------------------------------*/ -+ -+/* -+ * Provide compatibility with older versions of ncurses. -+ */ -+#include -+ -+#if defined(NCURSES_VERSION_PATCH) -+ -+#if NCURSES_VERSION_PATCH < 20081122 -+extern bool has_mouse(void); -+extern int _nc_has_mouse(void); -+ -+bool -+has_mouse(void) -+{ -+ return (bool) _nc_has_mouse(); -+} -+#endif -+ -+/* -+ * These are provided by lib_gen.c: -+ */ -+#if NCURSES_VERSION_PATCH < 20070331 -+extern bool (is_keypad) (const WINDOW *); -+extern bool (is_scrollok) (const WINDOW *); -+ -+bool -+is_keypad(const WINDOW *win) -+{ -+ return ((win)->_use_keypad); -+} -+ -+bool -+ (is_scrollok) (const WINDOW *win) -+{ -+ return ((win)->_scroll); -+} -+#endif -+ -+#if NCURSES_VERSION_PATCH < 20060107 -+extern int (getbegx) (WINDOW *); -+extern int (getbegy) (WINDOW *); -+extern int (getcurx) (WINDOW *); -+extern int (getcury) (WINDOW *); -+extern int (getmaxx) (WINDOW *); -+extern int (getmaxy) (WINDOW *); -+extern int (getparx) (WINDOW *); -+extern int (getpary) (WINDOW *); -+ -+int -+ (getbegy) (WINDOW *win) -+{ -+ return ((win) ? (win)->_begy : ERR); -+} -+ -+int -+ (getbegx) (WINDOW *win) -+{ -+ return ((win) ? (win)->_begx : ERR); -+} -+ -+int -+ (getcury) (WINDOW *win) -+{ -+ return ((win) ? (win)->_cury : ERR); -+} -+ -+int -+ (getcurx) (WINDOW *win) -+{ -+ return ((win) ? (win)->_curx : ERR); -+} -+ -+int -+ (getmaxy) (WINDOW *win) -+{ -+ return ((win) ? ((win)->_maxy + 1) : ERR); -+} -+ -+int -+ (getmaxx) (WINDOW *win) -+{ -+ return ((win) ? ((win)->_maxx + 1) : ERR); -+} -+ -+int -+ (getpary) (WINDOW *win) -+{ -+ return ((win) ? (win)->_pary : ERR); -+} -+ -+int -+ (getparx) (WINDOW *win) -+{ -+ return ((win) ? (win)->_parx : ERR); -+} -+#endif -+ -+#endif -diff -Naur ncurses-5.8/Ada95/src/terminal_interface-curses-forms.adb ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms.adb ---- ncurses-5.8/Ada95/src/terminal_interface-curses-forms.adb 2009-12-26 18:38:58.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms.adb 2011-03-23 00:37:32.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.27 $ ---- $Date: 2009/12/26 17:38:58 $ -+-- $Revision: 1.28 $ -+-- $Date: 2011/03/22 23:37:32 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Ada.Unchecked_Deallocation; -@@ -736,11 +736,11 @@ - - Res : Eti_Error; - begin -- pragma Assert (Flds (Flds'Last) = Null_Field); -- if Flds (Flds'Last) /= Null_Field then -+ pragma Assert (Flds.all (Flds'Last) = Null_Field); -+ if Flds.all (Flds'Last) /= Null_Field then - raise Form_Exception; - else -- Res := Set_Frm_Fields (Frm, Flds (Flds'First)'Address); -+ Res := Set_Frm_Fields (Frm, Flds.all (Flds'First)'Address); - if Res /= E_Ok then - Eti_Exception (Res); - end if; -@@ -806,11 +806,11 @@ - - M : Form; - begin -- pragma Assert (Fields (Fields'Last) = Null_Field); -- if Fields (Fields'Last) /= Null_Field then -+ pragma Assert (Fields.all (Fields'Last) = Null_Field); -+ if Fields.all (Fields'Last) /= Null_Field then - raise Form_Exception; - else -- M := NewForm (Fields (Fields'First)'Address); -+ M := NewForm (Fields.all (Fields'First)'Address); - if M = Null_Form then - raise Form_Exception; - end if; -@@ -1136,8 +1136,8 @@ - begin - if FA /= null and then Free_Fields then - for I in FA'First .. (FA'Last - 1) loop -- if FA (I) /= Null_Field then -- Delete (FA (I)); -+ if FA.all (I) /= Null_Field then -+ Delete (FA.all (I)); - end if; - end loop; - end if; -diff -Naur ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types.adb ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types.adb ---- ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types.adb 2009-12-26 18:38:58.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types.adb 2011-03-23 00:22:27.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -35,13 +35,14 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.21 $ ---- $Date: 2009/12/26 17:38:58 $ -+-- $Revision: 1.25 $ -+-- $Date: 2011/03/22 23:22:27 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux; - with Ada.Unchecked_Deallocation; --with Ada.Unchecked_Conversion; -+with System.Address_To_Access_Conversions; -+ - -- | - -- |===================================================================== - -- | man page form_fieldtype.3x -@@ -51,10 +52,8 @@ - - use type System.Address; - -- pragma Warnings (Off); -- function To_Argument_Access is new Ada.Unchecked_Conversion -- (System.Address, Argument_Access); -- pragma Warnings (On); -+ package Argument_Conversions is -+ new System.Address_To_Access_Conversions (Argument); - - function Get_Fieldtype (F : Field) return C_Field_Type; - pragma Import (C, Get_Fieldtype, "field_type"); -@@ -80,11 +79,12 @@ - Low_Level = M_Generic_Type or else - Low_Level = M_Choice_Router or else - Low_Level = M_Generic_Choice then -- Arg := To_Argument_Access (Get_Arg (Fld)); -+ Arg := Argument_Access -+ (Argument_Conversions.To_Pointer (Get_Arg (Fld))); - if Arg = null then - raise Form_Exception; - else -- return Arg.Typ; -+ return Arg.all.Typ; - end if; - else - raise Form_Exception; -@@ -92,24 +92,6 @@ - end if; - end Get_Type; - -- function Make_Arg (Args : System.Address) return System.Address -- is -- -- Actually args is a double indirected pointer to the arguments -- -- of a C variable argument list. In theory it is now quite -- -- complicated to write portable routine that reads the arguments, -- -- because one has to know the growth direction of the stack and -- -- the sizes of the individual arguments. -- -- Fortunately we are only interested in the first argument (#0), -- -- we know its size and for the first arg we don't care about -- -- into which stack direction we have to proceed. We simply -- -- resolve the double indirection and thats it. -- type V is access all System.Address; -- function To_Access is new Ada.Unchecked_Conversion (System.Address, -- V); -- begin -- return To_Access (To_Access (Args).all).all; -- end Make_Arg; -- - function Copy_Arg (Usr : System.Address) return System.Address - is - begin -@@ -123,18 +105,19 @@ - procedure Freeargs is new Ada.Unchecked_Deallocation - (Argument, Argument_Access); - -- To_Be_Free : Argument_Access := To_Argument_Access (Usr); -+ To_Be_Free : Argument_Access -+ := Argument_Access (Argument_Conversions.To_Pointer (Usr)); - Low_Level : C_Field_Type; - begin - if To_Be_Free /= null then -- if To_Be_Free.Usr /= System.Null_Address then -- Low_Level := To_Be_Free.Cft; -- if Low_Level.Freearg /= null then -- Low_Level.Freearg (To_Be_Free.Usr); -+ if To_Be_Free.all.Usr /= System.Null_Address then -+ Low_Level := To_Be_Free.all.Cft; -+ if Low_Level.all.Freearg /= null then -+ Low_Level.all.Freearg (To_Be_Free.all.Usr); - end if; - end if; -- if To_Be_Free.Typ /= null then -- Free_Type (To_Be_Free.Typ); -+ if To_Be_Free.all.Typ /= null then -+ Free_Type (To_Be_Free.all.Typ); - end if; - Freeargs (To_Be_Free); - end if; -@@ -151,7 +134,7 @@ - function Set_Fld_Type (F : Field := Fld; - Cf : C_Field_Type := Cft; - Arg1 : Argument_Access) return C_Int; -- pragma Import (C, Set_Fld_Type, "set_field_type"); -+ pragma Import (C, Set_Fld_Type, "set_field_type_user"); - - begin - pragma Assert (Low_Level /= Null_Field_Type); -@@ -162,10 +145,10 @@ - Typ => new Field_Type'Class'(Typ), - Cft => Get_Fieldtype (Fld)); - if Usr_Arg /= System.Null_Address then -- if Low_Level.Copyarg /= null then -- Arg.Usr := Low_Level.Copyarg (Usr_Arg); -+ if Low_Level.all.Copyarg /= null then -+ Arg.all.Usr := Low_Level.all.Copyarg (Usr_Arg); - else -- Arg.Usr := Usr_Arg; -+ Arg.all.Usr := Usr_Arg; - end if; - end if; - -@@ -177,56 +160,60 @@ - end Wrap_Builtin; - - function Field_Check_Router (Fld : Field; -- Usr : System.Address) return C_Int -+ Usr : System.Address) return Curses_Bool - is -- Arg : constant Argument_Access := To_Argument_Access (Usr); -+ Arg : constant Argument_Access -+ := Argument_Access (Argument_Conversions.To_Pointer (Usr)); - begin -- pragma Assert (Arg /= null and then Arg.Cft /= Null_Field_Type -- and then Arg.Typ /= null); -- if Arg.Cft.Fcheck /= null then -- return Arg.Cft.Fcheck (Fld, Arg.Usr); -+ pragma Assert (Arg /= null and then Arg.all.Cft /= Null_Field_Type -+ and then Arg.all.Typ /= null); -+ if Arg.all.Cft.all.Fcheck /= null then -+ return Arg.all.Cft.all.Fcheck (Fld, Arg.all.Usr); - else - return 1; - end if; - end Field_Check_Router; - - function Char_Check_Router (Ch : C_Int; -- Usr : System.Address) return C_Int -+ Usr : System.Address) return Curses_Bool - is -- Arg : constant Argument_Access := To_Argument_Access (Usr); -+ Arg : constant Argument_Access -+ := Argument_Access (Argument_Conversions.To_Pointer (Usr)); - begin -- pragma Assert (Arg /= null and then Arg.Cft /= Null_Field_Type -- and then Arg.Typ /= null); -- if Arg.Cft.Ccheck /= null then -- return Arg.Cft.Ccheck (Ch, Arg.Usr); -+ pragma Assert (Arg /= null and then Arg.all.Cft /= Null_Field_Type -+ and then Arg.all.Typ /= null); -+ if Arg.all.Cft.all.Ccheck /= null then -+ return Arg.all.Cft.all.Ccheck (Ch, Arg.all.Usr); - else - return 1; - end if; - end Char_Check_Router; - - function Next_Router (Fld : Field; -- Usr : System.Address) return C_Int -+ Usr : System.Address) return Curses_Bool - is -- Arg : constant Argument_Access := To_Argument_Access (Usr); -+ Arg : constant Argument_Access -+ := Argument_Access (Argument_Conversions.To_Pointer (Usr)); - begin -- pragma Assert (Arg /= null and then Arg.Cft /= Null_Field_Type -- and then Arg.Typ /= null); -- if Arg.Cft.Next /= null then -- return Arg.Cft.Next (Fld, Arg.Usr); -+ pragma Assert (Arg /= null and then Arg.all.Cft /= Null_Field_Type -+ and then Arg.all.Typ /= null); -+ if Arg.all.Cft.all.Next /= null then -+ return Arg.all.Cft.all.Next (Fld, Arg.all.Usr); - else - return 1; - end if; - end Next_Router; - - function Prev_Router (Fld : Field; -- Usr : System.Address) return C_Int -+ Usr : System.Address) return Curses_Bool - is -- Arg : constant Argument_Access := To_Argument_Access (Usr); -+ Arg : constant Argument_Access := -+ Argument_Access (Argument_Conversions.To_Pointer (Usr)); - begin -- pragma Assert (Arg /= null and then Arg.Cft /= Null_Field_Type -- and then Arg.Typ /= null); -- if Arg.Cft.Prev /= null then -- return Arg.Cft.Prev (Fld, Arg.Usr); -+ pragma Assert (Arg /= null and then Arg.all.Cft /= Null_Field_Type -+ and then Arg.all.Typ /= null); -+ if Arg.all.Cft.all.Prev /= null then -+ return Arg.all.Cft.all.Prev (Fld, Arg.all.Usr); - else - return 1; - end if; -diff -Naur ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-alpha.adb ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-alpha.adb ---- ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-alpha.adb 2009-12-26 18:38:58.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-alpha.adb 2011-03-19 01:45:37.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.10 $ ---- $Date: 2009/12/26 17:38:58 $ -+-- $Revision: 1.11 $ -+-- $Date: 2011/03/19 00:45:37 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux; -@@ -46,13 +46,9 @@ - procedure Set_Field_Type (Fld : Field; - Typ : Alpha_Field) - is -- C_Alpha_Field_Type : C_Field_Type; -- pragma Import (C, C_Alpha_Field_Type, "TYPE_ALPHA"); -- - function Set_Fld_Type (F : Field := Fld; -- Cft : C_Field_Type := C_Alpha_Field_Type; - Arg1 : C_Int) return C_Int; -- pragma Import (C, Set_Fld_Type, "set_field_type"); -+ pragma Import (C, Set_Fld_Type, "set_field_type_alpha"); - - Res : Eti_Error; - begin -diff -Naur ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-alphanumeric.adb ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-alphanumeric.adb ---- ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-alphanumeric.adb 2009-12-26 18:38:58.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-alphanumeric.adb 2011-03-19 01:45:37.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.10 $ ---- $Date: 2009/12/26 17:38:58 $ -+-- $Revision: 1.11 $ -+-- $Date: 2011/03/19 00:45:37 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux; -@@ -46,13 +46,9 @@ - procedure Set_Field_Type (Fld : Field; - Typ : AlphaNumeric_Field) - is -- C_AlphaNumeric_Field_Type : C_Field_Type; -- pragma Import (C, C_AlphaNumeric_Field_Type, "TYPE_ALNUM"); -- - function Set_Fld_Type (F : Field := Fld; -- Cft : C_Field_Type := C_AlphaNumeric_Field_Type; - Arg1 : C_Int) return C_Int; -- pragma Import (C, Set_Fld_Type, "set_field_type"); -+ pragma Import (C, Set_Fld_Type, "set_field_type_alnum"); - - Res : Eti_Error; - begin -diff -Naur ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-enumeration-ada.adb ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-enumeration-ada.adb ---- ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-enumeration-ada.adb 2004-08-21 23:37:00.000000000 +0200 -+++ ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-enumeration-ada.adb 2011-03-23 00:36:20.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998,2004 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2004,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.10 $ ---- $Date: 2004/08/21 21:37:00 $ -+-- $Revision: 1.11 $ -+-- $Date: 2011/03/22 23:36:20 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Ada.Characters.Handling; use Ada.Characters.Handling; -@@ -61,8 +61,8 @@ - if Set /= Upper_Case then - I.Names (J).all := To_Lower (I.Names (J).all); - if Set = Mixed_Case then -- I.Names (J)(I.Names (J).all'First) := -- To_Upper (I.Names (J)(I.Names (J).all'First)); -+ I.Names (J).all (I.Names (J).all'First) := -+ To_Upper (I.Names (J).all (I.Names (J).all'First)); - end if; - end if; - J := J + 1; -diff -Naur ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-enumeration.adb ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-enumeration.adb ---- ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-enumeration.adb 2009-12-26 18:45:26.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-enumeration.adb 2011-03-23 00:03:27.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -35,7 +35,7 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.8 $ -+-- $Revision: 1.10 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Ada.Unchecked_Deallocation; -@@ -63,13 +63,13 @@ - if Info.Names (I) = null then - raise Form_Exception; - end if; -- E.Arr (size_t (I)) := New_String (Info.Names (I).all); -+ E.Arr.all (size_t (I)) := New_String (Info.Names (I).all); - if Auto_Release_Names then - S := Info.Names (I); - Release_String (S); - end if; - end loop; -- E.Arr (L) := Null_Ptr; -+ E.Arr.all (L) := Null_Ptr; - return E; - end Create; - -@@ -79,10 +79,10 @@ - P : chars_ptr; - begin - loop -- P := Enum.Arr (I); -+ P := Enum.Arr.all (I); - exit when P = Null_Ptr; - Free (P); -- Enum.Arr (I) := Null_Ptr; -+ Enum.Arr.all (I) := Null_Ptr; - I := I + 1; - end loop; - Enum.Arr := null; -@@ -91,15 +91,11 @@ - procedure Set_Field_Type (Fld : Field; - Typ : Enumeration_Field) - is -- C_Enum_Type : C_Field_Type; -- pragma Import (C, C_Enum_Type, "TYPE_ENUM"); -- - function Set_Fld_Type (F : Field := Fld; -- Cft : C_Field_Type := C_Enum_Type; - Arg1 : chars_ptr_array; - Arg2 : C_Int; - Arg3 : C_Int) return C_Int; -- pragma Import (C, Set_Fld_Type, "set_field_type"); -+ pragma Import (C, Set_Fld_Type, "set_field_type_enum"); - - Res : Eti_Error; - begin -diff -Naur ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-intfield.adb ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-intfield.adb ---- ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-intfield.adb 2009-12-26 18:38:58.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-intfield.adb 2011-03-19 01:45:37.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.10 $ ---- $Date: 2009/12/26 17:38:58 $ -+-- $Revision: 1.11 $ -+-- $Date: 2011/03/19 00:45:37 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux; -@@ -46,15 +46,11 @@ - procedure Set_Field_Type (Fld : Field; - Typ : Integer_Field) - is -- C_Integer_Field_Type : C_Field_Type; -- pragma Import (C, C_Integer_Field_Type, "TYPE_INTEGER"); -- - function Set_Fld_Type (F : Field := Fld; -- Cft : C_Field_Type := C_Integer_Field_Type; - Arg1 : C_Int; - Arg2 : C_Long_Int; - Arg3 : C_Long_Int) return C_Int; -- pragma Import (C, Set_Fld_Type, "set_field_type"); -+ pragma Import (C, Set_Fld_Type, "set_field_type_integer"); - - Res : Eti_Error; - begin -diff -Naur ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-ipv4_address.adb ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-ipv4_address.adb ---- ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-ipv4_address.adb 2009-12-26 18:38:58.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-ipv4_address.adb 2011-03-19 01:45:37.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.10 $ ---- $Date: 2009/12/26 17:38:58 $ -+-- $Revision: 1.11 $ -+-- $Date: 2011/03/19 00:45:37 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux; -@@ -46,13 +46,9 @@ - procedure Set_Field_Type (Fld : Field; - Typ : Internet_V4_Address_Field) - is -- C_IPV4_Field_Type : C_Field_Type; -- pragma Import (C, C_IPV4_Field_Type, "TYPE_IPV4"); -- -- function Set_Fld_Type (F : Field := Fld; -- Cft : C_Field_Type := C_IPV4_Field_Type) -+ function Set_Fld_Type (F : Field := Fld) - return C_Int; -- pragma Import (C, Set_Fld_Type, "set_field_type"); -+ pragma Import (C, Set_Fld_Type, "set_field_type_ipv4"); - - Res : Eti_Error; - begin -diff -Naur ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-numeric.adb ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-numeric.adb ---- ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-numeric.adb 2009-12-26 18:38:58.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-numeric.adb 2011-03-19 01:45:37.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.11 $ ---- $Date: 2009/12/26 17:38:58 $ -+-- $Revision: 1.12 $ -+-- $Date: 2011/03/19 00:45:37 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Interfaces.C; -@@ -49,15 +49,11 @@ - is - type Double is new Interfaces.C.double; - -- C_Numeric_Field_Type : C_Field_Type; -- pragma Import (C, C_Numeric_Field_Type, "TYPE_NUMERIC"); -- - function Set_Fld_Type (F : Field := Fld; -- Cft : C_Field_Type := C_Numeric_Field_Type; - Arg1 : C_Int; - Arg2 : Double; - Arg3 : Double) return C_Int; -- pragma Import (C, Set_Fld_Type, "set_field_type"); -+ pragma Import (C, Set_Fld_Type, "set_field_type_numeric"); - - Res : Eti_Error; - begin -diff -Naur ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-regexp.adb ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-regexp.adb ---- ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-regexp.adb 2009-12-26 18:45:34.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-regexp.adb 2011-03-19 01:45:37.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2003,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -35,7 +35,7 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.9 $ -+-- $Revision: 1.10 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Interfaces.C; use Interfaces.C; -@@ -48,13 +48,9 @@ - is - type Char_Ptr is access all Interfaces.C.char; - -- C_Regexp_Field_Type : C_Field_Type; -- pragma Import (C, C_Regexp_Field_Type, "TYPE_REGEXP"); -- - function Set_Ftyp (F : Field := Fld; -- Cft : C_Field_Type := C_Regexp_Field_Type; - Arg1 : Char_Ptr) return C_Int; -- pragma Import (C, Set_Ftyp, "set_field_type"); -+ pragma Import (C, Set_Ftyp, "set_field_type_regexp"); - - Txt : char_array (0 .. Typ.Regular_Expression.all'Length); - Len : size_t; -diff -Naur ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-user.adb ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-user.adb ---- ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-user.adb 2009-12-26 18:38:58.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-user.adb 2011-03-23 01:44:58.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -35,11 +35,11 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.16 $ ---- $Date: 2009/12/26 17:38:58 $ -+-- $Revision: 1.21 $ -+-- $Date: 2011/03/23 00:44:58 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ --with Ada.Unchecked_Conversion; -+with System.Address_To_Access_Conversions; - with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux; - - package body Terminal_Interface.Curses.Forms.Field_Types.User is -@@ -54,7 +54,7 @@ - Cft : C_Field_Type := C_Generic_Type; - Arg1 : Argument_Access) - return C_Int; -- pragma Import (C, Set_Fld_Type, "set_field_type"); -+ pragma Import (C, Set_Fld_Type, "set_field_type_user"); - - Res : Eti_Error; - -@@ -76,31 +76,31 @@ - end if; - end Set_Field_Type; - -- pragma Warnings (Off); -- function To_Argument_Access is new Ada.Unchecked_Conversion -- (System.Address, Argument_Access); -- pragma Warnings (On); -+ package Argument_Conversions is -+ new System.Address_To_Access_Conversions (Argument); - - function Generic_Field_Check (Fld : Field; -- Usr : System.Address) return C_Int -+ Usr : System.Address) return Curses_Bool - is - Result : Boolean; - Udf : constant User_Defined_Field_Type_Access := -- User_Defined_Field_Type_Access (To_Argument_Access (Usr).Typ); -+ User_Defined_Field_Type_Access -+ (Argument_Access (Argument_Conversions.To_Pointer (Usr)).all.Typ); - begin - Result := Field_Check (Fld, Udf.all); -- return C_Int (Boolean'Pos (Result)); -+ return Curses_Bool (Boolean'Pos (Result)); - end Generic_Field_Check; - - function Generic_Char_Check (Ch : C_Int; -- Usr : System.Address) return C_Int -+ Usr : System.Address) return Curses_Bool - is - Result : Boolean; - Udf : constant User_Defined_Field_Type_Access := -- User_Defined_Field_Type_Access (To_Argument_Access (Usr).Typ); -+ User_Defined_Field_Type_Access -+ (Argument_Access (Argument_Conversions.To_Pointer (Usr)).all.Typ); - begin - Result := Character_Check (Character'Val (Ch), Udf.all); -- return C_Int (Boolean'Pos (Result)); -+ return Curses_Bool (Boolean'Pos (Result)); - end Generic_Char_Check; - - -- ----------------------------------------------------------------------- -diff -Naur ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-user.ads ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-user.ads ---- ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-user.ads 2009-12-26 18:38:58.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-user.ads 2011-03-19 13:27:21.000000000 +0100 -@@ -7,7 +7,7 @@ - -- S P E C -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.13 $ ---- $Date: 2009/12/26 17:38:58 $ -+-- $Revision: 1.15 $ -+-- $Date: 2011/03/19 12:27:21 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Interfaces.C; -@@ -79,17 +79,17 @@ - function C_Generic_Type return C_Field_Type; - - function Generic_Field_Check (Fld : Field; -- Usr : System.Address) return C_Int; -+ Usr : System.Address) return Curses_Bool; - pragma Convention (C, Generic_Field_Check); - -- This is the generic Field_Check_Function for the low-level fieldtype -- -- representing all the User_Defined_Field_Type derivates. It routes -+ -- representing all the User_Defined_Field_Type derivatives. It routes - -- the call to the Field_Check implementation for the type. - - function Generic_Char_Check (Ch : C_Int; -- Usr : System.Address) return C_Int; -+ Usr : System.Address) return Curses_Bool; - pragma Convention (C, Generic_Char_Check); - -- This is the generic Char_Check_Function for the low-level fieldtype -- -- representing all the User_Defined_Field_Type derivates. It routes -+ -- representing all the User_Defined_Field_Type derivatives. It routes - -- the call to the Character_Check implementation for the type. - - end Terminal_Interface.Curses.Forms.Field_Types.User; -diff -Naur ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-user-choice.adb ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-user-choice.adb ---- ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-user-choice.adb 2008-07-26 20:48:58.000000000 +0200 -+++ ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-user-choice.adb 2011-03-22 11:53:37.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2006,2008 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2008,2011 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 -- -@@ -35,42 +35,40 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.15 $ ---- $Date: 2008/07/26 18:48:58 $ -+-- $Revision: 1.17 $ -+-- $Date: 2011/03/22 10:53:37 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ --with Ada.Unchecked_Conversion; -+with System.Address_To_Access_Conversions; - with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux; - - package body Terminal_Interface.Curses.Forms.Field_Types.User.Choice is - -- pragma Warnings (Off); -- function To_Argument_Access is new Ada.Unchecked_Conversion -- (System.Address, Argument_Access); -- pragma Warnings (On); -+ package Argument_Conversions is -+ new System.Address_To_Access_Conversions (Argument); - - function Generic_Next (Fld : Field; -- Usr : System.Address) return C_Int -+ Usr : System.Address) return Curses_Bool - is - Result : Boolean; - Udf : constant User_Defined_Field_Type_With_Choice_Access := - User_Defined_Field_Type_With_Choice_Access -- (To_Argument_Access (Usr).Typ); -+ (Argument_Access (Argument_Conversions.To_Pointer (Usr)).Typ); - begin - Result := Next (Fld, Udf.all); -- return C_Int (Boolean'Pos (Result)); -+ return Curses_Bool (Boolean'Pos (Result)); - end Generic_Next; - - function Generic_Prev (Fld : Field; -- Usr : System.Address) return C_Int -+ Usr : System.Address) return Curses_Bool - is - Result : Boolean; - Udf : constant User_Defined_Field_Type_With_Choice_Access := - User_Defined_Field_Type_With_Choice_Access -- (To_Argument_Access (Usr).Typ); -+ (Argument_Access (Argument_Conversions.To_Pointer (Usr)).Typ); - begin - Result := Previous (Fld, Udf.all); -- return C_Int (Boolean'Pos (Result)); -+ return Curses_Bool (Boolean'Pos (Result)); - end Generic_Prev; - - -- ----------------------------------------------------------------------- -diff -Naur ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-user-choice.ads ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-user-choice.ads ---- ncurses-5.8/Ada95/src/terminal_interface-curses-forms-field_types-user-choice.ads 2008-07-26 20:49:20.000000000 +0200 -+++ ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-forms-field_types-user-choice.ads 2011-03-19 13:27:47.000000000 +0100 -@@ -7,7 +7,7 @@ - -- S P E C -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998,2008 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2008,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.12 $ ---- $Date: 2008/07/26 18:49:20 $ -+-- $Revision: 1.14 $ -+-- $Date: 2011/03/19 12:27:47 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Interfaces.C; -@@ -78,17 +78,17 @@ - function C_Generic_Choice return C_Field_Type; - - function Generic_Next (Fld : Field; -- Usr : System.Address) return C_Int; -+ Usr : System.Address) return Curses_Bool; - pragma Convention (C, Generic_Next); - -- This is the generic next Choice_Function for the low-level fieldtype -- -- representing all the User_Defined_Field_Type derivates. It routes -+ -- representing all the User_Defined_Field_Type derivatives. It routes - -- the call to the Next implementation for the type. - - function Generic_Prev (Fld : Field; -- Usr : System.Address) return C_Int; -+ Usr : System.Address) return Curses_Bool; - pragma Convention (C, Generic_Prev); - -- This is the generic prev Choice_Function for the low-level fieldtype -- -- representing all the User_Defined_Field_Type derivates. It routes -+ -- representing all the User_Defined_Field_Type derivatives. It routes - -- the call to the Previous implementation for the type. - - end Terminal_Interface.Curses.Forms.Field_Types.User.Choice; -diff -Naur ncurses-5.8/Ada95/src/terminal_interface-curses-menus.adb ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-menus.adb ---- ncurses-5.8/Ada95/src/terminal_interface-curses-menus.adb 2009-12-26 18:38:58.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-menus.adb 2011-03-23 00:38:12.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2008,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.27 $ ---- $Date: 2009/12/26 17:38:58 $ -+-- $Revision: 1.28 $ -+-- $Date: 2011/03/22 23:38:12 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - with Ada.Unchecked_Deallocation; -@@ -896,8 +896,8 @@ - - Res : Eti_Error; - begin -- pragma Assert (Items (Items'Last) = Null_Item); -- if Items (Items'Last) /= Null_Item then -+ pragma Assert (Items.all (Items'Last) = Null_Item); -+ if Items.all (Items'Last) /= Null_Item then - raise Menu_Exception; - else - Res := Set_Items (Men, Items.all'Address); -@@ -941,8 +941,8 @@ - - M : Menu; - begin -- pragma Assert (Items (Items'Last) = Null_Item); -- if Items (Items'Last) /= Null_Item then -+ pragma Assert (Items.all (Items'Last) = Null_Item); -+ if Items.all (Items'Last) /= Null_Item then - raise Menu_Exception; - else - M := Newmenu (Items.all'Address); -@@ -997,8 +997,8 @@ - begin - if IA /= null and then Free_Items then - for I in IA'First .. (IA'Last - 1) loop -- if IA (I) /= Null_Item then -- Delete (IA (I)); -+ if IA.all (I) /= Null_Item then -+ Delete (IA.all (I)); - end if; - end loop; - end if; -diff -Naur ncurses-5.8/Ada95/src/terminal_interface-curses-text_io.adb ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-text_io.adb ---- ncurses-5.8/Ada95/src/terminal_interface-curses-text_io.adb 2009-12-26 18:40:46.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-text_io.adb 2011-03-23 00:38:49.000000000 +0100 -@@ -7,7 +7,7 @@ - -- B O D Y -- - -- -- - ------------------------------------------------------------------------------ ---- Copyright (c) 1998-2006,2009 Free Software Foundation, Inc. -- -+-- Copyright (c) 1998-2009,2011 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 -- -@@ -35,8 +35,8 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.19 $ ---- $Date: 2009/12/26 17:40:46 $ -+-- $Revision: 1.20 $ -+-- $Date: 2011/03/22 23:38:49 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - package body Terminal_Interface.Curses.Text_IO is -@@ -205,6 +205,7 @@ - end if; - - Get_Cursor_Position (Win, Y1, X); -+ pragma Unreferenced (X); - N := Natural (To); N := N - 1; - Y2 := Line_Position (N); - if Y2 < Y1 then -diff -Naur ncurses-5.8/Ada95/src/terminal_interface-curses-trace.adb_p ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-trace.adb_p ---- ncurses-5.8/Ada95/src/terminal_interface-curses-trace.adb_p 2009-12-26 18:41:14.000000000 +0100 -+++ ncurses-5.8-20110402/Ada95/src/terminal_interface-curses-trace.adb_p 2011-03-19 19:16:43.000000000 +0100 -@@ -35,7 +35,7 @@ - ------------------------------------------------------------------------------ - -- Author: Juergen Pfeifer, 1996 - -- Version Control: ---- $Revision: 1.6 $ -+-- $Revision: 1.7 $ - -- Binding Version 01.00 - ------------------------------------------------------------------------------ - #if ADA_TRACE then -@@ -66,7 +66,7 @@ - - procedure Trace_Put (str : String) is - procedure tracef (format : char_array; s : char_array); -- pragma Import (C, tracef, "_tracef"); -+ pragma Import (C, tracef, "_traces"); - Txt : char_array (0 .. str'Length); - Length : size_t; - formatstr : constant String := "%s" & ASCII.NUL; -diff -Naur ncurses-5.8/configure ncurses-5.8-20110402/configure ---- ncurses-5.8/configure 2011-02-21 02:40:36.000000000 +0100 -+++ ncurses-5.8-20110402/configure 2011-04-01 01:35:51.000000000 +0200 -@@ -1,5 +1,5 @@ - #! /bin/sh --# From configure.in Revision: 1.514 . -+# From configure.in Revision: 1.520 . - # Guess values for system-dependent variables and create Makefiles. - # Generated by Autoconf 2.52.20101002. - # -@@ -3904,7 +3904,7 @@ - all : - @ echo '.$cf_option' - CF_EOF -- cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | sed -e 's,[ ]*$,,'` -+ cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[ ]*$,,'` - case "$cf_result" in - .*k) - cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` -@@ -13376,6 +13376,7 @@ - getopt.h \ - limits.h \ - locale.h \ -+math.h \ - poll.h \ - sys/bsdtypes.h \ - sys/ioctl.h \ -@@ -13390,23 +13391,23 @@ - - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:13393: checking for $ac_header" >&5 -+echo "$as_me:13394: 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 13399 "configure" -+#line 13400 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:13403: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:13404: \"$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:13409: \$? = $ac_status" >&5 -+ echo "$as_me:13410: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -13425,7 +13426,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:13428: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:13429: 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 < to declare fd_set - if test "$ISC" = yes ; then - --echo "$as_me:13442: checking for main in -lcposix" >&5 -+echo "$as_me:13443: checking for main in -lcposix" >&5 - echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6 - if test "${ac_cv_lib_cposix_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -13447,7 +13448,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lcposix $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 13450 "configure" -+#line 13451 "configure" - #include "confdefs.h" - - int -@@ -13459,16 +13460,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:13462: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:13463: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:13465: \$? = $ac_status" >&5 -+ echo "$as_me:13466: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:13468: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:13469: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:13471: \$? = $ac_status" >&5 -+ echo "$as_me:13472: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_cposix_main=yes - else -@@ -13479,7 +13480,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:13482: result: $ac_cv_lib_cposix_main" >&5 -+echo "$as_me:13483: result: $ac_cv_lib_cposix_main" >&5 - echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6 - if test $ac_cv_lib_cposix_main = yes; then - cat >>confdefs.h <&5 -+ echo "$as_me:13494: checking for bzero in -linet" >&5 - echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6 - if test "${ac_cv_lib_inet_bzero+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -13498,7 +13499,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-linet $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 13501 "configure" -+#line 13502 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -13517,16 +13518,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:13520: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:13521: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:13523: \$? = $ac_status" >&5 -+ echo "$as_me:13524: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:13526: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:13527: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:13529: \$? = $ac_status" >&5 -+ echo "$as_me:13530: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_inet_bzero=yes - else -@@ -13537,21 +13538,21 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:13540: result: $ac_cv_lib_inet_bzero" >&5 -+echo "$as_me:13541: result: $ac_cv_lib_inet_bzero" >&5 - echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6 - if test $ac_cv_lib_inet_bzero = yes; then - LIBS="-linet $LIBS" - fi - fi - --echo "$as_me:13547: checking if sys/time.h works with sys/select.h" >&5 -+echo "$as_me:13548: checking if sys/time.h works with sys/select.h" >&5 - echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6 - if test "${cf_cv_sys_time_select+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 13554 "configure" -+#line 13555 "configure" - #include "confdefs.h" - - #include -@@ -13571,16 +13572,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:13574: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:13575: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:13577: \$? = $ac_status" >&5 -+ echo "$as_me:13578: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:13580: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:13581: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:13583: \$? = $ac_status" >&5 -+ echo "$as_me:13584: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_sys_time_select=yes - else -@@ -13592,7 +13593,7 @@ - - fi - --echo "$as_me:13595: result: $cf_cv_sys_time_select" >&5 -+echo "$as_me:13596: result: $cf_cv_sys_time_select" >&5 - echo "${ECHO_T}$cf_cv_sys_time_select" >&6 - test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF - #define HAVE_SYS_TIME_SELECT 1 -@@ -13606,7 +13607,7 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_main_return=return - --echo "$as_me:13609: checking for $CC option to accept ANSI C" >&5 -+echo "$as_me:13610: checking for $CC option to accept ANSI C" >&5 - echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 - if test "${ac_cv_prog_cc_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -13614,7 +13615,7 @@ - ac_cv_prog_cc_stdc=no - ac_save_CC=$CC - cat >conftest.$ac_ext <<_ACEOF --#line 13617 "configure" -+#line 13618 "configure" - #include "confdefs.h" - #include - #include -@@ -13663,16 +13664,16 @@ - do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext --if { (eval echo "$as_me:13666: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:13667: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:13669: \$? = $ac_status" >&5 -+ echo "$as_me:13670: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:13672: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:13673: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:13675: \$? = $ac_status" >&5 -+ echo "$as_me:13676: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg - break -@@ -13689,21 +13690,21 @@ - - case "x$ac_cv_prog_cc_stdc" in - x|xno) -- echo "$as_me:13692: result: none needed" >&5 -+ echo "$as_me:13693: result: none needed" >&5 - echo "${ECHO_T}none needed" >&6 ;; - *) -- echo "$as_me:13695: result: $ac_cv_prog_cc_stdc" >&5 -+ echo "$as_me:13696: result: $ac_cv_prog_cc_stdc" >&5 - echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; - esac - --echo "$as_me:13700: checking for an ANSI C-conforming const" >&5 -+echo "$as_me:13701: checking for an ANSI C-conforming const" >&5 - echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 - if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 13706 "configure" -+#line 13707 "configure" - #include "confdefs.h" - - int -@@ -13761,16 +13762,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:13764: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:13765: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:13767: \$? = $ac_status" >&5 -+ echo "$as_me:13768: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:13770: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:13771: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:13773: \$? = $ac_status" >&5 -+ echo "$as_me:13774: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_const=yes - else -@@ -13780,7 +13781,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:13783: result: $ac_cv_c_const" >&5 -+echo "$as_me:13784: result: $ac_cv_c_const" >&5 - echo "${ECHO_T}$ac_cv_c_const" >&6 - if test $ac_cv_c_const = no; then - -@@ -13790,7 +13791,7 @@ - - fi - --echo "$as_me:13793: checking for inline" >&5 -+echo "$as_me:13794: checking for inline" >&5 - echo $ECHO_N "checking for inline... $ECHO_C" >&6 - if test "${ac_cv_c_inline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -13798,7 +13799,7 @@ - ac_cv_c_inline=no - for ac_kw in inline __inline__ __inline; do - cat >conftest.$ac_ext <<_ACEOF --#line 13801 "configure" -+#line 13802 "configure" - #include "confdefs.h" - #ifndef __cplusplus - static $ac_kw int static_foo () {return 0; } -@@ -13807,16 +13808,16 @@ - - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:13810: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:13811: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:13813: \$? = $ac_status" >&5 -+ echo "$as_me:13814: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:13816: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:13817: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:13819: \$? = $ac_status" >&5 -+ echo "$as_me:13820: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_inline=$ac_kw; break - else -@@ -13827,7 +13828,7 @@ - done - - fi --echo "$as_me:13830: result: $ac_cv_c_inline" >&5 -+echo "$as_me:13831: result: $ac_cv_c_inline" >&5 - echo "${ECHO_T}$ac_cv_c_inline" >&6 - case $ac_cv_c_inline in - inline | yes) ;; -@@ -13850,7 +13851,7 @@ - : - elif test "$GCC" = yes - then -- echo "$as_me:13853: checking if $CC supports options to tune inlining" >&5 -+ echo "$as_me:13854: checking if $CC supports options to tune inlining" >&5 - echo $ECHO_N "checking if $CC supports options to tune inlining... $ECHO_C" >&6 - if test "${cf_cv_gcc_inline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -13859,7 +13860,7 @@ - cf_save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS --param max-inline-insns-single=1200" - cat >conftest.$ac_ext <<_ACEOF --#line 13862 "configure" -+#line 13863 "configure" - #include "confdefs.h" - inline int foo(void) { return 1; } - int -@@ -13871,16 +13872,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:13874: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:13875: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:13877: \$? = $ac_status" >&5 -+ echo "$as_me:13878: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:13880: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:13881: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:13883: \$? = $ac_status" >&5 -+ echo "$as_me:13884: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_gcc_inline=yes - else -@@ -13892,7 +13893,7 @@ - CFLAGS=$cf_save_CFLAGS - - fi --echo "$as_me:13895: result: $cf_cv_gcc_inline" >&5 -+echo "$as_me:13896: result: $cf_cv_gcc_inline" >&5 - echo "${ECHO_T}$cf_cv_gcc_inline" >&6 - if test "$cf_cv_gcc_inline" = yes ; then - -@@ -13978,7 +13979,7 @@ - fi - fi - --echo "$as_me:13981: checking for signal global datatype" >&5 -+echo "$as_me:13982: checking for signal global datatype" >&5 - echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 - if test "${cf_cv_sig_atomic_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -13990,7 +13991,7 @@ - "int" - do - cat >conftest.$ac_ext <<_ACEOF --#line 13993 "configure" -+#line 13994 "configure" - #include "confdefs.h" - - #include -@@ -14013,16 +14014,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:14016: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:14017: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:14019: \$? = $ac_status" >&5 -+ echo "$as_me:14020: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:14022: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14023: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14025: \$? = $ac_status" >&5 -+ echo "$as_me:14026: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_sig_atomic_t=$cf_type - else -@@ -14036,7 +14037,7 @@ - - fi - --echo "$as_me:14039: result: $cf_cv_sig_atomic_t" >&5 -+echo "$as_me:14040: result: $cf_cv_sig_atomic_t" >&5 - echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 - test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <&5 -+echo "$as_me:14048: checking for type of chtype" >&5 - echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6 - if test "${cf_cv_typeof_chtype+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -14054,7 +14055,7 @@ - cf_cv_typeof_chtype=long - else - cat >conftest.$ac_ext <<_ACEOF --#line 14057 "configure" -+#line 14058 "configure" - #include "confdefs.h" - - #define WANT_BITS 31 -@@ -14089,15 +14090,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:14092: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14093: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14095: \$? = $ac_status" >&5 -+ echo "$as_me:14096: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:14097: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14098: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14100: \$? = $ac_status" >&5 -+ echo "$as_me:14101: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_typeof_chtype=`cat cf_test.out` - else -@@ -14112,7 +14113,7 @@ - - fi - --echo "$as_me:14115: result: $cf_cv_typeof_chtype" >&5 -+echo "$as_me:14116: result: $cf_cv_typeof_chtype" >&5 - echo "${ECHO_T}$cf_cv_typeof_chtype" >&6 - - cat >>confdefs.h <&5 -+echo "$as_me:14128: checking if unsigned literals are legal" >&5 - echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6 - if test "${cf_cv_unsigned_literals+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 14134 "configure" -+#line 14135 "configure" - #include "confdefs.h" - - int -@@ -14143,16 +14144,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:14146: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:14147: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:14149: \$? = $ac_status" >&5 -+ echo "$as_me:14150: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:14152: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14153: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14155: \$? = $ac_status" >&5 -+ echo "$as_me:14156: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_unsigned_literals=yes - else -@@ -14164,7 +14165,7 @@ - - fi - --echo "$as_me:14167: result: $cf_cv_unsigned_literals" >&5 -+echo "$as_me:14168: result: $cf_cv_unsigned_literals" >&5 - echo "${ECHO_T}$cf_cv_unsigned_literals" >&6 - - cf_cv_1UL="1" -@@ -14180,14 +14181,14 @@ - - ### Checks for external-data - --echo "$as_me:14183: checking if external errno is declared" >&5 -+echo "$as_me:14184: checking if external errno is declared" >&5 - echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 - if test "${cf_cv_dcl_errno+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 14190 "configure" -+#line 14191 "configure" - #include "confdefs.h" - - #ifdef HAVE_STDLIB_H -@@ -14205,16 +14206,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:14208: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:14209: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:14211: \$? = $ac_status" >&5 -+ echo "$as_me:14212: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:14214: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14215: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14217: \$? = $ac_status" >&5 -+ echo "$as_me:14218: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_dcl_errno=yes - else -@@ -14225,7 +14226,7 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:14228: result: $cf_cv_dcl_errno" >&5 -+echo "$as_me:14229: result: $cf_cv_dcl_errno" >&5 - echo "${ECHO_T}$cf_cv_dcl_errno" >&6 - - if test "$cf_cv_dcl_errno" = no ; then -@@ -14240,14 +14241,14 @@ - - # It's possible (for near-UNIX clones) that the data doesn't exist - --echo "$as_me:14243: checking if external errno exists" >&5 -+echo "$as_me:14244: checking if external errno exists" >&5 - echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 - if test "${cf_cv_have_errno+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 14250 "configure" -+#line 14251 "configure" - #include "confdefs.h" - - #undef errno -@@ -14262,16 +14263,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14265: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14266: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14268: \$? = $ac_status" >&5 -+ echo "$as_me:14269: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:14271: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14272: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14274: \$? = $ac_status" >&5 -+ echo "$as_me:14275: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_have_errno=yes - else -@@ -14282,7 +14283,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - - fi --echo "$as_me:14285: result: $cf_cv_have_errno" >&5 -+echo "$as_me:14286: result: $cf_cv_have_errno" >&5 - echo "${ECHO_T}$cf_cv_have_errno" >&6 - - if test "$cf_cv_have_errno" = yes ; then -@@ -14295,7 +14296,7 @@ - - fi - --echo "$as_me:14298: checking if data-only library module links" >&5 -+echo "$as_me:14299: checking if data-only library module links" >&5 - echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6 - if test "${cf_cv_link_dataonly+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -14303,20 +14304,20 @@ - - rm -f conftest.a - cat >conftest.$ac_ext <&5 -+ if { (eval echo "$as_me:14310: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:14312: \$? = $ac_status" >&5 -+ echo "$as_me:14313: \$? = $ac_status" >&5 - (exit $ac_status); } ; then - mv conftest.o data.o && \ - ( $AR $ARFLAGS conftest.a data.o ) 2>&5 1>/dev/null - fi - rm -f conftest.$ac_ext data.o - cat >conftest.$ac_ext <&5 -+ if { (eval echo "$as_me:14333: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:14335: \$? = $ac_status" >&5 -+ echo "$as_me:14336: \$? = $ac_status" >&5 - (exit $ac_status); }; then - mv conftest.o func.o && \ - ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null -@@ -14345,7 +14346,7 @@ - cf_cv_link_dataonly=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 14348 "configure" -+#line 14349 "configure" - #include "confdefs.h" - - int main() -@@ -14356,15 +14357,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:14359: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14360: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14362: \$? = $ac_status" >&5 -+ echo "$as_me:14363: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:14364: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14365: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14367: \$? = $ac_status" >&5 -+ echo "$as_me:14368: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_link_dataonly=yes - else -@@ -14379,7 +14380,7 @@ - - fi - --echo "$as_me:14382: result: $cf_cv_link_dataonly" >&5 -+echo "$as_me:14383: result: $cf_cv_link_dataonly" >&5 - echo "${ECHO_T}$cf_cv_link_dataonly" >&6 - - if test "$cf_cv_link_dataonly" = no ; then -@@ -14414,13 +14415,13 @@ - - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:14417: checking for $ac_func" >&5 -+echo "$as_me:14418: checking for $ac_func" >&5 - echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 - if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 14423 "configure" -+#line 14424 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -@@ -14451,16 +14452,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14454: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14455: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14457: \$? = $ac_status" >&5 -+ echo "$as_me:14458: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:14460: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14461: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14463: \$? = $ac_status" >&5 -+ echo "$as_me:14464: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" - else -@@ -14470,7 +14471,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:14473: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "$as_me:14474: result: `eval echo '${'$as_ac_var'}'`" >&5 - echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 - if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <&5 -+echo "$as_me:14486: checking for terminal-capability database functions" >&5 - echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6 - if test "${cf_cv_cgetent+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 14492 "configure" -+#line 14493 "configure" - #include "confdefs.h" - - #include -@@ -14509,16 +14510,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14512: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14513: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14515: \$? = $ac_status" >&5 -+ echo "$as_me:14516: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:14518: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14519: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14521: \$? = $ac_status" >&5 -+ echo "$as_me:14522: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_cgetent=yes - else -@@ -14530,7 +14531,7 @@ - - fi - --echo "$as_me:14533: result: $cf_cv_cgetent" >&5 -+echo "$as_me:14534: result: $cf_cv_cgetent" >&5 - echo "${ECHO_T}$cf_cv_cgetent" >&6 - test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF - #define HAVE_BSD_CGETENT 1 -@@ -14538,14 +14539,14 @@ - - fi - --echo "$as_me:14541: checking for isascii" >&5 -+echo "$as_me:14542: checking for isascii" >&5 - echo $ECHO_N "checking for isascii... $ECHO_C" >&6 - if test "${cf_cv_have_isascii+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 14548 "configure" -+#line 14549 "configure" - #include "confdefs.h" - #include - int -@@ -14557,16 +14558,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14560: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14561: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14563: \$? = $ac_status" >&5 -+ echo "$as_me:14564: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:14566: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14567: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14569: \$? = $ac_status" >&5 -+ echo "$as_me:14570: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_have_isascii=yes - else -@@ -14577,17 +14578,17 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - - fi --echo "$as_me:14580: result: $cf_cv_have_isascii" >&5 -+echo "$as_me:14581: result: $cf_cv_have_isascii" >&5 - echo "${ECHO_T}$cf_cv_have_isascii" >&6 - test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF - #define HAVE_ISASCII 1 - EOF - - if test "$ac_cv_func_sigaction" = yes; then --echo "$as_me:14587: checking whether sigaction needs _POSIX_SOURCE" >&5 -+echo "$as_me:14588: checking whether sigaction needs _POSIX_SOURCE" >&5 - echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line 14590 "configure" -+#line 14591 "configure" - #include "confdefs.h" - - #include -@@ -14601,16 +14602,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:14604: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:14605: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:14607: \$? = $ac_status" >&5 -+ echo "$as_me:14608: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:14610: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14611: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14613: \$? = $ac_status" >&5 -+ echo "$as_me:14614: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - sigact_bad=no - else -@@ -14618,7 +14619,7 @@ - cat conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 14621 "configure" -+#line 14622 "configure" - #include "confdefs.h" - - #define _POSIX_SOURCE -@@ -14633,16 +14634,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:14636: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:14637: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:14639: \$? = $ac_status" >&5 -+ echo "$as_me:14640: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:14642: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14643: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14645: \$? = $ac_status" >&5 -+ echo "$as_me:14646: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - sigact_bad=yes - cat >>confdefs.h <<\EOF -@@ -14657,11 +14658,11 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - fi - rm -f conftest.$ac_objext conftest.$ac_ext --echo "$as_me:14660: result: $sigact_bad" >&5 -+echo "$as_me:14661: result: $sigact_bad" >&5 - echo "${ECHO_T}$sigact_bad" >&6 - fi - --echo "$as_me:14664: checking if nanosleep really works" >&5 -+echo "$as_me:14665: checking if nanosleep really works" >&5 - echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6 - if test "${cf_cv_func_nanosleep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -14671,7 +14672,7 @@ - cf_cv_func_nanosleep=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 14674 "configure" -+#line 14675 "configure" - #include "confdefs.h" - - #include -@@ -14696,15 +14697,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:14699: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14700: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14702: \$? = $ac_status" >&5 -+ echo "$as_me:14703: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:14704: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14705: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14707: \$? = $ac_status" >&5 -+ echo "$as_me:14708: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_func_nanosleep=yes - else -@@ -14716,7 +14717,7 @@ - rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi --echo "$as_me:14719: result: $cf_cv_func_nanosleep" >&5 -+echo "$as_me:14720: result: $cf_cv_func_nanosleep" >&5 - echo "${ECHO_T}$cf_cv_func_nanosleep" >&6 - - test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF -@@ -14730,23 +14731,23 @@ - - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:14733: checking for $ac_header" >&5 -+echo "$as_me:14734: 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 14739 "configure" -+#line 14740 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:14743: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:14744: \"$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:14749: \$? = $ac_status" >&5 -+ echo "$as_me:14750: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -14765,7 +14766,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:14768: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:14769: 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:14784: 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 14789 "configure" -+#line 14790 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:14793: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:14794: \"$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:14799: \$? = $ac_status" >&5 -+ echo "$as_me:14800: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -14815,7 +14816,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:14818: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:14819: 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:14837: checking whether termios.h needs _POSIX_SOURCE" >&5 - echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line 14839 "configure" -+#line 14840 "configure" - #include "confdefs.h" - #include - int -@@ -14848,16 +14849,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:14851: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:14852: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:14854: \$? = $ac_status" >&5 -+ echo "$as_me:14855: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:14857: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14858: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14860: \$? = $ac_status" >&5 -+ echo "$as_me:14861: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - termios_bad=no - else -@@ -14865,7 +14866,7 @@ - cat conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 14868 "configure" -+#line 14869 "configure" - #include "confdefs.h" - - #define _POSIX_SOURCE -@@ -14879,16 +14880,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:14882: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:14883: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:14885: \$? = $ac_status" >&5 -+ echo "$as_me:14886: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:14888: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14889: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14891: \$? = $ac_status" >&5 -+ echo "$as_me:14892: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - termios_bad=unknown - else -@@ -14903,19 +14904,19 @@ - - fi - rm -f conftest.$ac_objext conftest.$ac_ext -- echo "$as_me:14906: result: $termios_bad" >&5 -+ echo "$as_me:14907: result: $termios_bad" >&5 - echo "${ECHO_T}$termios_bad" >&6 - fi - fi - --echo "$as_me:14911: checking for tcgetattr" >&5 -+echo "$as_me:14912: checking for tcgetattr" >&5 - echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6 - if test "${cf_cv_have_tcgetattr+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 14918 "configure" -+#line 14919 "configure" - #include "confdefs.h" - - #include -@@ -14943,16 +14944,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14946: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14947: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14949: \$? = $ac_status" >&5 -+ echo "$as_me:14950: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:14952: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:14953: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:14955: \$? = $ac_status" >&5 -+ echo "$as_me:14956: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_have_tcgetattr=yes - else -@@ -14962,20 +14963,20 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:14965: result: $cf_cv_have_tcgetattr" >&5 -+echo "$as_me:14966: result: $cf_cv_have_tcgetattr" >&5 - echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6 - test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF - #define HAVE_TCGETATTR 1 - EOF - --echo "$as_me:14971: checking for vsscanf function or workaround" >&5 -+echo "$as_me:14972: checking for vsscanf function or workaround" >&5 - echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6 - if test "${cf_cv_func_vsscanf+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 14978 "configure" -+#line 14979 "configure" - #include "confdefs.h" - - #include -@@ -14991,16 +14992,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:14994: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:14995: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:14997: \$? = $ac_status" >&5 -+ echo "$as_me:14998: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15000: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15001: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15003: \$? = $ac_status" >&5 -+ echo "$as_me:15004: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_func_vsscanf=vsscanf - else -@@ -15008,7 +15009,7 @@ - cat conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 15011 "configure" -+#line 15012 "configure" - #include "confdefs.h" - - #include -@@ -15030,16 +15031,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:15033: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15034: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15036: \$? = $ac_status" >&5 -+ echo "$as_me:15037: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15039: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15040: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15042: \$? = $ac_status" >&5 -+ echo "$as_me:15043: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_func_vsscanf=vfscanf - else -@@ -15047,7 +15048,7 @@ - cat conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 15050 "configure" -+#line 15051 "configure" - #include "confdefs.h" - - #include -@@ -15069,16 +15070,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:15072: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15073: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15075: \$? = $ac_status" >&5 -+ echo "$as_me:15076: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15078: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15079: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15081: \$? = $ac_status" >&5 -+ echo "$as_me:15082: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_func_vsscanf=_doscan - else -@@ -15093,7 +15094,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:15096: result: $cf_cv_func_vsscanf" >&5 -+echo "$as_me:15097: result: $cf_cv_func_vsscanf" >&5 - echo "${ECHO_T}$cf_cv_func_vsscanf" >&6 - - case $cf_cv_func_vsscanf in #(vi -@@ -15111,7 +15112,7 @@ - ;; - esac - --echo "$as_me:15114: checking for working mkstemp" >&5 -+echo "$as_me:15115: checking for working mkstemp" >&5 - echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 - if test "${cf_cv_func_mkstemp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -15119,13 +15120,13 @@ - - rm -rf conftest* - if test "$cross_compiling" = yes; then -- echo "$as_me:15122: checking for mkstemp" >&5 -+ echo "$as_me:15123: checking for mkstemp" >&5 - echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 - if test "${ac_cv_func_mkstemp+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 15128 "configure" -+#line 15129 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char mkstemp (); below. */ -@@ -15156,16 +15157,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:15159: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15160: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15162: \$? = $ac_status" >&5 -+ echo "$as_me:15163: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15165: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15166: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15168: \$? = $ac_status" >&5 -+ echo "$as_me:15169: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_mkstemp=yes - else -@@ -15175,12 +15176,12 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:15178: result: $ac_cv_func_mkstemp" >&5 -+echo "$as_me:15179: result: $ac_cv_func_mkstemp" >&5 - echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 - - else - cat >conftest.$ac_ext <<_ACEOF --#line 15183 "configure" -+#line 15184 "configure" - #include "confdefs.h" - - #include -@@ -15218,15 +15219,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:15221: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15222: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15224: \$? = $ac_status" >&5 -+ echo "$as_me:15225: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:15226: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15227: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15229: \$? = $ac_status" >&5 -+ echo "$as_me:15230: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_func_mkstemp=yes - -@@ -15241,7 +15242,7 @@ - fi - - fi --echo "$as_me:15244: result: $cf_cv_func_mkstemp" >&5 -+echo "$as_me:15245: result: $cf_cv_func_mkstemp" >&5 - echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 - if test "x$cf_cv_func_mkstemp" = xyes || test "x$ac_cv_func_mkstemp" = xyes ; then - cat >>confdefs.h <<\EOF -@@ -15259,21 +15260,21 @@ - fi - - if test "$cross_compiling" = yes ; then -- { echo "$as_me:15262: WARNING: cross compiling: assume setvbuf params not reversed" >&5 -+ { echo "$as_me:15263: WARNING: cross compiling: assume setvbuf params not reversed" >&5 - echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;} - else -- echo "$as_me:15265: checking whether setvbuf arguments are reversed" >&5 -+ echo "$as_me:15266: checking whether setvbuf arguments are reversed" >&5 - echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 - if test "${ac_cv_func_setvbuf_reversed+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test "$cross_compiling" = yes; then -- { { echo "$as_me:15271: error: cannot run test program while cross compiling" >&5 -+ { { echo "$as_me:15272: 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 15276 "configure" -+#line 15277 "configure" - #include "confdefs.h" - #include - /* If setvbuf has the reversed format, exit 0. */ -@@ -15290,15 +15291,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:15293: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15294: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15296: \$? = $ac_status" >&5 -+ echo "$as_me:15297: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:15298: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15299: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15301: \$? = $ac_status" >&5 -+ echo "$as_me:15302: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_setvbuf_reversed=yes - else -@@ -15311,7 +15312,7 @@ - fi - rm -f core core.* *.core - fi --echo "$as_me:15314: result: $ac_cv_func_setvbuf_reversed" >&5 -+echo "$as_me:15315: result: $ac_cv_func_setvbuf_reversed" >&5 - echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 - if test $ac_cv_func_setvbuf_reversed = yes; then - -@@ -15322,13 +15323,13 @@ - fi - - fi --echo "$as_me:15325: checking return type of signal handlers" >&5 -+echo "$as_me:15326: checking return type of signal handlers" >&5 - echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 - if test "${ac_cv_type_signal+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 15331 "configure" -+#line 15332 "configure" - #include "confdefs.h" - #include - #include -@@ -15350,16 +15351,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:15353: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:15354: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:15356: \$? = $ac_status" >&5 -+ echo "$as_me:15357: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:15359: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15360: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15362: \$? = $ac_status" >&5 -+ echo "$as_me:15363: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_signal=void - else -@@ -15369,21 +15370,21 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:15372: result: $ac_cv_type_signal" >&5 -+echo "$as_me:15373: result: $ac_cv_type_signal" >&5 - echo "${ECHO_T}$ac_cv_type_signal" >&6 - - cat >>confdefs.h <&5 -+echo "$as_me:15380: checking for type sigaction_t" >&5 - echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6 - if test "${cf_cv_type_sigaction+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 15386 "configure" -+#line 15387 "configure" - #include "confdefs.h" - - #include -@@ -15396,16 +15397,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:15399: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:15400: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:15402: \$? = $ac_status" >&5 -+ echo "$as_me:15403: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:15405: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15406: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15408: \$? = $ac_status" >&5 -+ echo "$as_me:15409: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_type_sigaction=yes - else -@@ -15416,13 +15417,13 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - fi - --echo "$as_me:15419: result: $cf_cv_type_sigaction" >&5 -+echo "$as_me:15420: result: $cf_cv_type_sigaction" >&5 - echo "${ECHO_T}$cf_cv_type_sigaction" >&6 - test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF - #define HAVE_TYPE_SIGACTION 1 - EOF - --echo "$as_me:15425: checking declaration of size-change" >&5 -+echo "$as_me:15426: checking declaration of size-change" >&5 - echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 - if test "${cf_cv_sizechange+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -15437,7 +15438,7 @@ - CPPFLAGS="$cf_save_CPPFLAGS" - test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" - cat >conftest.$ac_ext <<_ACEOF --#line 15440 "configure" -+#line 15441 "configure" - #include "confdefs.h" - #include - #ifdef HAVE_TERMIOS_H -@@ -15481,16 +15482,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:15484: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:15485: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:15487: \$? = $ac_status" >&5 -+ echo "$as_me:15488: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:15490: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15491: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15493: \$? = $ac_status" >&5 -+ echo "$as_me:15494: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_sizechange=yes - else -@@ -15509,7 +15510,7 @@ - done - - fi --echo "$as_me:15512: result: $cf_cv_sizechange" >&5 -+echo "$as_me:15513: result: $cf_cv_sizechange" >&5 - echo "${ECHO_T}$cf_cv_sizechange" >&6 - if test "$cf_cv_sizechange" != no ; then - cat >>confdefs.h <<\EOF -@@ -15526,13 +15527,13 @@ - esac - fi - --echo "$as_me:15529: checking for memmove" >&5 -+echo "$as_me:15530: checking for memmove" >&5 - echo $ECHO_N "checking for memmove... $ECHO_C" >&6 - if test "${ac_cv_func_memmove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 15535 "configure" -+#line 15536 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char memmove (); below. */ -@@ -15563,16 +15564,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:15566: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15567: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15569: \$? = $ac_status" >&5 -+ echo "$as_me:15570: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15572: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15573: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15575: \$? = $ac_status" >&5 -+ echo "$as_me:15576: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_memmove=yes - else -@@ -15582,19 +15583,19 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:15585: result: $ac_cv_func_memmove" >&5 -+echo "$as_me:15586: result: $ac_cv_func_memmove" >&5 - echo "${ECHO_T}$ac_cv_func_memmove" >&6 - if test $ac_cv_func_memmove = yes; then - : - else - --echo "$as_me:15591: checking for bcopy" >&5 -+echo "$as_me:15592: checking for bcopy" >&5 - echo $ECHO_N "checking for bcopy... $ECHO_C" >&6 - if test "${ac_cv_func_bcopy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 15597 "configure" -+#line 15598 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char bcopy (); below. */ -@@ -15625,16 +15626,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:15628: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15629: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15631: \$? = $ac_status" >&5 -+ echo "$as_me:15632: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15634: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15635: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15637: \$? = $ac_status" >&5 -+ echo "$as_me:15638: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_bcopy=yes - else -@@ -15644,11 +15645,11 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:15647: result: $ac_cv_func_bcopy" >&5 -+echo "$as_me:15648: result: $ac_cv_func_bcopy" >&5 - echo "${ECHO_T}$ac_cv_func_bcopy" >&6 - if test $ac_cv_func_bcopy = yes; then - -- echo "$as_me:15651: checking if bcopy does overlapping moves" >&5 -+ echo "$as_me:15652: checking if bcopy does overlapping moves" >&5 - echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6 - if test "${cf_cv_good_bcopy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -15658,7 +15659,7 @@ - cf_cv_good_bcopy=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 15661 "configure" -+#line 15662 "configure" - #include "confdefs.h" - - int main() { -@@ -15672,15 +15673,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:15675: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15676: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15678: \$? = $ac_status" >&5 -+ echo "$as_me:15679: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:15680: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15681: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15683: \$? = $ac_status" >&5 -+ echo "$as_me:15684: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_good_bcopy=yes - else -@@ -15693,7 +15694,7 @@ - fi - - fi --echo "$as_me:15696: result: $cf_cv_good_bcopy" >&5 -+echo "$as_me:15697: result: $cf_cv_good_bcopy" >&5 - echo "${ECHO_T}$cf_cv_good_bcopy" >&6 - - else -@@ -15714,7 +15715,7 @@ - - fi - --echo "$as_me:15717: checking if poll really works" >&5 -+echo "$as_me:15718: checking if poll really works" >&5 - echo $ECHO_N "checking if poll really works... $ECHO_C" >&6 - if test "${cf_cv_working_poll+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -15724,7 +15725,7 @@ - cf_cv_working_poll=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 15727 "configure" -+#line 15728 "configure" - #include "confdefs.h" - - #include -@@ -15745,15 +15746,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:15748: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15749: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15751: \$? = $ac_status" >&5 -+ echo "$as_me:15752: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:15753: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15754: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15756: \$? = $ac_status" >&5 -+ echo "$as_me:15757: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_working_poll=yes - else -@@ -15765,20 +15766,20 @@ - rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi --echo "$as_me:15768: result: $cf_cv_working_poll" >&5 -+echo "$as_me:15769: result: $cf_cv_working_poll" >&5 - echo "${ECHO_T}$cf_cv_working_poll" >&6 - test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF - #define HAVE_WORKING_POLL 1 - EOF - --echo "$as_me:15774: checking for va_copy" >&5 -+echo "$as_me:15775: checking for va_copy" >&5 - echo $ECHO_N "checking for va_copy... $ECHO_C" >&6 - if test "${cf_cv_have_va_copy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 15781 "configure" -+#line 15782 "configure" - #include "confdefs.h" - - #include -@@ -15795,16 +15796,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:15798: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15799: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15801: \$? = $ac_status" >&5 -+ echo "$as_me:15802: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15804: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15805: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15807: \$? = $ac_status" >&5 -+ echo "$as_me:15808: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_have_va_copy=yes - else -@@ -15814,21 +15815,21 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:15817: result: $cf_cv_have_va_copy" >&5 -+echo "$as_me:15818: result: $cf_cv_have_va_copy" >&5 - echo "${ECHO_T}$cf_cv_have_va_copy" >&6 - - test "$cf_cv_have_va_copy" = yes && cat >>confdefs.h <<\EOF - #define HAVE_VA_COPY 1 - EOF - --echo "$as_me:15824: checking for __va_copy" >&5 -+echo "$as_me:15825: checking for __va_copy" >&5 - echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6 - if test "${cf_cv_have___va_copy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - cat >conftest.$ac_ext <<_ACEOF --#line 15831 "configure" -+#line 15832 "configure" - #include "confdefs.h" - - #include -@@ -15845,16 +15846,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:15848: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:15849: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:15851: \$? = $ac_status" >&5 -+ echo "$as_me:15852: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:15854: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15855: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15857: \$? = $ac_status" >&5 -+ echo "$as_me:15858: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_have___va_copy=yes - else -@@ -15864,20 +15865,20 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:15867: result: $cf_cv_have___va_copy" >&5 -+echo "$as_me:15868: result: $cf_cv_have___va_copy" >&5 - echo "${ECHO_T}$cf_cv_have___va_copy" >&6 - - test "$cf_cv_have___va_copy" = yes && cat >>confdefs.h <<\EOF - #define HAVE___VA_COPY 1 - EOF - --echo "$as_me:15874: checking for pid_t" >&5 -+echo "$as_me:15875: checking for pid_t" >&5 - echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 - if test "${ac_cv_type_pid_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 15880 "configure" -+#line 15881 "configure" - #include "confdefs.h" - $ac_includes_default - int -@@ -15892,16 +15893,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:15895: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:15896: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:15898: \$? = $ac_status" >&5 -+ echo "$as_me:15899: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:15901: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:15902: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:15904: \$? = $ac_status" >&5 -+ echo "$as_me:15905: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_pid_t=yes - else -@@ -15911,7 +15912,7 @@ - fi - rm -f conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:15914: result: $ac_cv_type_pid_t" >&5 -+echo "$as_me:15915: result: $ac_cv_type_pid_t" >&5 - echo "${ECHO_T}$ac_cv_type_pid_t" >&6 - if test $ac_cv_type_pid_t = yes; then - : -@@ -15926,23 +15927,23 @@ - for ac_header in unistd.h vfork.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:15929: checking for $ac_header" >&5 -+echo "$as_me:15930: 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 15935 "configure" -+#line 15936 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:15939: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:15940: \"$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:15945: \$? = $ac_status" >&5 -+ echo "$as_me:15946: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -15961,7 +15962,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:15964: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:15965: 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:15978: checking for $ac_func" >&5 - echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 - if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF --#line 15983 "configure" -+#line 15984 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -@@ -16011,16 +16012,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:16014: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16015: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16017: \$? = $ac_status" >&5 -+ echo "$as_me:16018: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:16020: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16021: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16023: \$? = $ac_status" >&5 -+ echo "$as_me:16024: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" - else -@@ -16030,7 +16031,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:16033: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "$as_me:16034: result: `eval echo '${'$as_ac_var'}'`" >&5 - echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 - if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <&5 -+ echo "$as_me:16046: checking for working fork" >&5 - echo $ECHO_N "checking for working fork... $ECHO_C" >&6 - if test "${ac_cv_func_fork_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -16065,15 +16066,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:16068: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16069: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16071: \$? = $ac_status" >&5 -+ echo "$as_me:16072: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:16073: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16074: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16076: \$? = $ac_status" >&5 -+ echo "$as_me:16077: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_fork_works=yes - else -@@ -16085,7 +16086,7 @@ - rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi --echo "$as_me:16088: result: $ac_cv_func_fork_works" >&5 -+echo "$as_me:16089: result: $ac_cv_func_fork_works" >&5 - echo "${ECHO_T}$ac_cv_func_fork_works" >&6 - - fi -@@ -16099,12 +16100,12 @@ - ac_cv_func_fork_works=yes - ;; - esac -- { echo "$as_me:16102: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 -+ { echo "$as_me:16103: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5 - echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;} - fi - ac_cv_func_vfork_works=$ac_cv_func_vfork - if test "x$ac_cv_func_vfork" = xyes; then -- echo "$as_me:16107: checking for working vfork" >&5 -+ echo "$as_me:16108: checking for working vfork" >&5 - echo $ECHO_N "checking for working vfork... $ECHO_C" >&6 - if test "${ac_cv_func_vfork_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -16113,7 +16114,7 @@ - ac_cv_func_vfork_works=cross - else - cat >conftest.$ac_ext <<_ACEOF --#line 16116 "configure" -+#line 16117 "configure" - #include "confdefs.h" - /* Thanks to Paul Eggert for this test. */ - #include -@@ -16210,15 +16211,15 @@ - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:16213: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16214: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16216: \$? = $ac_status" >&5 -+ echo "$as_me:16217: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:16218: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16219: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16221: \$? = $ac_status" >&5 -+ echo "$as_me:16222: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_vfork_works=yes - else -@@ -16230,13 +16231,13 @@ - rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - fi --echo "$as_me:16233: result: $ac_cv_func_vfork_works" >&5 -+echo "$as_me:16234: result: $ac_cv_func_vfork_works" >&5 - echo "${ECHO_T}$ac_cv_func_vfork_works" >&6 - - fi; - if test "x$ac_cv_func_fork_works" = xcross; then - ac_cv_func_vfork_works=ac_cv_func_vfork -- { echo "$as_me:16239: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 -+ { echo "$as_me:16240: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5 - echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;} - fi - -@@ -16263,7 +16264,7 @@ - - # special check for test/ditto.c - --echo "$as_me:16266: checking for openpty in -lutil" >&5 -+echo "$as_me:16267: checking for openpty in -lutil" >&5 - echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 - if test "${ac_cv_lib_util_openpty+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -16271,7 +16272,7 @@ - ac_check_lib_save_LIBS=$LIBS - LIBS="-lutil $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 16274 "configure" -+#line 16275 "configure" - #include "confdefs.h" - - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -16290,16 +16291,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:16293: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16294: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16296: \$? = $ac_status" >&5 -+ echo "$as_me:16297: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:16299: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16300: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16302: \$? = $ac_status" >&5 -+ echo "$as_me:16303: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_util_openpty=yes - else -@@ -16310,7 +16311,7 @@ - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:16313: result: $ac_cv_lib_util_openpty" >&5 -+echo "$as_me:16314: result: $ac_cv_lib_util_openpty" >&5 - echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 - if test $ac_cv_lib_util_openpty = yes; then - cf_cv_lib_util=yes -@@ -16318,7 +16319,7 @@ - cf_cv_lib_util=no - fi - --echo "$as_me:16321: checking for openpty header" >&5 -+echo "$as_me:16322: checking for openpty header" >&5 - echo $ECHO_N "checking for openpty header... $ECHO_C" >&6 - if test "${cf_cv_func_openpty+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -16329,7 +16330,7 @@ - for cf_header in pty.h libutil.h util.h - do - cat >conftest.$ac_ext <<_ACEOF --#line 16332 "configure" -+#line 16333 "configure" - #include "confdefs.h" - - #include <$cf_header> -@@ -16346,16 +16347,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:16349: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16350: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16352: \$? = $ac_status" >&5 -+ echo "$as_me:16353: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:16355: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16356: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16358: \$? = $ac_status" >&5 -+ echo "$as_me:16359: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_func_openpty=$cf_header -@@ -16373,7 +16374,7 @@ - LIBS="$cf_save_LIBS" - - fi --echo "$as_me:16376: result: $cf_cv_func_openpty" >&5 -+echo "$as_me:16377: result: $cf_cv_func_openpty" >&5 - echo "${ECHO_T}$cf_cv_func_openpty" >&6 - - if test "$cf_cv_func_openpty" != no ; then -@@ -16425,7 +16426,7 @@ - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF --#line 16428 "configure" -+#line 16429 "configure" - #include "confdefs.h" - #include - int -@@ -16437,16 +16438,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:16440: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:16441: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16443: \$? = $ac_status" >&5 -+ echo "$as_me:16444: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:16446: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16447: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16449: \$? = $ac_status" >&5 -+ echo "$as_me:16450: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : - else -@@ -16463,7 +16464,7 @@ - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - --echo "${as_me:-configure}:16466: testing adding $cf_add_incdir to include-path ..." 1>&5 -+echo "${as_me:-configure}:16467: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - -@@ -16497,7 +16498,7 @@ - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 - --echo "${as_me:-configure}:16500: testing adding $cf_add_libdir to library-path ..." 1>&5 -+echo "${as_me:-configure}:16501: testing adding $cf_add_libdir to library-path ..." 1>&5 - - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi -@@ -16508,23 +16509,23 @@ - fi - esac - --echo "$as_me:16511: checking for db.h" >&5 -+echo "$as_me:16512: 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 16517 "configure" -+#line 16518 "configure" - #include "confdefs.h" - #include - _ACEOF --if { (eval echo "$as_me:16521: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:16522: \"$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:16527: \$? = $ac_status" >&5 -+ echo "$as_me:16528: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag -@@ -16543,11 +16544,11 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:16546: result: $ac_cv_header_db_h" >&5 -+echo "$as_me:16547: 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:16550: checking for version of db" >&5 -+echo "$as_me:16551: 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 -@@ -16558,10 +16559,10 @@ - for cf_db_version in 1 2 3 4 5 - do - --echo "${as_me:-configure}:16561: testing checking for db version $cf_db_version ..." 1>&5 -+echo "${as_me:-configure}:16562: testing checking for db version $cf_db_version ..." 1>&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 16564 "configure" -+#line 16565 "configure" - #include "confdefs.h" - - $ac_includes_default -@@ -16591,16 +16592,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:16594: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:16595: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16597: \$? = $ac_status" >&5 -+ echo "$as_me:16598: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:16600: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16601: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16603: \$? = $ac_status" >&5 -+ echo "$as_me:16604: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - cf_cv_hashed_db_version=$cf_db_version -@@ -16614,16 +16615,16 @@ - done - - fi --echo "$as_me:16617: result: $cf_cv_hashed_db_version" >&5 -+echo "$as_me:16618: 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:16621: error: Cannot determine version of db" >&5 -+ { { echo "$as_me:16622: 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:16626: checking for db libraries" >&5 -+echo "$as_me:16627: 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 -@@ -16637,10 +16638,10 @@ - LIBS="-l$cf_db_libs $LIBS" - fi - --echo "${as_me:-configure}:16640: testing checking for library "$cf_db_libs" ..." 1>&5 -+echo "${as_me:-configure}:16641: testing checking for library "$cf_db_libs" ..." 1>&5 - - cat >conftest.$ac_ext <<_ACEOF --#line 16643 "configure" -+#line 16644 "configure" - #include "confdefs.h" - - $ac_includes_default -@@ -16695,16 +16696,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:16698: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16699: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16701: \$? = $ac_status" >&5 -+ echo "$as_me:16702: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:16704: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16705: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16707: \$? = $ac_status" >&5 -+ echo "$as_me:16708: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - if test -n "$cf_db_libs" ; then -@@ -16724,11 +16725,11 @@ - done - - fi --echo "$as_me:16727: result: $cf_cv_hashed_db_libs" >&5 -+echo "$as_me:16728: 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:16731: error: Cannot determine library for db" >&5 -+ { { echo "$as_me:16732: 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 -@@ -16738,7 +16739,7 @@ - - else - -- { { echo "$as_me:16741: error: Cannot find db.h" >&5 -+ { { echo "$as_me:16742: error: Cannot find db.h" >&5 - echo "$as_me: error: Cannot find db.h" >&2;} - { (exit 1); exit 1; }; } - -@@ -16753,7 +16754,7 @@ - - # Just in case, check if the C compiler has a bool type. - --echo "$as_me:16756: checking if we should include stdbool.h" >&5 -+echo "$as_me:16757: 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 -@@ -16761,7 +16762,7 @@ - else - - cat >conftest.$ac_ext <<_ACEOF --#line 16764 "configure" -+#line 16765 "configure" - #include "confdefs.h" - - int -@@ -16773,23 +16774,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:16776: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:16777: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16779: \$? = $ac_status" >&5 -+ echo "$as_me:16780: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:16782: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16783: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16785: \$? = $ac_status" >&5 -+ echo "$as_me:16786: \$? = $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 16792 "configure" -+#line 16793 "configure" - #include "confdefs.h" - - #ifndef __BEOS__ -@@ -16805,16 +16806,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:16808: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:16809: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16811: \$? = $ac_status" >&5 -+ echo "$as_me:16812: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:16814: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16815: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16817: \$? = $ac_status" >&5 -+ echo "$as_me:16818: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_header_stdbool_h=1 - else -@@ -16828,13 +16829,13 @@ - fi - - if test "$cf_cv_header_stdbool_h" = 1 --then echo "$as_me:16831: result: yes" >&5 -+then echo "$as_me:16832: result: yes" >&5 - echo "${ECHO_T}yes" >&6 --else echo "$as_me:16833: result: no" >&5 -+else echo "$as_me:16834: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:16837: checking for builtin bool type" >&5 -+echo "$as_me:16838: 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 -@@ -16842,7 +16843,7 @@ - else - - cat >conftest.$ac_ext <<_ACEOF --#line 16845 "configure" -+#line 16846 "configure" - #include "confdefs.h" - - #include -@@ -16857,16 +16858,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:16860: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:16861: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:16863: \$? = $ac_status" >&5 -+ echo "$as_me:16864: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:16866: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16867: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16869: \$? = $ac_status" >&5 -+ echo "$as_me:16870: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_cc_bool_type=1 - else -@@ -16879,9 +16880,9 @@ - fi - - if test "$cf_cv_cc_bool_type" = 1 --then echo "$as_me:16882: result: yes" >&5 -+then echo "$as_me:16883: result: yes" >&5 - echo "${ECHO_T}yes" >&6 --else echo "$as_me:16884: result: no" >&5 -+else echo "$as_me:16885: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -16903,7 +16904,7 @@ - cf_stdcpp_libname=stdc++ - ;; - esac --echo "$as_me:16906: checking for library $cf_stdcpp_libname" >&5 -+echo "$as_me:16907: 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 -@@ -16912,7 +16913,7 @@ - cf_save="$LIBS" - LIBS="-l$cf_stdcpp_libname $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 16915 "configure" -+#line 16916 "configure" - #include "confdefs.h" - - #include -@@ -16928,16 +16929,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:16931: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:16932: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:16934: \$? = $ac_status" >&5 -+ echo "$as_me:16935: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:16937: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:16938: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16940: \$? = $ac_status" >&5 -+ echo "$as_me:16941: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_libstdcpp=yes - else -@@ -16949,12 +16950,12 @@ - LIBS="$cf_save" - - fi --echo "$as_me:16952: result: $cf_cv_libstdcpp" >&5 -+echo "$as_me:16953: 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:16957: checking whether $CXX understands -c and -o together" >&5 -+ echo "$as_me:16958: 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 -@@ -16970,15 +16971,15 @@ - # 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:16973: \"$ac_try\"") >&5 -+if { (eval echo "$as_me:16974: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16976: \$? = $ac_status" >&5 -+ echo "$as_me:16977: \$? = $ac_status" >&5 - (exit $ac_status); } && -- test -f conftest2.$ac_objext && { (eval echo "$as_me:16978: \"$ac_try\"") >&5 -+ test -f conftest2.$ac_objext && { (eval echo "$as_me:16979: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:16981: \$? = $ac_status" >&5 -+ echo "$as_me:16982: \$? = $ac_status" >&5 - (exit $ac_status); }; - then - eval cf_cv_prog_CXX_c_o=yes -@@ -16989,10 +16990,10 @@ - - fi - if test $cf_cv_prog_CXX_c_o = yes; then -- echo "$as_me:16992: result: yes" >&5 -+ echo "$as_me:16993: result: yes" >&5 - echo "${ECHO_T}yes" >&6 - else -- echo "$as_me:16995: result: no" >&5 -+ echo "$as_me:16996: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -17012,12 +17013,12 @@ - ;; - esac - if test "$GXX" = yes; then -- echo "$as_me:17015: checking for lib$cf_gpp_libname" >&5 -+ echo "$as_me:17016: 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 17020 "configure" -+#line 17021 "configure" - #include "confdefs.h" - - #include <$cf_gpp_libname/builtin.h> -@@ -17031,16 +17032,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:17034: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17035: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17037: \$? = $ac_status" >&5 -+ echo "$as_me:17038: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:17040: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17041: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17043: \$? = $ac_status" >&5 -+ echo "$as_me:17044: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cxx_library=yes - CXXLIBS="-l$cf_gpp_libname $CXXLIBS" -@@ -17059,7 +17060,7 @@ - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF --#line 17062 "configure" -+#line 17063 "configure" - #include "confdefs.h" - - #include -@@ -17073,16 +17074,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:17076: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17077: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17079: \$? = $ac_status" >&5 -+ echo "$as_me:17080: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:17082: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17083: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17085: \$? = $ac_status" >&5 -+ echo "$as_me:17086: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cxx_library=yes - CXXLIBS="-l$cf_gpp_libname $CXXLIBS" -@@ -17099,7 +17100,7 @@ - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - LIBS="$cf_save" -- echo "$as_me:17102: result: $cf_cxx_library" >&5 -+ echo "$as_me:17103: result: $cf_cxx_library" >&5 - echo "${ECHO_T}$cf_cxx_library" >&6 - fi - -@@ -17115,7 +17116,7 @@ - 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:17118: checking how to run the C++ preprocessor" >&5 -+echo "$as_me:17119: 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 -@@ -17132,18 +17133,18 @@ - # 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 17135 "configure" -+#line 17136 "configure" - #include "confdefs.h" - #include - Syntax error - _ACEOF --if { (eval echo "$as_me:17140: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:17141: \"$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:17146: \$? = $ac_status" >&5 -+ echo "$as_me:17147: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -17166,17 +17167,17 @@ - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF --#line 17169 "configure" -+#line 17170 "configure" - #include "confdefs.h" - #include - _ACEOF --if { (eval echo "$as_me:17173: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:17174: \"$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:17179: \$? = $ac_status" >&5 -+ echo "$as_me:17180: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -17213,7 +17214,7 @@ - else - ac_cv_prog_CXXCPP=$CXXCPP - fi --echo "$as_me:17216: result: $CXXCPP" >&5 -+echo "$as_me:17217: result: $CXXCPP" >&5 - echo "${ECHO_T}$CXXCPP" >&6 - ac_preproc_ok=false - for ac_cxx_preproc_warn_flag in '' yes -@@ -17223,18 +17224,18 @@ - # 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 17226 "configure" -+#line 17227 "configure" - #include "confdefs.h" - #include - Syntax error - _ACEOF --if { (eval echo "$as_me:17231: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:17232: \"$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:17237: \$? = $ac_status" >&5 -+ echo "$as_me:17238: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -17257,17 +17258,17 @@ - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF --#line 17260 "configure" -+#line 17261 "configure" - #include "confdefs.h" - #include - _ACEOF --if { (eval echo "$as_me:17264: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:17265: \"$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:17270: \$? = $ac_status" >&5 -+ echo "$as_me:17271: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -17295,7 +17296,7 @@ - if $ac_preproc_ok; then - : - else -- { { echo "$as_me:17298: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 -+ { { echo "$as_me:17299: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 - echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} - { (exit 1); exit 1; }; } - fi -@@ -17310,23 +17311,23 @@ - for ac_header in iostream typeinfo - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:17313: checking for $ac_header" >&5 -+echo "$as_me:17314: 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 17319 "configure" -+#line 17320 "configure" - #include "confdefs.h" - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:17323: \"$ac_cpp conftest.$ac_ext\"") >&5 -+if { (eval echo "$as_me:17324: \"$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:17329: \$? = $ac_status" >&5 -+ echo "$as_me:17330: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag -@@ -17345,7 +17346,7 @@ - fi - rm -f conftest.err conftest.$ac_ext - fi --echo "$as_me:17348: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "$as_me:17349: 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:17360: 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 17362 "configure" -+#line 17363 "configure" - #include "confdefs.h" - - #include -@@ -17376,16 +17377,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:17379: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:17380: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:17382: \$? = $ac_status" >&5 -+ echo "$as_me:17383: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:17385: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17386: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17388: \$? = $ac_status" >&5 -+ echo "$as_me:17389: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_iostream_namespace=yes - else -@@ -17394,7 +17395,7 @@ - cf_iostream_namespace=no - fi - rm -f conftest.$ac_objext conftest.$ac_ext -- echo "$as_me:17397: result: $cf_iostream_namespace" >&5 -+ echo "$as_me:17398: result: $cf_iostream_namespace" >&5 - echo "${ECHO_T}$cf_iostream_namespace" >&6 - if test "$cf_iostream_namespace" = yes ; then - cat >>confdefs.h <<\EOF -@@ -17404,7 +17405,7 @@ - fi - fi - --echo "$as_me:17407: checking if we should include stdbool.h" >&5 -+echo "$as_me:17408: 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 -@@ -17412,7 +17413,7 @@ - else - - cat >conftest.$ac_ext <<_ACEOF --#line 17415 "configure" -+#line 17416 "configure" - #include "confdefs.h" - - int -@@ -17424,23 +17425,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:17427: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:17428: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:17430: \$? = $ac_status" >&5 -+ echo "$as_me:17431: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:17433: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17434: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17436: \$? = $ac_status" >&5 -+ echo "$as_me:17437: \$? = $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 17443 "configure" -+#line 17444 "configure" - #include "confdefs.h" - - #ifndef __BEOS__ -@@ -17456,16 +17457,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:17459: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:17460: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:17462: \$? = $ac_status" >&5 -+ echo "$as_me:17463: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:17465: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17466: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17468: \$? = $ac_status" >&5 -+ echo "$as_me:17469: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_header_stdbool_h=1 - else -@@ -17479,13 +17480,13 @@ - fi - - if test "$cf_cv_header_stdbool_h" = 1 --then echo "$as_me:17482: result: yes" >&5 -+then echo "$as_me:17483: result: yes" >&5 - echo "${ECHO_T}yes" >&6 --else echo "$as_me:17484: result: no" >&5 -+else echo "$as_me:17485: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:17488: checking for builtin bool type" >&5 -+echo "$as_me:17489: 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 -@@ -17493,7 +17494,7 @@ - else - - cat >conftest.$ac_ext <<_ACEOF --#line 17496 "configure" -+#line 17497 "configure" - #include "confdefs.h" - - #include -@@ -17508,16 +17509,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:17511: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:17512: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:17514: \$? = $ac_status" >&5 -+ echo "$as_me:17515: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:17517: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17518: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17520: \$? = $ac_status" >&5 -+ echo "$as_me:17521: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_builtin_bool=1 - else -@@ -17530,13 +17531,13 @@ - fi - - if test "$cf_cv_builtin_bool" = 1 --then echo "$as_me:17533: result: yes" >&5 -+then echo "$as_me:17534: result: yes" >&5 - echo "${ECHO_T}yes" >&6 --else echo "$as_me:17535: result: no" >&5 -+else echo "$as_me:17536: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - --echo "$as_me:17539: checking for size of bool" >&5 -+echo "$as_me:17540: 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 -@@ -17547,7 +17548,7 @@ - cf_cv_type_of_bool=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 17550 "configure" -+#line 17551 "configure" - #include "confdefs.h" - - #include -@@ -17589,15 +17590,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:17592: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17593: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17595: \$? = $ac_status" >&5 -+ echo "$as_me:17596: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:17597: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17598: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17600: \$? = $ac_status" >&5 -+ echo "$as_me:17601: \$? = $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 -@@ -17615,18 +17616,18 @@ - fi - - rm -f cf_test.out --echo "$as_me:17618: result: $cf_cv_type_of_bool" >&5 -+echo "$as_me:17619: 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:17624: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 -+ { echo "$as_me:17625: 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:17629: checking for special defines needed for etip.h" >&5 -+echo "$as_me:17630: 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" -@@ -17638,7 +17639,7 @@ - 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 17641 "configure" -+#line 17642 "configure" - #include "confdefs.h" - - #include -@@ -17652,16 +17653,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:17655: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:17656: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:17658: \$? = $ac_status" >&5 -+ echo "$as_me:17659: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:17661: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17662: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17664: \$? = $ac_status" >&5 -+ echo "$as_me:17665: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - test -n "$cf_math" && cat >>confdefs.h <&5 -+echo "$as_me:17686: result: $cf_result" >&5 - echo "${ECHO_T}$cf_result" >&6 - CXXFLAGS="$cf_save_CXXFLAGS" - - if test -n "$CXX"; then --echo "$as_me:17690: checking if $CXX accepts parameter initialization" >&5 -+echo "$as_me:17691: 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 -@@ -17704,7 +17705,7 @@ - cf_cv_cpp_param_init=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 17707 "configure" -+#line 17708 "configure" - #include "confdefs.h" - - class TEST { -@@ -17723,15 +17724,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:17726: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17727: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17729: \$? = $ac_status" >&5 -+ echo "$as_me:17730: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:17731: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17732: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17734: \$? = $ac_status" >&5 -+ echo "$as_me:17735: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_cpp_param_init=yes - else -@@ -17750,7 +17751,7 @@ - ac_main_return=return - - fi --echo "$as_me:17753: result: $cf_cv_cpp_param_init" >&5 -+echo "$as_me:17754: result: $cf_cv_cpp_param_init" >&5 - echo "${ECHO_T}$cf_cv_cpp_param_init" >&6 - fi - test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF -@@ -17759,7 +17760,7 @@ - - if test -n "$CXX"; then - --echo "$as_me:17762: checking if $CXX accepts static_cast" >&5 -+echo "$as_me:17763: 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 -@@ -17773,7 +17774,7 @@ - ac_main_return=return - - cat >conftest.$ac_ext <<_ACEOF --#line 17776 "configure" -+#line 17777 "configure" - #include "confdefs.h" - - class NCursesPanel -@@ -17817,16 +17818,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:17820: \"$ac_compile\"") >&5 -+if { (eval echo "$as_me:17821: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:17823: \$? = $ac_status" >&5 -+ echo "$as_me:17824: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:17826: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17827: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17829: \$? = $ac_status" >&5 -+ echo "$as_me:17830: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_cpp_static_cast=yes - else -@@ -17844,7 +17845,7 @@ - ac_main_return=return - - fi --echo "$as_me:17847: result: $cf_cv_cpp_static_cast" >&5 -+echo "$as_me:17848: result: $cf_cv_cpp_static_cast" >&5 - echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6 - - fi -@@ -17892,7 +17893,7 @@ - else - if test "$cf_cv_header_stdbool_h" = 1 ; then - --echo "$as_me:17895: checking for size of bool" >&5 -+echo "$as_me:17896: 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 -@@ -17903,7 +17904,7 @@ - cf_cv_type_of_bool=unknown - else - cat >conftest.$ac_ext <<_ACEOF --#line 17906 "configure" -+#line 17907 "configure" - #include "confdefs.h" - - #include -@@ -17945,15 +17946,15 @@ - - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:17948: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:17949: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:17951: \$? = $ac_status" >&5 -+ echo "$as_me:17952: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:17953: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:17954: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:17956: \$? = $ac_status" >&5 -+ echo "$as_me:17957: \$? = $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 -@@ -17971,25 +17972,25 @@ - fi - - rm -f cf_test.out --echo "$as_me:17974: result: $cf_cv_type_of_bool" >&5 -+echo "$as_me:17975: 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:17980: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5 -+ { echo "$as_me:17981: 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:17986: checking for fallback type of bool" >&5 -+ echo "$as_me:17987: 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:17992: result: $cf_cv_type_of_bool" >&5 -+ echo "$as_me:17993: result: $cf_cv_type_of_bool" >&5 - echo "${ECHO_T}$cf_cv_type_of_bool" >&6 - fi - fi -@@ -18018,7 +18019,7 @@ - - if test "$cf_with_ada" != "no" ; then - if test "$with_libtool" != "no"; then -- { echo "$as_me:18021: WARNING: libtool does not support Ada - disabling feature" >&5 -+ { echo "$as_me:18022: 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 -@@ -18029,7 +18030,7 @@ - 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:18032: checking for $ac_word" >&5 -+echo "$as_me:18033: 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 -@@ -18044,7 +18045,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_gnat_exists="yes" --echo "$as_me:18047: found $ac_dir/$ac_word" >&5 -+echo "$as_me:18048: found $ac_dir/$ac_word" >&5 - break - done - -@@ -18053,10 +18054,10 @@ - fi - gnat_exists=$ac_cv_prog_gnat_exists - if test -n "$gnat_exists"; then -- echo "$as_me:18056: result: $gnat_exists" >&5 -+ echo "$as_me:18057: result: $gnat_exists" >&5 - echo "${ECHO_T}$gnat_exists" >&6 - else -- echo "$as_me:18059: result: no" >&5 -+ echo "$as_me:18060: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -18064,12 +18065,12 @@ - cf_ada_make= - else - --echo "$as_me:18067: checking for gnat version" >&5 -+echo "$as_me:18068: 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:18072: result: $cf_gnat_version" >&5 -+echo "$as_me:18073: result: $cf_gnat_version" >&5 - echo "${ECHO_T}$cf_gnat_version" >&6 - - case $cf_gnat_version in #(vi -@@ -18077,66 +18078,15 @@ - cf_cv_prog_gnat_correct=yes - ;; - *) -- { echo "$as_me:18080: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 -+ { echo "$as_me:18081: 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 - ;; - esac - --echo "$as_me:18086: 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 -- cf_gnat_generics=yes -- ;; --*) -- cf_gnat_generics=no -- ;; --esac --echo "$as_me:18096: result: $cf_gnat_generics" >&5 --echo "${ECHO_T}$cf_gnat_generics" >&6 -- --if test "$cf_gnat_generics" = yes --then -- cf_compile_generics=generics -- cf_generic_objects="\${GENOBJS}" --else -- cf_compile_generics= -- cf_generic_objects= --fi -- --echo "$as_me:18108: 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 -- cf_gnat_projects=no -- ;; --*) -- case $cf_cv_system_name in #(vi -- cygwin*) #(vi -- cf_gnat_projects=no -- ;; -- *) -- cf_gnat_projects=yes -- ;; -- esac -- ;; --esac --echo "$as_me:18125: result: $cf_gnat_projects" >&5 --echo "${ECHO_T}$cf_gnat_projects" >&6 -- --if test "$cf_gnat_projects" = yes --then -- USE_OLD_MAKERULES="#" -- USE_GNAT_PROJECTS="" --else -- USE_OLD_MAKERULES="" -- USE_GNAT_PROJECTS="#" --fi -- - # Extract the first word of "m4", so it can be a program name with args. - set dummy m4; ac_word=$2 --echo "$as_me:18139: checking for $ac_word" >&5 -+echo "$as_me:18089: 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 -@@ -18151,7 +18101,7 @@ - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue - ac_cv_prog_M4_exists="yes" --echo "$as_me:18154: found $ac_dir/$ac_word" >&5 -+echo "$as_me:18104: found $ac_dir/$ac_word" >&5 - break - done - -@@ -18160,10 +18110,10 @@ - fi - M4_exists=$ac_cv_prog_M4_exists - if test -n "$M4_exists"; then -- echo "$as_me:18163: result: $M4_exists" >&5 -+ echo "$as_me:18113: result: $M4_exists" >&5 - echo "${ECHO_T}$M4_exists" >&6 - else -- echo "$as_me:18166: result: no" >&5 -+ echo "$as_me:18116: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -18172,10 +18122,10 @@ - echo Ada95 binding required program m4 not found. Ada95 binding disabled. - fi - if test "$cf_cv_prog_gnat_correct" = yes; then -- echo "$as_me:18175: checking if GNAT works" >&5 -+ echo "$as_me:18125: checking if GNAT works" >&5 - echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 - --rm -rf conftest* -+rm -rf conftest* *~conftest* - cat >>conftest.ads <&5 -+ echo "$as_me:18153: result: $cf_cv_prog_gnat_correct" >&5 - echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 - fi - fi - - if test "$cf_cv_prog_gnat_correct" = yes; then - -- ADAFLAGS="$ADAFLAGS -O3 -gnatpn" -+ ADAFLAGS="$ADAFLAGS -gnatpn" -+ -+ # make ADAFLAGS consistent with CFLAGS -+ case "$CFLAGS" in -+ *-g*) -+ -+ ADAFLAGS="$ADAFLAGS -g" -+ -+ ;; -+ esac -+ case "$CFLAGS" in -+ *-O*) -+ -+ ADAFLAGS="$ADAFLAGS -O3" -+ -+ ;; -+ esac -+ -+echo "$as_me:18178: 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 -+ cf_gnat_generics=yes -+ ;; -+*) -+ cf_gnat_generics=no -+ ;; -+esac -+echo "$as_me:18188: result: $cf_gnat_generics" >&5 -+echo "${ECHO_T}$cf_gnat_generics" >&6 -+ -+if test "$cf_gnat_generics" = yes -+then -+ cf_compile_generics=generics -+ cf_generic_objects="\${GENOBJS}" -+else -+ cf_compile_generics= -+ cf_generic_objects= -+fi -+ -+echo "$as_me:18200: 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 -+else -+ -+rm -rf conftest* *~conftest* -+cat >>conftest.ads <>conftest.adb <&5 2>&1 ) ; then -+ cf_cv_gnat_sigint=yes -+else -+ cf_cv_gnat_sigint=no -+fi -+rm -rf conftest* *~conftest* -+ -+fi -+echo "$as_me:18248: result: $cf_cv_gnat_sigint" >&5 -+echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 -+ -+if test $cf_cv_gnat_sigint = yes ; then -+ USE_GNAT_SIGINT="" -+else -+ USE_GNAT_SIGINT="#" -+fi - --echo "$as_me:18212: checking if GNAT pragma Unreferenced works" >&5 -+echo "$as_me:18257: 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 - else - --rm -rf conftest* -+rm -rf conftest* *~conftest* - cat >>conftest.ads <&5 -+echo "$as_me:18288: 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). -@@ -18250,7 +18295,105 @@ - PRAGMA_UNREF=FALSE - fi - --echo "$as_me:18253: checking for ada-compiler" >&5 -+cf_gnat_libraries=no -+cf_gnat_projects=no -+ -+echo "$as_me:18301: 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 -+ ;; -+*) -+ case $cf_cv_system_name in #(vi -+ cygwin*) #(vi -+ ;; -+ *) -+ mkdir conftest.src conftest.bin conftest.lib -+ cd conftest.src -+ rm -rf conftest* *~conftest* -+ cat >>library.gpr <>confpackage.ads <>confpackage.adb <&5 2>&1 ) ; then -+ cf_gnat_projects=yes -+ fi -+ cd .. -+ if test -f conftest.lib/confpackage.ali -+ then -+ cf_gnat_libraries=yes -+ fi -+ rm -rf conftest* *~conftest* -+ ;; -+ esac -+ ;; -+esac -+echo "$as_me:18369: result: $cf_gnat_projects" >&5 -+echo "${ECHO_T}$cf_gnat_projects" >&6 -+ -+if test $cf_gnat_projects = yes -+then -+ echo "$as_me:18374: checking if GNAT supports libraries" >&5 -+echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 -+ echo "$as_me:18376: result: $cf_gnat_libraries" >&5 -+echo "${ECHO_T}$cf_gnat_libraries" >&6 -+fi -+ -+if test "$cf_gnat_projects" = yes -+then -+ USE_OLD_MAKERULES="#" -+ USE_GNAT_PROJECTS="" -+else -+ USE_OLD_MAKERULES="" -+ USE_GNAT_PROJECTS="#" -+fi -+ -+if test "$cf_gnat_libraries" = yes -+then -+ USE_GNAT_LIBRARIES="" -+else -+ USE_GNAT_LIBRARIES="#" -+fi -+ -+echo "$as_me:18396: 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. -@@ -18261,12 +18404,12 @@ - cf_ada_compiler=gnatmake - fi; - --echo "$as_me:18264: result: $cf_ada_compiler" >&5 -+echo "$as_me:18407: result: $cf_ada_compiler" >&5 - echo "${ECHO_T}$cf_ada_compiler" >&6 - - cf_ada_package=terminal_interface - --echo "$as_me:18269: checking for ada-include" >&5 -+echo "$as_me:18412: 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. -@@ -18302,7 +18445,7 @@ - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - *) -- { { echo "$as_me:18305: error: expected a pathname, not \"$withval\"" >&5 -+ { { echo "$as_me:18448: error: expected a pathname, not \"$withval\"" >&5 - echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -18311,10 +18454,10 @@ - fi - ADA_INCLUDE="$withval" - --echo "$as_me:18314: result: $ADA_INCLUDE" >&5 -+echo "$as_me:18457: result: $ADA_INCLUDE" >&5 - echo "${ECHO_T}$ADA_INCLUDE" >&6 - --echo "$as_me:18317: checking for ada-objects" >&5 -+echo "$as_me:18460: 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. -@@ -18350,7 +18493,7 @@ - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - *) -- { { echo "$as_me:18353: error: expected a pathname, not \"$withval\"" >&5 -+ { { echo "$as_me:18496: error: expected a pathname, not \"$withval\"" >&5 - echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} - { (exit 1); exit 1; }; } - ;; -@@ -18359,10 +18502,10 @@ - fi - ADA_OBJECTS="$withval" - --echo "$as_me:18362: result: $ADA_OBJECTS" >&5 -+echo "$as_me:18505: result: $ADA_OBJECTS" >&5 - echo "${ECHO_T}$ADA_OBJECTS" >&6 - --echo "$as_me:18365: checking if an Ada95 shared-library should be built" >&5 -+echo "$as_me:18508: 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. -@@ -18372,7 +18515,7 @@ - else - with_ada_sharedlib=no - fi; --echo "$as_me:18375: result: $with_ada_sharedlib" >&5 -+echo "$as_me:18518: result: $with_ada_sharedlib" >&5 - echo "${ECHO_T}$with_ada_sharedlib" >&6 - - ADA_SHAREDLIB='lib$(LIB_NAME).so.1' -@@ -18403,7 +18546,7 @@ - ### chooses to split module lists into libraries. - ### - ### (see CF_LIB_RULES). --echo "$as_me:18406: checking for library subsets" >&5 -+echo "$as_me:18549: checking for library subsets" >&5 - echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 - LIB_SUBSETS= - -@@ -18444,7 +18587,7 @@ - test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" - test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" - --echo "$as_me:18447: result: $LIB_SUBSETS" >&5 -+echo "$as_me:18590: result: $LIB_SUBSETS" >&5 - echo "${ECHO_T}$LIB_SUBSETS" >&6 - - ### Construct the list of include-directories to be generated -@@ -18482,7 +18625,7 @@ - fi - - ### Build up pieces for makefile rules --echo "$as_me:18485: checking default library suffix" >&5 -+echo "$as_me:18628: checking default library suffix" >&5 - echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 - - case $DFT_LWR_MODEL in -@@ -18493,10 +18636,10 @@ - shared) DFT_ARG_SUFFIX='' ;; - esac - test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" --echo "$as_me:18496: result: $DFT_ARG_SUFFIX" >&5 -+echo "$as_me:18639: result: $DFT_ARG_SUFFIX" >&5 - echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 - --echo "$as_me:18499: checking default library-dependency suffix" >&5 -+echo "$as_me:18642: checking default library-dependency suffix" >&5 - echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 - - case $DFT_LWR_MODEL in #(vi -@@ -18549,10 +18692,10 @@ - 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:18552: result: $DFT_DEP_SUFFIX" >&5 -+echo "$as_me:18695: result: $DFT_DEP_SUFFIX" >&5 - echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 - --echo "$as_me:18555: checking default object directory" >&5 -+echo "$as_me:18698: checking default object directory" >&5 - echo $ECHO_N "checking default object directory... $ECHO_C" >&6 - - case $DFT_LWR_MODEL in -@@ -18568,12 +18711,12 @@ - DFT_OBJ_SUBDIR='obj_s' ;; - esac - esac --echo "$as_me:18571: result: $DFT_OBJ_SUBDIR" >&5 -+echo "$as_me:18714: result: $DFT_OBJ_SUBDIR" >&5 - echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 - - # libtool thinks it can make c++ shared libraries (perhaps only g++) - if test "$cf_with_cxx" = yes ; then --echo "$as_me:18576: checking c++ library-dependency suffix" >&5 -+echo "$as_me:18719: checking c++ library-dependency suffix" >&5 - echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6 - if test "$with_libtool" != "no"; then - CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX -@@ -18630,7 +18773,7 @@ - test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}" - test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}" - fi --echo "$as_me:18633: result: $CXX_LIB_SUFFIX" >&5 -+echo "$as_me:18776: result: $CXX_LIB_SUFFIX" >&5 - echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 - - fi -@@ -18784,19 +18927,19 @@ - - if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" - then -- echo "$as_me:18787: checking if linker supports switching between static/dynamic" >&5 -+ echo "$as_me:18930: 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:18796: \"$ac_compile\"") >&5 -+ if { (eval echo "$as_me:18939: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:18799: \$? = $ac_status" >&5 -+ echo "$as_me:18942: \$? = $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 -@@ -18807,10 +18950,10 @@ - - LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" - cat >conftest.$ac_ext <<_ACEOF --#line 18810 "configure" -+#line 18953 "configure" - #include "confdefs.h" - --#line 18813 "configure" -+#line 18956 "configure" - #include - int cf_ldflags_static(FILE *fp); - -@@ -18825,16 +18968,16 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:18828: \"$ac_link\"") >&5 -+if { (eval echo "$as_me:18971: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? -- echo "$as_me:18831: \$? = $ac_status" >&5 -+ echo "$as_me:18974: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:18834: \"$ac_try\"") >&5 -+ { (eval echo "$as_me:18977: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:18837: \$? = $ac_status" >&5 -+ echo "$as_me:18980: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_ldflags_static=yes - else -@@ -18847,7 +18990,7 @@ - rm -f libconftest.* - LIBS="$cf_save_LIBS" - -- echo "$as_me:18850: result: $cf_ldflags_static" >&5 -+ echo "$as_me:18993: result: $cf_ldflags_static" >&5 - echo "${ECHO_T}$cf_ldflags_static" >&6 - - if test $cf_ldflags_static != yes -@@ -18863,12 +19006,12 @@ - ;; - esac - --echo "$as_me:18866: checking where we will install curses.h" >&5 -+echo "$as_me:19009: checking where we will install curses.h" >&5 - echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6 - test "$with_overwrite" = no && \ - test "x$includedir" = 'x${prefix}/include' && \ - includedir='${prefix}/include/ncurses'${LIB_SUFFIX} --echo "$as_me:18871: result: $includedir" >&5 -+echo "$as_me:19014: result: $includedir" >&5 - echo "${ECHO_T}$includedir" >&6 - - ### Resolve a conflict between normal and wide-curses by forcing applications -@@ -18876,7 +19019,7 @@ - if test "$with_overwrite" != no ; then - if test "$NCURSES_LIBUTF8" = 1 ; then - NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' -- { echo "$as_me:18879: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 -+ { echo "$as_me:19022: 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 -@@ -18893,7 +19036,7 @@ - ### Construct the list of subdirectories for which we'll customize makefiles - ### with the appropriate compile-rules. - --echo "$as_me:18896: checking for src modules" >&5 -+echo "$as_me:19039: checking for src modules" >&5 - echo $ECHO_N "checking for src modules... $ECHO_C" >&6 - - # dependencies and linker-arguments for test-programs -@@ -18956,7 +19099,7 @@ - fi - fi - done --echo "$as_me:18959: result: $cf_cv_src_modules" >&5 -+echo "$as_me:19102: result: $cf_cv_src_modules" >&5 - echo "${ECHO_T}$cf_cv_src_modules" >&6 - - TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" -@@ -19162,7 +19305,7 @@ - - # Extract the first word of "tic", so it can be a program name with args. - set dummy tic; ac_word=$2 --echo "$as_me:19165: checking for $ac_word" >&5 -+echo "$as_me:19308: 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 -@@ -19179,7 +19322,7 @@ - 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:19182: found $ac_dir/$ac_word" >&5 -+ echo "$as_me:19325: found $ac_dir/$ac_word" >&5 - break - fi - done -@@ -19191,10 +19334,10 @@ - TIC_PATH=$ac_cv_path_TIC_PATH - - if test -n "$TIC_PATH"; then -- echo "$as_me:19194: result: $TIC_PATH" >&5 -+ echo "$as_me:19337: result: $TIC_PATH" >&5 - echo "${ECHO_T}$TIC_PATH" >&6 - else -- echo "$as_me:19197: result: no" >&5 -+ echo "$as_me:19340: result: no" >&5 - echo "${ECHO_T}no" >&6 - fi - -@@ -19202,7 +19345,7 @@ - then - if test "$TIC_PATH" = unknown - then -- { echo "$as_me:19205: WARNING: no tic program found for fallbacks" >&5 -+ { echo "$as_me:19348: WARNING: no tic program found for fallbacks" >&5 - echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} - fi - fi -@@ -19213,6 +19356,8 @@ - MAKE_TESTS="#" - fi - -+ADAHTML_DIR=../../doc/html/ada -+ - SUB_SCRIPTS= - case $cf_cv_system_name in #(vi - *mingw32*) #(vi -@@ -19301,7 +19446,7 @@ - : ${CONFIG_STATUS=./config.status} - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:19304: creating $CONFIG_STATUS" >&5 -+{ echo "$as_me:19449: creating $CONFIG_STATUS" >&5 - echo "$as_me: creating $CONFIG_STATUS" >&6;} - cat >$CONFIG_STATUS <<_ACEOF - #! $SHELL -@@ -19477,7 +19622,7 @@ - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header -- { { echo "$as_me:19480: error: ambiguous option: $1 -+ { { echo "$as_me:19625: 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;} -@@ -19496,7 +19641,7 @@ - ac_need_defaults=false;; - - # This is an error. -- -*) { { echo "$as_me:19499: error: unrecognized option: $1 -+ -*) { { echo "$as_me:19644: 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;} -@@ -19602,7 +19747,7 @@ - "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:19605: error: invalid argument: $ac_config_target" >&5 -+ *) { { echo "$as_me:19750: error: invalid argument: $ac_config_target" >&5 - echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -@@ -19847,13 +19992,15 @@ - s,@CXXLIBS@,$CXXLIBS,;t t - s,@USE_CXX_BOOL@,$USE_CXX_BOOL,;t t - s,@gnat_exists@,$gnat_exists,;t t -+s,@M4_exists@,$M4_exists,;t t -+s,@cf_ada_make@,$cf_ada_make,;t t - s,@cf_compile_generics@,$cf_compile_generics,;t t - s,@cf_generic_objects@,$cf_generic_objects,;t t -+s,@USE_GNAT_SIGINT@,$USE_GNAT_SIGINT,;t t -+s,@PRAGMA_UNREF@,$PRAGMA_UNREF,;t t - s,@USE_OLD_MAKERULES@,$USE_OLD_MAKERULES,;t t - s,@USE_GNAT_PROJECTS@,$USE_GNAT_PROJECTS,;t t --s,@M4_exists@,$M4_exists,;t t --s,@cf_ada_make@,$cf_ada_make,;t t --s,@PRAGMA_UNREF@,$PRAGMA_UNREF,;t t -+s,@USE_GNAT_LIBRARIES@,$USE_GNAT_LIBRARIES,;t t - s,@cf_ada_compiler@,$cf_ada_compiler,;t t - s,@cf_ada_package@,$cf_ada_package,;t t - s,@ADA_INCLUDE@,$ADA_INCLUDE,;t t -@@ -19895,6 +20042,7 @@ - s,@cross_compiling@,$cross_compiling,;t t - s,@TIC_PATH@,$TIC_PATH,;t t - s,@MAKE_TESTS@,$MAKE_TESTS,;t t -+s,@ADAHTML_DIR@,$ADAHTML_DIR,;t t - CEOF - - EOF -@@ -20009,7 +20157,7 @@ - esac - - if test x"$ac_file" != x-; then -- { echo "$as_me:20012: creating $ac_file" >&5 -+ { echo "$as_me:20160: creating $ac_file" >&5 - echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi -@@ -20027,7 +20175,7 @@ - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:20030: error: cannot find input file: $f" >&5 -+ test -f "$f" || { { echo "$as_me:20178: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; -@@ -20040,7 +20188,7 @@ - echo $srcdir/$f - else - # /dev/null tree -- { { echo "$as_me:20043: error: cannot find input file: $f" >&5 -+ { { echo "$as_me:20191: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; -@@ -20106,7 +20254,7 @@ - * ) ac_file_in=$ac_file.in ;; - esac - -- test x"$ac_file" != x- && { echo "$as_me:20109: creating $ac_file" >&5 -+ test x"$ac_file" != x- && { echo "$as_me:20257: creating $ac_file" >&5 - echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the -@@ -20117,7 +20265,7 @@ - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:20120: error: cannot find input file: $f" >&5 -+ test -f "$f" || { { echo "$as_me:20268: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; -@@ -20130,7 +20278,7 @@ - echo $srcdir/$f - else - # /dev/null tree -- { { echo "$as_me:20133: error: cannot find input file: $f" >&5 -+ { { echo "$as_me:20281: error: cannot find input file: $f" >&5 - echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; -@@ -20188,7 +20336,7 @@ - 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:20191: $ac_file is unchanged" >&5 -+ { echo "$as_me:20339: $ac_file is unchanged" >&5 - echo "$as_me: $ac_file is unchanged" >&6;} - else - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -diff -Naur ncurses-5.8/configure.in ncurses-5.8-20110402/configure.in ---- ncurses-5.8/configure.in 2010-11-28 01:12:45.000000000 +0100 -+++ ncurses-5.8-20110402/configure.in 2011-03-28 02:22:26.000000000 +0200 -@@ -1,5 +1,5 @@ - dnl*************************************************************************** --dnl Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. * -+dnl Copyright (c) 1998-2010,2011 Free Software Foundation, Inc. * - dnl * - dnl Permission is hereby granted, free of charge, to any person obtaining a * - dnl copy of this software and associated documentation files (the * -@@ -28,14 +28,14 @@ - dnl - dnl Author: Thomas E. Dickey 1995-on - dnl --dnl $Id: configure.in,v 1.514 2010/11/28 00:12:45 tom Exp $ -+dnl $Id: configure.in,v 1.520 2011/03/28 00:22:26 tom Exp $ - dnl Process this file with autoconf to produce a configure script. - dnl - dnl See http://invisible-island.net/autoconf/ for additional information. - dnl - dnl --------------------------------------------------------------------------- - AC_PREREQ(2.13.20020210) --AC_REVISION($Revision: 1.514 $) -+AC_REVISION($Revision: 1.520 $) - AC_INIT(ncurses/base/lib_initscr.c) - AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) - -@@ -1330,6 +1330,7 @@ - getopt.h \ - limits.h \ - locale.h \ -+math.h \ - poll.h \ - sys/bsdtypes.h \ - sys/ioctl.h \ -@@ -1593,9 +1594,24 @@ - if test "$cf_with_ada" != "no" ; then - CF_PROG_GNAT - if test "$cf_cv_prog_gnat_correct" = yes; then -- CF_ADD_ADAFLAGS(-O3 -gnatpn) -+ CF_ADD_ADAFLAGS(-gnatpn) - -+ # make ADAFLAGS consistent with CFLAGS -+ case "$CFLAGS" in -+ *-g*) -+ CF_ADD_ADAFLAGS(-g) -+ ;; -+ esac -+ case "$CFLAGS" in -+ *-O*) -+ CF_ADD_ADAFLAGS(-O3) -+ ;; -+ esac -+ -+ CF_GNAT_GENERICS -+ CF_GNAT_SIGINT - CF_GNAT_PRAGMA_UNREF -+ CF_GNAT_PROJECTS - - CF_WITH_ADA_COMPILER - -@@ -1898,6 +1914,9 @@ - fi - AC_SUBST(MAKE_TESTS) - -+ADAHTML_DIR=../../doc/html/ada -+AC_SUBST(ADAHTML_DIR) -+ - SUB_SCRIPTS= - case $cf_cv_system_name in #(vi - *mingw32*) #(vi -diff -Naur ncurses-5.8/dist.mk ncurses-5.8-20110402/dist.mk ---- ncurses-5.8/dist.mk 2011-02-25 23:11:00.000000000 +0100 -+++ ncurses-5.8-20110402/dist.mk 2011-03-31 02:42:12.000000000 +0200 -@@ -25,7 +25,7 @@ - # use or other dealings in this Software without prior written # - # authorization. # - ############################################################################## --# $Id: dist.mk,v 1.800 2011/02/25 22:11:00 tom Exp $ -+# $Id: dist.mk,v 1.808 2011/03/31 00:42:12 tom Exp $ - # Makefile for creating ncurses distributions. - # - # This only needs to be used directly as a makefile by developers, but -@@ -37,7 +37,7 @@ - # These define the major/minor/patch versions of ncurses. - NCURSES_MAJOR = 5 - NCURSES_MINOR = 8 --NCURSES_PATCH = 20110226 -+NCURSES_PATCH = 20110402 - - # We don't append the patch to the version, since this only applies to releases - VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) -diff -Naur ncurses-5.8/doc/html/ada/funcs/A.htm ncurses-5.8-20110402/doc/html/ada/funcs/A.htm ---- ncurses-5.8/doc/html/ada/funcs/A.htm 2008-10-11 23:36:30.000000000 +0200 -+++ ncurses-5.8-20110402/doc/html/ada/funcs/A.htm 2011-03-20 00:18:38.000000000 +0100 -@@ -5,20 +5,20 @@ - [index] - -diff -Naur ncurses-5.8/doc/html/ada/funcs/B.htm ncurses-5.8-20110402/doc/html/ada/funcs/B.htm ---- ncurses-5.8/doc/html/ada/funcs/B.htm 2007-09-02 01:56:30.000000000 +0200 -+++ ncurses-5.8-20110402/doc/html/ada/funcs/B.htm 2011-03-26 22:54:28.000000000 +0100 -@@ -4,18 +4,18 @@ -

Functions - B

- [index] - -diff -Naur ncurses-5.8/doc/html/ada/funcs/C.htm ncurses-5.8-20110402/doc/html/ada/funcs/C.htm ---- ncurses-5.8/doc/html/ada/funcs/C.htm 2011-02-26 00:43:48.000000000 +0100 -+++ ncurses-5.8-20110402/doc/html/ada/funcs/C.htm 2011-03-26 22:54:28.000000000 +0100 -@@ -5,46 +5,46 @@ - [index] - -diff -Naur ncurses-5.8/doc/html/ada/funcs/H.htm ncurses-5.8-20110402/doc/html/ada/funcs/H.htm ---- ncurses-5.8/doc/html/ada/funcs/H.htm 2008-10-11 23:36:30.000000000 +0200 -+++ ncurses-5.8-20110402/doc/html/ada/funcs/H.htm 2011-03-26 22:54:28.000000000 +0100 -@@ -5,18 +5,18 @@ - [index] - -diff -Naur ncurses-5.8/doc/html/ada/funcs/I.htm ncurses-5.8-20110402/doc/html/ada/funcs/I.htm ---- ncurses-5.8/doc/html/ada/funcs/I.htm 2008-10-11 23:36:30.000000000 +0200 -+++ ncurses-5.8-20110402/doc/html/ada/funcs/I.htm 2011-03-26 22:54:28.000000000 +0100 -@@ -6,40 +6,40 @@ - -diff -Naur ncurses-5.8/doc/html/ada/funcs/L.htm ncurses-5.8-20110402/doc/html/ada/funcs/L.htm ---- ncurses-5.8/doc/html/ada/funcs/L.htm 2007-09-02 01:56:30.000000000 +0200 -+++ ncurses-5.8-20110402/doc/html/ada/funcs/L.htm 2011-03-26 22:54:28.000000000 +0100 -@@ -4,17 +4,17 @@ -

Functions - L

- [index] - -diff -Naur ncurses-5.8/doc/html/ada/funcs/M.htm ncurses-5.8-20110402/doc/html/ada/funcs/M.htm ---- ncurses-5.8/doc/html/ada/funcs/M.htm 2008-10-11 23:36:30.000000000 +0200 -+++ ncurses-5.8-20110402/doc/html/ada/funcs/M.htm 2011-03-26 22:54:28.000000000 +0100 -@@ -5,8 +5,8 @@ - [index] -