From 2b635f090ec43c82958cef9369464aee4dd8975f Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 27 Mar 2011 01:06:46 +0000 Subject: [PATCH] ncurses 5.8 - patch 20110326 + add special check in Ada95/configure script for ncurses6 reentrant code. + regen Ada html documentation. + build-fix for Ada shared libraries versus the varargs workaround. + add rpm and dpkg scripts for Ada95 and test directories, for test builds. + update test/configure macros CF_CURSES_LIBS, CF_XOPEN_SOURCE and CF_X_ATHENA_LIBS. + add configure check to determine if gnat's project feature supports libraries, i.e., collections of .ali files. + make all dereferences in Ada95 samples explicit. + fix typo in comment in lib_add_wch.c (patch by Petr Pavlu). + add configure check for, ifdef's for math.h which is in a separate package on Solaris and potentially not installed (report by Petr Pavlu). > fixes for Ada95 binding (Nicolas Boulenguez): + improve type-checking in Ada95 by eliminating a few warning-suppress pragmas. + suppress unreferenced warnings. + make all dereferences in binding explicit. --- Ada95/aclocal.m4 | 91 +- Ada95/configure | 620 +++-- Ada95/configure.in | 20 +- Ada95/doc/Makefile.in | 81 + Ada95/gen/Makefile.in | 4 +- Ada95/gen/gen.c | 7 +- Ada95/gen/terminal_interface-curses.adb.m4 | 6 +- Ada95/make-tar.sh | 70 +- Ada95/package/AdaCurses-doc.spec | 48 + Ada95/package/AdaCurses.spec | 66 + Ada95/package/debian/compat | 1 + Ada95/package/debian/control | 17 + Ada95/package/debian/copyright | 69 + Ada95/package/debian/docs | 1 + Ada95/package/debian/rules | 95 + Ada95/package/debian/source/format | 1 + Ada95/package/debian/watch | 4 + Ada95/samples/Makefile.in | 31 +- Ada95/samples/ncurses2-acs_and_scroll.adb | 124 +- Ada95/samples/ncurses2-demo_forms.adb | 32 +- Ada95/samples/ncurses2-demo_pad.adb | 10 +- Ada95/samples/ncurses2-demo_panels.adb | 8 +- Ada95/samples/ncurses2-menu_test.adb | 8 +- Ada95/samples/ncurses2-trace_set.adb | 8 +- Ada95/samples/sample-curses_demo.adb | 8 +- Ada95/samples/sample-explanation.adb | 72 +- Ada95/samples/sample-form_demo.adb | 16 +- Ada95/samples/sample-function_key_setting.adb | 30 +- Ada95/samples/sample-header_handler.adb | 6 +- Ada95/samples/sample-keyboard_handler.adb | 10 +- Ada95/samples/sample-menu_demo.adb | 14 +- Ada95/samples/sample-text_io_demo.adb | 24 +- Ada95/samples/sample.adb | 10 +- Ada95/src/Makefile.in | 27 +- ...rses-forms-field_types-enumeration-ada.adb | 10 +- ...e-curses-forms-field_types-enumeration.adb | 10 +- ...e-curses-forms-field_types-user-choice.adb | 16 +- ...nterface-curses-forms-field_types-user.adb | 18 +- ...nal_interface-curses-forms-field_types.adb | 83 +- Ada95/src/terminal_interface-curses-forms.adb | 22 +- Ada95/src/terminal_interface-curses-menus.adb | 18 +- .../src/terminal_interface-curses-text_io.adb | 7 +- MANIFEST | 18 + NEWS | 24 +- aclocal.m4 | 91 +- configure | 1293 ++++----- configure.in | 7 +- dist.mk | 4 +- doc/html/ada/funcs/B.htm | 2 +- doc/html/ada/funcs/C.htm | 16 +- doc/html/ada/funcs/D.htm | 8 +- doc/html/ada/funcs/E.htm | 2 +- doc/html/ada/funcs/F.htm | 2 +- doc/html/ada/funcs/G.htm | 20 +- doc/html/ada/funcs/H.htm | 6 +- doc/html/ada/funcs/I.htm | 4 +- doc/html/ada/funcs/K.htm | 4 +- doc/html/ada/funcs/L.htm | 4 +- doc/html/ada/funcs/M.htm | 8 +- doc/html/ada/funcs/N.htm | 4 +- doc/html/ada/funcs/O.htm | 4 +- doc/html/ada/funcs/P.htm | 8 +- doc/html/ada/funcs/R.htm | 8 +- doc/html/ada/funcs/S.htm | 44 +- doc/html/ada/funcs/T.htm | 8 +- doc/html/ada/funcs/U.htm | 6 +- doc/html/ada/funcs/W.htm | 24 +- ...forms-field_types-enumeration-ada__adb.htm | 10 +- ...ses-forms-field_types-enumeration__adb.htm | 10 +- ...ses-forms-field_types-user-choice__adb.htm | 64 +- ...ses-forms-field_types-user-choice__ads.htm | 10 +- ...ace-curses-forms-field_types-user__adb.htm | 42 +- ...ace-curses-forms-field_types-user__ads.htm | 8 +- ...nterface-curses-forms-field_types__adb.htm | 201 +- ...nterface-curses-forms-field_types__ads.htm | 30 +- .../terminal_interface-curses-forms__adb.htm | 22 +- .../terminal_interface-curses-menus__adb.htm | 18 +- ...terminal_interface-curses-text_io__adb.htm | 95 +- ...terminal_interface-curses-text_io__ads.htm | 28 +- .../ada/terminal_interface-curses__adb.htm | 1210 ++++----- .../ada/terminal_interface-curses__ads.htm | 426 +-- include/ncurses_defs | 7 +- man/MKada_config.in | 17 +- ncurses/widechar/lib_add_wch.c | 6 +- test/aclocal.m4 | 41 +- test/configure | 2391 +++++++++-------- test/configure.in | 3 +- test/make-tar.sh | 57 +- test/package/debian/compat | 1 + test/package/debian/control | 16 + test/package/debian/copyright | 69 + test/package/debian/docs | 1 + test/package/debian/rules | 90 + test/package/debian/source/format | 1 + test/package/debian/watch | 4 + test/package/ncurses-examples.spec | 55 + test/tclock.c | 12 +- test/test.priv.h | 6 +- 98 files changed, 4879 insertions(+), 3514 deletions(-) create mode 100644 Ada95/doc/Makefile.in create mode 100644 Ada95/package/AdaCurses-doc.spec create mode 100644 Ada95/package/AdaCurses.spec create mode 100644 Ada95/package/debian/compat create mode 100644 Ada95/package/debian/control create mode 100644 Ada95/package/debian/copyright create mode 100644 Ada95/package/debian/docs create mode 100644 Ada95/package/debian/rules create mode 100644 Ada95/package/debian/source/format create mode 100644 Ada95/package/debian/watch create mode 100644 test/package/debian/compat create mode 100644 test/package/debian/control create mode 100644 test/package/debian/copyright create mode 100644 test/package/debian/docs create mode 100644 test/package/debian/rules create mode 100644 test/package/debian/source/format create mode 100644 test/package/debian/watch create mode 100644 test/package/ncurses-examples.spec diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4 index 8021a818..b27fb9a5 100644 --- a/Ada95/aclocal.m4 +++ b/Ada95/aclocal.m4 @@ -28,7 +28,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey dnl -dnl $Id: aclocal.m4,v 1.21 2011/03/19 18:55:21 tom Exp $ +dnl $Id: aclocal.m4,v 1.22 2011/03/24 00:31:33 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 @@ rm -rf conftest* 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 @@ -1097,28 +1099,92 @@ fi 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,8 +1194,16 @@ else 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: 3 updated: 2011/03/19 14:47:45 @@ -1190,7 +1264,7 @@ fi rm -rf conftest* *~conftest* ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GNAT_VERSION version: 16 updated: 2010/11/13 14:15:18 +dnl CF_GNAT_VERSION version: 17 updated: 2011/03/23 20:24:41 dnl --------------- dnl Verify version of GNAT. AC_DEFUN([CF_GNAT_VERSION], @@ -1210,9 +1284,6 @@ case $cf_gnat_version in #(vi cf_cv_prog_gnat_correct=no ;; esac - -CF_GNAT_GENERICS -CF_GNAT_PROJECTS ]) dnl --------------------------------------------------------------------------- dnl CF_GNU_SOURCE version: 6 updated: 2005/07/09 13:23:07 diff --git a/Ada95/configure b/Ada95/configure index db7c79c0..b7919e06 100644 --- a/Ada95/configure +++ b/Ada95/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.23 . +# From configure.in Revision: 1.26 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20101002. # @@ -9202,11 +9202,76 @@ EOF fi fi +# OpenSUSE is installing ncurses6, using reentrant option. +echo "$as_me:9206: 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 9212 "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:9243: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:9246: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:9249: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:9252: \$? = $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:9262: 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:9209: checking if you want experimental reentrant code" >&5 +echo "$as_me:9274: 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. @@ -9214,9 +9279,9 @@ if test "${enable_reentrant+set}" = set; then enableval="$enable_reentrant" with_reentrant=$enableval else - with_reentrant=no + with_reentrant=$assume_reentrant fi; -echo "$as_me:9219: result: $with_reentrant" >&5 +echo "$as_me:9284: result: $with_reentrant" >&5 echo "${ECHO_T}$with_reentrant" >&6 if test "$with_reentrant" = yes ; then cf_cv_enable_reentrant=1 @@ -9225,7 +9290,7 @@ if test "$with_reentrant" = yes ; then # 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 @@ -9238,7 +9303,7 @@ fi ### Allow using a different wrap-prefix if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then - echo "$as_me:9241: checking for prefix used to wrap public variables" >&5 + echo "$as_me:9306: 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. @@ -9248,7 +9313,7 @@ if test "${with_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; - echo "$as_me:9251: result: $NCURSES_WRAP_PREFIX" >&5 + echo "$as_me:9316: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 else NCURSES_WRAP_PREFIX=_nc_ @@ -9261,7 +9326,7 @@ EOF ############################################################################### ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:9264: checking if you want to display full commands during build" >&5 +echo "$as_me:9329: 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. @@ -9276,11 +9341,11 @@ if test "$with_echo" = yes; then else ECHO_LINK='@ echo linking $@ ... ;' fi -echo "$as_me:9279: result: $with_echo" >&5 +echo "$as_me:9344: result: $with_echo" >&5 echo "${ECHO_T}$with_echo" >&6 ### use option --enable-warnings to turn on all gcc warnings -echo "$as_me:9283: checking if you want to see compiler warnings" >&5 +echo "$as_me:9348: 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. @@ -9288,7 +9353,7 @@ if test "${enable_warnings+set}" = set; then enableval="$enable_warnings" with_warnings=$enableval fi; -echo "$as_me:9291: result: $with_warnings" >&5 +echo "$as_me:9356: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "x$with_warnings" = "xyes"; then @@ -9300,12 +9365,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in linux*|gnu*) - echo "$as_me:9303: checking if this is really Intel C compiler" >&5 + echo "$as_me:9368: 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 9308 "configure" +#line 9373 "configure" #include "confdefs.h" int @@ -9322,16 +9387,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9325: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9390: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9328: \$? = $ac_status" >&5 + echo "$as_me:9393: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9331: \"$ac_try\"") >&5 + { (eval echo "$as_me:9396: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9334: \$? = $ac_status" >&5 + echo "$as_me:9399: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" @@ -9342,14 +9407,14 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:9345: result: $INTEL_COMPILER" >&5 + echo "$as_me:9410: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac fi cat > conftest.$ac_ext <&5 + { echo "$as_me:9434: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -9382,12 +9447,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:9385: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:9450: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9388: \$? = $ac_status" >&5 + echo "$as_me:9453: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:9390: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:9455: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -9396,7 +9461,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GCC" = yes then - { echo "$as_me:9399: checking for $CC warning options..." >&5 + { echo "$as_me:9464: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS= @@ -9416,12 +9481,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} 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:9419: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:9484: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9422: \$? = $ac_status" >&5 + echo "$as_me:9487: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:9424: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:9489: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in #(vi Wcast-qual) #(vi @@ -9432,7 +9497,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 [34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:9435: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:9500: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -9465,10 +9530,10 @@ cat > conftest.i <&5 + { echo "$as_me:9533: 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:9585: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9523: \$? = $ac_status" >&5 + echo "$as_me:9588: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:9525: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:9590: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in #(vi @@ -9558,7 +9623,7 @@ rm -rf conftest* fi ### use option --enable-assertions to turn on generation of assertion code -echo "$as_me:9561: checking if you want to enable runtime assertions" >&5 +echo "$as_me:9626: 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. @@ -9568,7 +9633,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:9571: result: $with_assertions" >&5 +echo "$as_me:9636: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -9622,7 +9687,7 @@ case "$CFLAGS $CPPFLAGS" in ;; esac -echo "$as_me:9625: checking whether to add trace feature to all models" >&5 +echo "$as_me:9690: 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. @@ -9632,7 +9697,7 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:9635: result: $cf_with_trace" >&5 +echo "$as_me:9700: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "$cf_with_trace" = yes ; then @@ -9725,13 +9790,13 @@ case $cf_cv_system_name in #(vi *mingw32*) #(vi ;; *) -echo "$as_me:9728: checking for gettimeofday" >&5 +echo "$as_me:9793: 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 9734 "configure" +#line 9799 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gettimeofday (); below. */ @@ -9762,16 +9827,16 @@ f = gettimeofday; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9765: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9830: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9768: \$? = $ac_status" >&5 + echo "$as_me:9833: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9771: \"$ac_try\"") >&5 + { (eval echo "$as_me:9836: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9774: \$? = $ac_status" >&5 + echo "$as_me:9839: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gettimeofday=yes else @@ -9781,7 +9846,7 @@ ac_cv_func_gettimeofday=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9784: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:9849: 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 @@ -9790,7 +9855,7 @@ EOF else -echo "$as_me:9793: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:9858: 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 @@ -9798,7 +9863,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9801 "configure" +#line 9866 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9817,16 +9882,16 @@ gettimeofday (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9820: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9885: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9823: \$? = $ac_status" >&5 + echo "$as_me:9888: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9826: \"$ac_try\"") >&5 + { (eval echo "$as_me:9891: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9829: \$? = $ac_status" >&5 + echo "$as_me:9894: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -9837,7 +9902,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9840: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:9905: 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 @@ -9852,13 +9917,13 @@ fi esac ### Checks for header files. -echo "$as_me:9855: checking for ANSI C header files" >&5 +echo "$as_me:9920: 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 9861 "configure" +#line 9926 "configure" #include "confdefs.h" #include #include @@ -9866,13 +9931,13 @@ else #include _ACEOF -if { (eval echo "$as_me:9869: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:9934: \"$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:9875: \$? = $ac_status" >&5 + echo "$as_me:9940: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9894,7 +9959,7 @@ rm -f conftest.err conftest.$ac_ext 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 9897 "configure" +#line 9962 "configure" #include "confdefs.h" #include @@ -9912,7 +9977,7 @@ fi 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 9915 "configure" +#line 9980 "configure" #include "confdefs.h" #include @@ -9933,7 +9998,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 9936 "configure" +#line 10001 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -9959,15 +10024,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:9962: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10027: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9965: \$? = $ac_status" >&5 + echo "$as_me:10030: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9967: \"$ac_try\"") >&5 + { (eval echo "$as_me:10032: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9970: \$? = $ac_status" >&5 + echo "$as_me:10035: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -9980,7 +10045,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:9983: result: $ac_cv_header_stdc" >&5 +echo "$as_me:10048: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -9993,13 +10058,13 @@ fi 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:9996: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:10061: 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 10002 "configure" +#line 10067 "configure" #include "confdefs.h" #include #include <$ac_hdr> @@ -10014,16 +10079,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10017: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10082: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10020: \$? = $ac_status" >&5 + echo "$as_me:10085: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10023: \"$ac_try\"") >&5 + { (eval echo "$as_me:10088: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10026: \$? = $ac_status" >&5 + echo "$as_me:10091: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -10033,7 +10098,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10036: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:10101: 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:10114: 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 @@ -10054,7 +10119,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10057 "configure" +#line 10122 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10073,16 +10138,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10076: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10141: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10079: \$? = $ac_status" >&5 + echo "$as_me:10144: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10082: \"$ac_try\"") >&5 + { (eval echo "$as_me:10147: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10085: \$? = $ac_status" >&5 + echo "$as_me:10150: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dir_opendir=yes else @@ -10093,14 +10158,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10096: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:10161: 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:10103: checking for opendir in -lx" >&5 + echo "$as_me:10168: 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 @@ -10108,7 +10173,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10111 "configure" +#line 10176 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10127,16 +10192,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10130: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10195: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10133: \$? = $ac_status" >&5 + echo "$as_me:10198: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10136: \"$ac_try\"") >&5 + { (eval echo "$as_me:10201: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10139: \$? = $ac_status" >&5 + echo "$as_me:10204: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_x_opendir=yes else @@ -10147,7 +10212,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10150: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:10215: 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" @@ -10155,13 +10220,13 @@ fi fi -echo "$as_me:10158: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:10223: 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 10164 "configure" +#line 10229 "configure" #include "confdefs.h" #include #include @@ -10177,16 +10242,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10180: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10245: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10183: \$? = $ac_status" >&5 + echo "$as_me:10248: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10186: \"$ac_try\"") >&5 + { (eval echo "$as_me:10251: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10189: \$? = $ac_status" >&5 + echo "$as_me:10254: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -10196,7 +10261,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10199: result: $ac_cv_header_time" >&5 +echo "$as_me:10264: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -10214,7 +10279,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return -echo "$as_me:10217: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:10282: 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 @@ -10222,7 +10287,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 10225 "configure" +#line 10290 "configure" #include "confdefs.h" #include #include @@ -10271,16 +10336,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:10274: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10339: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10277: \$? = $ac_status" >&5 + echo "$as_me:10342: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10280: \"$ac_try\"") >&5 + { (eval echo "$as_me:10345: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10283: \$? = $ac_status" >&5 + echo "$as_me:10348: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -10297,21 +10362,21 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:10300: result: none needed" >&5 + echo "$as_me:10365: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:10303: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:10368: 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:10308: checking for an ANSI C-conforming const" >&5 +echo "$as_me:10373: 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 10314 "configure" +#line 10379 "configure" #include "confdefs.h" int @@ -10369,16 +10434,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10372: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10437: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10375: \$? = $ac_status" >&5 + echo "$as_me:10440: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10378: \"$ac_try\"") >&5 + { (eval echo "$as_me:10443: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10381: \$? = $ac_status" >&5 + echo "$as_me:10446: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else @@ -10388,7 +10453,7 @@ ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10391: result: $ac_cv_c_const" >&5 +echo "$as_me:10456: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -10400,7 +10465,7 @@ fi ### Checks for external-data -echo "$as_me:10403: checking if data-only library module links" >&5 +echo "$as_me:10468: 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 @@ -10408,20 +10473,20 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:10479: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10417: \$? = $ac_status" >&5 + echo "$as_me:10482: \$? = $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:10502: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10440: \$? = $ac_status" >&5 + echo "$as_me:10505: \$? = $ac_status" >&5 (exit $ac_status); }; then mv conftest.o func.o && \ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null @@ -10450,7 +10515,7 @@ EOF cf_cv_link_dataonly=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 10453 "configure" +#line 10518 "configure" #include "confdefs.h" int main() @@ -10461,15 +10526,15 @@ else _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:10464: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10529: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10467: \$? = $ac_status" >&5 + echo "$as_me:10532: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:10469: \"$ac_try\"") >&5 + { (eval echo "$as_me:10534: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10472: \$? = $ac_status" >&5 + echo "$as_me:10537: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_link_dataonly=yes else @@ -10484,7 +10549,7 @@ fi fi -echo "$as_me:10487: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:10552: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -10497,7 +10562,7 @@ fi ### Checks for library functions. -echo "$as_me:10500: checking for working mkstemp" >&5 +echo "$as_me:10565: 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 @@ -10505,13 +10570,13 @@ else rm -rf conftest* if test "$cross_compiling" = yes; then - echo "$as_me:10508: checking for mkstemp" >&5 + echo "$as_me:10573: 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 10514 "configure" +#line 10579 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char mkstemp (); below. */ @@ -10542,16 +10607,16 @@ f = mkstemp; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10545: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10610: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10548: \$? = $ac_status" >&5 + echo "$as_me:10613: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10551: \"$ac_try\"") >&5 + { (eval echo "$as_me:10616: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10554: \$? = $ac_status" >&5 + echo "$as_me:10619: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mkstemp=yes else @@ -10561,12 +10626,12 @@ ac_cv_func_mkstemp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10564: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:10629: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10569 "configure" +#line 10634 "configure" #include "confdefs.h" #include @@ -10604,15 +10669,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:10607: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10672: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10610: \$? = $ac_status" >&5 + echo "$as_me:10675: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:10612: \"$ac_try\"") >&5 + { (eval echo "$as_me:10677: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10615: \$? = $ac_status" >&5 + echo "$as_me:10680: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_mkstemp=yes @@ -10627,7 +10692,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:10630: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:10695: 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 @@ -10636,13 +10701,13 @@ EOF fi -echo "$as_me:10639: checking return type of signal handlers" >&5 +echo "$as_me:10704: 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 10645 "configure" +#line 10710 "configure" #include "confdefs.h" #include #include @@ -10664,16 +10729,16 @@ int i; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10667: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10732: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10670: \$? = $ac_status" >&5 + echo "$as_me:10735: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10673: \"$ac_try\"") >&5 + { (eval echo "$as_me:10738: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10676: \$? = $ac_status" >&5 + echo "$as_me:10741: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_signal=void else @@ -10683,7 +10748,7 @@ ac_cv_type_signal=int fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10686: result: $ac_cv_type_signal" >&5 +echo "$as_me:10751: result: $ac_cv_type_signal" >&5 echo "${ECHO_T}$ac_cv_type_signal" >&6 cat >>confdefs.h <&5 +echo "$as_me:10768: 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 @@ -10715,7 +10780,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_gnat_exists="yes" -echo "$as_me:10718: found $ac_dir/$ac_word" >&5 +echo "$as_me:10783: found $ac_dir/$ac_word" >&5 break done @@ -10724,10 +10789,10 @@ fi fi gnat_exists=$ac_cv_prog_gnat_exists if test -n "$gnat_exists"; then - echo "$as_me:10727: result: $gnat_exists" >&5 + echo "$as_me:10792: result: $gnat_exists" >&5 echo "${ECHO_T}$gnat_exists" >&6 else - echo "$as_me:10730: result: no" >&5 + echo "$as_me:10795: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -10735,12 +10800,12 @@ if test "$ac_cv_prog_gnat_exists" = no; then cf_ada_make= else -echo "$as_me:10738: checking for gnat version" >&5 +echo "$as_me:10803: 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:10743: result: $cf_gnat_version" >&5 +echo "$as_me:10808: result: $cf_gnat_version" >&5 echo "${ECHO_T}$cf_gnat_version" >&6 case $cf_gnat_version in #(vi @@ -10748,66 +10813,15 @@ case $cf_gnat_version in #(vi cf_cv_prog_gnat_correct=yes ;; *) - { echo "$as_me:10751: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + { echo "$as_me:10816: 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:10757: 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:10767: 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:10779: 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:10796: 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:10810: checking for $ac_word" >&5 +echo "$as_me:10824: 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 @@ -10822,7 +10836,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_M4_exists="yes" -echo "$as_me:10825: found $ac_dir/$ac_word" >&5 +echo "$as_me:10839: found $ac_dir/$ac_word" >&5 break done @@ -10831,10 +10845,10 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:10834: result: $M4_exists" >&5 + echo "$as_me:10848: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:10837: result: no" >&5 + echo "$as_me:10851: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -10843,7 +10857,7 @@ fi echo Ada95 binding required program m4 not found. Ada95 binding disabled. fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:10846: checking if GNAT works" >&5 + echo "$as_me:10860: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -rf conftest* *~conftest* @@ -10871,7 +10885,7 @@ else fi rm -rf conftest* *~conftest* - echo "$as_me:10874: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:10888: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi fi @@ -10894,7 +10908,29 @@ fi ;; esac -echo "$as_me:10897: checking if GNAT pragma Unreferenced works" >&5 +echo "$as_me:10911: 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:10921: 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:10933: 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 @@ -10925,7 +10961,7 @@ fi rm -rf conftest* *~conftest* fi -echo "$as_me:10928: result: $cf_cv_pragma_unreferenced" >&5 +echo "$as_me:10964: 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). @@ -10935,7 +10971,105 @@ else PRAGMA_UNREF=FALSE fi -echo "$as_me:10938: checking for ada-compiler" >&5 +cf_gnat_libraries=no +cf_gnat_projects=no + +echo "$as_me:10977: 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:11045: result: $cf_gnat_projects" >&5 +echo "${ECHO_T}$cf_gnat_projects" >&6 + +if test $cf_gnat_projects = yes +then + echo "$as_me:11050: checking if GNAT supports libraries" >&5 +echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 + echo "$as_me:11052: 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:11072: 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. @@ -10946,12 +11080,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:10949: result: $cf_ada_compiler" >&5 +echo "$as_me:11083: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:10954: checking for ada-include" >&5 +echo "$as_me:11088: 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. @@ -10987,7 +11121,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:10990: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:11124: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -10996,10 +11130,10 @@ esac fi ADA_INCLUDE="$withval" -echo "$as_me:10999: result: $ADA_INCLUDE" >&5 +echo "$as_me:11133: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:11002: checking for ada-objects" >&5 +echo "$as_me:11136: 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. @@ -11035,7 +11169,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:11038: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:11172: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -11044,10 +11178,10 @@ esac fi ADA_OBJECTS="$withval" -echo "$as_me:11047: result: $ADA_OBJECTS" >&5 +echo "$as_me:11181: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:11050: checking if an Ada95 shared-library should be built" >&5 +echo "$as_me:11184: 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. @@ -11057,7 +11191,7 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:11060: result: $with_ada_sharedlib" >&5 +echo "$as_me:11194: result: $with_ada_sharedlib" >&5 echo "${ECHO_T}$with_ada_sharedlib" >&6 ADA_SHAREDLIB='lib$(LIB_NAME).so.1' @@ -11072,7 +11206,15 @@ then fi fi + else + { { echo "$as_me:11210: 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:11215: 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 ################################################################################ @@ -11115,7 +11257,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:11118: checking default library suffix" >&5 +echo "$as_me:11260: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -11126,10 +11268,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 shared) DFT_ARG_SUFFIX='' ;; esac test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" -echo "$as_me:11129: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:11271: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:11132: checking default library-dependency suffix" >&5 +echo "$as_me:11274: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in #(vi @@ -11182,10 +11324,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 esac test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}" test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}" -echo "$as_me:11185: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:11327: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:11188: checking default object directory" >&5 +echo "$as_me:11330: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -11201,7 +11343,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:11204: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:11346: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 ### Set up low-level terminfo dependencies for makefiles. @@ -11320,7 +11462,7 @@ TEST_LIBS2= 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 @@ -11336,7 +11478,7 @@ EXTERNAL_TREE= # match layout used by make-tar.sh ADAHTML_DIR=../doc/ada -ac_config_files="$ac_config_files $SUB_MAKEFILES Makefile" +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 @@ -11417,7 +11559,7 @@ DEFS=-DHAVE_CONFIG_H : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:11420: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:11562: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -11593,7 +11735,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:11596: error: ambiguous option: $1 + { { echo "$as_me:11738: 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;} @@ -11612,7 +11754,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:11615: error: unrecognized option: $1 + -*) { { echo "$as_me:11757: 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;} @@ -11679,10 +11821,11 @@ do 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:11685: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:11828: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -11854,13 +11997,14 @@ 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,@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 @@ -11995,7 +12139,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:11998: creating $ac_file" >&5 + { echo "$as_me:12142: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -12013,7 +12157,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:12016: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:12160: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -12026,7 +12170,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:12029: error: cannot find input file: $f" >&5 + { { echo "$as_me:12173: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -12092,7 +12236,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:12095: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:12239: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -12103,7 +12247,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:12106: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:12250: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -12116,7 +12260,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:12119: error: cannot find input file: $f" >&5 + { { echo "$as_me:12263: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -12174,7 +12318,7 @@ cat >>$CONFIG_STATUS <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:12177: $ac_file is unchanged" >&5 + { echo "$as_me:12321: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff --git a/Ada95/configure.in b/Ada95/configure.in index 01405987..4c03e9c9 100644 --- a/Ada95/configure.in +++ b/Ada95/configure.in @@ -28,14 +28,14 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey dnl -dnl $Id: configure.in,v 1.23 2011/03/19 17:47:55 tom Exp $ +dnl $Id: configure.in,v 1.26 2011/03/26 23:54:05 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.23 $) +AC_REVISION($Revision: 1.26 $) AC_INIT(gen/gen.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -324,6 +324,9 @@ if test "$with_pthread" = "yes" ; then 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 +335,13 @@ AC_MSG_CHECKING(if you want experimental reentrant code) 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) @@ -504,7 +507,9 @@ if test "$cf_with_ada" != "no" ; then ;; esac + CF_GNAT_GENERICS CF_GNAT_PRAGMA_UNREF + CF_GNAT_PROJECTS CF_WITH_ADA_COMPILER @@ -514,7 +519,11 @@ if test "$cf_with_ada" != "no" ; then 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 ################################################################################ @@ -586,7 +595,7 @@ dnl for separate build, this is good enough for "sh $(top_srcdir)/misc/shlib" NCURSES_SHLIB2="sh -c" AC_SUBST(NCURSES_SHLIB2) -ADA_SUBDIRS="include gen src" +ADA_SUBDIRS="include gen src doc" if test "x$cf_with_tests" != "xno" ; then ADA_SUBDIRS="$ADA_SUBDIRS samples" fi @@ -608,6 +617,7 @@ 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 --git a/Ada95/doc/Makefile.in b/Ada95/doc/Makefile.in new file mode 100644 index 00000000..8f33c930 --- /dev/null +++ b/Ada95/doc/Makefile.in @@ -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 --git a/Ada95/gen/Makefile.in b/Ada95/gen/Makefile.in index 7a5e503a..10fd6352 100644 --- a/Ada95/gen/Makefile.in +++ b/Ada95/gen/Makefile.in @@ -28,7 +28,7 @@ # # Author: Juergen Pfeifer, 1996 # -# $Id: Makefile.in,v 1.73 2011/03/19 18:02:39 tom Exp $ +# $Id: Makefile.in,v 1.74 2011/03/26 23:36:30 tom Exp $ # .SUFFIXES: @@ -57,7 +57,7 @@ CC = @CC@ HOST_CC = @BUILD_CC@ CFLAGS = @CFLAGS@ -CPPFLAGS = @ACPPFLAGS@ \ +CPPFLAGS = @ACPPFLAGS@ @CPPFLAGS@ \ -DHAVE_CONFIG_H -I$(srcdir) CCFLAGS = $(CPPFLAGS) $(CFLAGS) diff --git a/Ada95/gen/gen.c b/Ada95/gen/gen.c index fad98a1a..3c63cf5a 100644 --- a/Ada95/gen/gen.c +++ b/Ada95/gen/gen.c @@ -32,7 +32,7 @@ /* Version Control - $Id: gen.c,v 1.57 2011/03/19 19:09:38 Nicolas.Boulenguez Exp $ + $Id: gen.c,v 1.58 2011/03/25 23:55:30 tom Exp $ --------------------------------------------------------------------------*/ /* This program generates various record structures and constants from the @@ -274,7 +274,10 @@ static void 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[] = { diff --git a/Ada95/gen/terminal_interface-curses.adb.m4 b/Ada95/gen/terminal_interface-curses.adb.m4 index fcbf8261..1f89a5a3 100644 --- a/Ada95/gen/terminal_interface-curses.adb.m4 +++ b/Ada95/gen/terminal_interface-curses.adb.m4 @@ -37,8 +37,8 @@ include(M4MACRO)---------------------------------------------------------------- ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- $Revision: 1.7 $ --- $Date: 2011/03/19 16:17:19 $ +-- $Revision: 1.8 $ +-- $Date: 2011/03/22 23:02:14 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with System; @@ -1208,6 +1208,7 @@ package body Terminal_Interface.Curses is 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 @@ package body Terminal_Interface.Curses is X : Column_Position; begin Get_Size (Win, Y, X); + pragma Unreferenced (X); Change_Lines_Status (Win, 0, Positive (Y), False); end Untouch; diff --git a/Ada95/make-tar.sh b/Ada95/make-tar.sh index 8ca32fb1..608bbdff 100644 --- a/Ada95/make-tar.sh +++ b/Ada95/make-tar.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: make-tar.sh,v 1.7 2011/03/19 19:27:36 tom Exp $ +# $Id: make-tar.sh,v 1.12 2011/03/26 19:07:38 tom Exp $ ############################################################################## # Copyright (c) 2010,2011 Free Software Foundation, Inc. # # # @@ -37,10 +37,44 @@ 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... @@ -97,3 +149,5 @@ cd $DESTDIR pwd ls -l $ROOTNAME.tar.gz + +# vi:ts=4 sw=4 diff --git a/Ada95/package/AdaCurses-doc.spec b/Ada95/package/AdaCurses-doc.spec new file mode 100644 index 00000000..eb7e6b8f --- /dev/null +++ b/Ada95/package/AdaCurses-doc.spec @@ -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 --git a/Ada95/package/AdaCurses.spec b/Ada95/package/AdaCurses.spec new file mode 100644 index 00000000..dc0dc589 --- /dev/null +++ b/Ada95/package/AdaCurses.spec @@ -0,0 +1,66 @@ +Summary: AdaCurses - Ada95 binding for ncurses +%define AppProgram AdaCurses +%define AppVersion MAJOR.MINOR +%define AppRelease YYYYMMDD +# $Id: AdaCurses.spec,v 1.5 2011/03/26 20:41:44 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 + +INSTALL_PROGRAM='${INSTALL}' \ + ./configure \ + --target %{_target_platform} \ + --prefix=%{_prefix} \ + --bindir=%{_bindir} \ + --libdir=%{_libdir} \ + --mandir=%{_mandir} \ + --datadir=%{_datadir} \ + --with-ada-sharedlib + +make + +%install +[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT + +make install DESTDIR=$RPM_BUILD_ROOT + +( cd samples && + make install.examples \ + 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.* +%{_libdir}/ada/adalib/libAdaCurses.* +%{_libdir}/ada/adalib/terminal_interface* +%{_mandir}/man1/adacurses*-config.1* +%{_datadir}/ada/adainclude/terminal_interface* + +%changelog +# each patch should add its ChangeLog entries here + +* Fri Mar 25 2010 Thomas Dickey +- initial version diff --git a/Ada95/package/debian/compat b/Ada95/package/debian/compat new file mode 100644 index 00000000..7ed6ff82 --- /dev/null +++ b/Ada95/package/debian/compat @@ -0,0 +1 @@ +5 diff --git a/Ada95/package/debian/control b/Ada95/package/debian/control new file mode 100644 index 00000000..88af9706 --- /dev/null +++ b/Ada95/package/debian/control @@ -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 --git a/Ada95/package/debian/copyright b/Ada95/package/debian/copyright new file mode 100644 index 00000000..e681a6bd --- /dev/null +++ b/Ada95/package/debian/copyright @@ -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 --git a/Ada95/package/debian/docs b/Ada95/package/debian/docs new file mode 100644 index 00000000..e845566c --- /dev/null +++ b/Ada95/package/debian/docs @@ -0,0 +1 @@ +README diff --git a/Ada95/package/debian/rules b/Ada95/package/debian/rules new file mode 100644 index 00000000..b0b1db17 --- /dev/null +++ b/Ada95/package/debian/rules @@ -0,0 +1,95 @@ +#!/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 \ + --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) ) + ( 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 --git a/Ada95/package/debian/source/format b/Ada95/package/debian/source/format new file mode 100644 index 00000000..89ae9db8 --- /dev/null +++ b/Ada95/package/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/Ada95/package/debian/watch b/Ada95/package/debian/watch new file mode 100644 index 00000000..4794ae38 --- /dev/null +++ b/Ada95/package/debian/watch @@ -0,0 +1,4 @@ +version=3 + +opts=passive ftp://invisible-island.net/AdaCurses/AdaCurses-([\d.]+)\.tgz \ + debian uupdate diff --git a/Ada95/samples/Makefile.in b/Ada95/samples/Makefile.in index 0179fcf4..f560e1fc 100644 --- a/Ada95/samples/Makefile.in +++ b/Ada95/samples/Makefile.in @@ -28,7 +28,7 @@ # # Author: Juergen Pfeifer, 1996 # -# $Id: Makefile.in,v 1.41 2011/03/06 01:22:23 Nicolas.Boulenguez Exp $ +# $Id: Makefile.in,v 1.44 2011/03/26 22:59:04 tom Exp $ # .SUFFIXES: @@ -41,6 +41,8 @@ x = @PROG_EXT@ srcdir = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ +bindir = @bindir@ +datadir = @datadir@ libdir = @libdir@ includedir = @includedir@ @@ -73,6 +75,13 @@ LINK = $(CC) LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ RANLIB = @RANLIB@ +################################################################################ +BINDIR = $(DESTDIR)$(bindir) +DATADIR = $(DESTDIR)$(datadir) +LIBDIR = $(DESTDIR)$(libdir) + +MY_DATADIR = $(DATADIR)/AdaCurses + ################################################################################ ada_srcdir=../src @@ -90,9 +99,9 @@ ABASE = $(ALIB)-curses CARGS =-cargs $(ADAFLAGS) LARGS =-largs @TEST_ARG2@ $(LD_FLAGS) -L../lib -lAdaCurses @TEST_LIBS2@ -PROGS = tour rain ncurses +PROGS = tour$x rain$x ncurses$x -all :: tour$x rain$x ncurses$x +all :: $(PROGS) @echo made $@ sources : @@ -107,6 +116,22 @@ uninstall \ 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) diff --git a/Ada95/samples/ncurses2-acs_and_scroll.adb b/Ada95/samples/ncurses2-acs_and_scroll.adb index 42f3d163..00e9afc2 100644 --- a/Ada95/samples/ncurses2-acs_and_scroll.adb +++ b/Ada95/samples/ncurses2-acs_and_scroll.adb @@ -35,8 +35,8 @@ ------------------------------------------------------------------------------ -- Author: Eugene V. Melaragno 2000 -- Version Control --- $Revision: 1.10 $ --- $Date: 2011/03/19 12:16:44 $ +-- $Revision: 1.11 $ +-- $Date: 2011/03/23 00:33:00 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ -- Windows and scrolling tester. @@ -452,19 +452,19 @@ procedure ncurses2.acs_and_scroll is 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 @@ begin 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 @@ begin 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 @@ begin "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 @@ begin -- 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 @@ begin 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 @@ begin 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 @@ begin 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 --git a/Ada95/samples/ncurses2-demo_forms.adb b/Ada95/samples/ncurses2-demo_forms.adb index 7137aa0b..1afbb88b 100644 --- a/Ada95/samples/ncurses2-demo_forms.adb +++ b/Ada95/samples/ncurses2-demo_forms.adb @@ -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 @@ begin 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 --git a/Ada95/samples/ncurses2-demo_pad.adb b/Ada95/samples/ncurses2-demo_pad.adb index 862b8b70..b1b72aec 100644 --- a/Ada95/samples/ncurses2-demo_pad.adb +++ b/Ada95/samples/ncurses2-demo_pad.adb @@ -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 @@ procedure ncurses2.demo_pad is 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 --git a/Ada95/samples/ncurses2-demo_panels.adb b/Ada95/samples/ncurses2-demo_panels.adb index d2558ed4..9693e1a1 100644 --- a/Ada95/samples/ncurses2-demo_panels.adb +++ b/Ada95/samples/ncurses2-demo_panels.adb @@ -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 ncurses2.demo_panels (nap_mseci : Integer) is 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 --git a/Ada95/samples/ncurses2-menu_test.adb b/Ada95/samples/ncurses2-menu_test.adb index 2737d2a3..bce97823 100644 --- a/Ada95/samples/ncurses2-menu_test.adb +++ b/Ada95/samples/ncurses2-menu_test.adb @@ -35,8 +35,8 @@ ------------------------------------------------------------------------------ -- Author: Eugene V. Melaragno 2000 -- Version Control --- $Revision: 1.7 $ --- $Date: 2011/03/08 10:54:17 $ +-- $Revision: 1.8 $ +-- $Date: 2011/03/23 00:39:28 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with ncurses2.util; use ncurses2.util; @@ -121,9 +121,9 @@ begin 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 --git a/Ada95/samples/ncurses2-trace_set.adb b/Ada95/samples/ncurses2-trace_set.adb index cfa61234..7537afe4 100644 --- a/Ada95/samples/ncurses2-trace_set.adb +++ b/Ada95/samples/ncurses2-trace_set.adb @@ -35,8 +35,8 @@ ------------------------------------------------------------------------------ -- Author: Eugene V. Melaragno 2000 -- Version Control --- $Revision: 1.4 $ --- $Date: 2011/03/08 10:54:26 $ +-- $Revision: 1.5 $ +-- $Date: 2011/03/23 00:40:33 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with ncurses2.util; use ncurses2.util; @@ -416,9 +416,9 @@ begin 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 --git a/Ada95/samples/sample-curses_demo.adb b/Ada95/samples/sample-curses_demo.adb index d17a400d..4dd96a72 100644 --- a/Ada95/samples/sample-curses_demo.adb +++ b/Ada95/samples/sample-curses_demo.adb @@ -35,8 +35,8 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control --- $Revision: 1.16 $ --- $Date: 2011/03/19 12:06:32 $ +-- $Revision: 1.17 $ +-- $Date: 2011/03/23 00:29:04 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with Terminal_Interface.Curses; use Terminal_Interface.Curses; @@ -122,9 +122,9 @@ package body Sample.Curses_Demo is 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 --git a/Ada95/samples/sample-explanation.adb b/Ada95/samples/sample-explanation.adb index cf1ebb60..5587099b 100644 --- a/Ada95/samples/sample-explanation.adb +++ b/Ada95/samples/sample-explanation.adb @@ -35,8 +35,8 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control --- $Revision: 1.24 $ --- $Date: 2011/03/19 12:18:35 $ +-- $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 @@ -86,6 +86,8 @@ package body Sample.Explanation is 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 @@ -135,9 +137,9 @@ package body Sample.Explanation is 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 @@ package body Sample.Explanation is 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 @@ package body Sample.Explanation is 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 @@ package body Sample.Explanation is 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 @@ package body Sample.Explanation is 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 @@ package body Sample.Explanation is 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 @@ package body Sample.Explanation is 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,12 +405,26 @@ package body Sample.Explanation is 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); -exception - when Name_Error => + 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; + raise Name_Error; + end if; end Sample.Explanation; diff --git a/Ada95/samples/sample-form_demo.adb b/Ada95/samples/sample-form_demo.adb index e26a5d98..ed84526f 100644 --- a/Ada95/samples/sample-form_demo.adb +++ b/Ada95/samples/sample-form_demo.adb @@ -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 @@ package body Sample.Form_Demo is 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 --git a/Ada95/samples/sample-function_key_setting.adb b/Ada95/samples/sample-function_key_setting.adb index 0ce3a224..4ff70be7 100644 --- a/Ada95/samples/sample-function_key_setting.adb +++ b/Ada95/samples/sample-function_key_setting.adb @@ -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 @@ package body Sample.Function_Key_Setting is 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 @@ package body Sample.Function_Key_Setting is 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 @@ package body Sample.Function_Key_Setting is 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 --git a/Ada95/samples/sample-header_handler.adb b/Ada95/samples/sample-header_handler.adb index efa5badb..ad60caf4 100644 --- a/Ada95/samples/sample-header_handler.adb +++ b/Ada95/samples/sample-header_handler.adb @@ -35,14 +35,16 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control --- $Revision: 1.18 $ --- $Date: 2011/03/19 12:13:56 $ +-- $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 diff --git a/Ada95/samples/sample-keyboard_handler.adb b/Ada95/samples/sample-keyboard_handler.adb index da61051c..1d3f20c7 100644 --- a/Ada95/samples/sample-keyboard_handler.adb +++ b/Ada95/samples/sample-keyboard_handler.adb @@ -35,8 +35,8 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control --- $Revision: 1.15 $ --- $Date: 2011/03/19 12:09:02 $ +-- $Revision: 1.16 $ +-- $Date: 2011/03/23 00:34:24 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with Ada.Strings; use Ada.Strings; @@ -111,7 +111,7 @@ package body Sample.Keyboard_Handler is 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 @@ package body Sample.Keyboard_Handler is 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); diff --git a/Ada95/samples/sample-menu_demo.adb b/Ada95/samples/sample-menu_demo.adb index 38646748..80cd94b1 100644 --- a/Ada95/samples/sample-menu_demo.adb +++ b/Ada95/samples/sample-menu_demo.adb @@ -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 @@ package body Sample.Menu_Demo is 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 @@ package body Sample.Menu_Demo is 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 @@ package body Sample.Menu_Demo is 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 --git a/Ada95/samples/sample-text_io_demo.adb b/Ada95/samples/sample-text_io_demo.adb index 0b385c45..a458a37c 100644 --- a/Ada95/samples/sample-text_io_demo.adb +++ b/Ada95/samples/sample-text_io_demo.adb @@ -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.Function_Key_Setting; use Sample.Function_Key_Setting; 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 --git a/Ada95/samples/sample.adb b/Ada95/samples/sample.adb index 648036f7..9b3759f0 100644 --- a/Ada95/samples/sample.adb +++ b/Ada95/samples/sample.adb @@ -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 @@ package body Sample is 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 @@ package body Sample is 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 --git a/Ada95/src/Makefile.in b/Ada95/src/Makefile.in index 002dc64c..dd785a86 100644 --- a/Ada95/src/Makefile.in +++ b/Ada95/src/Makefile.in @@ -28,7 +28,7 @@ # # Author: Juergen Pfeifer, 1996 # -# $Id: Makefile.in,v 1.55 2011/03/19 19:02:35 tom Exp $ +# $Id: Makefile.in,v 1.58 2011/03/27 00:14:06 tom Exp $ # .SUFFIXES: @@ -44,6 +44,7 @@ top_srcdir = @top_srcdir@ srcdir = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ +includedir = @includedir@ libdir = ${exec_prefix}/lib LIBDIR = $(DESTDIR)$(libdir) @@ -224,7 +225,7 @@ c_varargs_to_ada.o : $(srcdir)/c_varargs_to_ada.c ############################################################################### -@USE_OLD_MAKERULES@MIXED_OBJS = $(C_OBJS) $(LIBOBJS) @cf_generic_objects@ +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) \ @@ -246,20 +247,20 @@ 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 $@ @@ -269,10 +270,10 @@ SHARED_DIRS = \ $(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 -@MAKE_ADA_SHAREDLIB@ $(AR) $(ARFLAGS) $@ $(MIXED_OBJS) install \ install.libs :: $(ADA_INCLUDE) diff --git a/Ada95/src/terminal_interface-curses-forms-field_types-enumeration-ada.adb b/Ada95/src/terminal_interface-curses-forms-field_types-enumeration-ada.adb index b3eaf447..d38e062a 100644 --- a/Ada95/src/terminal_interface-curses-forms-field_types-enumeration-ada.adb +++ b/Ada95/src/terminal_interface-curses-forms-field_types-enumeration-ada.adb @@ -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 @@ package body Terminal_Interface.Curses.Forms.Field_Types.Enumeration.Ada is 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 --git a/Ada95/src/terminal_interface-curses-forms-field_types-enumeration.adb b/Ada95/src/terminal_interface-curses-forms-field_types-enumeration.adb index 5eb5e817..12648e5a 100644 --- a/Ada95/src/terminal_interface-curses-forms-field_types-enumeration.adb +++ b/Ada95/src/terminal_interface-curses-forms-field_types-enumeration.adb @@ -35,7 +35,7 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- $Revision: 1.9 $ +-- $Revision: 1.10 $ -- Binding Version 01.00 ------------------------------------------------------------------------------ with Ada.Unchecked_Deallocation; @@ -63,13 +63,13 @@ package body Terminal_Interface.Curses.Forms.Field_Types.Enumeration is 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 @@ package body Terminal_Interface.Curses.Forms.Field_Types.Enumeration is 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; diff --git a/Ada95/src/terminal_interface-curses-forms-field_types-user-choice.adb b/Ada95/src/terminal_interface-curses-forms-field_types-user-choice.adb index 2a3ae477..3a7e6b5a 100644 --- a/Ada95/src/terminal_interface-curses-forms-field_types-user-choice.adb +++ b/Ada95/src/terminal_interface-curses-forms-field_types-user-choice.adb @@ -35,19 +35,17 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- $Revision: 1.16 $ --- $Date: 2011/03/08 01:16:49 $ +-- $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 Curses_Bool @@ -55,7 +53,7 @@ package body Terminal_Interface.Curses.Forms.Field_Types.User.Choice 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 Curses_Bool (Boolean'Pos (Result)); @@ -67,7 +65,7 @@ package body Terminal_Interface.Curses.Forms.Field_Types.User.Choice 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 Curses_Bool (Boolean'Pos (Result)); diff --git a/Ada95/src/terminal_interface-curses-forms-field_types-user.adb b/Ada95/src/terminal_interface-curses-forms-field_types-user.adb index f544637b..2dd295db 100644 --- a/Ada95/src/terminal_interface-curses-forms-field_types-user.adb +++ b/Ada95/src/terminal_interface-curses-forms-field_types-user.adb @@ -35,11 +35,11 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- $Revision: 1.17 $ --- $Date: 2011/03/08 01:16:49 $ +-- $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 @@ -76,17 +76,16 @@ package body Terminal_Interface.Curses.Forms.Field_Types.User is 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 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 Curses_Bool (Boolean'Pos (Result)); @@ -97,7 +96,8 @@ package body Terminal_Interface.Curses.Forms.Field_Types.User is 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 Curses_Bool (Boolean'Pos (Result)); diff --git a/Ada95/src/terminal_interface-curses-forms-field_types.adb b/Ada95/src/terminal_interface-curses-forms-field_types.adb index cff398a9..5195a20a 100644 --- a/Ada95/src/terminal_interface-curses-forms-field_types.adb +++ b/Ada95/src/terminal_interface-curses-forms-field_types.adb @@ -35,13 +35,14 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- $Revision: 1.22 $ --- $Date: 2011/03/08 01:16:49 $ +-- $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 @@ package body Terminal_Interface.Curses.Forms.Field_Types is 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 @@ package body Terminal_Interface.Curses.Forms.Field_Types is 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; @@ -105,18 +105,19 @@ package body Terminal_Interface.Curses.Forms.Field_Types is 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; @@ -144,10 +145,10 @@ package body Terminal_Interface.Curses.Forms.Field_Types is 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; @@ -161,12 +162,13 @@ package body Terminal_Interface.Curses.Forms.Field_Types is function Field_Check_Router (Fld : Field; 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; @@ -175,12 +177,13 @@ package body Terminal_Interface.Curses.Forms.Field_Types is function Char_Check_Router (Ch : 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; @@ -189,12 +192,13 @@ package body Terminal_Interface.Curses.Forms.Field_Types is function Next_Router (Fld : Field; 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; @@ -203,12 +207,13 @@ package body Terminal_Interface.Curses.Forms.Field_Types is function Prev_Router (Fld : Field; 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 --git a/Ada95/src/terminal_interface-curses-forms.adb b/Ada95/src/terminal_interface-curses-forms.adb index 68825fc3..915ed584 100644 --- a/Ada95/src/terminal_interface-curses-forms.adb +++ b/Ada95/src/terminal_interface-curses-forms.adb @@ -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 @@ package body Terminal_Interface.Curses.Forms is 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 @@ package body Terminal_Interface.Curses.Forms is 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 @@ package body Terminal_Interface.Curses.Forms is 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 --git a/Ada95/src/terminal_interface-curses-menus.adb b/Ada95/src/terminal_interface-curses-menus.adb index 9fce6de6..a7dca07c 100644 --- a/Ada95/src/terminal_interface-curses-menus.adb +++ b/Ada95/src/terminal_interface-curses-menus.adb @@ -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 @@ package body Terminal_Interface.Curses.Menus is 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 @@ package body Terminal_Interface.Curses.Menus is 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 @@ package body Terminal_Interface.Curses.Menus is 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 --git a/Ada95/src/terminal_interface-curses-text_io.adb b/Ada95/src/terminal_interface-curses-text_io.adb index 4b29514e..e2ca27f2 100644 --- a/Ada95/src/terminal_interface-curses-text_io.adb +++ b/Ada95/src/terminal_interface-curses-text_io.adb @@ -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 @@ package body Terminal_Interface.Curses.Text_IO is 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 --git a/MANIFEST b/MANIFEST index fd5f8e41..a2fd843c 100644 --- a/MANIFEST +++ b/MANIFEST @@ -6,6 +6,7 @@ ./Ada95/aclocal.m4 ./Ada95/configure ./Ada95/configure.in +./Ada95/doc/Makefile.in ./Ada95/gen/Makefile.in ./Ada95/gen/adacurses-config.in ./Ada95/gen/gen.c @@ -32,6 +33,15 @@ ./Ada95/include/ncurses_defs ./Ada95/make-tar.sh ./Ada95/mk-1st.awk +./Ada95/package/AdaCurses-doc.spec +./Ada95/package/AdaCurses.spec +./Ada95/package/debian/compat +./Ada95/package/debian/control +./Ada95/package/debian/copyright +./Ada95/package/debian/docs +./Ada95/package/debian/rules +./Ada95/package/debian/source/format +./Ada95/package/debian/watch ./Ada95/samples/Makefile.in ./Ada95/samples/README ./Ada95/samples/explain.txt @@ -1055,6 +1065,14 @@ ./test/ncurses.c ./test/ncurses_tst.hin ./test/newdemo.c +./test/package/debian/compat +./test/package/debian/control +./test/package/debian/copyright +./test/package/debian/docs +./test/package/debian/rules +./test/package/debian/source/format +./test/package/debian/watch +./test/package/ncurses-examples.spec ./test/programs ./test/railroad.c ./test/rain.c diff --git a/NEWS b/NEWS index a68ddf14..a3a757d0 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.1665 2011/03/19 23:25:18 tom Exp $ +-- $Id: NEWS,v 1.1673 2011/03/26 23:57:13 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,28 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20110326 + + add special check in Ada95/configure script for ncurses6 reentrant + code. + + regen Ada html documentation. + + build-fix for Ada shared libraries versus the varargs workaround. + + add rpm and dpkg scripts for Ada95 and test directories, for test + builds. + + update test/configure macros CF_CURSES_LIBS, CF_XOPEN_SOURCE and + CF_X_ATHENA_LIBS. + + add configure check to determine if gnat's project feature supports + libraries, i.e., collections of .ali files. + + make all dereferences in Ada95 samples explicit. + + fix typo in comment in lib_add_wch.c (patch by Petr Pavlu). + + add configure check for, ifdef's for math.h which is in a separate + package on Solaris and potentially not installed (report by Petr + Pavlu). + > fixes for Ada95 binding (Nicolas Boulenguez): + + improve type-checking in Ada95 by eliminating a few warning-suppress + pragmas. + + suppress unreferenced warnings. + + make all dereferences in binding explicit. + 20110319 + regen Ada html documentation. + change order of -I options from ncurses*-config script when the diff --git a/aclocal.m4 b/aclocal.m4 index ed61a677..f331dfb9 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -28,7 +28,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: aclocal.m4,v 1.550 2011/03/19 18:48:42 tom Exp $ +dnl $Id: aclocal.m4,v 1.551 2011/03/24 00:35:20 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 @@ rm -rf conftest* 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 @@ fi 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,8 +1923,16 @@ else 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: 3 updated: 2011/03/19 14:47:45 @@ -1919,7 +1993,7 @@ fi rm -rf conftest* *~conftest* ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GNAT_VERSION version: 16 updated: 2010/11/13 14:15:18 +dnl CF_GNAT_VERSION version: 17 updated: 2011/03/23 20:24:41 dnl --------------- dnl Verify version of GNAT. AC_DEFUN([CF_GNAT_VERSION], @@ -1939,9 +2013,6 @@ case $cf_gnat_version in #(vi cf_cv_prog_gnat_correct=no ;; esac - -CF_GNAT_GENERICS -CF_GNAT_PROJECTS ]) dnl --------------------------------------------------------------------------- dnl CF_GNU_SOURCE version: 6 updated: 2005/07/09 13:23:07 diff --git a/configure b/configure index d1ea9ebd..ade6eece 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.517 . +# From configure.in Revision: 1.519 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20101002. # @@ -13376,6 +13376,7 @@ fcntl.h \ getopt.h \ limits.h \ locale.h \ +math.h \ poll.h \ sys/bsdtypes.h \ sys/ioctl.h \ @@ -13390,23 +13391,23 @@ wctype.h \ 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 @@ else 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 @@ else 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 @@ main (); } _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 @@ fi 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 @@ else 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 @@ bzero (); } _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 @@ fi 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 @@ main () } _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 @@ rm -f conftest.$ac_objext conftest.$ac_ext 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_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ 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 @@ else 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 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO 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 @@ fi 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 @@ main () } _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 @@ ac_cv_c_const=no 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 @@ EOF 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 @@ else 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 @@ $ac_kw int foo () {return 0; } _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 @@ rm -f conftest.$ac_objext conftest.$ac_ext 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 @@ if test "$ac_cv_c_inline" != no ; then : 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 @@ else 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 @@ ${cf_cv_main_return:-return} foo() } _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 @@ rm -f conftest.$ac_objext conftest.$ac_ext 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 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 @@ else "int" do cat >conftest.$ac_ext <<_ACEOF -#line 13993 "configure" +#line 13994 "configure" #include "confdefs.h" #include @@ -14013,16 +14014,16 @@ signal(SIGINT, handler); } _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 @@ rm -f conftest.$ac_objext conftest.$ac_ext 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 @@ else 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 @@ int main() _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 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 @@ long x = 1L + 1UL + 1U + 1 } _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 @@ rm -f conftest.$ac_objext conftest.$ac_ext 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 @@ test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t="" ### 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 @@ int x = (int) errno } _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 @@ fi 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 @@ fi # 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 @@ errno = 2 } _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 @@ fi 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 @@ EOF 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 @@ else 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 @@ EOF 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 @@ else _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 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 @@ vsnprintf \ 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 @@ f = $ac_func; } _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 @@ eval "$as_ac_var=no" 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 @@ main () } _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 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 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 @@ EOF 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 @@ int x = isascii(' ') } _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 @@ fi 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 @@ struct sigaction act } _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 @@ else 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 @@ struct sigaction act } _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 @@ fi 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 @@ if test "$cross_compiling" = yes; then 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 @@ int main() { _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 @@ fi 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 @@ unistd.h \ 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 @@ else 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 @@ else 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 @@ struct termios foo; int x = foo.c_iflag } _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 @@ else 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 @@ struct termios foo; int x = foo.c_iflag } _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 @@ rm -f conftest.$ac_objext conftest.$ac_ext 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 @@ tcgetattr(1, &foo); } _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 @@ cf_cv_have_tcgetattr=no 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 @@ main () } _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 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 15011 "configure" +#line 15012 "configure" #include "confdefs.h" #include @@ -15030,16 +15031,16 @@ main () } _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 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 15050 "configure" +#line 15051 "configure" #include "confdefs.h" #include @@ -15069,16 +15070,16 @@ main () } _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 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 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 @@ EOF ;; 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 @@ else 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 @@ f = mkstemp; } _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 @@ ac_cv_func_mkstemp=no 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 @@ int main() _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 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 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 @@ else 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 @@ main () } _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 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 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 @@ EOF 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 @@ int i; } _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 @@ ac_cv_type_signal=int 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 @@ sigaction_t x } _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 @@ fi 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 @@ do 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 @@ main () } _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 @@ rm -f conftest.$ac_objext conftest.$ac_ext 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 @@ EOF 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 @@ f = memmove; } _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 @@ ac_cv_func_memmove=no 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 @@ f = bcopy; } _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 @@ ac_cv_func_bcopy=no 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 @@ else 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 @@ int main() { _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 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 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 @@ EOF 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 @@ if test "$cross_compiling" = yes; then 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 @@ int main() { } _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 @@ fi 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 @@ main () } _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 @@ cf_cv_have_va_copy=no 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 @@ main () } _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 @@ cf_cv_have___va_copy=no 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 @@ if (sizeof (pid_t)) } _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 @@ ac_cv_type_pid_t=no 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 @@ fi 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 @@ else 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 @@ f = $ac_func; } _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 @@ eval "$as_ac_var=no" 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 @@ else } _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 @@ fi 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 @@ if test "x$ac_cv_func_fork_works" = xcross; then 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 @@ else 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 @@ main () } _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 @@ fi 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 @@ fi # 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 @@ else 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 @@ openpty (); } _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 @@ fi 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 @@ else 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 @@ else 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 @@ main () } _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 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 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 @@ if test -n "$with_hashed_db/include" ; then 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 @@ printf("Hello") } _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 @@ rm -f conftest.$ac_objext conftest.$ac_ext 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 -n "$with_hashed_db/lib" ; then 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 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 @@ else 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 @@ cf_cv_hashed_db_version=unknown 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 @@ DBT *foo = 0 } _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 @@ rm -f conftest.$ac_objext conftest.$ac_ext 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 @@ do 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 @@ main () } _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 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 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 @@ fi 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 @@ fi # 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 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 16764 "configure" +#line 16765 "configure" #include "confdefs.h" int @@ -16773,23 +16774,23 @@ bool foo = false } _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 @@ bool foo = false } _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 @@ rm -f conftest.$ac_objext conftest.$ac_ext 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 @@ if test "${cf_cv_cc_bool_type+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 16845 "configure" +#line 16846 "configure" #include "confdefs.h" #include @@ -16857,16 +16858,16 @@ bool x = false } _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 @@ rm -f conftest.$ac_objext conftest.$ac_ext 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 @@ os2*) #(vi 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 @@ else 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 @@ strstreambuf foo(buf, sizeof(buf)) } _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 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext 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 @@ CF_EOF # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -if { (eval echo "$as_me: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 @@ rm -rf conftest* 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 @@ os2*) #(vi ;; 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 @@ two_arg_error_handler_t foo2 = lib_error_handler } _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 @@ else 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 @@ two_arg_error_handler_t foo2 = lib_error_handler } _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 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save" - echo "$as_me: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_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return -echo "$as_me: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 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 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 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 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 @@ fi 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 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 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 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 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 @@ rm -f conftest.err conftest.$ac_ext 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 @@ ac_main_return=return 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 @@ else 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 @@ cerr << "testing" << endl; } _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 @@ cat conftest.$ac_ext >&5 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 @@ EOF 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 @@ if test "${cf_cv_header_stdbool_h+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 17415 "configure" +#line 17416 "configure" #include "confdefs.h" int @@ -17424,23 +17425,23 @@ bool foo = false } _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 @@ bool foo = false } _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 @@ rm -f conftest.$ac_objext conftest.$ac_ext 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 @@ if test "${cf_cv_builtin_bool+set}" = set; then else cat >conftest.$ac_ext <<_ACEOF -#line 17496 "configure" +#line 17497 "configure" #include "confdefs.h" #include @@ -17508,16 +17509,16 @@ bool x = false } _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 @@ rm -f conftest.$ac_objext conftest.$ac_ext 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 @@ else 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 @@ main() _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 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 @@ do test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" cat >conftest.$ac_ext <<_ACEOF -#line 17641 "configure" +#line 17642 "configure" #include "confdefs.h" #include @@ -17652,16 +17653,16 @@ main () } _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 @@ ac_main_return=return 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 @@ void main() { } _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_compiler_gnu=$ac_cv_cxx_compiler_gnu 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 @@ EOF 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_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_main_return=return cat >conftest.$ac_ext <<_ACEOF -#line 17776 "configure" +#line 17777 "configure" #include "confdefs.h" class NCursesPanel @@ -17817,16 +17818,16 @@ main () } _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_compiler_gnu=$ac_cv_cxx_compiler_gnu 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 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 @@ else 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 @@ main() _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 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 -f "${srcdir}/Ada95/Makefile.in" ; then 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 @@ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;} cf_ada_make=gnatmake # Extract the first word of "$cf_ada_make", so it can be a program name with args. set dummy $cf_ada_make; ac_word=$2 -echo "$as_me: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 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_gnat_exists="yes" -echo "$as_me:18047: found $ac_dir/$ac_word" >&5 +echo "$as_me:18048: found $ac_dir/$ac_word" >&5 break done @@ -18053,10 +18054,10 @@ fi 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 @@ if test "$ac_cv_prog_gnat_exists" = no; then 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 @@ case $cf_gnat_version in #(vi 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 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_M4_exists="yes" -echo "$as_me:18154: found $ac_dir/$ac_word" >&5 +echo "$as_me:18104: found $ac_dir/$ac_word" >&5 break done @@ -18160,10 +18110,10 @@ fi 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,7 +18122,7 @@ fi echo Ada95 binding required program m4 not found. Ada95 binding disabled. fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me: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* *~conftest* @@ -18200,7 +18150,7 @@ else fi rm -rf conftest* *~conftest* - echo "$as_me:18203: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:18153: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi fi @@ -18225,7 +18175,29 @@ fi ;; esac -echo "$as_me:18228: checking if GNAT pragma Unreferenced works" >&5 +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 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 @@ -18256,7 +18228,7 @@ fi rm -rf conftest* *~conftest* fi -echo "$as_me:18259: result: $cf_cv_pragma_unreferenced" >&5 +echo "$as_me:18231: 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). @@ -18266,7 +18238,105 @@ else PRAGMA_UNREF=FALSE fi -echo "$as_me:18269: checking for ada-compiler" >&5 +cf_gnat_libraries=no +cf_gnat_projects=no + +echo "$as_me:18244: 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:18312: result: $cf_gnat_projects" >&5 +echo "${ECHO_T}$cf_gnat_projects" >&6 + +if test $cf_gnat_projects = yes +then + echo "$as_me:18317: checking if GNAT supports libraries" >&5 +echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 + echo "$as_me:18319: 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:18339: 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. @@ -18277,12 +18347,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:18280: result: $cf_ada_compiler" >&5 +echo "$as_me:18350: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:18285: checking for ada-include" >&5 +echo "$as_me:18355: 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. @@ -18318,7 +18388,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:18321: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:18391: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -18327,10 +18397,10 @@ esac fi ADA_INCLUDE="$withval" -echo "$as_me:18330: result: $ADA_INCLUDE" >&5 +echo "$as_me:18400: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:18333: checking for ada-objects" >&5 +echo "$as_me:18403: 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. @@ -18366,7 +18436,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:18369: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:18439: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -18375,10 +18445,10 @@ esac fi ADA_OBJECTS="$withval" -echo "$as_me:18378: result: $ADA_OBJECTS" >&5 +echo "$as_me:18448: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:18381: checking if an Ada95 shared-library should be built" >&5 +echo "$as_me:18451: 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. @@ -18388,7 +18458,7 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:18391: result: $with_ada_sharedlib" >&5 +echo "$as_me:18461: result: $with_ada_sharedlib" >&5 echo "${ECHO_T}$with_ada_sharedlib" >&6 ADA_SHAREDLIB='lib$(LIB_NAME).so.1' @@ -18419,7 +18489,7 @@ fi ### chooses to split module lists into libraries. ### ### (see CF_LIB_RULES). -echo "$as_me:18422: checking for library subsets" >&5 +echo "$as_me:18492: checking for library subsets" >&5 echo $ECHO_N "checking for library subsets... $ECHO_C" >&6 LIB_SUBSETS= @@ -18460,7 +18530,7 @@ fi test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar" test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs" -echo "$as_me:18463: result: $LIB_SUBSETS" >&5 +echo "$as_me:18533: result: $LIB_SUBSETS" >&5 echo "${ECHO_T}$LIB_SUBSETS" >&6 ### Construct the list of include-directories to be generated @@ -18498,7 +18568,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:18501: checking default library suffix" >&5 +echo "$as_me:18571: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -18509,10 +18579,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 shared) DFT_ARG_SUFFIX='' ;; esac test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" -echo "$as_me:18512: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:18582: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:18515: checking default library-dependency suffix" >&5 +echo "$as_me:18585: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in #(vi @@ -18565,10 +18635,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 esac test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}" test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}" -echo "$as_me:18568: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:18638: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:18571: checking default object directory" >&5 +echo "$as_me:18641: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -18584,12 +18654,12 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:18587: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:18657: 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:18592: checking c++ library-dependency suffix" >&5 +echo "$as_me:18662: 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 @@ -18646,7 +18716,7 @@ else 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:18649: result: $CXX_LIB_SUFFIX" >&5 +echo "$as_me:18719: result: $CXX_LIB_SUFFIX" >&5 echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6 fi @@ -18800,19 +18870,19 @@ fi if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED" then - echo "$as_me:18803: checking if linker supports switching between static/dynamic" >&5 + echo "$as_me:18873: 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:18812: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:18882: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18815: \$? = $ac_status" >&5 + echo "$as_me:18885: \$? = $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 @@ -18823,10 +18893,10 @@ EOF LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 18826 "configure" +#line 18896 "configure" #include "confdefs.h" -#line 18829 "configure" +#line 18899 "configure" #include int cf_ldflags_static(FILE *fp); @@ -18841,16 +18911,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18844: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18914: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18847: \$? = $ac_status" >&5 + echo "$as_me:18917: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18850: \"$ac_try\"") >&5 + { (eval echo "$as_me:18920: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18853: \$? = $ac_status" >&5 + echo "$as_me:18923: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_ldflags_static=yes else @@ -18863,7 +18933,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext rm -f libconftest.* LIBS="$cf_save_LIBS" - echo "$as_me:18866: result: $cf_ldflags_static" >&5 + echo "$as_me:18936: result: $cf_ldflags_static" >&5 echo "${ECHO_T}$cf_ldflags_static" >&6 if test $cf_ldflags_static != yes @@ -18879,12 +18949,12 @@ fi ;; esac -echo "$as_me:18882: checking where we will install curses.h" >&5 +echo "$as_me:18952: 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:18887: result: $includedir" >&5 +echo "$as_me:18957: result: $includedir" >&5 echo "${ECHO_T}$includedir" >&6 ### Resolve a conflict between normal and wide-curses by forcing applications @@ -18892,7 +18962,7 @@ echo "${ECHO_T}$includedir" >&6 if test "$with_overwrite" != no ; then if test "$NCURSES_LIBUTF8" = 1 ; then NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)' - { echo "$as_me:18895: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5 + { echo "$as_me:18965: 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 @@ -18909,7 +18979,7 @@ EOF ### Construct the list of subdirectories for which we'll customize makefiles ### with the appropriate compile-rules. -echo "$as_me:18912: checking for src modules" >&5 +echo "$as_me:18982: checking for src modules" >&5 echo $ECHO_N "checking for src modules... $ECHO_C" >&6 # dependencies and linker-arguments for test-programs @@ -18972,7 +19042,7 @@ EOF fi fi done -echo "$as_me:18975: result: $cf_cv_src_modules" >&5 +echo "$as_me:19045: result: $cf_cv_src_modules" >&5 echo "${ECHO_T}$cf_cv_src_modules" >&6 TEST_ARGS="-L${LIB_DIR} $TEST_ARGS" @@ -19178,7 +19248,7 @@ fi # Extract the first word of "tic", so it can be a program name with args. set dummy tic; ac_word=$2 -echo "$as_me:19181: checking for $ac_word" >&5 +echo "$as_me:19251: 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 @@ -19195,7 +19265,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_TIC_PATH="$ac_dir/$ac_word" - echo "$as_me:19198: found $ac_dir/$ac_word" >&5 + echo "$as_me:19268: found $ac_dir/$ac_word" >&5 break fi done @@ -19207,10 +19277,10 @@ fi TIC_PATH=$ac_cv_path_TIC_PATH if test -n "$TIC_PATH"; then - echo "$as_me:19210: result: $TIC_PATH" >&5 + echo "$as_me:19280: result: $TIC_PATH" >&5 echo "${ECHO_T}$TIC_PATH" >&6 else - echo "$as_me:19213: result: no" >&5 + echo "$as_me:19283: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -19218,7 +19288,7 @@ if test -n "$FALLBACK_LIST" then if test "$TIC_PATH" = unknown then - { echo "$as_me:19221: WARNING: no tic program found for fallbacks" >&5 + { echo "$as_me:19291: WARNING: no tic program found for fallbacks" >&5 echo "$as_me: WARNING: no tic program found for fallbacks" >&2;} fi fi @@ -19319,7 +19389,7 @@ DEFS=-DHAVE_CONFIG_H : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:19322: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:19392: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -19495,7 +19565,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:19498: error: ambiguous option: $1 + { { echo "$as_me:19568: 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;} @@ -19514,7 +19584,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:19517: error: unrecognized option: $1 + -*) { { echo "$as_me:19587: 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;} @@ -19620,7 +19690,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; - *) { { echo "$as_me:19623: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:19693: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -19865,13 +19935,14 @@ s,@CXX_ARFLAGS@,$CXX_ARFLAGS,;t t 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,@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 @@ -20028,7 +20099,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:20031: creating $ac_file" >&5 + { echo "$as_me:20102: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -20046,7 +20117,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:20049: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:20120: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -20059,7 +20130,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:20062: error: cannot find input file: $f" >&5 + { { echo "$as_me:20133: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -20125,7 +20196,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:20128: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:20199: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -20136,7 +20207,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:20139: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:20210: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -20149,7 +20220,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:20152: error: cannot find input file: $f" >&5 + { { echo "$as_me:20223: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -20207,7 +20278,7 @@ cat >>$CONFIG_STATUS <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:20210: $ac_file is unchanged" >&5 + { echo "$as_me:20281: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff --git a/configure.in b/configure.in index 1c5b44f8..21809080 100644 --- a/configure.in +++ b/configure.in @@ -28,14 +28,14 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: configure.in,v 1.517 2011/03/19 17:49:19 tom Exp $ +dnl $Id: configure.in,v 1.519 2011/03/24 00:36:08 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.517 $) +AC_REVISION($Revision: 1.519 $) AC_INIT(ncurses/base/lib_initscr.c) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) @@ -1330,6 +1330,7 @@ fcntl.h \ getopt.h \ limits.h \ locale.h \ +math.h \ poll.h \ sys/bsdtypes.h \ sys/ioctl.h \ @@ -1607,7 +1608,9 @@ dnl At the moment we support no other Ada95 compiler. ;; esac + CF_GNAT_GENERICS CF_GNAT_PRAGMA_UNREF + CF_GNAT_PROJECTS CF_WITH_ADA_COMPILER diff --git a/dist.mk b/dist.mk index 11ad95cf..b64522a2 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.804 2011/03/19 00:42:26 tom Exp $ +# $Id: dist.mk,v 1.805 2011/03/22 09:01:34 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,7 +37,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 5 NCURSES_MINOR = 8 -NCURSES_PATCH = 20110319 +NCURSES_PATCH = 20110326 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/doc/html/ada/funcs/B.htm b/doc/html/ada/funcs/B.htm index 451aeaa5..b62dda82 100644 --- a/doc/html/ada/funcs/B.htm +++ b/doc/html/ada/funcs/B.htm @@ -8,7 +8,7 @@
  • Background - terminal_interface-curses-forms.ads:463
  • Background - terminal_interface-curses-menus.ads:455
  • Background - terminal_interface-curses-menus.ads:460 -
  • Baud +
  • Baud
  • Baudrate
  • Beep
  • Beeper diff --git a/doc/html/ada/funcs/C.htm b/doc/html/ada/funcs/C.htm index 1ba46dde..85a094a1 100644 --- a/doc/html/ada/funcs/C.htm +++ b/doc/html/ada/funcs/C.htm @@ -4,7 +4,7 @@

    Functions - C

    [index] diff --git a/doc/html/ada/funcs/D.htm b/doc/html/ada/funcs/D.htm index 4ce9c031..e2db5db8 100644 --- a/doc/html/ada/funcs/D.htm +++ b/doc/html/ada/funcs/D.htm @@ -11,10 +11,10 @@
  • Default_Item_Options
  • Default_Menu_Options
  • Define_Key -
  • Defkey -
  • Def_Prog_Mode -
  • Def_Shell_Mode -
  • Delayoutput +
  • Defkey +
  • Def_Prog_Mode +
  • Def_Shell_Mode +
  • Delayoutput
  • Delay_Output
  • Delete - terminal_interface-curses-forms.ads:319
  • Delete - terminal_interface-curses-forms.ads:638 diff --git a/doc/html/ada/funcs/E.htm b/doc/html/ada/funcs/E.htm index a6b9824a..70d6a2a4 100644 --- a/doc/html/ada/funcs/E.htm +++ b/doc/html/ada/funcs/E.htm @@ -12,7 +12,7 @@
  • End_Screen
  • End_Windows
  • Erase -
  • Erasechar +
  • Erasechar
  • Erase_Character
  • Eti_Exception diff --git a/doc/html/ada/funcs/F.htm b/doc/html/ada/funcs/F.htm index d8ef3896..465e06e5 100644 --- a/doc/html/ada/funcs/F.htm +++ b/doc/html/ada/funcs/F.htm @@ -27,7 +27,7 @@
  • Fld_Info
  • Flush - terminal_interface-curses-text_io.ads:65
  • Flush - terminal_interface-curses-text_io.ads:66 -
  • Flushinp +
  • Flushinp
  • Flush_Input
  • Foreground - terminal_interface-curses-forms.ads:438
  • Foreground - terminal_interface-curses-forms.ads:443 diff --git a/doc/html/ada/funcs/G.htm b/doc/html/ada/funcs/G.htm index d2bd7183..1f7bf212 100644 --- a/doc/html/ada/funcs/G.htm +++ b/doc/html/ada/funcs/G.htm @@ -10,17 +10,17 @@
  • Generic_Prev
  • Get - terminal_interface-curses.ads:1465
  • Get - terminal_interface-curses.ads:1476 -
  • GetBegX -
  • GetBegY -
  • GetCurX -
  • GetCurY -
  • GetMaxX -
  • GetMaxY +
  • GetBegX +
  • GetBegY +
  • GetCurX +
  • GetCurY +
  • GetMaxX +
  • GetMaxY
  • Getmouse -
  • GetParX -
  • GetParY +
  • GetParX +
  • GetParY
  • getwin -
  • Get_Arg +
  • Get_Arg
  • Get_Background
  • Get_Buffer - terminal_interface-curses-forms.ads:366
  • Get_Buffer - terminal_interface-curses-forms.ads:372 @@ -30,7 +30,7 @@
  • Get_Entry
  • Get_Event
  • Get_Fieldindex -
  • Get_Fieldtype +
  • Get_Fieldtype
  • Get_Field_Init_Hook
  • Get_Field_Term_Hook
  • Get_Flag - terminal_interface-curses-termcap.ads:63 diff --git a/doc/html/ada/funcs/H.htm b/doc/html/ada/funcs/H.htm index cc6e3267..4d31cedb 100644 --- a/doc/html/ada/funcs/H.htm +++ b/doc/html/ada/funcs/H.htm @@ -6,11 +6,11 @@ diff --git a/doc/html/ada/funcs/M.htm b/doc/html/ada/funcs/M.htm index 69f5d60a..27dea4e0 100644 --- a/doc/html/ada/funcs/M.htm +++ b/doc/html/ada/funcs/M.htm @@ -37,11 +37,11 @@
  • Move_Window
  • Mvderwin
  • mvwaddch -
  • Mvwdelch +
  • Mvwdelch
  • Mvwin -
  • Mvwinch -
  • Mvwinsch -
  • Mvwinsnstr +
  • Mvwinch +
  • Mvwinsch +
  • Mvwinsnstr
  • M_Post - terminal_interface-curses-forms.adb:916
  • M_Post - terminal_interface-curses-menus.adb:354
  • M_Scale - terminal_interface-curses-forms.adb:643 diff --git a/doc/html/ada/funcs/N.htm b/doc/html/ada/funcs/N.htm index 932a8a0a..40fbf5ae 100644 --- a/doc/html/ada/funcs/N.htm +++ b/doc/html/ada/funcs/N.htm @@ -6,13 +6,13 @@ diff --git a/doc/html/ada/funcs/S.htm b/doc/html/ada/funcs/S.htm index 45b119bc..67478063 100644 --- a/doc/html/ada/funcs/S.htm +++ b/doc/html/ada/funcs/S.htm @@ -4,7 +4,7 @@

    Functions - S

    [index] diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-enumeration-ada__adb.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-enumeration-ada__adb.htm index 8c07d79b..aa1c6665 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-enumeration-ada__adb.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-enumeration-ada__adb.htm @@ -12,7 +12,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 -- @@ -40,8 +40,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; @@ -66,8 +66,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 --git a/doc/html/ada/terminal_interface-curses-forms-field_types-enumeration__adb.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-enumeration__adb.htm index aea55cbb..adac9c06 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-enumeration__adb.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-enumeration__adb.htm @@ -40,7 +40,7 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- @Revision: 1.9 @ +-- @Revision: 1.10 @ -- Binding Version 01.00 ------------------------------------------------------------------------------ with Ada.Unchecked_Deallocation; @@ -68,13 +68,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; @@ -84,10 +84,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; diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-user-choice__adb.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-user-choice__adb.htm index 9fccc4f5..018a19dd 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-user-choice__adb.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-user-choice__adb.htm @@ -40,73 +40,71 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- @Revision: 1.16 @ --- @Date: 2011/03/08 01:16:49 @ +-- @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 Curses_Bool + function Generic_Next (Fld : Field; + Usr : System.Address) return Curses_Bool is - Result : Boolean; - Udf : constant User_Defined_Field_Type_With_Choice_Access := + 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 Curses_Bool (Boolean'Pos (Result)); + Result := Next (Fld, Udf.all); + return Curses_Bool (Boolean'Pos (Result)); end Generic_Next; - function Generic_Prev (Fld : Field; - Usr : System.Address) return Curses_Bool + function Generic_Prev (Fld : Field; + Usr : System.Address) return Curses_Bool is - Result : Boolean; - Udf : constant User_Defined_Field_Type_With_Choice_Access := + 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 Curses_Bool (Boolean'Pos (Result)); + Result := Previous (Fld, Udf.all); + return Curses_Bool (Boolean'Pos (Result)); end Generic_Prev; -- ----------------------------------------------------------------------- -- - function C_Generic_Choice return C_Field_Type + function C_Generic_Choice return C_Field_Type is - Res : Eti_Error; - T : C_Field_Type; + Res : Eti_Error; + T : C_Field_Type; begin if M_Generic_Choice = Null_Field_Type then - T := New_Fieldtype (Generic_Field_Check'Access, + T := New_Fieldtype (Generic_Field_Check'Access, Generic_Char_Check'Access); - if T = Null_Field_Type then + if T = Null_Field_Type then raise Form_Exception; else - Res := Set_Fieldtype_Arg (T, + Res := Set_Fieldtype_Arg (T, Make_Arg'Access, Copy_Arg'Access, Free_Arg'Access); - if Res /= E_Ok then - Eti_Exception (Res); + if Res /= E_Ok then + Eti_Exception (Res); end if; - Res := Set_Fieldtype_Choice (T, + Res := Set_Fieldtype_Choice (T, Generic_Next'Access, Generic_Prev'Access); - if Res /= E_Ok then - Eti_Exception (Res); + if Res /= E_Ok then + Eti_Exception (Res); end if; end if; - M_Generic_Choice := T; + M_Generic_Choice := T; end if; pragma Assert (M_Generic_Choice /= Null_Field_Type); return M_Generic_Choice; diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-user-choice__ads.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-user-choice__ads.htm index c5e51e52..1b0d0ffb 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-user-choice__ads.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-user-choice__ads.htm @@ -80,17 +80,17 @@ -- | Private Part. -- | private - function C_Generic_Choice return C_Field_Type; + function C_Generic_Choice return C_Field_Type; - function Generic_Next (Fld : Field; - Usr : System.Address) return Curses_Bool; + function Generic_Next (Fld : Field; + 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 derivatives. It routes -- the call to the Next implementation for the type. - function Generic_Prev (Fld : Field; - Usr : System.Address) return Curses_Bool; + function Generic_Prev (Fld : Field; + 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 derivatives. It routes diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-user__adb.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-user__adb.htm index 8d6b3460..ed3a5e1b 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-user__adb.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-user__adb.htm @@ -40,11 +40,11 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- @Revision: 1.17 @ --- @Date: 2011/03/08 01:16:49 @ +-- @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 @@ -81,31 +81,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 Curses_Bool + function Generic_Field_Check (Fld : Field; + 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); + Result : Boolean; + Udf : constant User_Defined_Field_Type_Access := + User_Defined_Field_Type_Access + (Argument_Access (Argument_Conversions.To_Pointer (Usr)).all.Typ); begin - Result := Field_Check (Fld, Udf.all); - return Curses_Bool (Boolean'Pos (Result)); + Result := Field_Check (Fld, Udf.all); + return Curses_Bool (Boolean'Pos (Result)); end Generic_Field_Check; - function Generic_Char_Check (Ch : C_Int; - Usr : System.Address) return Curses_Bool + function Generic_Char_Check (Ch : 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); + Result : Boolean; + Udf : constant User_Defined_Field_Type_Access := + User_Defined_Field_Type_Access + (Argument_Access (Argument_Conversions.To_Pointer (Usr)).all.Typ); begin - Result := Character_Check (Character'Val (Ch), Udf.all); - return Curses_Bool (Boolean'Pos (Result)); + Result := Character_Check (Character'Val (Ch), Udf.all); + return Curses_Bool (Boolean'Pos (Result)); end Generic_Char_Check; -- ----------------------------------------------------------------------- diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types-user__ads.htm b/doc/html/ada/terminal_interface-curses-forms-field_types-user__ads.htm index c2285333..107c8637 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types-user__ads.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types-user__ads.htm @@ -83,15 +83,15 @@ private function C_Generic_Type return C_Field_Type; - function Generic_Field_Check (Fld : Field; - Usr : System.Address) return Curses_Bool; + function Generic_Field_Check (Fld : Field; + 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 derivatives. It routes -- the call to the Field_Check implementation for the type. - function Generic_Char_Check (Ch : C_Int; - Usr : System.Address) return Curses_Bool; + function Generic_Char_Check (Ch : 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 derivatives. It routes diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types__adb.htm b/doc/html/ada/terminal_interface-curses-forms-field_types__adb.htm index 21606641..2a48f9c5 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types__adb.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types__adb.htm @@ -40,31 +40,30 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- @Revision: 1.22 @ --- @Date: 2011/03/08 01:16:49 @ +-- @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 -- |===================================================================== -- | -package body Terminal_Interface.Curses.Forms.Field_Types is +package body Terminal_Interface.Curses.Forms.Field_Types is 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; + function Get_Fieldtype (F : Field) return C_Field_Type; pragma Import (C, Get_Fieldtype, "field_type"); - function Get_Arg (F : Field) return System.Address; + function Get_Arg (F : Field) return System.Address; pragma Import (C, Get_Arg, "field_arg"); -- | -- |===================================================================== @@ -73,23 +72,24 @@ -- | -- | -- | - function Get_Type (Fld : Field) return Field_Type_Access + function Get_Type (Fld : Field) return Field_Type_Access is - Low_Level : constant C_Field_Type := Get_Fieldtype (Fld); - Arg : Argument_Access; + Low_Level : constant C_Field_Type := Get_Fieldtype (Fld); + Arg : Argument_Access; begin - if Low_Level = Null_Field_Type then + if Low_Level = Null_Field_Type then return null; else - if Low_Level = M_Builtin_Router or else - 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)); - if Arg = null then + if Low_Level = M_Builtin_Router or else + Low_Level = M_Generic_Type or else + Low_Level = M_Choice_Router or else + Low_Level = M_Generic_Choice then + 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; @@ -110,110 +110,115 @@ procedure Freeargs is new Ada.Unchecked_Deallocation (Argument, Argument_Access); - To_Be_Free : Argument_Access := To_Argument_Access (Usr); - Low_Level : C_Field_Type; + 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; end Free_Arg; - procedure Wrap_Builtin (Fld : Field; - Typ : Field_Type'Class; - Cft : C_Field_Type := C_Builtin_Router) + procedure Wrap_Builtin (Fld : Field; + Typ : Field_Type'Class; + Cft : C_Field_Type := C_Builtin_Router) is - Usr_Arg : constant System.Address := Get_Arg (Fld); - Low_Level : constant C_Field_Type := Get_Fieldtype (Fld); - Arg : Argument_Access; - Res : Eti_Error; - function Set_Fld_Type (F : Field := Fld; - Cf : C_Field_Type := Cft; - Arg1 : Argument_Access) return C_Int; + Usr_Arg : constant System.Address := Get_Arg (Fld); + Low_Level : constant C_Field_Type := Get_Fieldtype (Fld); + Arg : Argument_Access; + Res : Eti_Error; + 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_user"); begin - pragma Assert (Low_Level /= Null_Field_Type); + pragma Assert (Low_Level /= Null_Field_Type); if Cft /= C_Builtin_Router and then Cft /= C_Choice_Router then raise Form_Exception; else - Arg := new Argument'(Usr => System.Null_Address, + Arg := new Argument'(Usr => System.Null_Address, 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); + Cft => Get_Fieldtype (Fld)); + if Usr_Arg /= System.Null_Address then + 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; - Res := Set_Fld_Type (Arg1 => Arg); - if Res /= E_Ok then - Eti_Exception (Res); + Res := Set_Fld_Type (Arg1 => Arg); + if Res /= E_Ok then + Eti_Exception (Res); end if; end if; end Wrap_Builtin; - function Field_Check_Router (Fld : Field; - Usr : System.Address) return Curses_Bool + function Field_Check_Router (Fld : Field; + 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 Curses_Bool + function Char_Check_Router (Ch : 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 Curses_Bool + function Next_Router (Fld : Field; + 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 Curses_Bool + function Prev_Router (Fld : Field; + 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; @@ -221,26 +226,26 @@ -- ----------------------------------------------------------------------- -- - function C_Builtin_Router return C_Field_Type + function C_Builtin_Router return C_Field_Type is - Res : Eti_Error; - T : C_Field_Type; + Res : Eti_Error; + T : C_Field_Type; begin if M_Builtin_Router = Null_Field_Type then - T := New_Fieldtype (Field_Check_Router'Access, + T := New_Fieldtype (Field_Check_Router'Access, Char_Check_Router'Access); - if T = Null_Field_Type then + if T = Null_Field_Type then raise Form_Exception; else - Res := Set_Fieldtype_Arg (T, + Res := Set_Fieldtype_Arg (T, Make_Arg'Access, Copy_Arg'Access, Free_Arg'Access); - if Res /= E_Ok then - Eti_Exception (Res); + if Res /= E_Ok then + Eti_Exception (Res); end if; end if; - M_Builtin_Router := T; + M_Builtin_Router := T; end if; pragma Assert (M_Builtin_Router /= Null_Field_Type); return M_Builtin_Router; @@ -248,33 +253,33 @@ -- ----------------------------------------------------------------------- -- - function C_Choice_Router return C_Field_Type + function C_Choice_Router return C_Field_Type is - Res : Eti_Error; - T : C_Field_Type; + Res : Eti_Error; + T : C_Field_Type; begin if M_Choice_Router = Null_Field_Type then - T := New_Fieldtype (Field_Check_Router'Access, + T := New_Fieldtype (Field_Check_Router'Access, Char_Check_Router'Access); - if T = Null_Field_Type then + if T = Null_Field_Type then raise Form_Exception; else - Res := Set_Fieldtype_Arg (T, + Res := Set_Fieldtype_Arg (T, Make_Arg'Access, Copy_Arg'Access, Free_Arg'Access); - if Res /= E_Ok then - Eti_Exception (Res); + if Res /= E_Ok then + Eti_Exception (Res); end if; - Res := Set_Fieldtype_Choice (T, + Res := Set_Fieldtype_Choice (T, Next_Router'Access, Prev_Router'Access); - if Res /= E_Ok then - Eti_Exception (Res); + if Res /= E_Ok then + Eti_Exception (Res); end if; end if; - M_Choice_Router := T; + M_Choice_Router := T; end if; pragma Assert (M_Choice_Router /= Null_Field_Type); return M_Choice_Router; diff --git a/doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm b/doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm index 04e4fb5c..94f90eae 100644 --- a/doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm +++ b/doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm @@ -45,7 +45,7 @@ ------------------------------------------------------------------------------ with Interfaces.C; -package Terminal_Interface.Curses.Forms.Field_Types is +package Terminal_Interface.Curses.Forms.Field_Types is pragma Preelaborate (Terminal_Interface.Curses.Forms.Field_Types); use type Interfaces.C.int; subtype C_Int is Interfaces.C.int; @@ -81,7 +81,7 @@ -- |===================================================================== -- #1A NAME="AFU_2"#2| - function Get_Type (Fld : Field) return Field_Type_Access; + function Get_Type (Fld : Field) return Field_Type_Access; -- AKA: field_type() -- AKA: field_arg() -- In Ada95 we can combine these. If you try to retrieve the field type @@ -150,12 +150,12 @@ -- Two wrapper functions to access those low-level fieldtypes defined -- in this package. - function C_Builtin_Router return C_Field_Type; - function C_Choice_Router return C_Field_Type; + function C_Builtin_Router return C_Field_Type; + function C_Choice_Router return C_Field_Type; - procedure Wrap_Builtin (Fld : Field; - Typ : Field_Type'Class; - Cft : C_Field_Type := C_Builtin_Router); + procedure Wrap_Builtin (Fld : Field; + Typ : Field_Type'Class; + Cft : C_Field_Type := C_Builtin_Router); -- This procedure has to be called by the Set_Field_Type implementation -- for builtin low-level fieldtypes to replace it by an Ada95 -- conformant Field_Type object. @@ -179,32 +179,32 @@ -- This is the Freearg_Function for the internal low-level types -- introduced by this binding. - function Field_Check_Router (Fld : Field; - Usr : System.Address) return Curses_Bool; + function Field_Check_Router (Fld : Field; + 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 -- type. It routes the call to the corresponding low-level validation -- function. - function Char_Check_Router (Ch : C_Int; - Usr : System.Address) return Curses_Bool; + function Char_Check_Router (Ch : 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 -- type. It routes the call to the corresponding low-level validation -- function. - function Next_Router (Fld : Field; - Usr : System.Address) return Curses_Bool; + function Next_Router (Fld : Field; + 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 -- type. It routes the call to the corresponding low-level next_choice -- function. - function Prev_Router (Fld : Field; - Usr : System.Address) return Curses_Bool; + function Prev_Router (Fld : Field; + 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 --git a/doc/html/ada/terminal_interface-curses-forms__adb.htm b/doc/html/ada/terminal_interface-curses-forms__adb.htm index a827a399..007b21ba 100644 --- a/doc/html/ada/terminal_interface-curses-forms__adb.htm +++ b/doc/html/ada/terminal_interface-curses-forms__adb.htm @@ -12,7 +12,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 -- @@ -40,8 +40,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; @@ -741,11 +741,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; @@ -811,11 +811,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; @@ -1141,8 +1141,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 --git a/doc/html/ada/terminal_interface-curses-menus__adb.htm b/doc/html/ada/terminal_interface-curses-menus__adb.htm index 007e4516..c51db280 100644 --- a/doc/html/ada/terminal_interface-curses-menus__adb.htm +++ b/doc/html/ada/terminal_interface-curses-menus__adb.htm @@ -12,7 +12,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 -- @@ -40,8 +40,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; @@ -901,8 +901,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); @@ -946,8 +946,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); @@ -1002,8 +1002,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 --git a/doc/html/ada/terminal_interface-curses-text_io__adb.htm b/doc/html/ada/terminal_interface-curses-text_io__adb.htm index de70100f..7d48825d 100644 --- a/doc/html/ada/terminal_interface-curses-text_io__adb.htm +++ b/doc/html/ada/terminal_interface-curses-text_io__adb.htm @@ -12,7 +12,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 -- @@ -40,8 +40,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 @@ -210,6 +210,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 @@ -221,47 +222,47 @@ end if; end Set_Line; - procedure Set_Line (To : Positive_Count) + procedure Set_Line (To : Positive_Count) is begin Set_Line (Get_Window, To); end Set_Line; - function Col (Win : Window) return Positive_Count + function Col (Win : Window) return Positive_Count is - Y : Line_Position; - X : Column_Position; - N : Natural; + Y : Line_Position; + X : Column_Position; + N : Natural; begin - Get_Cursor_Position (Win, Y, X); - N := Natural (X); N := N + 1; + Get_Cursor_Position (Win, Y, X); + N := Natural (X); N := N + 1; -- if N > Natural (Count'Last) then -- raise Layout_Error; -- end if; - return Positive_Count (N); + return Positive_Count (N); end Col; - function Col return Positive_Count + function Col return Positive_Count is begin return Col (Get_Window); end Col; - function Line (Win : Window) return Positive_Count + function Line (Win : Window) return Positive_Count is - Y : Line_Position; - X : Column_Position; - N : Natural; + Y : Line_Position; + X : Column_Position; + N : Natural; begin - Get_Cursor_Position (Win, Y, X); - N := Natural (Y); N := N + 1; + Get_Cursor_Position (Win, Y, X); + N := Natural (Y); N := N + 1; -- if N > Natural (Count'Last) then -- raise Layout_Error; -- end if; - return Positive_Count (N); + return Positive_Count (N); end Line; - function Line return Positive_Count + function Line return Positive_Count is begin return Line (Get_Window); @@ -271,25 +272,25 @@ -- Characters Output -- ----------------------- - procedure Put (Win : Window; Item : Character) + procedure Put (Win : Window; Item : Character) is - P_Size : constant Count := Page_Length (Win); - Y : Line_Position; - X : Column_Position; - L : Line_Count; - C : Column_Count; + P_Size : constant Count := Page_Length (Win); + Y : Line_Position; + X : Column_Position; + L : Line_Count; + C : Column_Count; begin - if P_Size > 0 then - Get_Cursor_Position (Win, Y, X); - Get_Size (Win, L, C); - if (Y + 1) = L and then (X + 1) = C then + if P_Size > 0 then + Get_Cursor_Position (Win, Y, X); + Get_Size (Win, L, C); + if (Y + 1) = L and then (X + 1) = C then New_Page (Win); end if; end if; Add (Win, Item); end Put; - procedure Put (Item : Character) + procedure Put (Item : Character) is begin Put (Get_Window, Item); @@ -299,41 +300,41 @@ -- Strings-Output -- -------------------- - procedure Put (Win : Window; Item : String) + procedure Put (Win : Window; Item : String) is - P_Size : constant Count := Page_Length (Win); - Y : Line_Position; - X : Column_Position; - L : Line_Count; - C : Column_Count; + P_Size : constant Count := Page_Length (Win); + Y : Line_Position; + X : Column_Position; + L : Line_Count; + C : Column_Count; begin - if P_Size > 0 then - Get_Cursor_Position (Win, Y, X); - Get_Size (Win, L, C); - if (Y + 1) = L and then (X + 1 + Item'Length) >= C then + if P_Size > 0 then + Get_Cursor_Position (Win, Y, X); + Get_Size (Win, L, C); + if (Y + 1) = L and then (X + 1 + Item'Length) >= C then New_Page (Win); end if; end if; Add (Win, Item); end Put; - procedure Put (Item : String) + procedure Put (Item : String) is begin Put (Get_Window, Item); end Put; - procedure Put_Line - (Win : Window; - Item : String) + procedure Put_Line + (Win : Window; + Item : String) is begin Put (Win, Item); New_Line (Win, 1); end Put_Line; - procedure Put_Line - (Item : String) + procedure Put_Line + (Item : String) is begin Put_Line (Get_Window, Item); diff --git a/doc/html/ada/terminal_interface-curses-text_io__ads.htm b/doc/html/ada/terminal_interface-curses-text_io__ads.htm index 3d1daf34..36f9476f 100644 --- a/doc/html/ada/terminal_interface-curses-text_io__ads.htm +++ b/doc/html/ada/terminal_interface-curses-text_io__ads.htm @@ -98,34 +98,34 @@ procedure Set_Col (To : Positive_Count); procedure Set_Line (Win : Window; To : Positive_Count); - procedure Set_Line (To : Positive_Count); + procedure Set_Line (To : Positive_Count); - function Col (Win : Window) return Positive_Count; - function Col return Positive_Count; + function Col (Win : Window) return Positive_Count; + function Col return Positive_Count; - function Line (Win : Window) return Positive_Count; - function Line return Positive_Count; + function Line (Win : Window) return Positive_Count; + function Line return Positive_Count; ----------------------- -- Characters-Output -- ----------------------- - procedure Put (Win : Window; Item : Character); - procedure Put (Item : Character); + procedure Put (Win : Window; Item : Character); + procedure Put (Item : Character); -------------------- -- Strings-Output -- -------------------- - procedure Put (Win : Window; Item : String); - procedure Put (Item : String); + procedure Put (Win : Window; Item : String); + procedure Put (Item : String); - procedure Put_Line - (Win : Window; - Item : String); + procedure Put_Line + (Win : Window; + Item : String); - procedure Put_Line - (Item : String); + procedure Put_Line + (Item : String); -- Exceptions diff --git a/doc/html/ada/terminal_interface-curses__adb.htm b/doc/html/ada/terminal_interface-curses__adb.htm index 448eea42..272b0036 100644 --- a/doc/html/ada/terminal_interface-curses__adb.htm +++ b/doc/html/ada/terminal_interface-curses__adb.htm @@ -40,8 +40,8 @@ ------------------------------------------------------------------------------ -- Author: Juergen Pfeifer, 1996 -- Version Control: --- @Revision: 1.7 @ --- @Date: 2011/03/19 16:17:19 @ +-- @Revision: 1.8 @ +-- @Date: 2011/03/22 23:02:14 @ -- Binding Version 01.00 ------------------------------------------------------------------------------ with System; @@ -1211,76 +1211,78 @@ X : Column_Position; begin Get_Size (Win, Y, X); + pragma Unreferenced (X); Change_Lines_Status (Win, 0, Positive (Y), True); end Touch; - procedure Untouch (Win : Window := Standard_Window) + procedure Untouch (Win : Window := Standard_Window) is - Y : Line_Position; - X : Column_Position; + Y : Line_Position; + X : Column_Position; begin - Get_Size (Win, Y, X); - Change_Lines_Status (Win, 0, Positive (Y), False); + Get_Size (Win, Y, X); + pragma Unreferenced (X); + Change_Lines_Status (Win, 0, Positive (Y), False); end Untouch; - procedure Touch (Win : Window := Standard_Window; - Start : Line_Position; - Count : Positive) + procedure Touch (Win : Window := Standard_Window; + Start : Line_Position; + Count : Positive) is begin Change_Lines_Status (Win, Start, Count, True); end Touch; - function Is_Touched - (Win : Window := Standard_Window; - Line : Line_Position) return Boolean + function Is_Touched + (Win : Window := Standard_Window; + Line : Line_Position) return Boolean is - function WLineTouched (W : Window; L : C_Int) return Curses_Bool; + function WLineTouched (W : Window; L : C_Int) return Curses_Bool; pragma Import (C, WLineTouched, "is_linetouched"); begin - if WLineTouched (Win, C_Int (Line)) = Curses_Bool_False then + if WLineTouched (Win, C_Int (Line)) = Curses_Bool_False then return False; else return True; end if; end Is_Touched; - function Is_Touched - (Win : Window := Standard_Window) return Boolean + function Is_Touched + (Win : Window := Standard_Window) return Boolean is - function WWinTouched (W : Window) return Curses_Bool; + function WWinTouched (W : Window) return Curses_Bool; pragma Import (C, WWinTouched, "is_wintouched"); begin - if WWinTouched (Win) = Curses_Bool_False then + if WWinTouched (Win) = Curses_Bool_False then return False; else return True; end if; end Is_Touched; ------------------------------------------------------------------------------ - procedure Copy - (Source_Window : Window; - Destination_Window : Window; - Source_Top_Row : Line_Position; - Source_Left_Column : Column_Position; - Destination_Top_Row : Line_Position; - Destination_Left_Column : Column_Position; - Destination_Bottom_Row : Line_Position; - Destination_Right_Column : Column_Position; - Non_Destructive_Mode : Boolean := True) - is - function Copywin (Src : Window; - Dst : Window; - Str : C_Int; - Slc : C_Int; - Dtr : C_Int; - Dlc : C_Int; - Dbr : C_Int; - Drc : C_Int; - Ndm : C_Int) return C_Int; + procedure Copy + (Source_Window : Window; + Destination_Window : Window; + Source_Top_Row : Line_Position; + Source_Left_Column : Column_Position; + Destination_Top_Row : Line_Position; + Destination_Left_Column : Column_Position; + Destination_Bottom_Row : Line_Position; + Destination_Right_Column : Column_Position; + Non_Destructive_Mode : Boolean := True) + is + function Copywin (Src : Window; + Dst : Window; + Str : C_Int; + Slc : C_Int; + Dtr : C_Int; + Dlc : C_Int; + Dbr : C_Int; + Drc : C_Int; + Ndm : C_Int) return C_Int; pragma Import (C, Copywin, "copywin"); begin - if Copywin (Source_Window, + if Copywin (Source_Window, Destination_Window, C_Int (Source_Top_Row), C_Int (Source_Left_Column), @@ -1294,199 +1296,199 @@ end if; end Copy; - procedure Overwrite - (Source_Window : Window; - Destination_Window : Window) + procedure Overwrite + (Source_Window : Window; + Destination_Window : Window) is - function Overwrite (Src : Window; Dst : Window) return C_Int; + function Overwrite (Src : Window; Dst : Window) return C_Int; pragma Import (C, Overwrite, "overwrite"); begin - if Overwrite (Source_Window, Destination_Window) = Curses_Err then + if Overwrite (Source_Window, Destination_Window) = Curses_Err then raise Curses_Exception; end if; end Overwrite; - procedure Overlay - (Source_Window : Window; - Destination_Window : Window) + procedure Overlay + (Source_Window : Window; + Destination_Window : Window) is - function Overlay (Src : Window; Dst : Window) return C_Int; + function Overlay (Src : Window; Dst : Window) return C_Int; pragma Import (C, Overlay, "overlay"); begin - if Overlay (Source_Window, Destination_Window) = Curses_Err then + if Overlay (Source_Window, Destination_Window) = Curses_Err then raise Curses_Exception; end if; end Overlay; ------------------------------------------------------------------------------ - procedure Insert_Delete_Lines - (Win : Window := Standard_Window; - Lines : Integer := 1) -- default is to insert one line above + procedure Insert_Delete_Lines + (Win : Window := Standard_Window; + Lines : Integer := 1) -- default is to insert one line above is - function Winsdelln (W : Window; N : C_Int) return C_Int; + function Winsdelln (W : Window; N : C_Int) return C_Int; pragma Import (C, Winsdelln, "winsdelln"); begin - if Winsdelln (Win, C_Int (Lines)) = Curses_Err then + if Winsdelln (Win, C_Int (Lines)) = Curses_Err then raise Curses_Exception; end if; end Insert_Delete_Lines; - procedure Delete_Line (Win : Window := Standard_Window) + procedure Delete_Line (Win : Window := Standard_Window) is begin Insert_Delete_Lines (Win, -1); end Delete_Line; - procedure Insert_Line (Win : Window := Standard_Window) + procedure Insert_Line (Win : Window := Standard_Window) is begin Insert_Delete_Lines (Win, 1); end Insert_Line; ------------------------------------------------------------------------------ - procedure Get_Size - (Win : Window := Standard_Window; - Number_Of_Lines : out Line_Count; - Number_Of_Columns : out Column_Count) + procedure Get_Size + (Win : Window := Standard_Window; + Number_Of_Lines : out Line_Count; + Number_Of_Columns : out Column_Count) is - function GetMaxY (W : Window) return C_Int; + function GetMaxY (W : Window) return C_Int; pragma Import (C, GetMaxY, "getmaxy"); - function GetMaxX (W : Window) return C_Int; + function GetMaxX (W : Window) return C_Int; pragma Import (C, GetMaxX, "getmaxx"); - Y : constant C_Int := GetMaxY (Win); - X : constant C_Int := GetMaxX (Win); + 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); + Number_Of_Lines := Line_Count (Y); + Number_Of_Columns := Column_Count (X); end Get_Size; - procedure Get_Window_Position - (Win : Window := Standard_Window; - Top_Left_Line : out Line_Position; - Top_Left_Column : out Column_Position) + procedure Get_Window_Position + (Win : Window := Standard_Window; + Top_Left_Line : out Line_Position; + Top_Left_Column : out Column_Position) is - function GetBegY (W : Window) return C_Int; + function GetBegY (W : Window) return C_Int; pragma Import (C, GetBegY, "getbegy"); - function GetBegX (W : Window) return C_Int; + function GetBegX (W : Window) return C_Int; pragma Import (C, GetBegX, "getbegx"); - Y : constant C_Short := C_Short (GetBegY (Win)); - X : constant C_Short := C_Short (GetBegX (Win)); + Y : constant C_Short := C_Short (GetBegY (Win)); + X : constant C_Short := C_Short (GetBegX (Win)); begin - Top_Left_Line := Line_Position (Y); - Top_Left_Column := Column_Position (X); + Top_Left_Line := Line_Position (Y); + Top_Left_Column := Column_Position (X); end Get_Window_Position; - procedure Get_Cursor_Position - (Win : Window := Standard_Window; - Line : out Line_Position; - Column : out Column_Position) + procedure Get_Cursor_Position + (Win : Window := Standard_Window; + Line : out Line_Position; + Column : out Column_Position) is - function GetCurY (W : Window) return C_Int; + function GetCurY (W : Window) return C_Int; pragma Import (C, GetCurY, "getcury"); - function GetCurX (W : Window) return C_Int; + function GetCurX (W : Window) return C_Int; pragma Import (C, GetCurX, "getcurx"); - Y : constant C_Short := C_Short (GetCurY (Win)); - X : constant C_Short := C_Short (GetCurX (Win)); + Y : constant C_Short := C_Short (GetCurY (Win)); + X : constant C_Short := C_Short (GetCurX (Win)); begin - Line := Line_Position (Y); - Column := Column_Position (X); + Line := Line_Position (Y); + Column := Column_Position (X); end Get_Cursor_Position; - procedure Get_Origin_Relative_To_Parent - (Win : Window; - Top_Left_Line : out Line_Position; - Top_Left_Column : out Column_Position; - Is_Not_A_Subwindow : out Boolean) + procedure Get_Origin_Relative_To_Parent + (Win : Window; + Top_Left_Line : out Line_Position; + Top_Left_Column : out Column_Position; + Is_Not_A_Subwindow : out Boolean) is - function GetParY (W : Window) return C_Int; + function GetParY (W : Window) return C_Int; pragma Import (C, GetParY, "getpary"); - function GetParX (W : Window) return C_Int; + function GetParX (W : Window) return C_Int; pragma Import (C, GetParX, "getparx"); - Y : constant C_Int := GetParY (Win); - X : constant C_Int := GetParX (Win); + Y : constant C_Int := GetParY (Win); + X : constant C_Int := GetParX (Win); begin - if Y = -1 then + if Y = -1 then Top_Left_Line := Line_Position'Last; Top_Left_Column := Column_Position'Last; Is_Not_A_Subwindow := True; else - Top_Left_Line := Line_Position (Y); - Top_Left_Column := Column_Position (X); + Top_Left_Line := Line_Position (Y); + Top_Left_Column := Column_Position (X); Is_Not_A_Subwindow := False; end if; end Get_Origin_Relative_To_Parent; ------------------------------------------------------------------------------ - function New_Pad (Lines : Line_Count; - Columns : Column_Count) return Window + function New_Pad (Lines : Line_Count; + Columns : Column_Count) return Window is - function Newpad (Lines : C_Int; Columns : C_Int) return Window; + function Newpad (Lines : C_Int; Columns : C_Int) return Window; pragma Import (C, Newpad, "newpad"); - W : Window; + W : Window; begin - W := Newpad (C_Int (Lines), C_Int (Columns)); - if W = Null_Window then + W := Newpad (C_Int (Lines), C_Int (Columns)); + if W = Null_Window then raise Curses_Exception; end if; - return W; + return W; end New_Pad; - function Sub_Pad - (Pad : Window; - Number_Of_Lines : Line_Count; - Number_Of_Columns : Column_Count; - First_Line_Position : Line_Position; - First_Column_Position : Column_Position) return Window - is - function Subpad - (Pad : Window; - Number_Of_Lines : C_Int; - Number_Of_Columns : C_Int; - First_Line_Position : C_Int; - First_Column_Position : C_Int) return Window; + function Sub_Pad + (Pad : Window; + Number_Of_Lines : Line_Count; + Number_Of_Columns : Column_Count; + First_Line_Position : Line_Position; + First_Column_Position : Column_Position) return Window + is + function Subpad + (Pad : Window; + Number_Of_Lines : C_Int; + Number_Of_Columns : C_Int; + First_Line_Position : C_Int; + First_Column_Position : C_Int) return Window; pragma Import (C, Subpad, "subpad"); - W : Window; + W : Window; begin - W := Subpad (Pad, + W := Subpad (Pad, C_Int (Number_Of_Lines), C_Int (Number_Of_Columns), C_Int (First_Line_Position), C_Int (First_Column_Position)); - if W = Null_Window then + if W = Null_Window then raise Curses_Exception; end if; - return W; + return W; end Sub_Pad; - procedure Refresh - (Pad : Window; - Source_Top_Row : Line_Position; - Source_Left_Column : Column_Position; - Destination_Top_Row : Line_Position; - Destination_Left_Column : Column_Position; - Destination_Bottom_Row : Line_Position; - Destination_Right_Column : Column_Position) - is - function Prefresh - (Pad : Window; - Source_Top_Row : C_Int; - Source_Left_Column : C_Int; - Destination_Top_Row : C_Int; - Destination_Left_Column : C_Int; - Destination_Bottom_Row : C_Int; - Destination_Right_Column : C_Int) return C_Int; + procedure Refresh + (Pad : Window; + Source_Top_Row : Line_Position; + Source_Left_Column : Column_Position; + Destination_Top_Row : Line_Position; + Destination_Left_Column : Column_Position; + Destination_Bottom_Row : Line_Position; + Destination_Right_Column : Column_Position) + is + function Prefresh + (Pad : Window; + Source_Top_Row : C_Int; + Source_Left_Column : C_Int; + Destination_Top_Row : C_Int; + Destination_Left_Column : C_Int; + Destination_Bottom_Row : C_Int; + Destination_Right_Column : C_Int) return C_Int; pragma Import (C, Prefresh, "prefresh"); begin - if Prefresh (Pad, + if Prefresh (Pad, C_Int (Source_Top_Row), C_Int (Source_Left_Column), C_Int (Destination_Top_Row), @@ -1497,26 +1499,26 @@ end if; end Refresh; - procedure Refresh_Without_Update - (Pad : Window; - Source_Top_Row : Line_Position; - Source_Left_Column : Column_Position; - Destination_Top_Row : Line_Position; - Destination_Left_Column : Column_Position; - Destination_Bottom_Row : Line_Position; - Destination_Right_Column : Column_Position) - is - function Pnoutrefresh - (Pad : Window; - Source_Top_Row : C_Int; - Source_Left_Column : C_Int; - Destination_Top_Row : C_Int; - Destination_Left_Column : C_Int; - Destination_Bottom_Row : C_Int; - Destination_Right_Column : C_Int) return C_Int; + procedure Refresh_Without_Update + (Pad : Window; + Source_Top_Row : Line_Position; + Source_Left_Column : Column_Position; + Destination_Top_Row : Line_Position; + Destination_Left_Column : Column_Position; + Destination_Bottom_Row : Line_Position; + Destination_Right_Column : Column_Position) + is + function Pnoutrefresh + (Pad : Window; + Source_Top_Row : C_Int; + Source_Left_Column : C_Int; + Destination_Top_Row : C_Int; + Destination_Left_Column : C_Int; + Destination_Bottom_Row : C_Int; + Destination_Right_Column : C_Int) return C_Int; pragma Import (C, Pnoutrefresh, "pnoutrefresh"); begin - if Pnoutrefresh (Pad, + if Pnoutrefresh (Pad, C_Int (Source_Top_Row), C_Int (Source_Left_Column), C_Int (Destination_Top_Row), @@ -1527,22 +1529,22 @@ end if; end Refresh_Without_Update; - procedure Add_Character_To_Pad_And_Echo_It - (Pad : Window; - Ch : Attributed_Character) + procedure Add_Character_To_Pad_And_Echo_It + (Pad : Window; + Ch : Attributed_Character) is - function Pechochar (Pad : Window; Ch : C_Chtype) + function Pechochar (Pad : Window; Ch : C_Chtype) return C_Int; pragma Import (C, Pechochar, "pechochar"); begin - if Pechochar (Pad, AttrChar_To_Chtype (Ch)) = Curses_Err then + if Pechochar (Pad, AttrChar_To_Chtype (Ch)) = Curses_Err then raise Curses_Exception; end if; end Add_Character_To_Pad_And_Echo_It; - procedure Add_Character_To_Pad_And_Echo_It - (Pad : Window; - Ch : Character) + procedure Add_Character_To_Pad_And_Echo_It + (Pad : Window; + Ch : Character) is begin Add_Character_To_Pad_And_Echo_It @@ -1552,90 +1554,90 @@ Attr => Normal_Video)); end Add_Character_To_Pad_And_Echo_It; ------------------------------------------------------------------------------ - procedure Scroll (Win : Window := Standard_Window; - Amount : Integer := 1) + procedure Scroll (Win : Window := Standard_Window; + Amount : Integer := 1) is - function Wscrl (Win : Window; N : C_Int) return C_Int; + function Wscrl (Win : Window; N : C_Int) return C_Int; pragma Import (C, Wscrl, "wscrl"); begin - if Wscrl (Win, C_Int (Amount)) = Curses_Err then + if Wscrl (Win, C_Int (Amount)) = Curses_Err then raise Curses_Exception; end if; end Scroll; ------------------------------------------------------------------------------ - procedure Delete_Character (Win : Window := Standard_Window) + procedure Delete_Character (Win : Window := Standard_Window) is - function Wdelch (Win : Window) return C_Int; + function Wdelch (Win : Window) return C_Int; pragma Import (C, Wdelch, "wdelch"); begin - if Wdelch (Win) = Curses_Err then + if Wdelch (Win) = Curses_Err then raise Curses_Exception; end if; end Delete_Character; - procedure Delete_Character - (Win : Window := Standard_Window; - Line : Line_Position; - Column : Column_Position) + procedure Delete_Character + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position) is - function Mvwdelch (Win : Window; - Lin : C_Int; - Col : C_Int) return C_Int; + function Mvwdelch (Win : Window; + Lin : C_Int; + Col : C_Int) return C_Int; pragma Import (C, Mvwdelch, "mvwdelch"); begin - if Mvwdelch (Win, C_Int (Line), C_Int (Column)) = Curses_Err then + if Mvwdelch (Win, C_Int (Line), C_Int (Column)) = Curses_Err then raise Curses_Exception; end if; end Delete_Character; ------------------------------------------------------------------------------ - function Peek (Win : Window := Standard_Window) + function Peek (Win : Window := Standard_Window) return Attributed_Character is - function Winch (Win : Window) return C_Chtype; + function Winch (Win : Window) return C_Chtype; pragma Import (C, Winch, "winch"); begin - return Chtype_To_AttrChar (Winch (Win)); + return Chtype_To_AttrChar (Winch (Win)); end Peek; - function Peek - (Win : Window := Standard_Window; - Line : Line_Position; - Column : Column_Position) return Attributed_Character + function Peek + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position) return Attributed_Character is - function Mvwinch (Win : Window; - Lin : C_Int; - Col : C_Int) return C_Chtype; + function Mvwinch (Win : Window; + Lin : C_Int; + Col : C_Int) return C_Chtype; pragma Import (C, Mvwinch, "mvwinch"); begin - return Chtype_To_AttrChar (Mvwinch (Win, C_Int (Line), C_Int (Column))); + return Chtype_To_AttrChar (Mvwinch (Win, C_Int (Line), C_Int (Column))); end Peek; ------------------------------------------------------------------------------ - procedure Insert (Win : Window := Standard_Window; - Ch : Attributed_Character) + procedure Insert (Win : Window := Standard_Window; + Ch : Attributed_Character) is - function Winsch (Win : Window; Ch : C_Chtype) return C_Int; + function Winsch (Win : Window; Ch : C_Chtype) return C_Int; pragma Import (C, Winsch, "winsch"); begin - if Winsch (Win, AttrChar_To_Chtype (Ch)) = Curses_Err then + if Winsch (Win, AttrChar_To_Chtype (Ch)) = Curses_Err then raise Curses_Exception; end if; end Insert; - procedure Insert - (Win : Window := Standard_Window; - Line : Line_Position; - Column : Column_Position; - Ch : Attributed_Character) + procedure Insert + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Ch : Attributed_Character) is - function Mvwinsch (Win : Window; - Lin : C_Int; - Col : C_Int; - Ch : C_Chtype) return C_Int; + function Mvwinsch (Win : Window; + Lin : C_Int; + Col : C_Int; + Ch : C_Chtype) return C_Int; pragma Import (C, Mvwinsch, "mvwinsch"); begin - if Mvwinsch (Win, + if Mvwinsch (Win, C_Int (Line), C_Int (Column), AttrChar_To_Chtype (Ch)) = Curses_Err then @@ -1643,510 +1645,510 @@ end if; end Insert; ------------------------------------------------------------------------------ - procedure Insert (Win : Window := Standard_Window; - Str : String; - Len : Integer := -1) + procedure Insert (Win : Window := Standard_Window; + Str : String; + Len : Integer := -1) is - function Winsnstr (Win : Window; - Str : char_array; - Len : Integer := -1) return C_Int; + function Winsnstr (Win : Window; + Str : char_array; + Len : Integer := -1) return C_Int; pragma Import (C, Winsnstr, "winsnstr"); - Txt : char_array (0 .. Str'Length); - Length : size_t; + Txt : char_array (0 .. Str'Length); + Length : size_t; begin - To_C (Str, Txt, Length); - if Winsnstr (Win, Txt, Len) = Curses_Err then + To_C (Str, Txt, Length); + if Winsnstr (Win, Txt, Len) = Curses_Err then raise Curses_Exception; end if; end Insert; - procedure Insert - (Win : Window := Standard_Window; - Line : Line_Position; - Column : Column_Position; - Str : String; - Len : Integer := -1) - is - function Mvwinsnstr (Win : Window; - Line : C_Int; - Column : C_Int; - Str : char_array; - Len : C_Int) return C_Int; + procedure Insert + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Str : String; + Len : Integer := -1) + is + function Mvwinsnstr (Win : Window; + Line : C_Int; + Column : C_Int; + Str : char_array; + Len : C_Int) return C_Int; pragma Import (C, Mvwinsnstr, "mvwinsnstr"); - Txt : char_array (0 .. Str'Length); - Length : size_t; + Txt : char_array (0 .. Str'Length); + Length : size_t; begin - To_C (Str, Txt, Length); - if Mvwinsnstr (Win, C_Int (Line), C_Int (Column), Txt, C_Int (Len)) + To_C (Str, Txt, Length); + if Mvwinsnstr (Win, C_Int (Line), C_Int (Column), Txt, C_Int (Len)) = Curses_Err then raise Curses_Exception; end if; end Insert; ------------------------------------------------------------------------------ - procedure Peek (Win : Window := Standard_Window; - Str : out String; - Len : Integer := -1) + procedure Peek (Win : Window := Standard_Window; + Str : out String; + Len : Integer := -1) is - function Winnstr (Win : Window; - Str : char_array; - Len : C_Int) return C_Int; + function Winnstr (Win : Window; + Str : char_array; + Len : C_Int) return C_Int; pragma Import (C, Winnstr, "winnstr"); - N : Integer := Len; - Txt : char_array (0 .. Str'Length); - Cnt : Natural; + N : Integer := Len; + Txt : char_array (0 .. Str'Length); + Cnt : Natural; begin - if N < 0 then - N := Str'Length; + if N < 0 then + N := Str'Length; end if; - if N > Str'Length then + if N > Str'Length then raise Constraint_Error; end if; - Txt (0) := Interfaces.C.char'First; - if Winnstr (Win, Txt, C_Int (N)) = Curses_Err then + Txt (0) := Interfaces.C.char'First; + if Winnstr (Win, Txt, C_Int (N)) = Curses_Err then raise Curses_Exception; end if; - To_Ada (Txt, Str, Cnt, True); - if Cnt < Str'Length then - Str ((Str'First + Cnt) .. Str'Last) := (others => ' '); + To_Ada (Txt, Str, Cnt, True); + if Cnt < Str'Length then + Str ((Str'First + Cnt) .. Str'Last) := (others => ' '); end if; end Peek; - procedure Peek - (Win : Window := Standard_Window; - Line : Line_Position; - Column : Column_Position; - Str : out String; - Len : Integer := -1) + procedure Peek + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Str : out String; + Len : Integer := -1) is begin Move_Cursor (Win, Line, Column); Peek (Win, Str, Len); end Peek; ------------------------------------------------------------------------------ - procedure Peek - (Win : Window := Standard_Window; - Str : out Attributed_String; - Len : Integer := -1) - is - function Winchnstr (Win : Window; - Str : chtype_array; -- out - Len : C_Int) return C_Int; + procedure Peek + (Win : Window := Standard_Window; + Str : out Attributed_String; + Len : Integer := -1) + is + function Winchnstr (Win : Window; + Str : chtype_array; -- out + Len : C_Int) return C_Int; pragma Import (C, Winchnstr, "winchnstr"); - N : Integer := Len; - Txt : constant chtype_array (0 .. Str'Length) + N : Integer := Len; + Txt : constant chtype_array (0 .. Str'Length) := (0 => Default_Character); - Cnt : Natural := 0; + Cnt : Natural := 0; begin - if N < 0 then - N := Str'Length; + if N < 0 then + N := Str'Length; end if; - if N > Str'Length then + if N > Str'Length then raise Constraint_Error; end if; - if Winchnstr (Win, Txt, C_Int (N)) = Curses_Err then + if Winchnstr (Win, Txt, C_Int (N)) = Curses_Err then raise Curses_Exception; end if; - for To in Str'Range loop - exit when Txt (size_t (Cnt)) = Default_Character; - Str (To) := Txt (size_t (Cnt)); - Cnt := Cnt + 1; + for To in Str'Range loop + exit when Txt (size_t (Cnt)) = Default_Character; + Str (To) := Txt (size_t (Cnt)); + Cnt := Cnt + 1; end loop; - if Cnt < Str'Length then - Str ((Str'First + Cnt) .. Str'Last) := + if Cnt < Str'Length then + Str ((Str'First + Cnt) .. Str'Last) := (others => (Ch => ' ', Color => Color_Pair'First, Attr => Normal_Video)); end if; end Peek; - procedure Peek - (Win : Window := Standard_Window; - Line : Line_Position; - Column : Column_Position; - Str : out Attributed_String; - Len : Integer := -1) + procedure Peek + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Str : out Attributed_String; + Len : Integer := -1) is begin Move_Cursor (Win, Line, Column); Peek (Win, Str, Len); end Peek; ------------------------------------------------------------------------------ - procedure Get (Win : Window := Standard_Window; - Str : out String; - Len : Integer := -1) + procedure Get (Win : Window := Standard_Window; + Str : out String; + Len : Integer := -1) is - function Wgetnstr (Win : Window; - Str : char_array; - Len : C_Int) return C_Int; + function Wgetnstr (Win : Window; + Str : char_array; + Len : C_Int) return C_Int; pragma Import (C, Wgetnstr, "wgetnstr"); - N : Integer := Len; - Txt : char_array (0 .. Str'Length); - Cnt : Natural; + N : Integer := Len; + Txt : char_array (0 .. Str'Length); + Cnt : Natural; begin - if N < 0 then - N := Str'Length; + if N < 0 then + N := Str'Length; end if; - if N > Str'Length then + if N > Str'Length then raise Constraint_Error; end if; - Txt (0) := Interfaces.C.char'First; - if Wgetnstr (Win, Txt, C_Int (N)) = Curses_Err then + Txt (0) := Interfaces.C.char'First; + if Wgetnstr (Win, Txt, C_Int (N)) = Curses_Err then raise Curses_Exception; end if; - To_Ada (Txt, Str, Cnt, True); - if Cnt < Str'Length then - Str ((Str'First + Cnt) .. Str'Last) := (others => ' '); + To_Ada (Txt, Str, Cnt, True); + if Cnt < Str'Length then + Str ((Str'First + Cnt) .. Str'Last) := (others => ' '); end if; end Get; - procedure Get - (Win : Window := Standard_Window; - Line : Line_Position; - Column : Column_Position; - Str : out String; - Len : Integer := -1) + procedure Get + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Str : out String; + Len : Integer := -1) is begin Move_Cursor (Win, Line, Column); Get (Win, Str, Len); end Get; ------------------------------------------------------------------------------ - procedure Init_Soft_Label_Keys - (Format : Soft_Label_Key_Format := Three_Two_Three) + procedure Init_Soft_Label_Keys + (Format : Soft_Label_Key_Format := Three_Two_Three) is - function Slk_Init (Fmt : C_Int) return C_Int; + function Slk_Init (Fmt : C_Int) return C_Int; pragma Import (C, Slk_Init, "slk_init"); begin - if Slk_Init (Soft_Label_Key_Format'Pos (Format)) = Curses_Err then + if Slk_Init (Soft_Label_Key_Format'Pos (Format)) = Curses_Err then raise Curses_Exception; end if; end Init_Soft_Label_Keys; - procedure Set_Soft_Label_Key (Label : Label_Number; - Text : String; - Fmt : Label_Justification := Left) + procedure Set_Soft_Label_Key (Label : Label_Number; + Text : String; + Fmt : Label_Justification := Left) is - function Slk_Set (Label : C_Int; - Txt : char_array; - Fmt : C_Int) return C_Int; + function Slk_Set (Label : C_Int; + Txt : char_array; + Fmt : C_Int) return C_Int; pragma Import (C, Slk_Set, "slk_set"); - Txt : char_array (0 .. Text'Length); - Len : size_t; + Txt : char_array (0 .. Text'Length); + Len : size_t; begin - To_C (Text, Txt, Len); - if Slk_Set (C_Int (Label), Txt, + To_C (Text, Txt, Len); + if Slk_Set (C_Int (Label), Txt, C_Int (Label_Justification'Pos (Fmt))) = Curses_Err then raise Curses_Exception; end if; end Set_Soft_Label_Key; - procedure Refresh_Soft_Label_Keys + procedure Refresh_Soft_Label_Keys is - function Slk_Refresh return C_Int; + function Slk_Refresh return C_Int; pragma Import (C, Slk_Refresh, "slk_refresh"); begin - if Slk_Refresh = Curses_Err then + if Slk_Refresh = Curses_Err then raise Curses_Exception; end if; end Refresh_Soft_Label_Keys; - procedure Refresh_Soft_Label_Keys_Without_Update + procedure Refresh_Soft_Label_Keys_Without_Update is - function Slk_Noutrefresh return C_Int; + function Slk_Noutrefresh return C_Int; pragma Import (C, Slk_Noutrefresh, "slk_noutrefresh"); begin - if Slk_Noutrefresh = Curses_Err then + if Slk_Noutrefresh = Curses_Err then raise Curses_Exception; end if; end Refresh_Soft_Label_Keys_Without_Update; - procedure Get_Soft_Label_Key (Label : Label_Number; - Text : out String) + procedure Get_Soft_Label_Key (Label : Label_Number; + Text : out String) is - function Slk_Label (Label : C_Int) return chars_ptr; + function Slk_Label (Label : C_Int) return chars_ptr; pragma Import (C, Slk_Label, "slk_label"); begin - Fill_String (Slk_Label (C_Int (Label)), Text); + Fill_String (Slk_Label (C_Int (Label)), Text); end Get_Soft_Label_Key; - function Get_Soft_Label_Key (Label : Label_Number) return String + function Get_Soft_Label_Key (Label : Label_Number) return String is - function Slk_Label (Label : C_Int) return chars_ptr; + function Slk_Label (Label : C_Int) return chars_ptr; pragma Import (C, Slk_Label, "slk_label"); begin - return Fill_String (Slk_Label (C_Int (Label))); + return Fill_String (Slk_Label (C_Int (Label))); end Get_Soft_Label_Key; - procedure Clear_Soft_Label_Keys + procedure Clear_Soft_Label_Keys is - function Slk_Clear return C_Int; + function Slk_Clear return C_Int; pragma Import (C, Slk_Clear, "slk_clear"); begin - if Slk_Clear = Curses_Err then + if Slk_Clear = Curses_Err then raise Curses_Exception; end if; end Clear_Soft_Label_Keys; - procedure Restore_Soft_Label_Keys + procedure Restore_Soft_Label_Keys is - function Slk_Restore return C_Int; + function Slk_Restore return C_Int; pragma Import (C, Slk_Restore, "slk_restore"); begin - if Slk_Restore = Curses_Err then + if Slk_Restore = Curses_Err then raise Curses_Exception; end if; end Restore_Soft_Label_Keys; - procedure Touch_Soft_Label_Keys + procedure Touch_Soft_Label_Keys is - function Slk_Touch return C_Int; + function Slk_Touch return C_Int; pragma Import (C, Slk_Touch, "slk_touch"); begin - if Slk_Touch = Curses_Err then + if Slk_Touch = Curses_Err then raise Curses_Exception; end if; end Touch_Soft_Label_Keys; - procedure Switch_Soft_Label_Key_Attributes - (Attr : Character_Attribute_Set; - On : Boolean := True) + procedure Switch_Soft_Label_Key_Attributes + (Attr : Character_Attribute_Set; + On : Boolean := True) is - function Slk_Attron (Ch : C_Chtype) return C_Int; + function Slk_Attron (Ch : C_Chtype) return C_Int; pragma Import (C, Slk_Attron, "slk_attron"); - function Slk_Attroff (Ch : C_Chtype) return C_Int; + function Slk_Attroff (Ch : C_Chtype) return C_Int; pragma Import (C, Slk_Attroff, "slk_attroff"); - Err : C_Int; - Ch : constant Attributed_Character := (Ch => Character'First, + Err : C_Int; + Ch : constant Attributed_Character := (Ch => Character'First, Attr => Attr, Color => Color_Pair'First); begin if On then - Err := Slk_Attron (AttrChar_To_Chtype (Ch)); + Err := Slk_Attron (AttrChar_To_Chtype (Ch)); else - Err := Slk_Attroff (AttrChar_To_Chtype (Ch)); + Err := Slk_Attroff (AttrChar_To_Chtype (Ch)); end if; - if Err = Curses_Err then + if Err = Curses_Err then raise Curses_Exception; end if; end Switch_Soft_Label_Key_Attributes; - procedure Set_Soft_Label_Key_Attributes - (Attr : Character_Attribute_Set := Normal_Video; - Color : Color_Pair := Color_Pair'First) + procedure Set_Soft_Label_Key_Attributes + (Attr : Character_Attribute_Set := Normal_Video; + Color : Color_Pair := Color_Pair'First) is - function Slk_Attrset (Ch : C_Chtype) return C_Int; + function Slk_Attrset (Ch : C_Chtype) return C_Int; pragma Import (C, Slk_Attrset, "slk_attrset"); - Ch : constant Attributed_Character := (Ch => Character'First, + Ch : constant Attributed_Character := (Ch => Character'First, Attr => Attr, Color => Color); begin - if Slk_Attrset (AttrChar_To_Chtype (Ch)) = Curses_Err then + if Slk_Attrset (AttrChar_To_Chtype (Ch)) = Curses_Err then raise Curses_Exception; end if; end Set_Soft_Label_Key_Attributes; - function Get_Soft_Label_Key_Attributes return Character_Attribute_Set + function Get_Soft_Label_Key_Attributes return Character_Attribute_Set is - function Slk_Attr return C_Chtype; + function Slk_Attr return C_Chtype; pragma Import (C, Slk_Attr, "slk_attr"); - Attr : constant C_Chtype := Slk_Attr; + Attr : constant C_Chtype := Slk_Attr; begin - return Chtype_To_AttrChar (Attr).Attr; + return Chtype_To_AttrChar (Attr).Attr; end Get_Soft_Label_Key_Attributes; - function Get_Soft_Label_Key_Attributes return Color_Pair + function Get_Soft_Label_Key_Attributes return Color_Pair is - function Slk_Attr return C_Chtype; + function Slk_Attr return C_Chtype; pragma Import (C, Slk_Attr, "slk_attr"); - Attr : constant C_Chtype := Slk_Attr; + Attr : constant C_Chtype := Slk_Attr; begin - return Chtype_To_AttrChar (Attr).Color; + return Chtype_To_AttrChar (Attr).Color; end Get_Soft_Label_Key_Attributes; - procedure Set_Soft_Label_Key_Color (Pair : Color_Pair) + procedure Set_Soft_Label_Key_Color (Pair : Color_Pair) is - function Slk_Color (Color : C_Short) return C_Int; + function Slk_Color (Color : C_Short) return C_Int; pragma Import (C, Slk_Color, "slk_color"); begin - if Slk_Color (C_Short (Pair)) = Curses_Err then + if Slk_Color (C_Short (Pair)) = Curses_Err then raise Curses_Exception; end if; end Set_Soft_Label_Key_Color; ------------------------------------------------------------------------------ - procedure Enable_Key (Key : Special_Key_Code; - Enable : Boolean := True) + procedure Enable_Key (Key : Special_Key_Code; + Enable : Boolean := True) is - function Keyok (Keycode : C_Int; - On_Off : Curses_Bool) return C_Int; + function Keyok (Keycode : C_Int; + On_Off : Curses_Bool) return C_Int; pragma Import (C, Keyok, "keyok"); begin - if Keyok (C_Int (Key), Curses_Bool (Boolean'Pos (Enable))) + if Keyok (C_Int (Key), Curses_Bool (Boolean'Pos (Enable))) = Curses_Err then raise Curses_Exception; end if; end Enable_Key; ------------------------------------------------------------------------------ - procedure Define_Key (Definition : String; - Key : Special_Key_Code) + procedure Define_Key (Definition : String; + Key : Special_Key_Code) is - function Defkey (Def : char_array; - Key : C_Int) return C_Int; + function Defkey (Def : char_array; + Key : C_Int) return C_Int; pragma Import (C, Defkey, "define_key"); - Txt : char_array (0 .. Definition'Length); - Length : size_t; + Txt : char_array (0 .. Definition'Length); + Length : size_t; begin - To_C (Definition, Txt, Length); - if Defkey (Txt, C_Int (Key)) = Curses_Err then + To_C (Definition, Txt, Length); + if Defkey (Txt, C_Int (Key)) = Curses_Err then raise Curses_Exception; end if; end Define_Key; ------------------------------------------------------------------------------ - procedure Un_Control (Ch : Attributed_Character; - Str : out String) + procedure Un_Control (Ch : Attributed_Character; + Str : out String) is - function Unctrl (Ch : C_Chtype) return chars_ptr; + function Unctrl (Ch : C_Chtype) return chars_ptr; pragma Import (C, Unctrl, "unctrl"); begin - Fill_String (Unctrl (AttrChar_To_Chtype (Ch)), Str); + Fill_String (Unctrl (AttrChar_To_Chtype (Ch)), Str); end Un_Control; - function Un_Control (Ch : Attributed_Character) return String + function Un_Control (Ch : Attributed_Character) return String is - function Unctrl (Ch : C_Chtype) return chars_ptr; + function Unctrl (Ch : C_Chtype) return chars_ptr; pragma Import (C, Unctrl, "unctrl"); begin - return Fill_String (Unctrl (AttrChar_To_Chtype (Ch))); + return Fill_String (Unctrl (AttrChar_To_Chtype (Ch))); end Un_Control; - procedure Delay_Output (Msecs : Natural) + procedure Delay_Output (Msecs : Natural) is - function Delayoutput (Msecs : C_Int) return C_Int; + function Delayoutput (Msecs : C_Int) return C_Int; pragma Import (C, Delayoutput, "delay_output"); begin - if Delayoutput (C_Int (Msecs)) = Curses_Err then + if Delayoutput (C_Int (Msecs)) = Curses_Err then raise Curses_Exception; end if; end Delay_Output; - procedure Flush_Input + procedure Flush_Input is - function Flushinp return C_Int; + function Flushinp return C_Int; pragma Import (C, Flushinp, "flushinp"); begin - if Flushinp = Curses_Err then -- docu says that never happens, but... + if Flushinp = Curses_Err then -- docu says that never happens, but... raise Curses_Exception; end if; end Flush_Input; ------------------------------------------------------------------------------ - function Baudrate return Natural + function Baudrate return Natural is - function Baud return C_Int; + function Baud return C_Int; pragma Import (C, Baud, "baudrate"); begin - return Natural (Baud); + return Natural (Baud); end Baudrate; - function Erase_Character return Character + function Erase_Character return Character is - function Erasechar return C_Int; + function Erasechar return C_Int; pragma Import (C, Erasechar, "erasechar"); begin - return Character'Val (Erasechar); + return Character'Val (Erasechar); end Erase_Character; - function Kill_Character return Character + function Kill_Character return Character is - function Killchar return C_Int; + function Killchar return C_Int; pragma Import (C, Killchar, "killchar"); begin - return Character'Val (Killchar); + return Character'Val (Killchar); end Kill_Character; - function Has_Insert_Character return Boolean + function Has_Insert_Character return Boolean is - function Has_Ic return Curses_Bool; + function Has_Ic return Curses_Bool; pragma Import (C, Has_Ic, "has_ic"); begin - if Has_Ic = Curses_Bool_False then + if Has_Ic = Curses_Bool_False then return False; else return True; end if; end Has_Insert_Character; - function Has_Insert_Line return Boolean + function Has_Insert_Line return Boolean is - function Has_Il return Curses_Bool; + function Has_Il return Curses_Bool; pragma Import (C, Has_Il, "has_il"); begin - if Has_Il = Curses_Bool_False then + if Has_Il = Curses_Bool_False then return False; else return True; end if; end Has_Insert_Line; - function Supported_Attributes return Character_Attribute_Set + function Supported_Attributes return Character_Attribute_Set is - function Termattrs return C_Chtype; + function Termattrs return C_Chtype; pragma Import (C, Termattrs, "termattrs"); - Ch : constant Attributed_Character := Chtype_To_AttrChar (Termattrs); + Ch : constant Attributed_Character := Chtype_To_AttrChar (Termattrs); begin - return Ch.Attr; + return Ch.Attr; end Supported_Attributes; - procedure Long_Name (Name : out String) + procedure Long_Name (Name : out String) is - function Longname return chars_ptr; + function Longname return chars_ptr; pragma Import (C, Longname, "longname"); begin - Fill_String (Longname, Name); + Fill_String (Longname, Name); end Long_Name; - function Long_Name return String + function Long_Name return String is - function Longname return chars_ptr; + function Longname return chars_ptr; pragma Import (C, Longname, "longname"); begin - return Fill_String (Longname); + return Fill_String (Longname); end Long_Name; - procedure Terminal_Name (Name : out String) + procedure Terminal_Name (Name : out String) is - function Termname return chars_ptr; + function Termname return chars_ptr; pragma Import (C, Termname, "termname"); begin - Fill_String (Termname, Name); + Fill_String (Termname, Name); end Terminal_Name; - function Terminal_Name return String + function Terminal_Name return String is - function Termname return chars_ptr; + function Termname return chars_ptr; pragma Import (C, Termname, "termname"); begin - return Fill_String (Termname); + return Fill_String (Termname); end Terminal_Name; ------------------------------------------------------------------------------ - procedure Init_Pair (Pair : Redefinable_Color_Pair; - Fore : Color_Number; - Back : Color_Number) + procedure Init_Pair (Pair : Redefinable_Color_Pair; + Fore : Color_Number; + Back : Color_Number) is - function Initpair (Pair : C_Short; - Fore : C_Short; - Back : C_Short) return C_Int; + function Initpair (Pair : C_Short; + Fore : C_Short; + Back : C_Short) return C_Int; pragma Import (C, Initpair, "init_pair"); begin if Integer (Pair) >= Number_Of_Color_Pairs then @@ -2156,311 +2158,311 @@ Integer (Back) >= Number_Of_Colors then raise Constraint_Error; end if; - if Initpair (C_Short (Pair), C_Short (Fore), C_Short (Back)) + if Initpair (C_Short (Pair), C_Short (Fore), C_Short (Back)) = Curses_Err then raise Curses_Exception; end if; end Init_Pair; - procedure Pair_Content (Pair : Color_Pair; - Fore : out Color_Number; - Back : out Color_Number) + procedure Pair_Content (Pair : Color_Pair; + Fore : out Color_Number; + Back : out Color_Number) is - type C_Short_Access is access all C_Short; - function Paircontent (Pair : C_Short; - Fp : C_Short_Access; - Bp : C_Short_Access) return C_Int; + type C_Short_Access is access all C_Short; + function Paircontent (Pair : C_Short; + Fp : C_Short_Access; + Bp : C_Short_Access) return C_Int; pragma Import (C, Paircontent, "pair_content"); - F, B : aliased C_Short; + F, B : aliased C_Short; begin - if Paircontent (C_Short (Pair), F'Access, B'Access) = Curses_Err then + if Paircontent (C_Short (Pair), F'Access, B'Access) = Curses_Err then raise Curses_Exception; else - Fore := Color_Number (F); - Back := Color_Number (B); + Fore := Color_Number (F); + Back := Color_Number (B); end if; end Pair_Content; - function Has_Colors return Boolean + function Has_Colors return Boolean is - function Hascolors return Curses_Bool; + function Hascolors return Curses_Bool; pragma Import (C, Hascolors, "has_colors"); begin - if Hascolors = Curses_Bool_False then + if Hascolors = Curses_Bool_False then return False; else return True; end if; end Has_Colors; - procedure Init_Color (Color : Color_Number; - Red : RGB_Value; - Green : RGB_Value; - Blue : RGB_Value) + procedure Init_Color (Color : Color_Number; + Red : RGB_Value; + Green : RGB_Value; + Blue : RGB_Value) is - function Initcolor (Col : C_Short; - Red : C_Short; - Green : C_Short; - Blue : C_Short) return C_Int; + function Initcolor (Col : C_Short; + Red : C_Short; + Green : C_Short; + Blue : C_Short) return C_Int; pragma Import (C, Initcolor, "init_color"); begin - if Initcolor (C_Short (Color), C_Short (Red), C_Short (Green), + if Initcolor (C_Short (Color), C_Short (Red), C_Short (Green), C_Short (Blue)) = Curses_Err then raise Curses_Exception; end if; end Init_Color; - function Can_Change_Color return Boolean + function Can_Change_Color return Boolean is - function Canchangecolor return Curses_Bool; + function Canchangecolor return Curses_Bool; pragma Import (C, Canchangecolor, "can_change_color"); begin - if Canchangecolor = Curses_Bool_False then + if Canchangecolor = Curses_Bool_False then return False; else return True; end if; end Can_Change_Color; - procedure Color_Content (Color : Color_Number; - Red : out RGB_Value; - Green : out RGB_Value; - Blue : out RGB_Value) + procedure Color_Content (Color : Color_Number; + Red : out RGB_Value; + Green : out RGB_Value; + Blue : out RGB_Value) is - type C_Short_Access is access all C_Short; + type C_Short_Access is access all C_Short; - function Colorcontent (Color : C_Short; R, G, B : C_Short_Access) + function Colorcontent (Color : C_Short; R, G, B : C_Short_Access) return C_Int; pragma Import (C, Colorcontent, "color_content"); - R, G, B : aliased C_Short; + R, G, B : aliased C_Short; begin - if Colorcontent (C_Short (Color), R'Access, G'Access, B'Access) = + if Colorcontent (C_Short (Color), R'Access, G'Access, B'Access) = Curses_Err then raise Curses_Exception; else - Red := RGB_Value (R); - Green := RGB_Value (G); - Blue := RGB_Value (B); + Red := RGB_Value (R); + Green := RGB_Value (G); + Blue := RGB_Value (B); end if; end Color_Content; ------------------------------------------------------------------------------ - procedure Save_Curses_Mode (Mode : Curses_Mode) + procedure Save_Curses_Mode (Mode : Curses_Mode) is - function Def_Prog_Mode return C_Int; + function Def_Prog_Mode return C_Int; pragma Import (C, Def_Prog_Mode, "def_prog_mode"); - function Def_Shell_Mode return C_Int; + function Def_Shell_Mode return C_Int; pragma Import (C, Def_Shell_Mode, "def_shell_mode"); - Err : C_Int; + Err : C_Int; begin case Mode is - when Curses => Err := Def_Prog_Mode; - when Shell => Err := Def_Shell_Mode; + when Curses => Err := Def_Prog_Mode; + when Shell => Err := Def_Shell_Mode; end case; - if Err = Curses_Err then + if Err = Curses_Err then raise Curses_Exception; end if; end Save_Curses_Mode; - procedure Reset_Curses_Mode (Mode : Curses_Mode) + procedure Reset_Curses_Mode (Mode : Curses_Mode) is - function Reset_Prog_Mode return C_Int; + function Reset_Prog_Mode return C_Int; pragma Import (C, Reset_Prog_Mode, "reset_prog_mode"); - function Reset_Shell_Mode return C_Int; + function Reset_Shell_Mode return C_Int; pragma Import (C, Reset_Shell_Mode, "reset_shell_mode"); - Err : C_Int; + Err : C_Int; begin case Mode is - when Curses => Err := Reset_Prog_Mode; - when Shell => Err := Reset_Shell_Mode; + when Curses => Err := Reset_Prog_Mode; + when Shell => Err := Reset_Shell_Mode; end case; - if Err = Curses_Err then + if Err = Curses_Err then raise Curses_Exception; end if; end Reset_Curses_Mode; - procedure Save_Terminal_State + procedure Save_Terminal_State is - function Savetty return C_Int; + function Savetty return C_Int; pragma Import (C, Savetty, "savetty"); begin - if Savetty = Curses_Err then + if Savetty = Curses_Err then raise Curses_Exception; end if; end Save_Terminal_State; - procedure Reset_Terminal_State + procedure Reset_Terminal_State is - function Resetty return C_Int; + function Resetty return C_Int; pragma Import (C, Resetty, "resetty"); begin - if Resetty = Curses_Err then + if Resetty = Curses_Err then raise Curses_Exception; end if; end Reset_Terminal_State; - procedure Rip_Off_Lines (Lines : Integer; - Proc : Stdscr_Init_Proc) + procedure Rip_Off_Lines (Lines : Integer; + Proc : Stdscr_Init_Proc) is - function Ripoffline (Lines : C_Int; - Proc : Stdscr_Init_Proc) return C_Int; + function Ripoffline (Lines : C_Int; + Proc : Stdscr_Init_Proc) return C_Int; pragma Import (C, Ripoffline, "_nc_ripoffline"); begin - if Ripoffline (C_Int (Lines), Proc) = Curses_Err then + if Ripoffline (C_Int (Lines), Proc) = Curses_Err then raise Curses_Exception; end if; end Rip_Off_Lines; - procedure Set_Cursor_Visibility (Visibility : in out Cursor_Visibility) + procedure Set_Cursor_Visibility (Visibility : in out Cursor_Visibility) is - function Curs_Set (Curs : C_Int) return C_Int; + function Curs_Set (Curs : C_Int) return C_Int; pragma Import (C, Curs_Set, "curs_set"); - Res : C_Int; + Res : C_Int; begin - Res := Curs_Set (Cursor_Visibility'Pos (Visibility)); - if Res /= Curses_Err then - Visibility := Cursor_Visibility'Val (Res); + Res := Curs_Set (Cursor_Visibility'Pos (Visibility)); + if Res /= Curses_Err then + Visibility := Cursor_Visibility'Val (Res); end if; end Set_Cursor_Visibility; - procedure Nap_Milli_Seconds (Ms : Natural) + procedure Nap_Milli_Seconds (Ms : Natural) is - function Napms (Ms : C_Int) return C_Int; + function Napms (Ms : C_Int) return C_Int; pragma Import (C, Napms, "napms"); begin - if Napms (C_Int (Ms)) = Curses_Err then + if Napms (C_Int (Ms)) = Curses_Err then raise Curses_Exception; end if; end Nap_Milli_Seconds; ------------------------------------------------------------------------------ - function Standard_Window return Window + function Standard_Window return Window is - Result : Window; - pragma Import (C, Result, "stdscr"); + Result : Window; + pragma Import (C, Result, "stdscr"); begin - return Result; + return Result; end Standard_Window; - function Current_Window return Window + function Current_Window return Window is - Result : Window; - pragma Import (C, Result, "curscr"); + Result : Window; + pragma Import (C, Result, "curscr"); begin - return Result; + return Result; end Current_Window; - function Lines return Line_Count + function Lines return Line_Count is - Result : C_Int; - pragma Import (C, Result, "LINES"); + Result : C_Int; + pragma Import (C, Result, "LINES"); begin - return Line_Count (Result); + return Line_Count (Result); end Lines; - function Columns return Column_Count + function Columns return Column_Count is - Result : C_Int; - pragma Import (C, Result, "COLS"); + Result : C_Int; + pragma Import (C, Result, "COLS"); begin - return Column_Count (Result); + return Column_Count (Result); end Columns; - function Tab_Size return Natural + function Tab_Size return Natural is - Result : C_Int; - pragma Import (C, Result, "TABSIZE"); + Result : C_Int; + pragma Import (C, Result, "TABSIZE"); begin - return Natural (Result); + return Natural (Result); end Tab_Size; - function Number_Of_Colors return Natural + function Number_Of_Colors return Natural is - Result : C_Int; - pragma Import (C, Result, "COLORS"); + Result : C_Int; + pragma Import (C, Result, "COLORS"); begin - return Natural (Result); + return Natural (Result); end Number_Of_Colors; - function Number_Of_Color_Pairs return Natural + function Number_Of_Color_Pairs return Natural is - Result : C_Int; - pragma Import (C, Result, "COLOR_PAIRS"); + Result : C_Int; + pragma Import (C, Result, "COLOR_PAIRS"); begin - return Natural (Result); + return Natural (Result); end Number_Of_Color_Pairs; ------------------------------------------------------------------------------ - procedure Transform_Coordinates - (W : Window := Standard_Window; - Line : in out Line_Position; - Column : in out Column_Position; - Dir : Transform_Direction := From_Screen) - is - type Int_Access is access all C_Int; - function Transform (W : Window; - Y, X : Int_Access; - Dir : Curses_Bool) return C_Int; + procedure Transform_Coordinates + (W : Window := Standard_Window; + Line : in out Line_Position; + Column : in out Column_Position; + Dir : Transform_Direction := From_Screen) + is + type Int_Access is access all C_Int; + function Transform (W : Window; + Y, X : Int_Access; + Dir : Curses_Bool) return C_Int; pragma Import (C, Transform, "wmouse_trafo"); - X : aliased C_Int := C_Int (Column); - Y : aliased C_Int := C_Int (Line); - D : Curses_Bool := Curses_Bool_False; - R : C_Int; + X : aliased C_Int := C_Int (Column); + Y : aliased C_Int := C_Int (Line); + D : Curses_Bool := Curses_Bool_False; + R : C_Int; begin if Dir = To_Screen then - D := 1; + D := 1; end if; - R := Transform (W, Y'Access, X'Access, D); - if R = Curses_False then + R := Transform (W, Y'Access, X'Access, D); + if R = Curses_False then raise Curses_Exception; else - Line := Line_Position (Y); - Column := Column_Position (X); + Line := Line_Position (Y); + Column := Column_Position (X); end if; end Transform_Coordinates; ------------------------------------------------------------------------------ - procedure Use_Default_Colors is - function C_Use_Default_Colors return C_Int; + procedure Use_Default_Colors is + function C_Use_Default_Colors return C_Int; pragma Import (C, C_Use_Default_Colors, "use_default_colors"); - Err : constant C_Int := C_Use_Default_Colors; + Err : constant C_Int := C_Use_Default_Colors; begin - if Err = Curses_Err then + if Err = Curses_Err then raise Curses_Exception; end if; end Use_Default_Colors; - procedure Assume_Default_Colors (Fore : Color_Number := Default_Color; - Back : Color_Number := Default_Color) + procedure Assume_Default_Colors (Fore : Color_Number := Default_Color; + Back : Color_Number := Default_Color) is - function C_Assume_Default_Colors (Fore : C_Int; - Back : C_Int) return C_Int; + function C_Assume_Default_Colors (Fore : C_Int; + Back : C_Int) return C_Int; pragma Import (C, C_Assume_Default_Colors, "assume_default_colors"); - Err : constant C_Int := C_Assume_Default_Colors (C_Int (Fore), + Err : constant C_Int := C_Assume_Default_Colors (C_Int (Fore), C_Int (Back)); begin - if Err = Curses_Err then + if Err = Curses_Err then raise Curses_Exception; end if; end Assume_Default_Colors; ------------------------------------------------------------------------------ - function Curses_Version return String + function Curses_Version return String is - function curses_versionC return chars_ptr; + function curses_versionC return chars_ptr; pragma Import (C, curses_versionC, "curses_version"); - Result : constant chars_ptr := curses_versionC; + Result : constant chars_ptr := curses_versionC; begin - return Fill_String (Result); + return Fill_String (Result); end Curses_Version; ------------------------------------------------------------------------------ - procedure Curses_Free_All is - procedure curses_freeall; + procedure Curses_Free_All is + procedure curses_freeall; pragma Import (C, curses_freeall, "_nc_freeall"); begin -- Use this only for testing: you cannot use curses after calling it, @@ -2470,85 +2472,85 @@ -- _nc_free_and_exit() procedure can do that, but it can be invoked -- safely only from C - and again, that only as the "last" thing done -- before exiting the program. - curses_freeall; + curses_freeall; end Curses_Free_All; ------------------------------------------------------------------------------ - function Use_Extended_Names (Enable : Boolean) return Boolean + function Use_Extended_Names (Enable : Boolean) return Boolean is - function use_extended_namesC (e : Curses_Bool) return C_Int; + function use_extended_namesC (e : Curses_Bool) return C_Int; pragma Import (C, use_extended_namesC, "use_extended_names"); - Res : constant C_Int := - use_extended_namesC (Curses_Bool (Boolean'Pos (Enable))); + Res : constant C_Int := + use_extended_namesC (Curses_Bool (Boolean'Pos (Enable))); begin - if Res = C_Int (Curses_Bool_False) then + if Res = C_Int (Curses_Bool_False) then return False; else return True; end if; end Use_Extended_Names; ------------------------------------------------------------------------------ - procedure Screen_Dump_To_File (Filename : String) + procedure Screen_Dump_To_File (Filename : String) is - function scr_dump (f : char_array) return C_Int; + function scr_dump (f : char_array) return C_Int; pragma Import (C, scr_dump, "scr_dump"); - Txt : char_array (0 .. Filename'Length); - Length : size_t; + Txt : char_array (0 .. Filename'Length); + Length : size_t; begin - To_C (Filename, Txt, Length); - if Curses_Err = scr_dump (Txt) then + To_C (Filename, Txt, Length); + if Curses_Err = scr_dump (Txt) then raise Curses_Exception; end if; end Screen_Dump_To_File; - procedure Screen_Restore_From_File (Filename : String) + procedure Screen_Restore_From_File (Filename : String) is - function scr_restore (f : char_array) return C_Int; + function scr_restore (f : char_array) return C_Int; pragma Import (C, scr_restore, "scr_restore"); - Txt : char_array (0 .. Filename'Length); - Length : size_t; + Txt : char_array (0 .. Filename'Length); + Length : size_t; begin - To_C (Filename, Txt, Length); - if Curses_Err = scr_restore (Txt) then + To_C (Filename, Txt, Length); + if Curses_Err = scr_restore (Txt) then raise Curses_Exception; end if; end Screen_Restore_From_File; - procedure Screen_Init_From_File (Filename : String) + procedure Screen_Init_From_File (Filename : String) is - function scr_init (f : char_array) return C_Int; + function scr_init (f : char_array) return C_Int; pragma Import (C, scr_init, "scr_init"); - Txt : char_array (0 .. Filename'Length); - Length : size_t; + Txt : char_array (0 .. Filename'Length); + Length : size_t; begin - To_C (Filename, Txt, Length); - if Curses_Err = scr_init (Txt) then + To_C (Filename, Txt, Length); + if Curses_Err = scr_init (Txt) then raise Curses_Exception; end if; end Screen_Init_From_File; - procedure Screen_Set_File (Filename : String) + procedure Screen_Set_File (Filename : String) is - function scr_set (f : char_array) return C_Int; + function scr_set (f : char_array) return C_Int; pragma Import (C, scr_set, "scr_set"); - Txt : char_array (0 .. Filename'Length); - Length : size_t; + Txt : char_array (0 .. Filename'Length); + Length : size_t; begin - To_C (Filename, Txt, Length); - if Curses_Err = scr_set (Txt) then + To_C (Filename, Txt, Length); + if Curses_Err = scr_set (Txt) then raise Curses_Exception; end if; end Screen_Set_File; ------------------------------------------------------------------------------ - procedure Resize (Win : Window := Standard_Window; - Number_Of_Lines : Line_Count; - Number_Of_Columns : Column_Count) is - function wresize (win : Window; - lines : C_Int; - columns : C_Int) return C_Int; + procedure Resize (Win : Window := Standard_Window; + Number_Of_Lines : Line_Count; + Number_Of_Columns : Column_Count) is + function wresize (win : Window; + lines : C_Int; + columns : C_Int) return C_Int; pragma Import (C, wresize); begin - if wresize (Win, + if wresize (Win, C_Int (Number_Of_Lines), C_Int (Number_Of_Columns)) = Curses_Err then raise Curses_Exception; diff --git a/doc/html/ada/terminal_interface-curses__ads.htm b/doc/html/ada/terminal_interface-curses__ads.htm index 7cb70e70..3d690414 100644 --- a/doc/html/ada/terminal_interface-curses__ads.htm +++ b/doc/html/ada/terminal_interface-curses__ads.htm @@ -416,19 +416,19 @@ -- this is to use functions. -------------------------------------------------------------------------- - function Lines return Line_Count; + function Lines return Line_Count; pragma Inline (Lines); - function Columns return Column_Count; + function Columns return Column_Count; pragma Inline (Columns); - function Tab_Size return Natural; + function Tab_Size return Natural; pragma Inline (Tab_Size); - function Number_Of_Colors return Natural; + function Number_Of_Colors return Natural; pragma Inline (Number_Of_Colors); - function Number_Of_Color_Pairs return Natural; + function Number_Of_Color_Pairs return Natural; pragma Inline (Number_Of_Color_Pairs); type C_ACS_Map is array (Character'Val (0) .. Character'Val (127)) @@ -480,12 +480,12 @@ -- | Not implemented: newterm, set_term, delscreen -- #1A NAME="AFU_1"#2| - function Standard_Window return Window; + function Standard_Window return Window; -- AKA: stdscr pragma Inline (Standard_Window); -- #1A NAME="AFU_2"#2| - function Current_Window return Window; + function Current_Window return Window; -- AKA: curscr pragma Inline (Current_Window); @@ -1140,7 +1140,7 @@ -- |===================================================================== -- #1A NAME="AFU_73"#2| - procedure Untouch (Win : Window := Standard_Window); + procedure Untouch (Win : Window := Standard_Window); -- AKA: untouchwin() pragma Inline (Untouch); @@ -1149,9 +1149,9 @@ -- AKA: touchwin() -- #1A NAME="AFU_75"#2| - procedure Touch (Win : Window := Standard_Window; - Start : Line_Position; - Count : Positive); + procedure Touch (Win : Window := Standard_Window; + Start : Line_Position; + Count : Positive); -- AKA: touchline() pragma Inline (Touch); @@ -1164,12 +1164,12 @@ pragma Inline (Change_Lines_Status); -- #1A NAME="AFU_77"#2| - function Is_Touched (Win : Window := Standard_Window; - Line : Line_Position) return Boolean; + function Is_Touched (Win : Window := Standard_Window; + Line : Line_Position) return Boolean; -- AKA: is_linetouched() -- #1A NAME="AFU_78"#2| - function Is_Touched (Win : Window := Standard_Window) return Boolean; + function Is_Touched (Win : Window := Standard_Window) return Boolean; -- AKA: is_wintouched() pragma Inline (Is_Touched); @@ -1178,28 +1178,28 @@ -- |===================================================================== -- #1A NAME="AFU_79"#2| - procedure Copy - (Source_Window : Window; - Destination_Window : Window; - Source_Top_Row : Line_Position; - Source_Left_Column : Column_Position; - Destination_Top_Row : Line_Position; - Destination_Left_Column : Column_Position; - Destination_Bottom_Row : Line_Position; - Destination_Right_Column : Column_Position; - Non_Destructive_Mode : Boolean := True); + procedure Copy + (Source_Window : Window; + Destination_Window : Window; + Source_Top_Row : Line_Position; + Source_Left_Column : Column_Position; + Destination_Top_Row : Line_Position; + Destination_Left_Column : Column_Position; + Destination_Bottom_Row : Line_Position; + Destination_Right_Column : Column_Position; + Non_Destructive_Mode : Boolean := True); -- AKA: copywin() pragma Inline (Copy); -- #1A NAME="AFU_80"#2| - procedure Overwrite (Source_Window : Window; - Destination_Window : Window); + procedure Overwrite (Source_Window : Window; + Destination_Window : Window); -- AKA: overwrite() pragma Inline (Overwrite); -- #1A NAME="AFU_81"#2| - procedure Overlay (Source_Window : Window; - Destination_Window : Window); + procedure Overlay (Source_Window : Window; + Destination_Window : Window); -- AKA: overlay() pragma Inline (Overlay); @@ -1208,21 +1208,21 @@ -- |===================================================================== -- #1A NAME="AFU_82"#2| - procedure Insert_Delete_Lines - (Win : Window := Standard_Window; - Lines : Integer := 1); -- default is to insert one line above + procedure Insert_Delete_Lines + (Win : Window := Standard_Window; + Lines : Integer := 1); -- default is to insert one line above -- AKA: winsdelln() -- AKA: insdelln() pragma Inline (Insert_Delete_Lines); -- #1A NAME="AFU_83"#2| - procedure Delete_Line (Win : Window := Standard_Window); + procedure Delete_Line (Win : Window := Standard_Window); -- AKA: wdeleteln() -- AKA: deleteln() pragma Inline (Delete_Line); -- #1A NAME="AFU_84"#2| - procedure Insert_Line (Win : Window := Standard_Window); + procedure Insert_Line (Win : Window := Standard_Window); -- AKA: winsertln() -- AKA: insertln() pragma Inline (Insert_Line); @@ -1232,35 +1232,35 @@ -- |===================================================================== -- #1A NAME="AFU_85"#2| - procedure Get_Size - (Win : Window := Standard_Window; - Number_Of_Lines : out Line_Count; - Number_Of_Columns : out Column_Count); + procedure Get_Size + (Win : Window := Standard_Window; + Number_Of_Lines : out Line_Count; + Number_Of_Columns : out Column_Count); -- AKA: getmaxyx() pragma Inline (Get_Size); -- #1A NAME="AFU_86"#2| - procedure Get_Window_Position - (Win : Window := Standard_Window; - Top_Left_Line : out Line_Position; - Top_Left_Column : out Column_Position); + procedure Get_Window_Position + (Win : Window := Standard_Window; + Top_Left_Line : out Line_Position; + Top_Left_Column : out Column_Position); -- AKA: getbegyx() pragma Inline (Get_Window_Position); -- #1A NAME="AFU_87"#2| - procedure Get_Cursor_Position - (Win : Window := Standard_Window; - Line : out Line_Position; - Column : out Column_Position); + procedure Get_Cursor_Position + (Win : Window := Standard_Window; + Line : out Line_Position; + Column : out Column_Position); -- AKA: getyx() pragma Inline (Get_Cursor_Position); -- #1A NAME="AFU_88"#2| - procedure Get_Origin_Relative_To_Parent - (Win : Window; - Top_Left_Line : out Line_Position; - Top_Left_Column : out Column_Position; - Is_Not_A_Subwindow : out Boolean); + procedure Get_Origin_Relative_To_Parent + (Win : Window; + Top_Left_Line : out Line_Position; + Top_Left_Column : out Column_Position; + Is_Not_A_Subwindow : out Boolean); -- AKA: getparyx() -- Instead of placing -1 in the coordinates as return, we use a Boolean -- to return the info that the window has no parent. @@ -1271,54 +1271,54 @@ -- |===================================================================== -- #1A NAME="AFU_89"#2| - function New_Pad (Lines : Line_Count; - Columns : Column_Count) return Window; + function New_Pad (Lines : Line_Count; + Columns : Column_Count) return Window; -- AKA: newpad() pragma Inline (New_Pad); -- #1A NAME="AFU_90"#2| - function Sub_Pad - (Pad : Window; - Number_Of_Lines : Line_Count; - Number_Of_Columns : Column_Count; - First_Line_Position : Line_Position; - First_Column_Position : Column_Position) return Window; + function Sub_Pad + (Pad : Window; + Number_Of_Lines : Line_Count; + Number_Of_Columns : Column_Count; + First_Line_Position : Line_Position; + First_Column_Position : Column_Position) return Window; -- AKA: subpad() pragma Inline (Sub_Pad); -- #1A NAME="AFU_91"#2| - procedure Refresh - (Pad : Window; - Source_Top_Row : Line_Position; - Source_Left_Column : Column_Position; - Destination_Top_Row : Line_Position; - Destination_Left_Column : Column_Position; - Destination_Bottom_Row : Line_Position; - Destination_Right_Column : Column_Position); + procedure Refresh + (Pad : Window; + Source_Top_Row : Line_Position; + Source_Left_Column : Column_Position; + Destination_Top_Row : Line_Position; + Destination_Left_Column : Column_Position; + Destination_Bottom_Row : Line_Position; + Destination_Right_Column : Column_Position); -- AKA: prefresh() pragma Inline (Refresh); -- #1A NAME="AFU_92"#2| - procedure Refresh_Without_Update - (Pad : Window; - Source_Top_Row : Line_Position; - Source_Left_Column : Column_Position; - Destination_Top_Row : Line_Position; - Destination_Left_Column : Column_Position; - Destination_Bottom_Row : Line_Position; - Destination_Right_Column : Column_Position); + procedure Refresh_Without_Update + (Pad : Window; + Source_Top_Row : Line_Position; + Source_Left_Column : Column_Position; + Destination_Top_Row : Line_Position; + Destination_Left_Column : Column_Position; + Destination_Bottom_Row : Line_Position; + Destination_Right_Column : Column_Position); -- AKA: pnoutrefresh() pragma Inline (Refresh_Without_Update); -- #1A NAME="AFU_93"#2| - procedure Add_Character_To_Pad_And_Echo_It - (Pad : Window; - Ch : Attributed_Character); + procedure Add_Character_To_Pad_And_Echo_It + (Pad : Window; + Ch : Attributed_Character); -- AKA: pechochar() - procedure Add_Character_To_Pad_And_Echo_It - (Pad : Window; - Ch : Character); + procedure Add_Character_To_Pad_And_Echo_It + (Pad : Window; + Ch : Character); pragma Inline (Add_Character_To_Pad_And_Echo_It); -- |===================================================================== @@ -1326,8 +1326,8 @@ -- |===================================================================== -- #1A NAME="AFU_94"#2| - procedure Scroll (Win : Window := Standard_Window; - Amount : Integer := 1); + procedure Scroll (Win : Window := Standard_Window; + Amount : Integer := 1); -- AKA: wscrl() -- AKA: scroll() -- AKA: scrl() @@ -1338,15 +1338,15 @@ -- |===================================================================== -- #1A NAME="AFU_95"#2| - procedure Delete_Character (Win : Window := Standard_Window); + procedure Delete_Character (Win : Window := Standard_Window); -- AKA: wdelch() -- AKA: delch() -- #1A NAME="AFU_96"#2| - procedure Delete_Character - (Win : Window := Standard_Window; - Line : Line_Position; - Column : Column_Position); + procedure Delete_Character + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position); -- AKA: mvwdelch() -- AKA: mvdelch() pragma Inline (Delete_Character); @@ -1356,16 +1356,16 @@ -- |===================================================================== -- #1A NAME="AFU_97"#2| - function Peek (Win : Window := Standard_Window) + function Peek (Win : Window := Standard_Window) return Attributed_Character; -- AKA: inch() -- AKA: winch() -- #1A NAME="AFU_98"#2| - function Peek - (Win : Window := Standard_Window; - Line : Line_Position; - Column : Column_Position) return Attributed_Character; + function Peek + (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position) return Attributed_Character; -- AKA: mvwinch() -- AKA: mvinch() -- More Peek's follow, pragma Inline appears later. @@ -1375,16 +1375,16 @@ -- |===================================================================== -- #1A NAME="AFU_99"#2| - procedure Insert (Win : Window := Standard_Window; - Ch : Attributed_Character); + procedure Insert (Win : Window := Standard_Window; + Ch : Attributed_Character); -- AKA: winsch() -- AKA: insch() -- #1A NAME="AFU_100"#2| - procedure Insert (Win : Window := Standard_Window; - Line : Line_Position; - Column : Column_Position; - Ch : Attributed_Character); + procedure Insert (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Ch : Attributed_Character); -- AKA: mvwinsch() -- AKA: mvinsch() @@ -1393,20 +1393,20 @@ -- |===================================================================== -- #1A NAME="AFU_101"#2| - procedure Insert (Win : Window := Standard_Window; - Str : String; - Len : Integer := -1); + procedure Insert (Win : Window := Standard_Window; + Str : String; + Len : Integer := -1); -- AKA: winsnstr() -- AKA: winsstr() -- AKA: insnstr() -- AKA: insstr() -- #1A NAME="AFU_102"#2| - procedure Insert (Win : Window := Standard_Window; - Line : Line_Position; - Column : Column_Position; - Str : String; - Len : Integer := -1); + procedure Insert (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Str : String; + Len : Integer := -1); -- AKA: mvwinsnstr() -- AKA: mvwinsstr() -- AKA: mvinsnstr() @@ -1418,20 +1418,20 @@ -- |===================================================================== -- #1A NAME="AFU_103"#2| - procedure Peek (Win : Window := Standard_Window; - Str : out String; - Len : Integer := -1); + procedure Peek (Win : Window := Standard_Window; + Str : out String; + Len : Integer := -1); -- AKA: winnstr() -- AKA: winstr() -- AKA: innstr() -- AKA: instr() -- #1A NAME="AFU_104"#2| - procedure Peek (Win : Window := Standard_Window; - Line : Line_Position; - Column : Column_Position; - Str : out String; - Len : Integer := -1); + procedure Peek (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Str : out String; + Len : Integer := -1); -- AKA: mvwinnstr() -- AKA: mvwinstr() -- AKA: mvinnstr() @@ -1442,20 +1442,20 @@ -- |===================================================================== -- #1A NAME="AFU_105"#2| - procedure Peek (Win : Window := Standard_Window; - Str : out Attributed_String; - Len : Integer := -1); + procedure Peek (Win : Window := Standard_Window; + Str : out Attributed_String; + Len : Integer := -1); -- AKA: winchnstr() -- AKA: winchstr() -- AKA: inchnstr() -- AKA: inchstr() -- #1A NAME="AFU_106"#2| - procedure Peek (Win : Window := Standard_Window; - Line : Line_Position; - Column : Column_Position; - Str : out Attributed_String; - Len : Integer := -1); + procedure Peek (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Str : out Attributed_String; + Len : Integer := -1); -- AKA: mvwinchnstr() -- AKA: mvwinchstr() -- AKA: mvinchnstr() @@ -1467,9 +1467,9 @@ -- |===================================================================== -- #1A NAME="AFU_107"#2| - procedure Get (Win : Window := Standard_Window; - Str : out String; - Len : Integer := -1); + procedure Get (Win : Window := Standard_Window; + Str : out String; + Len : Integer := -1); -- AKA: wgetnstr() -- AKA: wgetstr() -- AKA: getnstr() @@ -1478,11 +1478,11 @@ -- overflows. -- #1A NAME="AFU_108"#2| - procedure Get (Win : Window := Standard_Window; - Line : Line_Position; - Column : Column_Position; - Str : out String; - Len : Integer := -1); + procedure Get (Win : Window := Standard_Window; + Line : Line_Position; + Column : Column_Position; + Str : out String; + Len : Integer := -1); -- AKA: mvwgetnstr() -- AKA: mvwgetstr() -- AKA: mvgetnstr() @@ -1503,80 +1503,80 @@ type Label_Justification is (Left, Centered, Right); -- #1A NAME="AFU_109"#2| - procedure Init_Soft_Label_Keys - (Format : Soft_Label_Key_Format := Three_Two_Three); + procedure Init_Soft_Label_Keys + (Format : Soft_Label_Key_Format := Three_Two_Three); -- AKA: slk_init() pragma Inline (Init_Soft_Label_Keys); -- #1A NAME="AFU_110"#2| - procedure Set_Soft_Label_Key (Label : Label_Number; - Text : String; - Fmt : Label_Justification := Left); + procedure Set_Soft_Label_Key (Label : Label_Number; + Text : String; + Fmt : Label_Justification := Left); -- AKA: slk_set() -- We do not inline this procedure -- #1A NAME="AFU_111"#2| - procedure Refresh_Soft_Label_Keys; + procedure Refresh_Soft_Label_Keys; -- AKA: slk_refresh() pragma Inline (Refresh_Soft_Label_Keys); -- #1A NAME="AFU_112"#2| - procedure Refresh_Soft_Label_Keys_Without_Update; + procedure Refresh_Soft_Label_Keys_Without_Update; -- AKA: slk_noutrefresh() pragma Inline (Refresh_Soft_Label_Keys_Without_Update); -- #1A NAME="AFU_113"#2| - procedure Get_Soft_Label_Key (Label : Label_Number; - Text : out String); + procedure Get_Soft_Label_Key (Label : Label_Number; + Text : out String); -- AKA: slk_label() -- #1A NAME="AFU_114"#2| - function Get_Soft_Label_Key (Label : Label_Number) return String; + function Get_Soft_Label_Key (Label : Label_Number) return String; -- AKA: slk_label() -- Same as function pragma Inline (Get_Soft_Label_Key); -- #1A NAME="AFU_115"#2| - procedure Clear_Soft_Label_Keys; + procedure Clear_Soft_Label_Keys; -- AKA: slk_clear() pragma Inline (Clear_Soft_Label_Keys); -- #1A NAME="AFU_116"#2| - procedure Restore_Soft_Label_Keys; + procedure Restore_Soft_Label_Keys; -- AKA: slk_restore() pragma Inline (Restore_Soft_Label_Keys); -- #1A NAME="AFU_117"#2| - procedure Touch_Soft_Label_Keys; + procedure Touch_Soft_Label_Keys; -- AKA: slk_touch() pragma Inline (Touch_Soft_Label_Keys); -- #1A NAME="AFU_118"#2| - procedure Switch_Soft_Label_Key_Attributes - (Attr : Character_Attribute_Set; - On : Boolean := True); + procedure Switch_Soft_Label_Key_Attributes + (Attr : Character_Attribute_Set; + On : Boolean := True); -- AKA: slk_attron() -- AKA: slk_attroff() pragma Inline (Switch_Soft_Label_Key_Attributes); -- #1A NAME="AFU_119"#2| - procedure Set_Soft_Label_Key_Attributes - (Attr : Character_Attribute_Set := Normal_Video; - Color : Color_Pair := Color_Pair'First); + procedure Set_Soft_Label_Key_Attributes + (Attr : Character_Attribute_Set := Normal_Video; + Color : Color_Pair := Color_Pair'First); -- AKA: slk_attrset() pragma Inline (Set_Soft_Label_Key_Attributes); -- #1A NAME="AFU_120"#2| - function Get_Soft_Label_Key_Attributes return Character_Attribute_Set; + function Get_Soft_Label_Key_Attributes return Character_Attribute_Set; -- AKA: slk_attr() -- #1A NAME="AFU_121"#2| - function Get_Soft_Label_Key_Attributes return Color_Pair; + function Get_Soft_Label_Key_Attributes return Color_Pair; -- AKA: slk_attr() pragma Inline (Get_Soft_Label_Key_Attributes); -- #1A NAME="AFU_122"#2| - procedure Set_Soft_Label_Key_Color (Pair : Color_Pair); + procedure Set_Soft_Label_Key_Color (Pair : Color_Pair); -- AKA: slk_color() pragma Inline (Set_Soft_Label_Key_Color); @@ -1590,8 +1590,8 @@ -- |===================================================================== -- #1A NAME="AFU_123"#2| - procedure Enable_Key (Key : Special_Key_Code; - Enable : Boolean := True); + procedure Enable_Key (Key : Special_Key_Code; + Enable : Boolean := True); -- AKA: keyok() pragma Inline (Enable_Key); @@ -1600,8 +1600,8 @@ -- |===================================================================== -- #1A NAME="AFU_124"#2| - procedure Define_Key (Definition : String; - Key : Special_Key_Code); + procedure Define_Key (Definition : String; + Key : Special_Key_Code); -- AKA: define_key() pragma Inline (Define_Key); @@ -1626,23 +1626,23 @@ -- We do not inline this routine -- #1A NAME="AFU_127"#2| - procedure Un_Control (Ch : Attributed_Character; - Str : out String); + procedure Un_Control (Ch : Attributed_Character; + Str : out String); -- AKA: unctrl() -- #1A NAME="AFU_128"#2| - function Un_Control (Ch : Attributed_Character) return String; + function Un_Control (Ch : Attributed_Character) return String; -- AKA: unctrl() -- Same as function pragma Inline (Un_Control); -- #1A NAME="AFU_129"#2| - procedure Delay_Output (Msecs : Natural); + procedure Delay_Output (Msecs : Natural); -- AKA: delay_output() pragma Inline (Delay_Output); -- #1A NAME="AFU_130"#2| - procedure Flush_Input; + procedure Flush_Input; -- AKA: flushinp() pragma Inline (Flush_Input); @@ -1651,51 +1651,51 @@ -- |===================================================================== -- #1A NAME="AFU_131"#2| - function Baudrate return Natural; + function Baudrate return Natural; -- AKA: baudrate() pragma Inline (Baudrate); -- #1A NAME="AFU_132"#2| - function Erase_Character return Character; + function Erase_Character return Character; -- AKA: erasechar() pragma Inline (Erase_Character); -- #1A NAME="AFU_133"#2| - function Kill_Character return Character; + function Kill_Character return Character; -- AKA: killchar() pragma Inline (Kill_Character); -- #1A NAME="AFU_134"#2| - function Has_Insert_Character return Boolean; + function Has_Insert_Character return Boolean; -- AKA: has_ic() pragma Inline (Has_Insert_Character); -- #1A NAME="AFU_135"#2| - function Has_Insert_Line return Boolean; + function Has_Insert_Line return Boolean; -- AKA: has_il() pragma Inline (Has_Insert_Line); -- #1A NAME="AFU_136"#2| - function Supported_Attributes return Character_Attribute_Set; + function Supported_Attributes return Character_Attribute_Set; -- AKA: termattrs() pragma Inline (Supported_Attributes); -- #1A NAME="AFU_137"#2| - procedure Long_Name (Name : out String); + procedure Long_Name (Name : out String); -- AKA: longname() -- #1A NAME="AFU_138"#2| - function Long_Name return String; + function Long_Name return String; -- AKA: longname() -- Same as function pragma Inline (Long_Name); -- #1A NAME="AFU_139"#2| - procedure Terminal_Name (Name : out String); + procedure Terminal_Name (Name : out String); -- AKA: termname() -- #1A NAME="AFU_140"#2| - function Terminal_Name return String; + function Terminal_Name return String; -- AKA: termname() -- Same as function pragma Inline (Terminal_Name); @@ -1716,42 +1716,42 @@ pragma Import (C, Start_Color, "start_color"); -- #1A NAME="AFU_142"#2| - procedure Init_Pair (Pair : Redefinable_Color_Pair; - Fore : Color_Number; - Back : Color_Number); + procedure Init_Pair (Pair : Redefinable_Color_Pair; + Fore : Color_Number; + Back : Color_Number); -- AKA: init_pair() pragma Inline (Init_Pair); -- #1A NAME="AFU_143"#2| - procedure Pair_Content (Pair : Color_Pair; - Fore : out Color_Number; - Back : out Color_Number); + procedure Pair_Content (Pair : Color_Pair; + Fore : out Color_Number; + Back : out Color_Number); -- AKA: pair_content() pragma Inline (Pair_Content); -- #1A NAME="AFU_144"#2| - function Has_Colors return Boolean; + function Has_Colors return Boolean; -- AKA: has_colors() pragma Inline (Has_Colors); -- #1A NAME="AFU_145"#2| - procedure Init_Color (Color : Color_Number; - Red : RGB_Value; - Green : RGB_Value; - Blue : RGB_Value); + procedure Init_Color (Color : Color_Number; + Red : RGB_Value; + Green : RGB_Value; + Blue : RGB_Value); -- AKA: init_color() pragma Inline (Init_Color); -- #1A NAME="AFU_146"#2| - function Can_Change_Color return Boolean; + function Can_Change_Color return Boolean; -- AKA: can_change_color() pragma Inline (Can_Change_Color); -- #1A NAME="AFU_147"#2| - procedure Color_Content (Color : Color_Number; - Red : out RGB_Value; - Green : out RGB_Value; - Blue : out RGB_Value); + procedure Color_Content (Color : Color_Number; + Red : out RGB_Value; + Green : out RGB_Value; + Blue : out RGB_Value); -- AKA: color_content() pragma Inline (Color_Content); @@ -1763,24 +1763,24 @@ type Curses_Mode is (Curses, Shell); -- #1A NAME="AFU_148"#2| - procedure Save_Curses_Mode (Mode : Curses_Mode); + procedure Save_Curses_Mode (Mode : Curses_Mode); -- AKA: def_prog_mode() -- AKA: def_shell_mode() pragma Inline (Save_Curses_Mode); -- #1A NAME="AFU_149"#2| - procedure Reset_Curses_Mode (Mode : Curses_Mode); + procedure Reset_Curses_Mode (Mode : Curses_Mode); -- AKA: reset_prog_mode() -- AKA: reset_shell_mode() pragma Inline (Reset_Curses_Mode); -- #1A NAME="AFU_150"#2| - procedure Save_Terminal_State; + procedure Save_Terminal_State; -- AKA: savetty() pragma Inline (Save_Terminal_State); -- #1A NAME="AFU_151"#2| - procedure Reset_Terminal_State; + procedure Reset_Terminal_State; -- AKA: resetty(); pragma Inline (Reset_Terminal_State); @@ -1793,8 +1793,8 @@ -- and -1 otherwise. -- #1A NAME="AFU_152"#2| - procedure Rip_Off_Lines (Lines : Integer; - Proc : Stdscr_Init_Proc); + procedure Rip_Off_Lines (Lines : Integer; + Proc : Stdscr_Init_Proc); -- AKA: ripoffline() -- N.B.: to be more precise, this uses a ncurses specific enhancement of -- ripoffline(), in which the Lines argument absolute value is the @@ -1805,12 +1805,12 @@ type Cursor_Visibility is (Invisible, Normal, Very_Visible); -- #1A NAME="AFU_153"#2| - procedure Set_Cursor_Visibility (Visibility : in out Cursor_Visibility); + procedure Set_Cursor_Visibility (Visibility : in out Cursor_Visibility); -- AKA: curs_set() pragma Inline (Set_Cursor_Visibility); -- #1A NAME="AFU_154"#2| - procedure Nap_Milli_Seconds (Ms : Natural); + procedure Nap_Milli_Seconds (Ms : Natural); -- AKA: napms() pragma Inline (Nap_Milli_Seconds); @@ -1818,11 +1818,11 @@ -- | Some useful helpers. -- |===================================================================== type Transform_Direction is (From_Screen, To_Screen); - procedure Transform_Coordinates - (W : Window := Standard_Window; - Line : in out Line_Position; - Column : in out Column_Position; - Dir : Transform_Direction := From_Screen); + procedure Transform_Coordinates + (W : Window := Standard_Window; + Line : in out Line_Position; + Column : in out Column_Position; + 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 information for the physical device. @@ -1835,13 +1835,13 @@ -- |===================================================================== -- #1A NAME="AFU_155"#2| - procedure Use_Default_Colors; + procedure Use_Default_Colors; -- AKA: use_default_colors() pragma Inline (Use_Default_Colors); -- #1A NAME="AFU_156"#2| - procedure Assume_Default_Colors (Fore : Color_Number := Default_Color; - Back : Color_Number := Default_Color); + procedure Assume_Default_Colors (Fore : Color_Number := Default_Color; + Back : Color_Number := Default_Color); -- AKA: assume_default_colors() pragma Inline (Assume_Default_Colors); @@ -1850,12 +1850,12 @@ -- |===================================================================== -- #1A NAME="AFU_157"#2| - function Curses_Version return String; + function Curses_Version return String; -- AKA: curses_version() -- #1A NAME="AFU_158"#2| -- The returnvalue is the previous setting of the flag - function Use_Extended_Names (Enable : Boolean) return Boolean; + function Use_Extended_Names (Enable : Boolean) return Boolean; -- AKA: use_extended_names() -- |===================================================================== @@ -1863,7 +1863,7 @@ -- |===================================================================== -- #1A NAME="AFU_159"#2| - procedure Curses_Free_All; + procedure Curses_Free_All; -- AKA: _nc_freeall() -- |===================================================================== @@ -1871,19 +1871,19 @@ -- |===================================================================== -- #1A NAME="AFU_160"#2| - procedure Screen_Dump_To_File (Filename : String); + procedure Screen_Dump_To_File (Filename : String); -- AKA: scr_dump() -- #1A NAME="AFU_161"#2| - procedure Screen_Restore_From_File (Filename : String); + procedure Screen_Restore_From_File (Filename : String); -- AKA: scr_restore() -- #1A NAME="AFU_162"#2| - procedure Screen_Init_From_File (Filename : String); + procedure Screen_Init_From_File (Filename : String); -- AKA: scr_init() -- #1A NAME="AFU_163"#2| - procedure Screen_Set_File (Filename : String); + procedure Screen_Set_File (Filename : String); -- AKA: scr_set() -- |===================================================================== @@ -1915,9 +1915,9 @@ -- |===================================================================== -- #1A NAME="AFU_164"#2| - procedure Resize (Win : Window := Standard_Window; - Number_Of_Lines : Line_Count; - Number_Of_Columns : Column_Count); + procedure Resize (Win : Window := Standard_Window; + Number_Of_Lines : Line_Count; + Number_Of_Columns : Column_Count); -- AKA: wresize() private diff --git a/include/ncurses_defs b/include/ncurses_defs index cab12f84..42d59084 100644 --- a/include/ncurses_defs +++ b/include/ncurses_defs @@ -1,4 +1,4 @@ -# $Id: ncurses_defs,v 1.45 2011/01/15 18:19:51 tom Exp $ +# $Id: ncurses_defs,v 1.46 2011/03/22 09:17:59 tom Exp $ ############################################################################## # Copyright (c) 2000-2010,2011 Free Software Foundation, Inc. # # # @@ -85,6 +85,7 @@ HAVE_LIMITS_H HAVE_LINK HAVE_LOCALE_H HAVE_LONG_FILE_NAMES +HAVE_MATH_H HAVE_MBLEN HAVE_MBRLEN HAVE_MBRTOWC @@ -141,8 +142,8 @@ HAVE_TERMATTRS 1 HAVE_TERMIOS_H HAVE_TERMIO_H HAVE_TERMNAME 1 -HAVE_TERM_H 1 HAVE_TERM_ENTRY_H 1 +HAVE_TERM_H 1 HAVE_TGETENT 1 HAVE_TIGETNUM 1 HAVE_TIGETSTR 1 @@ -164,9 +165,9 @@ HAVE_WCTOB HAVE_WCTOMB HAVE_WCTYPE_H HAVE_WINSSTR 1 -HAVE_WSYNCDOWN 1 HAVE_WORKING_POLL HAVE_WRESIZE +HAVE_WSYNCDOWN 1 HAVE__DOSCAN MIXEDCASE_FILENAMES NCURSES_CHAR_EQ diff --git a/man/MKada_config.in b/man/MKada_config.in index 487a9a82..2be3c419 100644 --- a/man/MKada_config.in +++ b/man/MKada_config.in @@ -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 * @@ -26,12 +26,12 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: MKada_config.in,v 1.3 2010/03/06 22:29:06 tom Exp $ +.\" $Id: MKada_config.in,v 1.5 2011/03/26 14:44:51 tom Exp $ .TH ADACURSES "1" "" "" "User Commands" .SH NAME -adacurses-config \- helper script for AdaCurses libraries +adacurses\-config \- helper script for AdaCurses libraries .SH SYNOPSIS -.B adacurses-config +.B adacurses\-config [\fIoptions\fR] .SH DESCRIPTION This is a shell script which simplifies configuring an application to use @@ -39,16 +39,17 @@ the AdaCurses library binding to ncurses. .SH OPTIONS .TP \fB\-\-cflags\fR -echos the gnat (Ada compiler) flags needed to compile with adacurses +echos the gnat (Ada compiler) flags needed to compile with AdaCurses. .TP \fB\-\-libs\fR -echos the gnat libraries needed to link with adacurses +echos the gnat libraries needed to link with AdaCurses. .TP \fB\-\-version\fR -echos the release+patchdate version of adacurses +echos the release+patchdate version of the ncurses libraries used +to configure and build AdaCurses. .TP \fB\-\-help\fR -prints this message +prints a list of the \fBadacurses\-config\fP script's options. .SH "SEE ALSO" \fBcurses\fR(3X) .PP diff --git a/ncurses/widechar/lib_add_wch.c b/ncurses/widechar/lib_add_wch.c index a8491fcb..38d3130a 100644 --- a/ncurses/widechar/lib_add_wch.c +++ b/ncurses/widechar/lib_add_wch.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2004-2009,2010 Free Software Foundation, Inc. * + * Copyright (c) 2004-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 * @@ -39,7 +39,7 @@ #include #endif -MODULE_ID("$Id: lib_add_wch.c,v 1.11 2010/12/19 01:32:55 tom Exp $") +MODULE_ID("$Id: lib_add_wch.c,v 1.12 2011/03/22 09:31:15 Petr.Pavlu Exp $") /* clone/adapt lib_addch.c */ static const cchar_t blankchar = NewChar(BLANK_TEXT); @@ -308,7 +308,7 @@ wadd_wch_nosync(WINDOW *win, cchar_t ch) /* * If we are using the alternate character set, forget about locale. - * Otherwise, if the locale * claims the code is printable, treat it that + * Otherwise, if the locale claims the code is printable, treat it that * way. */ if ((AttrOf(ch) & A_ALTCHARSET) diff --git a/test/aclocal.m4 b/test/aclocal.m4 index 41641b50..4e334314 100644 --- a/test/aclocal.m4 +++ b/test/aclocal.m4 @@ -26,7 +26,7 @@ dnl sale, use or other dealings in this Software without prior written * dnl authorization. * dnl*************************************************************************** dnl -dnl $Id: aclocal.m4,v 1.49 2011/01/15 23:47:10 tom Exp $ +dnl $Id: aclocal.m4,v 1.50 2011/03/24 08:28:07 tom Exp $ dnl dnl Author: Thomas E. Dickey dnl @@ -624,7 +624,7 @@ fi AC_CHECK_HEADERS($cf_cv_ncurses_header) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_LIBS version: 31 updated: 2010/10/23 15:54:49 +dnl CF_CURSES_LIBS version: 33 updated: 2011/03/06 12:37:18 dnl -------------- dnl Look for the curses libraries. Older curses implementations may require dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first. @@ -655,8 +655,20 @@ hpux10.*) #(vi ac_cv_func_initscr=yes ])]) ;; -linux*) # Suse Linux does not follow /usr/lib convention - CF_ADD_LIBDIR(/lib) +linux*) + case `arch 2>/dev/null` in + x86_64) + if test -d /lib64 + then + CF_ADD_LIBDIR(/lib64) + else + CF_ADD_LIBDIR(/lib) + fi + ;; + *) + CF_ADD_LIBDIR(/lib) + ;; + esac ;; sunos3*|sunos4*) if test -d /usr/5lib ; then @@ -2164,7 +2176,7 @@ else fi ])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], @@ -2181,7 +2193,7 @@ no) #(vi PKG_CONFIG=none ;; yes) #(vi - AC_PATH_PROG(PKG_CONFIG, pkg-config, none) + AC_PATH_TOOL(PKG_CONFIG, pkg-config, none) ;; *) PKG_CONFIG=$withval @@ -2663,7 +2675,7 @@ CF_NO_LEAKS_OPTION(valgrind, [USE_VALGRIND]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_CURSES version: 10 updated: 2010/10/23 15:54:49 +dnl CF_XOPEN_CURSES version: 11 updated: 2011/01/18 18:15:30 dnl --------------- dnl Test if we should define X/Open source for curses, needed on Digital Unix dnl 4.x, to see the extended functions, but breaks on IRIX 6.x. @@ -2678,7 +2690,7 @@ AC_TRY_LINK([ #include #include <${cf_cv_ncurses_header:-curses.h}>],[ #if defined(NCURSES_VERSION_PATCH) -if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403) +#if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403) make an error #endif #endif @@ -2702,7 +2714,7 @@ if (NCURSES_VERSION_PATCH < 20100501) && (NCURSES_VERSION_PATCH >= 20100403) test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" ])dnl 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, @@ -2721,6 +2733,9 @@ case $host_os in #(vi 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" ;; @@ -2942,7 +2957,7 @@ elif test "$cf_x_athena_inc" != default ; then fi ]) dnl --------------------------------------------------------------------------- -dnl CF_X_ATHENA_LIBS version: 9 updated: 2010/06/02 05:03:05 +dnl CF_X_ATHENA_LIBS version: 10 updated: 2011/02/13 13:31:33 dnl ---------------- dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw. @@ -2972,7 +2987,11 @@ do CF_ADD_LIBS($cf_lib) AC_MSG_CHECKING(for $cf_test in $cf_lib) fi - AC_TRY_LINK([],[$cf_test()], + AC_TRY_LINK([ +#include +#include +],[ +$cf_test((XtAppContext) 0)], [cf_result=yes], [cf_result=no]) AC_MSG_RESULT($cf_result) diff --git a/test/configure b/test/configure index ab87e4ea..2937235e 100755 --- a/test/configure +++ b/test/configure @@ -1,6 +1,6 @@ #! /bin/sh # 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. @@ -767,7 +767,7 @@ This file contains any messages produced by compilers while 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 $@ @@ -2842,6 +2842,9 @@ case $host_os in #(vi 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" ;; @@ -2867,14 +2870,14 @@ irix[56].*) #(vi ;; linux*|gnu*|mint*|k*bsd*-gnu) #(vi -echo "$as_me:2870: checking if we must define _GNU_SOURCE" >&5 +echo "$as_me:2873: 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 2877 "configure" +#line 2880 "configure" #include "confdefs.h" #include int @@ -2889,16 +2892,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2892: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2895: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2895: \$? = $ac_status" >&5 + echo "$as_me:2898: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2898: \"$ac_try\"") >&5 + { (eval echo "$as_me:2901: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2901: \$? = $ac_status" >&5 + echo "$as_me:2904: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -2907,7 +2910,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 2910 "configure" +#line 2913 "configure" #include "confdefs.h" #include int @@ -2922,16 +2925,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2925: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2928: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2928: \$? = $ac_status" >&5 + echo "$as_me:2931: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2931: \"$ac_try\"") >&5 + { (eval echo "$as_me:2934: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2934: \$? = $ac_status" >&5 + echo "$as_me:2937: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -2946,7 +2949,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2949: result: $cf_cv_gnu_source" >&5 +echo "$as_me:2952: 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" @@ -2976,14 +2979,14 @@ solaris2.[1-9]) #(vi cf_xopen_source="-D__EXTENSIONS__" ;; *) - echo "$as_me:2979: checking if we should define _XOPEN_SOURCE" >&5 + echo "$as_me:2982: 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 2986 "configure" +#line 2989 "configure" #include "confdefs.h" #include int @@ -2998,16 +3001,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3001: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3004: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3004: \$? = $ac_status" >&5 + echo "$as_me:3007: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3007: \"$ac_try\"") >&5 + { (eval echo "$as_me:3010: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3010: \$? = $ac_status" >&5 + echo "$as_me:3013: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3016,7 +3019,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 3019 "configure" +#line 3022 "configure" #include "confdefs.h" #include int @@ -3031,16 +3034,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3034: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3037: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3037: \$? = $ac_status" >&5 + echo "$as_me:3040: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3040: \"$ac_try\"") >&5 + { (eval echo "$as_me:3043: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3043: \$? = $ac_status" >&5 + echo "$as_me:3046: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3055,7 +3058,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3058: result: $cf_cv_xopen_source" >&5 +echo "$as_me:3061: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -3162,16 +3165,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:3165: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:3168: 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}:3171: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:3174: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3174 "configure" +#line 3177 "configure" #include "confdefs.h" #include int @@ -3186,16 +3189,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3189: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3192: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3192: \$? = $ac_status" >&5 + echo "$as_me:3195: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3195: \"$ac_try\"") >&5 + { (eval echo "$as_me:3198: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3198: \$? = $ac_status" >&5 + echo "$as_me:3201: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -3216,7 +3219,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 3219 "configure" +#line 3222 "configure" #include "confdefs.h" #include int @@ -3231,16 +3234,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3234: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3237: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3237: \$? = $ac_status" >&5 + echo "$as_me:3240: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3240: \"$ac_try\"") >&5 + { (eval echo "$as_me:3243: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3243: \$? = $ac_status" >&5 + echo "$as_me:3246: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3251,15 +3254,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:3254: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:3257: 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}:3259: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:3262: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3262 "configure" +#line 3265 "configure" #include "confdefs.h" #include int @@ -3274,16 +3277,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3277: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3280: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3280: \$? = $ac_status" >&5 + echo "$as_me:3283: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3283: \"$ac_try\"") >&5 + { (eval echo "$as_me:3286: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3286: \$? = $ac_status" >&5 + echo "$as_me:3289: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3299,7 +3302,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3302: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:3305: 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 @@ -3471,7 +3474,7 @@ fi fi -echo "$as_me:3474: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:3477: 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 @@ -3479,7 +3482,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 3482 "configure" +#line 3485 "configure" #include "confdefs.h" #include #include @@ -3528,16 +3531,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:3531: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3534: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3534: \$? = $ac_status" >&5 + echo "$as_me:3537: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3537: \"$ac_try\"") >&5 + { (eval echo "$as_me:3540: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3540: \$? = $ac_status" >&5 + echo "$as_me:3543: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -3554,21 +3557,21 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:3557: result: none needed" >&5 + echo "$as_me:3560: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:3560: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:3563: 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:3565: checking for an ANSI C-conforming const" >&5 +echo "$as_me:3568: 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 3571 "configure" +#line 3574 "configure" #include "confdefs.h" int @@ -3626,16 +3629,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3629: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3632: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3632: \$? = $ac_status" >&5 + echo "$as_me:3635: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3635: \"$ac_try\"") >&5 + { (eval echo "$as_me:3638: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3638: \$? = $ac_status" >&5 + echo "$as_me:3641: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else @@ -3645,7 +3648,7 @@ ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3648: result: $ac_cv_c_const" >&5 +echo "$as_me:3651: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -3655,7 +3658,7 @@ EOF fi -echo "$as_me:3658: checking for signal global datatype" >&5 +echo "$as_me:3661: 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 @@ -3667,7 +3670,7 @@ else "int" do cat >conftest.$ac_ext <<_ACEOF -#line 3670 "configure" +#line 3673 "configure" #include "confdefs.h" #include @@ -3690,16 +3693,16 @@ signal(SIGINT, handler); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3693: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3696: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3696: \$? = $ac_status" >&5 + echo "$as_me:3699: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3699: \"$ac_try\"") >&5 + { (eval echo "$as_me:3702: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3702: \$? = $ac_status" >&5 + echo "$as_me:3705: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sig_atomic_t=$cf_type else @@ -3713,13 +3716,13 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3716: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:3719: 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:3725: checking if you want to see long compiling messages" >&5 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 # Check whether --enable-echo or --disable-echo was given. @@ -3753,22 +3756,22 @@ else ECHO_CC='' fi; -echo "$as_me:3756: result: $enableval" >&5 +echo "$as_me:3759: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:3761: checking version of $CC" >&5 + echo "$as_me:3764: 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:3765: result: $GCC_VERSION" >&5 + echo "$as_me:3768: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi if ( test "$GCC" = yes || test "$GXX" = yes ) then -echo "$as_me:3771: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:3774: checking if you want to turn on gcc warnings" >&5 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. @@ -3785,7 +3788,7 @@ else with_warnings=no fi; -echo "$as_me:3788: result: $with_warnings" >&5 +echo "$as_me:3791: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "$with_warnings" = "yes" then @@ -3808,10 +3811,10 @@ cat > conftest.i <&5 + { echo "$as_me:3814: 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:3866: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3866: \$? = $ac_status" >&5 + echo "$as_me:3869: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:3868: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:3871: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in #(vi @@ -3905,12 +3908,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in linux*|gnu*) - echo "$as_me:3908: checking if this is really Intel C compiler" >&5 + echo "$as_me:3911: 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 3913 "configure" +#line 3916 "configure" #include "confdefs.h" int @@ -3927,16 +3930,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3930: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3933: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3933: \$? = $ac_status" >&5 + echo "$as_me:3936: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3936: \"$ac_try\"") >&5 + { (eval echo "$as_me:3939: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3939: \$? = $ac_status" >&5 + echo "$as_me:3942: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" @@ -3947,14 +3950,14 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:3950: result: $INTEL_COMPILER" >&5 + echo "$as_me:3953: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac fi cat > conftest.$ac_ext <&5 + { echo "$as_me:3977: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -3987,12 +3990,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:3990: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:3993: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3993: \$? = $ac_status" >&5 + echo "$as_me:3996: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:3995: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:3998: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -4001,7 +4004,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GCC" = yes then - { echo "$as_me:4004: checking for $CC warning options..." >&5 + { echo "$as_me:4007: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS= @@ -4021,12 +4024,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:4024: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:4027: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4027: \$? = $ac_status" >&5 + echo "$as_me:4030: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:4029: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:4032: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in #(vi Wcast-qual) #(vi @@ -4037,7 +4040,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 [34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:4040: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:4043: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -4053,7 +4056,7 @@ rm -rf conftest* fi fi -echo "$as_me:4056: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:4059: checking if you want to use dmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6 # Check whether --with-dmalloc or --without-dmalloc was given. @@ -4069,7 +4072,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:4072: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:4075: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case .$with_cflags in #(vi @@ -4163,23 +4166,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:4166: checking for dmalloc.h" >&5 + echo "$as_me:4169: checking for dmalloc.h" >&5 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4172 "configure" +#line 4175 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:4176: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4179: \"$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:4182: \$? = $ac_status" >&5 + echo "$as_me:4185: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4198,11 +4201,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4201: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:4204: result: $ac_cv_header_dmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6 if test $ac_cv_header_dmalloc_h = yes; then -echo "$as_me:4205: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:4208: checking for dmalloc_debug in -ldmalloc" >&5 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4210,7 +4213,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4213 "configure" +#line 4216 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4229,16 +4232,16 @@ dmalloc_debug (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4232: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4235: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4235: \$? = $ac_status" >&5 + echo "$as_me:4238: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4238: \"$ac_try\"") >&5 + { (eval echo "$as_me:4241: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4241: \$? = $ac_status" >&5 + echo "$as_me:4244: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -4249,7 +4252,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4252: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:4255: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then cat >>confdefs.h <&5 +echo "$as_me:4270: checking if you want to use dbmalloc for testing" >&5 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 # Check whether --with-dbmalloc or --without-dbmalloc was given. @@ -4280,7 +4283,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:4283: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:4286: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case .$with_cflags in #(vi @@ -4374,23 +4377,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:4377: checking for dbmalloc.h" >&5 + echo "$as_me:4380: checking for dbmalloc.h" >&5 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6 if test "${ac_cv_header_dbmalloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4383 "configure" +#line 4386 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:4387: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4390: \"$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:4393: \$? = $ac_status" >&5 + echo "$as_me:4396: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4409,11 +4412,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4412: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:4415: result: $ac_cv_header_dbmalloc_h" >&5 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6 if test $ac_cv_header_dbmalloc_h = yes; then -echo "$as_me:4416: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:4419: checking for debug_malloc in -ldbmalloc" >&5 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4421,7 +4424,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4424 "configure" +#line 4427 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4440,16 +4443,16 @@ debug_malloc (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4443: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4446: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4446: \$? = $ac_status" >&5 + echo "$as_me:4449: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4449: \"$ac_try\"") >&5 + { (eval echo "$as_me:4452: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4452: \$? = $ac_status" >&5 + echo "$as_me:4455: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -4460,7 +4463,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4463: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:4466: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then cat >>confdefs.h <&5 +echo "$as_me:4481: checking if you want to use valgrind for testing" >&5 echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 # Check whether --with-valgrind or --without-valgrind was given. @@ -4491,7 +4494,7 @@ EOF else with_valgrind= fi; -echo "$as_me:4494: result: ${with_valgrind:-no}" >&5 +echo "$as_me:4497: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case .$with_cflags in #(vi @@ -4584,7 +4587,7 @@ fi ;; esac -echo "$as_me:4587: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:4590: checking if you want to perform memory-leak testing" >&5 echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 # Check whether --enable-leaks or --disable-leaks was given. @@ -4594,7 +4597,7 @@ if test "${enable_leaks+set}" = set; then else : ${with_no_leaks:=no} fi; -echo "$as_me:4597: result: $with_no_leaks" >&5 +echo "$as_me:4600: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$with_no_leaks" = yes ; then @@ -4608,7 +4611,7 @@ EOF fi -echo "$as_me:4611: checking for specific curses-directory" >&5 +echo "$as_me:4614: 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. @@ -4618,7 +4621,7 @@ if test "${with_curses_dir+set}" = set; then else cf_cv_curses_dir=no fi; -echo "$as_me:4621: result: $cf_cv_curses_dir" >&5 +echo "$as_me:4624: 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" ) @@ -4649,7 +4652,7 @@ case ".$withval" in #(vi withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:4652: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:4655: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -4682,7 +4685,7 @@ if test -n "$cf_cv_curses_dir/include" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 4685 "configure" +#line 4688 "configure" #include "confdefs.h" #include int @@ -4694,16 +4697,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4697: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4700: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4700: \$? = $ac_status" >&5 + echo "$as_me:4703: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4703: \"$ac_try\"") >&5 + { (eval echo "$as_me:4706: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4706: \$? = $ac_status" >&5 + echo "$as_me:4709: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -4720,7 +4723,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:4723: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:4726: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -4754,7 +4757,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:4757: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:4760: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -4795,7 +4798,7 @@ fi; case $cf_cv_screen in curses) -echo "$as_me:4798: checking for extra include directories" >&5 +echo "$as_me:4801: checking for extra include directories" >&5 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6 if test "${cf_cv_curses_incdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4815,11 +4818,11 @@ sunos3*|sunos4*) esac fi -echo "$as_me:4818: result: $cf_cv_curses_incdir" >&5 +echo "$as_me:4821: result: $cf_cv_curses_incdir" >&5 echo "${ECHO_T}$cf_cv_curses_incdir" >&6 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir" -echo "$as_me:4822: checking if we have identified curses headers" >&5 +echo "$as_me:4825: 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 @@ -4831,7 +4834,7 @@ for cf_header in \ ncurses.h ncurses/curses.h ncurses/ncurses.h do cat >conftest.$ac_ext <<_ACEOF -#line 4834 "configure" +#line 4837 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -4843,16 +4846,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4846: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4849: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4849: \$? = $ac_status" >&5 + echo "$as_me:4852: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4852: \"$ac_try\"") >&5 + { (eval echo "$as_me:4855: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4855: \$? = $ac_status" >&5 + echo "$as_me:4858: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -4863,11 +4866,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:4866: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:4869: 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:4870: error: No curses header-files found" >&5 + { { echo "$as_me:4873: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -4877,23 +4880,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4880: checking for $ac_header" >&5 +echo "$as_me:4883: 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 4886 "configure" +#line 4889 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4890: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4893: \"$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:4896: \$? = $ac_status" >&5 + echo "$as_me:4899: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4912,7 +4915,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4915: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4918: 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:4928: 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 @@ -4940,7 +4943,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 4943 "configure" +#line 4946 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -4955,16 +4958,16 @@ int x = auto_left_margin } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4958: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4961: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4961: \$? = $ac_status" >&5 + echo "$as_me:4964: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4964: \"$ac_try\"") >&5 + { (eval echo "$as_me:4967: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4967: \$? = $ac_status" >&5 + echo "$as_me:4970: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -4980,7 +4983,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:4983: result: $cf_cv_term_header" >&5 +echo "$as_me:4986: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -5009,7 +5012,7 @@ EOF ;; esac -echo "$as_me:5012: checking for ncurses version" >&5 +echo "$as_me:5015: 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 @@ -5035,10 +5038,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:5038: \"$cf_try\"") >&5 + { (eval echo "$as_me:5041: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:5041: \$? = $ac_status" >&5 + echo "$as_me:5044: \$? = $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%".*%%'` @@ -5048,7 +5051,7 @@ EOF else cat >conftest.$ac_ext <<_ACEOF -#line 5051 "configure" +#line 5054 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -5073,15 +5076,15 @@ int main() } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:5076: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5079: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5079: \$? = $ac_status" >&5 + echo "$as_me:5082: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5081: \"$ac_try\"") >&5 + { (eval echo "$as_me:5084: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5084: \$? = $ac_status" >&5 + echo "$as_me:5087: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -5095,16 +5098,16 @@ fi rm -f $cf_tempfile fi -echo "$as_me:5098: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:5101: 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 EOF -echo "$as_me:5104: checking if we have identified curses libraries" >&5 +echo "$as_me:5107: checking if we have identified curses libraries" >&5 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 5107 "configure" +#line 5110 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -5116,16 +5119,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5119: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5122: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5122: \$? = $ac_status" >&5 + echo "$as_me:5125: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5125: \"$ac_try\"") >&5 + { (eval echo "$as_me:5128: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5128: \$? = $ac_status" >&5 + echo "$as_me:5131: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -5134,13 +5137,13 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:5137: result: $cf_result" >&5 +echo "$as_me:5140: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then case $host_os in #(vi freebsd*) #(vi - echo "$as_me:5143: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:5146: 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 @@ -5148,7 +5151,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5151 "configure" +#line 5154 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5167,16 +5170,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5170: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5173: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5173: \$? = $ac_status" >&5 + echo "$as_me:5176: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5176: \"$ac_try\"") >&5 + { (eval echo "$as_me:5179: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5179: \$? = $ac_status" >&5 + echo "$as_me:5182: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -5187,7 +5190,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5190: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:5193: 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 LIBS="-lmytinfo $LIBS" @@ -5195,7 +5198,7 @@ fi ;; hpux10.*) #(vi - echo "$as_me:5198: checking for initscr in -lcur_colr" >&5 + echo "$as_me:5201: checking for initscr in -lcur_colr" >&5 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5203,7 +5206,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcur_colr $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5206 "configure" +#line 5209 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5222,16 +5225,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5225: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5228: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5228: \$? = $ac_status" >&5 + echo "$as_me:5231: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5231: \"$ac_try\"") >&5 + { (eval echo "$as_me:5234: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5234: \$? = $ac_status" >&5 + echo "$as_me:5237: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_cur_colr_initscr=yes else @@ -5242,7 +5245,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5245: result: $ac_cv_lib_cur_colr_initscr" >&5 +echo "$as_me:5248: result: $ac_cv_lib_cur_colr_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6 if test $ac_cv_lib_cur_colr_initscr = yes; then @@ -5251,7 +5254,7 @@ if test $ac_cv_lib_cur_colr_initscr = yes; then else - echo "$as_me:5254: checking for initscr in -lHcurses" >&5 + echo "$as_me:5257: checking for initscr in -lHcurses" >&5 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5259,7 +5262,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lHcurses $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5262 "configure" +#line 5265 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5278,16 +5281,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5281: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5284: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5284: \$? = $ac_status" >&5 + echo "$as_me:5287: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5287: \"$ac_try\"") >&5 + { (eval echo "$as_me:5290: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5290: \$? = $ac_status" >&5 + echo "$as_me:5293: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Hcurses_initscr=yes else @@ -5298,7 +5301,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5301: result: $ac_cv_lib_Hcurses_initscr" >&5 +echo "$as_me:5304: result: $ac_cv_lib_Hcurses_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6 if test $ac_cv_lib_Hcurses_initscr = yes; then @@ -5312,7 +5315,71 @@ fi fi ;; -linux*) # Suse Linux does not follow /usr/lib convention +linux*) + case `arch 2>/dev/null` in + x86_64) + if test -d /lib64 + then + +if test -n "/lib64" ; then + for cf_add_libdir in /lib64 + do + if test $cf_add_libdir = /usr/lib ; then + : + elif test -d $cf_add_libdir + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +echo "${as_me:-configure}:5343: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi + + else + +if test -n "/lib" ; then + for cf_add_libdir in /lib + do + if test $cf_add_libdir = /usr/lib ; then + : + elif test -d $cf_add_libdir + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + +echo "${as_me:-configure}:5372: testing adding $cf_add_libdir to library-path ..." 1>&5 + + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi + + fi + ;; + *) if test -n "/lib" ; then for cf_add_libdir in /lib @@ -5333,7 +5400,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:5336: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:5403: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -5341,6 +5408,8 @@ echo "${as_me:-configure}:5336: testing adding $cf_add_libdir to library-path .. done fi + ;; + esac ;; sunos3*|sunos4*) if test -d /usr/5lib ; then @@ -5364,7 +5433,7 @@ if test -n "/usr/5lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:5367: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:5436: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -5392,13 +5461,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then # Check for library containing tgoto. Do this before curses library # because it may be needed to link the test-case for initscr. - echo "$as_me:5395: checking for tgoto" >&5 + echo "$as_me:5464: checking for tgoto" >&5 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6 if test "${ac_cv_func_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5401 "configure" +#line 5470 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char tgoto (); below. */ @@ -5429,16 +5498,16 @@ f = tgoto; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5432: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5501: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5435: \$? = $ac_status" >&5 + echo "$as_me:5504: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5438: \"$ac_try\"") >&5 + { (eval echo "$as_me:5507: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5441: \$? = $ac_status" >&5 + echo "$as_me:5510: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_tgoto=yes else @@ -5448,7 +5517,7 @@ ac_cv_func_tgoto=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5451: result: $ac_cv_func_tgoto" >&5 +echo "$as_me:5520: result: $ac_cv_func_tgoto" >&5 echo "${ECHO_T}$ac_cv_func_tgoto" >&6 if test $ac_cv_func_tgoto = yes; then cf_term_lib=predefined @@ -5457,7 +5526,7 @@ else for cf_term_lib in $cf_check_list termcap termlib unknown do as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` -echo "$as_me:5460: checking for tgoto in -l$cf_term_lib" >&5 +echo "$as_me:5529: checking for tgoto in -l$cf_term_lib" >&5 echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5465,7 +5534,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_term_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5468 "configure" +#line 5537 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5484,16 +5553,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5487: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5556: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5490: \$? = $ac_status" >&5 + echo "$as_me:5559: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5493: \"$ac_try\"") >&5 + { (eval echo "$as_me:5562: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5496: \$? = $ac_status" >&5 + echo "$as_me:5565: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -5504,7 +5573,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5507: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:5576: result: `eval echo '${'$as_ac_Lib'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 if test `eval echo '${'$as_ac_Lib'}'` = yes; then break @@ -5519,7 +5588,7 @@ fi for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown do as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh` -echo "$as_me:5522: checking for initscr in -l$cf_curs_lib" >&5 +echo "$as_me:5591: checking for initscr in -l$cf_curs_lib" >&5 echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5527,7 +5596,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_curs_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5530 "configure" +#line 5599 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5546,16 +5615,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5549: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5618: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5552: \$? = $ac_status" >&5 + echo "$as_me:5621: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5555: \"$ac_try\"") >&5 + { (eval echo "$as_me:5624: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5558: \$? = $ac_status" >&5 + echo "$as_me:5627: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -5566,23 +5635,23 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5569: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:5638: result: `eval echo '${'$as_ac_Lib'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 if test `eval echo '${'$as_ac_Lib'}'` = yes; then break fi done - test $cf_curs_lib = unknown && { { echo "$as_me:5576: error: no curses library found" >&5 + test $cf_curs_lib = unknown && { { echo "$as_me:5645: error: no curses library found" >&5 echo "$as_me: error: no curses library found" >&2;} { (exit 1); exit 1; }; } LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown ; then - echo "$as_me:5582: checking if we can link with $cf_curs_lib library" >&5 + echo "$as_me:5651: checking if we can link with $cf_curs_lib library" >&5 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 5585 "configure" +#line 5654 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -5594,16 +5663,16 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5597: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5666: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5600: \$? = $ac_status" >&5 + echo "$as_me:5669: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5603: \"$ac_try\"") >&5 + { (eval echo "$as_me:5672: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5606: \$? = $ac_status" >&5 + echo "$as_me:5675: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -5612,18 +5681,18 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:5615: result: $cf_result" >&5 + echo "$as_me:5684: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 - test $cf_result = no && { { echo "$as_me:5617: error: Cannot link curses library" >&5 + test $cf_result = no && { { echo "$as_me:5686: error: Cannot link curses library" >&5 echo "$as_me: error: Cannot link curses library" >&2;} { (exit 1); exit 1; }; } elif test "$cf_curs_lib" = "$cf_term_lib" ; then : elif test "$cf_term_lib" != predefined ; then - echo "$as_me:5623: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 + echo "$as_me:5692: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 5626 "configure" +#line 5695 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -5635,16 +5704,16 @@ initscr(); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5638: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5707: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5641: \$? = $ac_status" >&5 + echo "$as_me:5710: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5644: \"$ac_try\"") >&5 + { (eval echo "$as_me:5713: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5647: \$? = $ac_status" >&5 + echo "$as_me:5716: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=no else @@ -5653,7 +5722,7 @@ cat conftest.$ac_ext >&5 LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5656 "configure" +#line 5725 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -5665,16 +5734,16 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5668: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5737: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5671: \$? = $ac_status" >&5 + echo "$as_me:5740: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5674: \"$ac_try\"") >&5 + { (eval echo "$as_me:5743: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5677: \$? = $ac_status" >&5 + echo "$as_me:5746: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -5686,20 +5755,20 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:5689: result: $cf_result" >&5 + echo "$as_me:5758: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 fi fi fi -echo "$as_me:5695: checking for NetBSD form.h" >&5 +echo "$as_me:5764: checking for NetBSD form.h" >&5 echo $ECHO_N "checking for NetBSD form.h... $ECHO_C" >&6 if test "${cf_cv_netbsd_form_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5702 "configure" +#line 5771 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -5718,16 +5787,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5721: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5790: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5724: \$? = $ac_status" >&5 + echo "$as_me:5793: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5727: \"$ac_try\"") >&5 + { (eval echo "$as_me:5796: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5730: \$? = $ac_status" >&5 + echo "$as_me:5799: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_netbsd_form_h=yes @@ -5739,21 +5808,21 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5742: result: $cf_cv_netbsd_form_h" >&5 +echo "$as_me:5811: result: $cf_cv_netbsd_form_h" >&5 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6 test "$cf_cv_netbsd_form_h" = yes && cat >>confdefs.h <<\EOF #define HAVE_NETBSD_FORM_H 1 EOF -echo "$as_me:5749: checking for NetBSD menu.h" >&5 +echo "$as_me:5818: checking for NetBSD menu.h" >&5 echo $ECHO_N "checking for NetBSD menu.h... $ECHO_C" >&6 if test "${cf_cv_netbsd_menu_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5756 "configure" +#line 5825 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -5771,16 +5840,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5774: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5843: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5777: \$? = $ac_status" >&5 + echo "$as_me:5846: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5780: \"$ac_try\"") >&5 + { (eval echo "$as_me:5849: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5783: \$? = $ac_status" >&5 + echo "$as_me:5852: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_netbsd_menu_h=yes @@ -5792,7 +5861,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5795: result: $cf_cv_netbsd_menu_h" >&5 +echo "$as_me:5864: result: $cf_cv_netbsd_menu_h" >&5 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6 test "$cf_cv_netbsd_menu_h" = yes && cat >>confdefs.h <<\EOF @@ -5809,7 +5878,7 @@ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config 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:5812: checking for $ac_word" >&5 +echo "$as_me:5881: 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 @@ -5826,7 +5895,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" - echo "$as_me:5829: found $ac_dir/$ac_word" >&5 + echo "$as_me:5898: found $ac_dir/$ac_word" >&5 break fi done @@ -5837,10 +5906,10 @@ fi NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:5840: result: $NCURSES_CONFIG" >&5 + echo "$as_me:5909: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:5843: result: no" >&5 + echo "$as_me:5912: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5855,7 +5924,7 @@ LIBS="`$NCURSES_CONFIG --libs` $LIBS" # even with config script, some packages use no-override for curses.h -echo "$as_me:5858: checking if we have identified curses headers" >&5 +echo "$as_me:5927: 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 @@ -5869,7 +5938,7 @@ for cf_header in \ ncurses.h do cat >conftest.$ac_ext <<_ACEOF -#line 5872 "configure" +#line 5941 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -5881,16 +5950,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5884: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5953: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5887: \$? = $ac_status" >&5 + echo "$as_me:5956: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5890: \"$ac_try\"") >&5 + { (eval echo "$as_me:5959: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5893: \$? = $ac_status" >&5 + echo "$as_me:5962: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -5901,11 +5970,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:5904: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:5973: 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:5908: error: No curses header-files found" >&5 + { { echo "$as_me:5977: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -5915,23 +5984,23 @@ fi for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5918: checking for $ac_header" >&5 +echo "$as_me:5987: 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 5924 "configure" +#line 5993 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5928: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5997: \"$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:5934: \$? = $ac_status" >&5 + echo "$as_me:6003: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5950,7 +6019,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5953: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:6022: 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 6006 "configure" +#line 6075 "configure" #include "confdefs.h" #include int @@ -6015,16 +6084,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6018: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6087: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6021: \$? = $ac_status" >&5 + echo "$as_me:6090: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6024: \"$ac_try\"") >&5 + { (eval echo "$as_me:6093: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6027: \$? = $ac_status" >&5 + echo "$as_me:6096: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -6041,7 +6110,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:6044: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6113: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6058,7 +6127,7 @@ fi } -echo "$as_me:6061: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:6130: 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 @@ -6070,7 +6139,7 @@ else do cat >conftest.$ac_ext <<_ACEOF -#line 6073 "configure" +#line 6142 "configure" #include "confdefs.h" #include <$cf_header> @@ -6094,16 +6163,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6097: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6166: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6100: \$? = $ac_status" >&5 + echo "$as_me:6169: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6103: \"$ac_try\"") >&5 + { (eval echo "$as_me:6172: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6106: \$? = $ac_status" >&5 + echo "$as_me:6175: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h=$cf_header @@ -6118,14 +6187,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:6121: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:6190: 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:6128: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:6197: 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 @@ -6265,7 +6334,7 @@ if test -n "$cf_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 6268 "configure" +#line 6337 "configure" #include "confdefs.h" #include int @@ -6277,16 +6346,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6280: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6349: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6283: \$? = $ac_status" >&5 + echo "$as_me:6352: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6286: \"$ac_try\"") >&5 + { (eval echo "$as_me:6355: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6289: \$? = $ac_status" >&5 + echo "$as_me:6358: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -6303,7 +6372,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:6306: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6375: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6324,7 +6393,7 @@ fi do cat >conftest.$ac_ext <<_ACEOF -#line 6327 "configure" +#line 6396 "configure" #include "confdefs.h" #include <$cf_header> @@ -6348,16 +6417,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6351: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6420: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6354: \$? = $ac_status" >&5 + echo "$as_me:6423: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6357: \"$ac_try\"") >&5 + { (eval echo "$as_me:6426: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6360: \$? = $ac_status" >&5 + echo "$as_me:6429: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h2=$cf_header @@ -6378,12 +6447,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6381: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6450: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:6386: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:6455: 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%/[^/]*$%%'` @@ -6416,7 +6485,7 @@ if test -n "$cf_1st_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 6419 "configure" +#line 6488 "configure" #include "confdefs.h" #include int @@ -6428,16 +6497,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6431: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6500: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6434: \$? = $ac_status" >&5 + echo "$as_me:6503: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6437: \"$ac_try\"") >&5 + { (eval echo "$as_me:6506: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6440: \$? = $ac_status" >&5 + echo "$as_me:6509: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -6454,7 +6523,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:6457: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6526: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6497,7 +6566,7 @@ EOF ;; esac -echo "$as_me:6500: checking for terminfo header" >&5 +echo "$as_me:6569: 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 @@ -6515,7 +6584,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 6518 "configure" +#line 6587 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -6530,16 +6599,16 @@ int x = auto_left_margin } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6533: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6602: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6536: \$? = $ac_status" >&5 + echo "$as_me:6605: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6539: \"$ac_try\"") >&5 + { (eval echo "$as_me:6608: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6542: \$? = $ac_status" >&5 + echo "$as_me:6611: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -6555,7 +6624,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:6558: result: $cf_cv_term_header" >&5 +echo "$as_me:6627: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -6589,7 +6658,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:6592: checking for ncurses version" >&5 +echo "$as_me:6661: 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 @@ -6615,10 +6684,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:6618: \"$cf_try\"") >&5 + { (eval echo "$as_me:6687: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:6621: \$? = $ac_status" >&5 + echo "$as_me:6690: \$? = $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%".*%%'` @@ -6628,7 +6697,7 @@ EOF else cat >conftest.$ac_ext <<_ACEOF -#line 6631 "configure" +#line 6700 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -6653,15 +6722,15 @@ int main() } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6656: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6725: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6659: \$? = $ac_status" >&5 + echo "$as_me:6728: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6661: \"$ac_try\"") >&5 + { (eval echo "$as_me:6730: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6664: \$? = $ac_status" >&5 + echo "$as_me:6733: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -6675,7 +6744,7 @@ fi rm -f $cf_tempfile fi -echo "$as_me:6678: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:6747: 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 @@ -6687,7 +6756,7 @@ cf_nculib_root=ncurses # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:6690: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:6759: 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 @@ -6695,7 +6764,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6698 "configure" +#line 6767 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6714,16 +6783,16 @@ Gpm_Open (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6717: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6786: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6720: \$? = $ac_status" >&5 + echo "$as_me:6789: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6723: \"$ac_try\"") >&5 + { (eval echo "$as_me:6792: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6726: \$? = $ac_status" >&5 + echo "$as_me:6795: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -6734,10 +6803,10 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6737: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:6806: 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:6740: checking for initscr in -lgpm" >&5 + echo "$as_me:6809: 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 @@ -6745,7 +6814,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6748 "configure" +#line 6817 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6764,16 +6833,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6767: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6836: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6770: \$? = $ac_status" >&5 + echo "$as_me:6839: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6773: \"$ac_try\"") >&5 + { (eval echo "$as_me:6842: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6776: \$? = $ac_status" >&5 + echo "$as_me:6845: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -6784,7 +6853,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6787: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:6856: 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" @@ -6799,7 +6868,7 @@ freebsd*) # 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:6802: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:6871: 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 @@ -6807,7 +6876,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6810 "configure" +#line 6879 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6826,16 +6895,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6829: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6898: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6832: \$? = $ac_status" >&5 + echo "$as_me:6901: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6835: \"$ac_try\"") >&5 + { (eval echo "$as_me:6904: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6838: \$? = $ac_status" >&5 + echo "$as_me:6907: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -6846,7 +6915,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6849: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:6918: 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" @@ -6865,13 +6934,13 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" - echo "$as_me:6868: checking for initscr" >&5 + echo "$as_me:6937: 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 6874 "configure" +#line 6943 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr (); below. */ @@ -6902,16 +6971,16 @@ f = initscr; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6905: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6974: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6908: \$? = $ac_status" >&5 + echo "$as_me:6977: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6911: \"$ac_try\"") >&5 + { (eval echo "$as_me:6980: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6914: \$? = $ac_status" >&5 + echo "$as_me:6983: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_initscr=yes else @@ -6921,18 +6990,18 @@ ac_cv_func_initscr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6924: result: $ac_cv_func_initscr" >&5 +echo "$as_me:6993: 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:6931: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:7000: 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 6935 "configure" +#line 7004 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6944,25 +7013,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6947: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7016: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6950: \$? = $ac_status" >&5 + echo "$as_me:7019: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6953: \"$ac_try\"") >&5 + { (eval echo "$as_me:7022: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6956: \$? = $ac_status" >&5 + echo "$as_me:7025: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:6958: result: yes" >&5 + echo "$as_me:7027: 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:6965: result: no" >&5 +echo "$as_me:7034: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -7052,11 +7121,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:7055: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:7124: 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 7059 "configure" +#line 7128 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7068,25 +7137,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7071: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7140: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7074: \$? = $ac_status" >&5 + echo "$as_me:7143: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7077: \"$ac_try\"") >&5 + { (eval echo "$as_me:7146: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7080: \$? = $ac_status" >&5 + echo "$as_me:7149: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:7082: result: yes" >&5 + echo "$as_me:7151: 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:7089: result: no" >&5 +echo "$as_me:7158: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -7101,7 +7170,7 @@ fi eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root if test $cf_found_library = no ; then - { { echo "$as_me:7104: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:7173: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -7109,7 +7178,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:7112: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:7181: 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 @@ -7119,7 +7188,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >conftest.$ac_ext <<_ACEOF -#line 7122 "configure" +#line 7191 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -7131,23 +7200,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7134: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7203: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7137: \$? = $ac_status" >&5 + echo "$as_me:7206: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7140: \"$ac_try\"") >&5 + { (eval echo "$as_me:7209: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7143: \$? = $ac_status" >&5 + echo "$as_me:7212: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:7145: result: yes" >&5 + echo "$as_me:7214: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:7150: result: no" >&5 +echo "$as_me:7219: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -7166,7 +7235,7 @@ fi ncursesw) cf_cv_libtype=w -echo "$as_me:7169: checking for multibyte character support" >&5 +echo "$as_me:7238: 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 @@ -7174,7 +7243,7 @@ else cf_save_LIBS="$LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7177 "configure" +#line 7246 "configure" #include "confdefs.h" #include @@ -7187,16 +7256,16 @@ putwc(0,0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7190: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7259: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7193: \$? = $ac_status" >&5 + echo "$as_me:7262: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7196: \"$ac_try\"") >&5 + { (eval echo "$as_me:7265: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7199: \$? = $ac_status" >&5 + echo "$as_me:7268: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_utf8_lib=yes else @@ -7208,12 +7277,12 @@ cat conftest.$ac_ext >&5 cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:7211: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:7280: testing Starting FIND_