From: Thomas E. Dickey Date: Sun, 26 Apr 2015 01:21:33 +0000 (+0000) Subject: ncurses 5.9 - patch 20150425 X-Git-Tag: v6.0~14 X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=ee1bcda2cbb28cd84f136d8343cf83b7e576bd79 ncurses 5.9 - patch 20150425 + expanded description of tgetstr's area pointer in manual page (report by Todd M Lewis). + in-progress changes to modify test-packages to use ncursesw6 rather than ncursesw, with updated configure scripts. + modify CF_NCURSES_CONFIG in Ada95- and test-configure scripts to check for ".pc" files via pkg-config, but add a linkage check since frequently pkg-config configurations are broken. + modify misc/gen-pkgconfig.in to include EXTRA_LDFLAGS, e.g., for the rpath option. + add 'dim' capability to screen entry (report by Leonardo B Schenkel) + add several key definitions to nsterm-bce to match preconfigured keys, e.g., with OSX 10.9 and 10.10 (report by Leonardo B Schenkel) + fix repeated "extra-suffix" in ncurses-config.in (cf: 20150418). + improve term_variables manual page, adding section on the terminfo long-name symbols which are defined in the term.h header. + fix bug in lib_tracebits.c introduced in const-fixes (cf: 20150404). --- diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4 index be75a4c4..74c7f0f3 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.97 2015/04/18 13:04:25 tom Exp $ +dnl $Id: aclocal.m4,v 1.98 2015/04/25 09:52:32 tom Exp $ dnl Macros used in NCURSES Ada95 auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -656,7 +656,7 @@ cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" fi ]) dnl --------------------------------------------------------------------------- -dnl CF_CURSES_HEADER version: 4 updated: 2015/04/18 09:03:58 +dnl CF_CURSES_HEADER version: 5 updated: 2015/04/23 20:35:30 dnl ---------------- dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common dnl variations of ncurses' installs. @@ -665,11 +665,9 @@ dnl $1 = ncurses when looking for ncurses, or is empty AC_DEFUN([CF_CURSES_HEADER],[ AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[ cf_cv_ncurses_header=none -for cf_header in ifelse($1,,,[ \ - $1/ncurses.h \ - $1/curses.h]) \ - ncurses.h \ - curses.h ifelse($1,,[ncurses/ncurses.h ncurses/curses.h]) +for cf_header in \ + ncurses.h ifelse($1,,,[$1/ncurses.h]) \ + curses.h ifelse($1,,,[$1/curses.h]) ifelse($1,,[ncurses/ncurses.h ncurses/curses.h]) do AC_TRY_COMPILE([#include <${cf_header}>], [initscr(); tgoto("?", 0,0)], @@ -2191,46 +2189,86 @@ printf("old\n"); ,[$1=no]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CONFIG version: 10 updated: 2012/10/06 08:57:51 +dnl CF_NCURSES_CONFIG version: 12 updated: 2015/04/24 20:52:45 dnl ----------------- dnl Tie together the configure-script macros for ncurses. dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis. dnl Allow that to be overridden using the $NCURSES_CONFIG environment variable. dnl dnl $1 is the root library name (default: "ncurses") -AC_DEFUN([CF_NCURSES_CONFIG], -[ +AC_DEFUN([CF_NCURSES_CONFIG],[ +AC_REQUIRE([CF_PKG_CONFIG]) cf_ncuconfig_root=ifelse($1,,ncurses,$1) +cf_have_ncuconfig=no -echo "Looking for ${cf_ncuconfig_root}-config" +if test "x$PKG_CONFIG" != xnone; then + AC_MSG_CHECKING(pkg-config for $cf_ncuconfig_root) + if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then + AC_MSG_RESULT(yes) -CF_ACVERSION_CHECK(2.52, - [AC_CHECK_TOOLS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)], - [AC_PATH_PROGS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)]) + AC_MSG_CHECKING(if the $cf_ncuconfig_root package files work) + cf_have_ncuconfig=unknown -if test "$NCURSES_CONFIG" != none ; then + cf_save_CPPFLAGS="$CPPFLAGS" + cf_save_LIBS="$LIBS" -CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" -CF_ADD_LIBS(`$NCURSES_CONFIG --libs`) + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags $cf_ncuconfig_root`" + CF_ADD_LIBS(`$PKG_CONFIG --libs $cf_ncuconfig_root`) -# even with config script, some packages use no-override for curses.h -CF_CURSES_HEADER(ifelse($1,,ncurses,$1)) + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);], + [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { char *xx = curses_version(); return (xx == 0); }], + [cf_have_ncuconfig=yes], + [cf_have_ncuconfig=no])], + [cf_have_ncuconfig=no]) -dnl like CF_NCURSES_CPPFLAGS -AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries]) + AC_MSG_RESULT($cf_have_ncuconfig) + if test "$cf_have_ncuconfig" != "yes" + then + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + else + AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries]) + fi -dnl like CF_NCURSES_LIBS -CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_ncuconfig_root) -AC_DEFINE_UNQUOTED($cf_nculib_ROOT) + else + AC_MSG_RESULT(no) + fi +fi -dnl like CF_NCURSES_VERSION -cf_cv_ncurses_version=`$NCURSES_CONFIG --version` +if test "x$cf_have_ncuconfig" = "xno"; then + echo "Looking for ${cf_ncuconfig_root}-config" -else + CF_ACVERSION_CHECK(2.52, + [AC_CHECK_TOOLS(NCURSES_CONFIG, ${cf_ncuconfig_root}-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)], + [AC_PATH_PROGS(NCURSES_CONFIG, ${cf_ncuconfig_root}-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)]) + + if test "$NCURSES_CONFIG" != none ; then + + CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" + CF_ADD_LIBS(`$NCURSES_CONFIG --libs`) + + # even with config script, some packages use no-override for curses.h + CF_CURSES_HEADER(ifelse($1,,ncurses,$1)) -CF_NCURSES_CPPFLAGS(ifelse($1,,ncurses,$1)) -CF_NCURSES_LIBS(ifelse($1,,ncurses,$1)) + dnl like CF_NCURSES_CPPFLAGS + AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries]) + dnl like CF_NCURSES_LIBS + CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_ncuconfig_root) + AC_DEFINE_UNQUOTED($cf_nculib_ROOT) + + dnl like CF_NCURSES_VERSION + cf_cv_ncurses_version=`$NCURSES_CONFIG --version` + + else + + CF_NCURSES_CPPFLAGS(ifelse($1,,ncurses,$1)) + CF_NCURSES_LIBS(ifelse($1,,ncurses,$1)) + + fi fi ])dnl dnl --------------------------------------------------------------------------- diff --git a/Ada95/configure b/Ada95/configure index fc81c608..4ef850a0 100644 --- a/Ada95/configure +++ b/Ada95/configure @@ -4200,15 +4200,132 @@ LIBS="$cf_add_libs" fi cf_ncuconfig_root=ncursesw +cf_have_ncuconfig=no -echo "Looking for ${cf_ncuconfig_root}-config" +if test "x$PKG_CONFIG" != xnone; then + echo "$as_me:4206: checking pkg-config for $cf_ncuconfig_root" >&5 +echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 + if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then + echo "$as_me:4209: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + + echo "$as_me:4212: checking if the $cf_ncuconfig_root package files work" >&5 +echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 + cf_have_ncuconfig=unknown + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_save_LIBS="$LIBS" + + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags $cf_ncuconfig_root`" + +cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +#line 4238 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main () +{ +initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4250: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4253: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4256: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4259: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + if test "$cross_compiling" = yes; then + { { echo "$as_me:4262: 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 4267 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { char *xx = curses_version(); return (xx == 0); } +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:4274: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4277: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:4279: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4282: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_have_ncuconfig=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_ncuconfig=no +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_ncuconfig=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + echo "$as_me:4300: result: $cf_have_ncuconfig" >&5 +echo "${ECHO_T}$cf_have_ncuconfig" >&6 + if test "$cf_have_ncuconfig" != "yes" + then + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + else + +cat >>confdefs.h <<\EOF +#define NCURSES 1 +EOF + + fi + + else + echo "$as_me:4315: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi +fi + +if test "x$cf_have_ncuconfig" = "xno"; then + echo "Looking for ${cf_ncuconfig_root}-config" if test -n "$ac_tool_prefix"; then - for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + for ac_prog in ${cf_ncuconfig_root}-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:4211: checking for $ac_word" >&5 +echo "$as_me:4328: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4223,7 +4340,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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:4226: found $ac_dir/$ac_word" >&5 +echo "$as_me:4343: found $ac_dir/$ac_word" >&5 break done @@ -4231,10 +4348,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:4234: result: $NCURSES_CONFIG" >&5 + echo "$as_me:4351: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:4237: result: no" >&5 + echo "$as_me:4354: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4243,11 +4360,11 @@ fi fi if test -z "$NCURSES_CONFIG"; then ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG - for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + for ac_prog in ${cf_ncuconfig_root}-config ${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:4250: checking for $ac_word" >&5 +echo "$as_me:4367: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4262,7 +4379,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_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:4265: found $ac_dir/$ac_word" >&5 +echo "$as_me:4382: found $ac_dir/$ac_word" >&5 break done @@ -4270,10 +4387,10 @@ fi fi ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:4273: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:4390: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:4276: result: no" >&5 + echo "$as_me:4393: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4284,9 +4401,9 @@ test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG fi -if test "$NCURSES_CONFIG" != none ; then + if test "$NCURSES_CONFIG" != none ; then -CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" + CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" cf_add_libs="`$NCURSES_CONFIG --libs`" # Filter out duplicates - this happens with badly-designed ".pc" files... @@ -4304,23 +4421,21 @@ do done LIBS="$cf_add_libs" -# even with config script, some packages use no-override for curses.h + # even with config script, some packages use no-override for curses.h -echo "$as_me:4309: checking if we have identified curses headers" >&5 +echo "$as_me:4426: 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 else cf_cv_ncurses_header=none -for cf_header in \ - ncursesw/ncurses.h \ - ncursesw/curses.h \ - ncurses.h \ - curses.h +for cf_header in \ + ncurses.h ncursesw/ncurses.h \ + curses.h ncursesw/curses.h do cat >conftest.$ac_ext <<_ACEOF -#line 4323 "configure" +#line 4438 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -4332,16 +4447,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4335: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4450: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4338: \$? = $ac_status" >&5 + echo "$as_me:4453: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4341: \"$ac_try\"") >&5 + { (eval echo "$as_me:4456: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4344: \$? = $ac_status" >&5 + echo "$as_me:4459: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -4352,11 +4467,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:4355: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:4470: 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:4359: error: No curses header-files found" >&5 + { { echo "$as_me:4474: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -4366,23 +4481,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:4369: checking for $ac_header" >&5 +echo "$as_me:4484: 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 4375 "configure" +#line 4490 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4379: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4494: \"$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:4385: \$? = $ac_status" >&5 + echo "$as_me:4500: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4401,7 +4516,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4404: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4519: 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 <>confdefs.h <>confdefs.h <conftest.$ac_ext <<_ACEOF -#line 4457 "configure" +#line 4572 "configure" #include "confdefs.h" #include int @@ -4466,16 +4581,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4469: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4584: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4472: \$? = $ac_status" >&5 + echo "$as_me:4587: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4475: \"$ac_try\"") >&5 + { (eval echo "$as_me:4590: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4478: \$? = $ac_status" >&5 + echo "$as_me:4593: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -4492,7 +4607,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}:4495: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:4610: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -4509,7 +4624,7 @@ fi } -echo "$as_me:4512: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:4627: 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 @@ -4521,7 +4636,7 @@ else do cat >conftest.$ac_ext <<_ACEOF -#line 4524 "configure" +#line 4639 "configure" #include "confdefs.h" #define _XOPEN_SOURCE_EXTENDED @@ -4553,16 +4668,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4556: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4671: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4559: \$? = $ac_status" >&5 + echo "$as_me:4674: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4562: \"$ac_try\"") >&5 + { (eval echo "$as_me:4677: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4565: \$? = $ac_status" >&5 + echo "$as_me:4680: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h=$cf_header @@ -4577,14 +4692,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:4580: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:4695: 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:4587: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:4702: 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 @@ -4702,7 +4817,7 @@ if test -n "$cf_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 4705 "configure" +#line 4820 "configure" #include "confdefs.h" #include int @@ -4714,16 +4829,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4717: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4832: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4720: \$? = $ac_status" >&5 + echo "$as_me:4835: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4723: \"$ac_try\"") >&5 + { (eval echo "$as_me:4838: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4726: \$? = $ac_status" >&5 + echo "$as_me:4841: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -4740,7 +4855,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}:4743: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:4858: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -4761,7 +4876,7 @@ fi do cat >conftest.$ac_ext <<_ACEOF -#line 4764 "configure" +#line 4879 "configure" #include "confdefs.h" #include <$cf_header> @@ -4785,16 +4900,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4788: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4903: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4791: \$? = $ac_status" >&5 + echo "$as_me:4906: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4794: \"$ac_try\"") >&5 + { (eval echo "$as_me:4909: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4797: \$? = $ac_status" >&5 + echo "$as_me:4912: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h2=$cf_header @@ -4815,12 +4930,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:4818: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:4933: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:4823: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:4938: 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%/[^/]*$%%'` @@ -4853,7 +4968,7 @@ if test -n "$cf_1st_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 4856 "configure" +#line 4971 "configure" #include "confdefs.h" #include int @@ -4865,16 +4980,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4868: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4983: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4871: \$? = $ac_status" >&5 + echo "$as_me:4986: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4874: \"$ac_try\"") >&5 + { (eval echo "$as_me:4989: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4877: \$? = $ac_status" >&5 + echo "$as_me:4992: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -4891,7 +5006,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}:4894: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:5009: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -4937,7 +5052,7 @@ EOF ;; esac -echo "$as_me:4940: checking for terminfo header" >&5 +echo "$as_me:5055: 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 @@ -4955,7 +5070,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 4958 "configure" +#line 5073 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -4970,16 +5085,16 @@ int x = auto_left_margin } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4973: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5088: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4976: \$? = $ac_status" >&5 + echo "$as_me:5091: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4979: \"$ac_try\"") >&5 + { (eval echo "$as_me:5094: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4982: \$? = $ac_status" >&5 + echo "$as_me:5097: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -4995,7 +5110,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:4998: result: $cf_cv_term_header" >&5 +echo "$as_me:5113: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -5033,7 +5148,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:5036: checking for ncurses version" >&5 +echo "$as_me:5151: 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 @@ -5059,10 +5174,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:5062: \"$cf_try\"") >&5 + { (eval echo "$as_me:5177: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:5065: \$? = $ac_status" >&5 + echo "$as_me:5180: \$? = $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%".*%%'` @@ -5072,7 +5187,7 @@ EOF else cat >conftest.$ac_ext <<_ACEOF -#line 5075 "configure" +#line 5190 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -5097,15 +5212,15 @@ int main() } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:5100: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5215: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5103: \$? = $ac_status" >&5 + echo "$as_me:5218: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5105: \"$ac_try\"") >&5 + { (eval echo "$as_me:5220: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5108: \$? = $ac_status" >&5 + echo "$as_me:5223: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -5119,7 +5234,7 @@ fi rm -f $cf_tempfile fi -echo "$as_me:5122: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:5237: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -5132,7 +5247,7 @@ cf_nculib_root=ncursesw # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:5135: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:5250: 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 @@ -5140,7 +5255,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5143 "configure" +#line 5258 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5159,16 +5274,16 @@ Gpm_Open (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5162: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5277: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5165: \$? = $ac_status" >&5 + echo "$as_me:5280: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5168: \"$ac_try\"") >&5 + { (eval echo "$as_me:5283: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5171: \$? = $ac_status" >&5 + echo "$as_me:5286: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -5179,10 +5294,10 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5182: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:5297: 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:5185: checking for initscr in -lgpm" >&5 + echo "$as_me:5300: 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 @@ -5190,7 +5305,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5193 "configure" +#line 5308 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5209,16 +5324,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5212: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5327: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5215: \$? = $ac_status" >&5 + echo "$as_me:5330: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5218: \"$ac_try\"") >&5 + { (eval echo "$as_me:5333: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5221: \$? = $ac_status" >&5 + echo "$as_me:5336: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -5229,7 +5344,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5232: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:5347: 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" @@ -5244,7 +5359,7 @@ case $host_os in # 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:5247: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:5362: 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 @@ -5252,7 +5367,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5255 "configure" +#line 5370 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5271,16 +5386,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5274: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5389: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5277: \$? = $ac_status" >&5 + echo "$as_me:5392: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5280: \"$ac_try\"") >&5 + { (eval echo "$as_me:5395: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5283: \$? = $ac_status" >&5 + echo "$as_me:5398: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -5291,7 +5406,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5294: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:5409: 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" @@ -5340,13 +5455,13 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" - echo "$as_me:5343: checking for initscr" >&5 + echo "$as_me:5458: 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 5349 "configure" +#line 5464 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr (); below. */ @@ -5377,16 +5492,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5380: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5495: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5383: \$? = $ac_status" >&5 + echo "$as_me:5498: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5386: \"$ac_try\"") >&5 + { (eval echo "$as_me:5501: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5389: \$? = $ac_status" >&5 + echo "$as_me:5504: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_initscr=yes else @@ -5396,18 +5511,18 @@ ac_cv_func_initscr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5399: result: $ac_cv_func_initscr" >&5 +echo "$as_me:5514: 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:5406: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:5521: 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 5410 "configure" +#line 5525 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -5419,25 +5534,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5422: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5537: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5425: \$? = $ac_status" >&5 + echo "$as_me:5540: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5428: \"$ac_try\"") >&5 + { (eval echo "$as_me:5543: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5431: \$? = $ac_status" >&5 + echo "$as_me:5546: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:5433: result: yes" >&5 + echo "$as_me:5548: 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:5440: result: no" >&5 +echo "$as_me:5555: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -5505,11 +5620,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:5508: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:5623: 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 5512 "configure" +#line 5627 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -5521,25 +5636,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5524: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5639: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5527: \$? = $ac_status" >&5 + echo "$as_me:5642: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5530: \"$ac_try\"") >&5 + { (eval echo "$as_me:5645: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5533: \$? = $ac_status" >&5 + echo "$as_me:5648: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:5535: result: yes" >&5 + echo "$as_me:5650: 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:5542: result: no" >&5 +echo "$as_me:5657: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -5554,7 +5669,7 @@ fi eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root if test $cf_found_library = no ; then - { { echo "$as_me:5557: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:5672: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -5562,7 +5677,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:5565: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:5680: 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 @@ -5572,7 +5687,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >conftest.$ac_ext <<_ACEOF -#line 5575 "configure" +#line 5690 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -5584,23 +5699,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5587: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5702: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5590: \$? = $ac_status" >&5 + echo "$as_me:5705: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5593: \"$ac_try\"") >&5 + { (eval echo "$as_me:5708: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5596: \$? = $ac_status" >&5 + echo "$as_me:5711: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:5598: result: yes" >&5 + echo "$as_me:5713: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:5603: result: no" >&5 +echo "$as_me:5718: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -5613,20 +5728,138 @@ cat >>confdefs.h <&5 +echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 + if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then + echo "$as_me:5743: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + + echo "$as_me:5746: checking if the $cf_ncuconfig_root package files work" >&5 +echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 + cf_have_ncuconfig=unknown -echo "Looking for ${cf_ncuconfig_root}-config" + cf_save_CPPFLAGS="$CPPFLAGS" + cf_save_LIBS="$LIBS" + + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags $cf_ncuconfig_root`" + +cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +#line 5772 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main () +{ +initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:5784: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:5787: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:5790: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5793: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + if test "$cross_compiling" = yes; then + { { echo "$as_me:5796: 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 5801 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { char *xx = curses_version(); return (xx == 0); } +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:5808: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:5811: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:5813: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5816: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_have_ncuconfig=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_ncuconfig=no +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_ncuconfig=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + echo "$as_me:5834: result: $cf_have_ncuconfig" >&5 +echo "${ECHO_T}$cf_have_ncuconfig" >&6 + if test "$cf_have_ncuconfig" != "yes" + then + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + else + +cat >>confdefs.h <<\EOF +#define NCURSES 1 +EOF + + fi + + else + echo "$as_me:5849: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi +fi + +if test "x$cf_have_ncuconfig" = "xno"; then + echo "Looking for ${cf_ncuconfig_root}-config" if test -n "$ac_tool_prefix"; then - for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + for ac_prog in ${cf_ncuconfig_root}-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:5629: checking for $ac_word" >&5 +echo "$as_me:5862: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5641,7 +5874,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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:5644: found $ac_dir/$ac_word" >&5 +echo "$as_me:5877: found $ac_dir/$ac_word" >&5 break done @@ -5649,10 +5882,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:5652: result: $NCURSES_CONFIG" >&5 + echo "$as_me:5885: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:5655: result: no" >&5 + echo "$as_me:5888: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5661,11 +5894,11 @@ fi fi if test -z "$NCURSES_CONFIG"; then ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG - for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + for ac_prog in ${cf_ncuconfig_root}-config ${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:5668: checking for $ac_word" >&5 +echo "$as_me:5901: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5680,7 +5913,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_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:5683: found $ac_dir/$ac_word" >&5 +echo "$as_me:5916: found $ac_dir/$ac_word" >&5 break done @@ -5688,10 +5921,10 @@ fi fi ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:5691: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:5924: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:5694: result: no" >&5 + echo "$as_me:5927: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -5702,9 +5935,9 @@ test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG fi -if test "$NCURSES_CONFIG" != none ; then + if test "$NCURSES_CONFIG" != none ; then -CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" + CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" cf_add_libs="`$NCURSES_CONFIG --libs`" # Filter out duplicates - this happens with badly-designed ".pc" files... @@ -5722,23 +5955,21 @@ do done LIBS="$cf_add_libs" -# even with config script, some packages use no-override for curses.h + # even with config script, some packages use no-override for curses.h -echo "$as_me:5727: checking if we have identified curses headers" >&5 +echo "$as_me:5960: 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 else cf_cv_ncurses_header=none -for cf_header in \ - ncurses/ncurses.h \ - ncurses/curses.h \ - ncurses.h \ - curses.h +for cf_header in \ + ncurses.h ncurses/ncurses.h \ + curses.h ncurses/curses.h do cat >conftest.$ac_ext <<_ACEOF -#line 5741 "configure" +#line 5972 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -5750,16 +5981,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5753: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5984: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5756: \$? = $ac_status" >&5 + echo "$as_me:5987: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5759: \"$ac_try\"") >&5 + { (eval echo "$as_me:5990: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5762: \$? = $ac_status" >&5 + echo "$as_me:5993: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -5770,11 +6001,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:5773: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:6004: 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:5777: error: No curses header-files found" >&5 + { { echo "$as_me:6008: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -5784,23 +6015,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:5787: checking for $ac_header" >&5 +echo "$as_me:6018: 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 5793 "configure" +#line 6024 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5797: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:6028: \"$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:5803: \$? = $ac_status" >&5 + echo "$as_me:6034: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5819,7 +6050,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5822: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:6053: 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 <>confdefs.h <>confdefs.h <conftest.$ac_ext <<_ACEOF -#line 5875 "configure" +#line 6106 "configure" #include "confdefs.h" #include int @@ -5884,16 +6115,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5887: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6118: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5890: \$? = $ac_status" >&5 + echo "$as_me:6121: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5893: \"$ac_try\"") >&5 + { (eval echo "$as_me:6124: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5896: \$? = $ac_status" >&5 + echo "$as_me:6127: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -5910,7 +6141,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}:5913: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6144: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5927,7 +6158,7 @@ fi } -echo "$as_me:5930: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:6161: 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 @@ -5939,7 +6170,7 @@ else do cat >conftest.$ac_ext <<_ACEOF -#line 5942 "configure" +#line 6173 "configure" #include "confdefs.h" #include <$cf_header> @@ -5963,16 +6194,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5966: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6197: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5969: \$? = $ac_status" >&5 + echo "$as_me:6200: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5972: \"$ac_try\"") >&5 + { (eval echo "$as_me:6203: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5975: \$? = $ac_status" >&5 + echo "$as_me:6206: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h=$cf_header @@ -5987,14 +6218,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:5990: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:6221: 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:5997: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:6228: 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 @@ -6112,7 +6343,7 @@ if test -n "$cf_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 6115 "configure" +#line 6346 "configure" #include "confdefs.h" #include int @@ -6124,16 +6355,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6127: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6358: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6130: \$? = $ac_status" >&5 + echo "$as_me:6361: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6133: \"$ac_try\"") >&5 + { (eval echo "$as_me:6364: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6136: \$? = $ac_status" >&5 + echo "$as_me:6367: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -6150,7 +6381,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}:6153: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6384: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6171,7 +6402,7 @@ fi do cat >conftest.$ac_ext <<_ACEOF -#line 6174 "configure" +#line 6405 "configure" #include "confdefs.h" #include <$cf_header> @@ -6195,16 +6426,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6198: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6429: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6201: \$? = $ac_status" >&5 + echo "$as_me:6432: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6204: \"$ac_try\"") >&5 + { (eval echo "$as_me:6435: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6207: \$? = $ac_status" >&5 + echo "$as_me:6438: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h2=$cf_header @@ -6225,12 +6456,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:6228: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6459: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:6233: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:6464: 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%/[^/]*$%%'` @@ -6263,7 +6494,7 @@ if test -n "$cf_1st_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 6266 "configure" +#line 6497 "configure" #include "confdefs.h" #include int @@ -6275,16 +6506,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6278: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6509: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6281: \$? = $ac_status" >&5 + echo "$as_me:6512: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6284: \"$ac_try\"") >&5 + { (eval echo "$as_me:6515: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6287: \$? = $ac_status" >&5 + echo "$as_me:6518: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -6301,7 +6532,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}:6304: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6535: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6347,7 +6578,7 @@ EOF ;; esac -echo "$as_me:6350: checking for terminfo header" >&5 +echo "$as_me:6581: 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 @@ -6365,7 +6596,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 6368 "configure" +#line 6599 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -6380,16 +6611,16 @@ int x = auto_left_margin } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6383: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6614: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6386: \$? = $ac_status" >&5 + echo "$as_me:6617: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6389: \"$ac_try\"") >&5 + { (eval echo "$as_me:6620: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6392: \$? = $ac_status" >&5 + echo "$as_me:6623: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -6405,7 +6636,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:6408: result: $cf_cv_term_header" >&5 +echo "$as_me:6639: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -6443,7 +6674,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:6446: checking for ncurses version" >&5 +echo "$as_me:6677: 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 @@ -6469,10 +6700,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:6472: \"$cf_try\"") >&5 + { (eval echo "$as_me:6703: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:6475: \$? = $ac_status" >&5 + echo "$as_me:6706: \$? = $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%".*%%'` @@ -6482,7 +6713,7 @@ EOF else cat >conftest.$ac_ext <<_ACEOF -#line 6485 "configure" +#line 6716 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -6507,15 +6738,15 @@ int main() } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6510: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6741: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6513: \$? = $ac_status" >&5 + echo "$as_me:6744: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6515: \"$ac_try\"") >&5 + { (eval echo "$as_me:6746: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6518: \$? = $ac_status" >&5 + echo "$as_me:6749: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -6529,7 +6760,7 @@ fi rm -f $cf_tempfile fi -echo "$as_me:6532: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:6763: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -6542,7 +6773,7 @@ cf_nculib_root=ncurses # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:6545: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:6776: 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 @@ -6550,7 +6781,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6553 "configure" +#line 6784 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6569,16 +6800,16 @@ Gpm_Open (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6572: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6803: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6575: \$? = $ac_status" >&5 + echo "$as_me:6806: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6578: \"$ac_try\"") >&5 + { (eval echo "$as_me:6809: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6581: \$? = $ac_status" >&5 + echo "$as_me:6812: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -6589,10 +6820,10 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6592: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:6823: 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:6595: checking for initscr in -lgpm" >&5 + echo "$as_me:6826: 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 @@ -6600,7 +6831,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6603 "configure" +#line 6834 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6619,16 +6850,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6622: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6853: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6625: \$? = $ac_status" >&5 + echo "$as_me:6856: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6628: \"$ac_try\"") >&5 + { (eval echo "$as_me:6859: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6631: \$? = $ac_status" >&5 + echo "$as_me:6862: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -6639,7 +6870,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6642: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:6873: 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" @@ -6654,7 +6885,7 @@ case $host_os in # 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:6657: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:6888: 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 @@ -6662,7 +6893,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6665 "configure" +#line 6896 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6681,16 +6912,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6684: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6915: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6687: \$? = $ac_status" >&5 + echo "$as_me:6918: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6690: \"$ac_try\"") >&5 + { (eval echo "$as_me:6921: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6693: \$? = $ac_status" >&5 + echo "$as_me:6924: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -6701,7 +6932,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6704: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:6935: 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" @@ -6750,13 +6981,13 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" - echo "$as_me:6753: checking for initscr" >&5 + echo "$as_me:6984: 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 6759 "configure" +#line 6990 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr (); below. */ @@ -6787,16 +7018,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6790: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7021: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6793: \$? = $ac_status" >&5 + echo "$as_me:7024: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6796: \"$ac_try\"") >&5 + { (eval echo "$as_me:7027: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6799: \$? = $ac_status" >&5 + echo "$as_me:7030: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_initscr=yes else @@ -6806,18 +7037,18 @@ ac_cv_func_initscr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6809: result: $ac_cv_func_initscr" >&5 +echo "$as_me:7040: 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:6816: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:7047: 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 6820 "configure" +#line 7051 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6829,25 +7060,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6832: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7063: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6835: \$? = $ac_status" >&5 + echo "$as_me:7066: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6838: \"$ac_try\"") >&5 + { (eval echo "$as_me:7069: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6841: \$? = $ac_status" >&5 + echo "$as_me:7072: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:6843: result: yes" >&5 + echo "$as_me:7074: 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:6850: result: no" >&5 +echo "$as_me:7081: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -6915,11 +7146,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:6918: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:7149: 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 6922 "configure" +#line 7153 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6931,25 +7162,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6934: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7165: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6937: \$? = $ac_status" >&5 + echo "$as_me:7168: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6940: \"$ac_try\"") >&5 + { (eval echo "$as_me:7171: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6943: \$? = $ac_status" >&5 + echo "$as_me:7174: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:6945: result: yes" >&5 + echo "$as_me:7176: 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:6952: result: no" >&5 +echo "$as_me:7183: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -6964,7 +7195,7 @@ fi eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root if test $cf_found_library = no ; then - { { echo "$as_me:6967: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:7198: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -6972,7 +7203,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:6975: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:7206: 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 @@ -6982,7 +7213,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >conftest.$ac_ext <<_ACEOF -#line 6985 "configure" +#line 7216 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -6994,23 +7225,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6997: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7228: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7000: \$? = $ac_status" >&5 + echo "$as_me:7231: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7003: \"$ac_try\"") >&5 + { (eval echo "$as_me:7234: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7006: \$? = $ac_status" >&5 + echo "$as_me:7237: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:7008: result: yes" >&5 + echo "$as_me:7239: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:7013: result: no" >&5 +echo "$as_me:7244: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -7023,6 +7254,7 @@ cat >>confdefs.h <conftest.$ac_ext <&5 + { (eval echo "$as_me:7282: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:7053: \$? = $ac_status" >&5 + echo "$as_me:7285: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_result=`cat conftest.out | sed -e "s/^.*AUTOCONF_$cf_name[ ][ ]*//"` @@ -7068,10 +7300,10 @@ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR} cf_cv_timestamp=`date` -echo "$as_me:7071: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 +echo "$as_me:7303: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5 echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6 -echo "$as_me:7074: checking if you want to have a library-prefix" >&5 +echo "$as_me:7306: checking if you want to have a library-prefix" >&5 echo $ECHO_N "checking if you want to have a library-prefix... $ECHO_C" >&6 # Check whether --with-lib-prefix or --without-lib-prefix was given. @@ -7081,7 +7313,7 @@ if test "${with_lib_prefix+set}" = set; then else with_lib_prefix=auto fi; -echo "$as_me:7084: result: $with_lib_prefix" >&5 +echo "$as_me:7316: result: $with_lib_prefix" >&5 echo "${ECHO_T}$with_lib_prefix" >&6 if test $with_lib_prefix = auto @@ -7112,7 +7344,7 @@ if test X"$CC_G_OPT" = X"" ; then test -n "$GCC" && test "${ac_cv_prog_cc_g}" != yes && CC_G_OPT='' fi -echo "$as_me:7115: checking for default loader flags" >&5 +echo "$as_me:7347: checking for default loader flags" >&5 echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6 case $DFT_LWR_MODEL in (normal) LD_MODEL='' ;; @@ -7120,11 +7352,11 @@ case $DFT_LWR_MODEL in (profile) LD_MODEL='-pg';; (shared) LD_MODEL='' ;; esac -echo "$as_me:7123: result: $LD_MODEL" >&5 +echo "$as_me:7355: result: $LD_MODEL" >&5 echo "${ECHO_T}$LD_MODEL" >&6 LD_RPATH_OPT= -echo "$as_me:7127: checking for an rpath option" >&5 +echo "$as_me:7359: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case $cf_cv_system_name in (irix*) @@ -7155,12 +7387,12 @@ case $cf_cv_system_name in (*) ;; esac -echo "$as_me:7158: result: $LD_RPATH_OPT" >&5 +echo "$as_me:7390: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:7163: checking if we need a space after rpath option" >&5 + echo "$as_me:7395: checking if we need a space after rpath option" >&5 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -7181,7 +7413,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 7184 "configure" +#line 7416 "configure" #include "confdefs.h" int @@ -7193,16 +7425,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7196: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7428: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7199: \$? = $ac_status" >&5 + echo "$as_me:7431: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7202: \"$ac_try\"") >&5 + { (eval echo "$as_me:7434: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7205: \$? = $ac_status" >&5 + echo "$as_me:7437: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_space=no else @@ -7212,7 +7444,7 @@ cf_rpath_space=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:7215: result: $cf_rpath_space" >&5 + echo "$as_me:7447: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; @@ -7233,7 +7465,7 @@ esac cf_ld_rpath_opt= test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT" - echo "$as_me:7236: checking if release/abi version should be used for shared libs" >&5 + echo "$as_me:7468: checking if release/abi version should be used for shared libs" >&5 echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6 # Check whether --with-shlib-version or --without-shlib-version was given. @@ -7248,7 +7480,7 @@ if test "${with_shlib_version+set}" = set; then cf_cv_shlib_version=$withval ;; (*) - { { echo "$as_me:7251: error: option value must be one of: rel, abi, auto or no" >&5 + { { echo "$as_me:7483: error: option value must be one of: rel, abi, auto or no" >&5 echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;} { (exit 1); exit 1; }; } ;; @@ -7257,7 +7489,7 @@ echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;} else cf_cv_shlib_version=auto fi; - echo "$as_me:7260: result: $cf_cv_shlib_version" >&5 + echo "$as_me:7492: result: $cf_cv_shlib_version" >&5 echo "${ECHO_T}$cf_cv_shlib_version" >&6 cf_cv_rm_so_locs=no @@ -7267,14 +7499,14 @@ echo "${ECHO_T}$cf_cv_shlib_version" >&6 CC_SHARED_OPTS= if test "$GCC" = yes then - echo "$as_me:7270: checking which $CC option to use" >&5 + echo "$as_me:7502: checking which $CC option to use" >&5 echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" for CC_SHARED_OPTS in -fPIC -fpic '' do CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS" cat >conftest.$ac_ext <<_ACEOF -#line 7277 "configure" +#line 7509 "configure" #include "confdefs.h" #include int @@ -7286,16 +7518,16 @@ int x = 1 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7289: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7521: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7292: \$? = $ac_status" >&5 + echo "$as_me:7524: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7295: \"$ac_try\"") >&5 + { (eval echo "$as_me:7527: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7298: \$? = $ac_status" >&5 + echo "$as_me:7530: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -7304,7 +7536,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done - echo "$as_me:7307: result: $CC_SHARED_OPTS" >&5 + echo "$as_me:7539: result: $CC_SHARED_OPTS" >&5 echo "${ECHO_T}$CC_SHARED_OPTS" >&6 CFLAGS="$cf_save_CFLAGS" fi @@ -7375,7 +7607,7 @@ CF_EOF MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@' test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi cf_cv_shlib_version_infix=yes - echo "$as_me:7378: checking if ld -search_paths_first works" >&5 + echo "$as_me:7610: checking if ld -search_paths_first works" >&5 echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6 if test "${cf_cv_ldflags_search_paths_first+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7384,7 +7616,7 @@ else cf_save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-search_paths_first" cat >conftest.$ac_ext <<_ACEOF -#line 7387 "configure" +#line 7619 "configure" #include "confdefs.h" int @@ -7396,16 +7628,16 @@ int i; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7399: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7631: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7402: \$? = $ac_status" >&5 + echo "$as_me:7634: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7405: \"$ac_try\"") >&5 + { (eval echo "$as_me:7637: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7408: \$? = $ac_status" >&5 + echo "$as_me:7640: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ldflags_search_paths_first=yes else @@ -7416,7 +7648,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LDFLAGS=$cf_save_LDFLAGS fi -echo "$as_me:7419: result: $cf_cv_ldflags_search_paths_first" >&5 +echo "$as_me:7651: result: $cf_cv_ldflags_search_paths_first" >&5 echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6 if test $cf_cv_ldflags_search_paths_first = yes; then LDFLAGS="$LDFLAGS -Wl,-search_paths_first" @@ -7641,7 +7873,7 @@ CF_EOF do CFLAGS="$cf_shared_opts $cf_save_CFLAGS" cat >conftest.$ac_ext <<_ACEOF -#line 7644 "configure" +#line 7876 "configure" #include "confdefs.h" #include int @@ -7653,16 +7885,16 @@ printf("Hello\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7656: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7888: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7659: \$? = $ac_status" >&5 + echo "$as_me:7891: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7662: \"$ac_try\"") >&5 + { (eval echo "$as_me:7894: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7665: \$? = $ac_status" >&5 + echo "$as_me:7897: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -7699,7 +7931,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes ;; (*) - { echo "$as_me:7702: WARNING: ignored --with-shlib-version" >&5 + { echo "$as_me:7934: WARNING: ignored --with-shlib-version" >&5 echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} ;; esac @@ -7709,7 +7941,7 @@ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;} if test -n "$cf_try_cflags" then cat > conftest.$ac_ext < int main(int argc, char *argv[]) { @@ -7721,18 +7953,18 @@ EOF for cf_opt in $cf_try_cflags do CFLAGS="$cf_save_CFLAGS -$cf_opt" - echo "$as_me:7724: checking if CFLAGS option -$cf_opt works" >&5 + echo "$as_me:7956: checking if CFLAGS option -$cf_opt works" >&5 echo $ECHO_N "checking if CFLAGS option -$cf_opt works... $ECHO_C" >&6 - if { (eval echo "$as_me:7726: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:7958: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7729: \$? = $ac_status" >&5 + echo "$as_me:7961: \$? = $ac_status" >&5 (exit $ac_status); }; then - echo "$as_me:7731: result: yes" >&5 + echo "$as_me:7963: result: yes" >&5 echo "${ECHO_T}yes" >&6 cf_save_CFLAGS="$CFLAGS" else - echo "$as_me:7735: result: no" >&5 + echo "$as_me:7967: result: no" >&5 echo "${ECHO_T}no" >&6 fi done @@ -7747,17 +7979,17 @@ echo "${ECHO_T}no" >&6 test -n "$verbose" && echo " CC_SHARED_OPTS: $CC_SHARED_OPTS" 1>&6 -echo "${as_me:-configure}:7750: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 +echo "${as_me:-configure}:7982: testing CC_SHARED_OPTS: $CC_SHARED_OPTS ..." 1>&5 test -n "$verbose" && echo " MK_SHARED_LIB: $MK_SHARED_LIB" 1>&6 -echo "${as_me:-configure}:7754: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 +echo "${as_me:-configure}:7986: testing MK_SHARED_LIB: $MK_SHARED_LIB ..." 1>&5 # The test/sample programs in the original tree link using rpath option. # Make it optional for packagers. if test -n "$LOCAL_LDFLAGS" then - echo "$as_me:7760: checking if you want to link sample programs with rpath option" >&5 + echo "$as_me:7992: checking if you want to link sample programs with rpath option" >&5 echo $ECHO_N "checking if you want to link sample programs with rpath option... $ECHO_C" >&6 # Check whether --enable-rpath-link or --disable-rpath-link was given. @@ -7767,7 +7999,7 @@ if test "${enable_rpath_link+set}" = set; then else with_rpath_link=yes fi; - echo "$as_me:7770: result: $with_rpath_link" >&5 + echo "$as_me:8002: result: $with_rpath_link" >&5 echo "${ECHO_T}$with_rpath_link" >&6 if test "$with_rpath_link" = no then @@ -7779,7 +8011,7 @@ fi ############################################################################### ### use option --enable-broken-linker to force on use of broken-linker support -echo "$as_me:7782: checking if you want broken-linker support code" >&5 +echo "$as_me:8014: checking if you want broken-linker support code" >&5 echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6 # Check whether --enable-broken_linker or --disable-broken_linker was given. @@ -7789,7 +8021,7 @@ if test "${enable_broken_linker+set}" = set; then else with_broken_linker=${BROKEN_LINKER:-no} fi; -echo "$as_me:7792: result: $with_broken_linker" >&5 +echo "$as_me:8024: result: $with_broken_linker" >&5 echo "${ECHO_T}$with_broken_linker" >&6 BROKEN_LINKER=0 @@ -7809,7 +8041,7 @@ EOF BROKEN_LINKER=1 test -n "$verbose" && echo " cygwin linker is broken anyway" 1>&6 -echo "${as_me:-configure}:7812: testing cygwin linker is broken anyway ..." 1>&5 +echo "${as_me:-configure}:8044: testing cygwin linker is broken anyway ..." 1>&5 ;; esac @@ -7855,14 +8087,14 @@ case $host_os in ;; (linux*|gnu*|mint*|k*bsd*-gnu) -echo "$as_me:7858: checking if we must define _GNU_SOURCE" >&5 +echo "$as_me:8090: 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 7865 "configure" +#line 8097 "configure" #include "confdefs.h" #include int @@ -7877,16 +8109,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7880: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8112: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7883: \$? = $ac_status" >&5 + echo "$as_me:8115: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7886: \"$ac_try\"") >&5 + { (eval echo "$as_me:8118: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7889: \$? = $ac_status" >&5 + echo "$as_me:8121: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -7895,7 +8127,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 7898 "configure" +#line 8130 "configure" #include "confdefs.h" #include int @@ -7910,16 +8142,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7913: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8145: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7916: \$? = $ac_status" >&5 + echo "$as_me:8148: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7919: \"$ac_try\"") >&5 + { (eval echo "$as_me:8151: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7922: \$? = $ac_status" >&5 + echo "$as_me:8154: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -7934,7 +8166,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7937: result: $cf_cv_gnu_source" >&5 +echo "$as_me:8169: 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" @@ -7959,16 +8191,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:7962: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:8194: 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}:7968: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:8200: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 7971 "configure" +#line 8203 "configure" #include "confdefs.h" #include int @@ -7983,16 +8215,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7986: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8218: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7989: \$? = $ac_status" >&5 + echo "$as_me:8221: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7992: \"$ac_try\"") >&5 + { (eval echo "$as_me:8224: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7995: \$? = $ac_status" >&5 + echo "$as_me:8227: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -8013,7 +8245,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 8016 "configure" +#line 8248 "configure" #include "confdefs.h" #include int @@ -8028,16 +8260,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8031: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8263: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8034: \$? = $ac_status" >&5 + echo "$as_me:8266: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8037: \"$ac_try\"") >&5 + { (eval echo "$as_me:8269: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8040: \$? = $ac_status" >&5 + echo "$as_me:8272: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8048,15 +8280,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:8051: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:8283: 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}:8056: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:8288: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 8059 "configure" +#line 8291 "configure" #include "confdefs.h" #include int @@ -8071,16 +8303,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8074: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8306: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8077: \$? = $ac_status" >&5 + echo "$as_me:8309: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8080: \"$ac_try\"") >&5 + { (eval echo "$as_me:8312: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8083: \$? = $ac_status" >&5 + echo "$as_me:8315: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8096,7 +8328,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8099: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:8331: 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 @@ -8214,14 +8446,14 @@ fi ;; (*) -echo "$as_me:8217: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:8449: 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 8224 "configure" +#line 8456 "configure" #include "confdefs.h" #include @@ -8240,16 +8472,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8243: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8475: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8246: \$? = $ac_status" >&5 + echo "$as_me:8478: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8249: \"$ac_try\"") >&5 + { (eval echo "$as_me:8481: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8252: \$? = $ac_status" >&5 + echo "$as_me:8484: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -8258,7 +8490,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 8261 "configure" +#line 8493 "configure" #include "confdefs.h" #include @@ -8277,16 +8509,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8280: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8512: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8283: \$? = $ac_status" >&5 + echo "$as_me:8515: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8286: \"$ac_try\"") >&5 + { (eval echo "$as_me:8518: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8289: \$? = $ac_status" >&5 + echo "$as_me:8521: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -8301,7 +8533,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8304: result: $cf_cv_xopen_source" >&5 +echo "$as_me:8536: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -8409,16 +8641,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:8412: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:8644: 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}:8418: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:8650: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 8421 "configure" +#line 8653 "configure" #include "confdefs.h" #include int @@ -8433,16 +8665,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8436: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8668: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8439: \$? = $ac_status" >&5 + echo "$as_me:8671: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8442: \"$ac_try\"") >&5 + { (eval echo "$as_me:8674: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8445: \$? = $ac_status" >&5 + echo "$as_me:8677: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -8463,7 +8695,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 8466 "configure" +#line 8698 "configure" #include "confdefs.h" #include int @@ -8478,16 +8710,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8481: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8713: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8484: \$? = $ac_status" >&5 + echo "$as_me:8716: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8487: \"$ac_try\"") >&5 + { (eval echo "$as_me:8719: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8490: \$? = $ac_status" >&5 + echo "$as_me:8722: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8498,15 +8730,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:8501: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:8733: 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}:8506: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:8738: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 8509 "configure" +#line 8741 "configure" #include "confdefs.h" #include int @@ -8521,16 +8753,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8524: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8756: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8527: \$? = $ac_status" >&5 + echo "$as_me:8759: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8530: \"$ac_try\"") >&5 + { (eval echo "$as_me:8762: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8533: \$? = $ac_status" >&5 + echo "$as_me:8765: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8546,7 +8778,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8549: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:8781: 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 @@ -8704,7 +8936,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:8707: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:8939: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 CFLAGS="$CFLAGS $cf_new_cflags" fi @@ -8712,7 +8944,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:8715: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:8947: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 CPPFLAGS="$CPPFLAGS $cf_new_cppflags" fi @@ -8720,7 +8952,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:8723: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:8955: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi @@ -8728,10 +8960,10 @@ fi fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:8731: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:8963: checking if _XOPEN_SOURCE really is set" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 8734 "configure" +#line 8966 "configure" #include "confdefs.h" #include int @@ -8746,16 +8978,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8749: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8981: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8752: \$? = $ac_status" >&5 + echo "$as_me:8984: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8755: \"$ac_try\"") >&5 + { (eval echo "$as_me:8987: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8758: \$? = $ac_status" >&5 + echo "$as_me:8990: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -8764,12 +8996,12 @@ cat conftest.$ac_ext >&5 cf_XOPEN_SOURCE_set=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:8767: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:8999: result: $cf_XOPEN_SOURCE_set" >&5 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 if test $cf_XOPEN_SOURCE_set = yes then cat >conftest.$ac_ext <<_ACEOF -#line 8772 "configure" +#line 9004 "configure" #include "confdefs.h" #include int @@ -8784,16 +9016,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8787: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9019: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8790: \$? = $ac_status" >&5 + echo "$as_me:9022: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8793: \"$ac_try\"") >&5 + { (eval echo "$as_me:9025: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8796: \$? = $ac_status" >&5 + echo "$as_me:9028: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -8804,19 +9036,19 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext if test $cf_XOPEN_SOURCE_set_ok = no then - { echo "$as_me:8807: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:9039: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:8812: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:9044: 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 8819 "configure" +#line 9051 "configure" #include "confdefs.h" #include @@ -8835,16 +9067,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8838: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9070: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8841: \$? = $ac_status" >&5 + echo "$as_me:9073: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8844: \"$ac_try\"") >&5 + { (eval echo "$as_me:9076: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8847: \$? = $ac_status" >&5 + echo "$as_me:9079: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -8853,7 +9085,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 8856 "configure" +#line 9088 "configure" #include "confdefs.h" #include @@ -8872,16 +9104,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8875: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9107: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8878: \$? = $ac_status" >&5 + echo "$as_me:9110: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8881: \"$ac_try\"") >&5 + { (eval echo "$as_me:9113: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8884: \$? = $ac_status" >&5 + echo "$as_me:9116: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -8896,7 +9128,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:8899: result: $cf_cv_xopen_source" >&5 +echo "$as_me:9131: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -9001,7 +9233,7 @@ if test "${enable_largefile+set}" = set; then fi; if test "$enable_largefile" != no; then - echo "$as_me:9004: checking for special C compiler options needed for large files" >&5 + echo "$as_me:9236: checking for special C compiler options needed for large files" >&5 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9013,7 +9245,7 @@ else # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. cat >conftest.$ac_ext <<_ACEOF -#line 9016 "configure" +#line 9248 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -9033,16 +9265,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9036: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9268: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9039: \$? = $ac_status" >&5 + echo "$as_me:9271: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9042: \"$ac_try\"") >&5 + { (eval echo "$as_me:9274: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9045: \$? = $ac_status" >&5 + echo "$as_me:9277: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -9052,16 +9284,16 @@ fi rm -f conftest.$ac_objext CC="$CC -n32" rm -f conftest.$ac_objext -if { (eval echo "$as_me:9055: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9287: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9058: \$? = $ac_status" >&5 + echo "$as_me:9290: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9061: \"$ac_try\"") >&5 + { (eval echo "$as_me:9293: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9064: \$? = $ac_status" >&5 + echo "$as_me:9296: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -9075,13 +9307,13 @@ rm -f conftest.$ac_objext rm -f conftest.$ac_ext fi fi -echo "$as_me:9078: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:9310: result: $ac_cv_sys_largefile_CC" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - echo "$as_me:9084: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:9316: checking for _FILE_OFFSET_BITS value needed for large files" >&5 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_file_offset_bits+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9089,7 +9321,7 @@ else while :; do ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF -#line 9092 "configure" +#line 9324 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -9109,16 +9341,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9112: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9344: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9115: \$? = $ac_status" >&5 + echo "$as_me:9347: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9118: \"$ac_try\"") >&5 + { (eval echo "$as_me:9350: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9121: \$? = $ac_status" >&5 + echo "$as_me:9353: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -9127,7 +9359,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 9130 "configure" +#line 9362 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include @@ -9148,16 +9380,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9151: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9383: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9154: \$? = $ac_status" >&5 + echo "$as_me:9386: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9157: \"$ac_try\"") >&5 + { (eval echo "$as_me:9389: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9160: \$? = $ac_status" >&5 + echo "$as_me:9392: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -9168,7 +9400,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:9171: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:9403: result: $ac_cv_sys_file_offset_bits" >&5 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 if test "$ac_cv_sys_file_offset_bits" != no; then @@ -9178,7 +9410,7 @@ EOF fi rm -rf conftest* - echo "$as_me:9181: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:9413: checking for _LARGE_FILES value needed for large files" >&5 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_large_files+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9186,7 +9418,7 @@ else while :; do ac_cv_sys_large_files=no cat >conftest.$ac_ext <<_ACEOF -#line 9189 "configure" +#line 9421 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -9206,16 +9438,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9209: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9441: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9212: \$? = $ac_status" >&5 + echo "$as_me:9444: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9215: \"$ac_try\"") >&5 + { (eval echo "$as_me:9447: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9218: \$? = $ac_status" >&5 + echo "$as_me:9450: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -9224,7 +9456,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 9227 "configure" +#line 9459 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include @@ -9245,16 +9477,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9248: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9480: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9251: \$? = $ac_status" >&5 + echo "$as_me:9483: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9254: \"$ac_try\"") >&5 + { (eval echo "$as_me:9486: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9257: \$? = $ac_status" >&5 + echo "$as_me:9489: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_large_files=1; break else @@ -9265,7 +9497,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:9268: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:9500: result: $ac_cv_sys_large_files" >&5 echo "${ECHO_T}$ac_cv_sys_large_files" >&6 if test "$ac_cv_sys_large_files" != no; then @@ -9278,7 +9510,7 @@ rm -rf conftest* fi if test "$enable_largefile" != no ; then - echo "$as_me:9281: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo "$as_me:9513: checking for _LARGEFILE_SOURCE value needed for large files" >&5 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9286,7 +9518,7 @@ else while :; do ac_cv_sys_largefile_source=no cat >conftest.$ac_ext <<_ACEOF -#line 9289 "configure" +#line 9521 "configure" #include "confdefs.h" #include int @@ -9298,16 +9530,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9301: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9533: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9304: \$? = $ac_status" >&5 + echo "$as_me:9536: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9307: \"$ac_try\"") >&5 + { (eval echo "$as_me:9539: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9310: \$? = $ac_status" >&5 + echo "$as_me:9542: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -9316,7 +9548,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 9319 "configure" +#line 9551 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include @@ -9329,16 +9561,16 @@ return !fseeko; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9332: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9564: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9335: \$? = $ac_status" >&5 + echo "$as_me:9567: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9338: \"$ac_try\"") >&5 + { (eval echo "$as_me:9570: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9341: \$? = $ac_status" >&5 + echo "$as_me:9573: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_source=1; break else @@ -9349,7 +9581,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext break done fi -echo "$as_me:9352: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:9584: result: $ac_cv_sys_largefile_source" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 if test "$ac_cv_sys_largefile_source" != no; then @@ -9363,13 +9595,13 @@ rm -rf conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -echo "$as_me:9366: checking for fseeko" >&5 +echo "$as_me:9598: checking for fseeko" >&5 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 if test "${ac_cv_func_fseeko+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9372 "configure" +#line 9604 "configure" #include "confdefs.h" #include int @@ -9381,16 +9613,16 @@ return fseeko && fseeko (stdin, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9384: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9616: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9387: \$? = $ac_status" >&5 + echo "$as_me:9619: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9390: \"$ac_try\"") >&5 + { (eval echo "$as_me:9622: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9393: \$? = $ac_status" >&5 + echo "$as_me:9625: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_fseeko=yes else @@ -9400,7 +9632,7 @@ ac_cv_func_fseeko=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9403: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:9635: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -9421,14 +9653,14 @@ fi test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE " test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits " - echo "$as_me:9424: checking whether to use struct dirent64" >&5 + echo "$as_me:9656: checking whether to use struct dirent64" >&5 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6 if test "${cf_cv_struct_dirent64+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9431 "configure" +#line 9663 "configure" #include "confdefs.h" #include @@ -9449,16 +9681,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9452: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9684: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9455: \$? = $ac_status" >&5 + echo "$as_me:9687: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9458: \"$ac_try\"") >&5 + { (eval echo "$as_me:9690: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9461: \$? = $ac_status" >&5 + echo "$as_me:9693: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_struct_dirent64=yes else @@ -9469,7 +9701,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9472: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:9704: result: $cf_cv_struct_dirent64" >&5 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF @@ -9479,7 +9711,7 @@ EOF fi ### Enable compiling-in rcs id's -echo "$as_me:9482: checking if RCS identifiers should be compiled-in" >&5 +echo "$as_me:9714: checking if RCS identifiers should be compiled-in" >&5 echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6 # Check whether --with-rcs-ids or --without-rcs-ids was given. @@ -9489,7 +9721,7 @@ if test "${with_rcs_ids+set}" = set; then else with_rcs_ids=no fi; -echo "$as_me:9492: result: $with_rcs_ids" >&5 +echo "$as_me:9724: result: $with_rcs_ids" >&5 echo "${ECHO_T}$with_rcs_ids" >&6 test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF @@ -9499,7 +9731,7 @@ EOF ############################################################################### ### Note that some functions (such as const) are normally disabled anyway. -echo "$as_me:9502: checking if you want to build with function extensions" >&5 +echo "$as_me:9734: checking if you want to build with function extensions" >&5 echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6 # Check whether --enable-ext-funcs or --disable-ext-funcs was given. @@ -9509,7 +9741,7 @@ if test "${enable_ext_funcs+set}" = set; then else with_ext_funcs=yes fi; -echo "$as_me:9512: result: $with_ext_funcs" >&5 +echo "$as_me:9744: result: $with_ext_funcs" >&5 echo "${ECHO_T}$with_ext_funcs" >&6 if test "$with_ext_funcs" = yes ; then NCURSES_EXT_FUNCS=1 @@ -9527,7 +9759,7 @@ else fi ### use option --enable-const to turn on use of const beyond that in XSI. -echo "$as_me:9530: checking for extended use of const keyword" >&5 +echo "$as_me:9762: checking for extended use of const keyword" >&5 echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6 # Check whether --enable-const or --disable-const was given. @@ -9537,7 +9769,7 @@ if test "${enable_const+set}" = set; then else with_ext_const=no fi; -echo "$as_me:9540: result: $with_ext_const" >&5 +echo "$as_me:9772: result: $with_ext_const" >&5 echo "${ECHO_T}$with_ext_const" >&6 NCURSES_CONST='/*nothing*/' if test "$with_ext_const" = yes ; then @@ -9547,7 +9779,7 @@ fi ############################################################################### # These options are relatively safe to experiment with. -echo "$as_me:9550: checking if you want all development code" >&5 +echo "$as_me:9782: checking if you want all development code" >&5 echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6 # Check whether --with-develop or --without-develop was given. @@ -9557,7 +9789,7 @@ if test "${with_develop+set}" = set; then else with_develop=no fi; -echo "$as_me:9560: result: $with_develop" >&5 +echo "$as_me:9792: result: $with_develop" >&5 echo "${ECHO_T}$with_develop" >&6 ############################################################################### @@ -9566,7 +9798,7 @@ echo "${ECHO_T}$with_develop" >&6 # This is still experimental (20080329), but should ultimately be moved to # the script-block --with-normal, etc. -echo "$as_me:9569: checking if you want to link with the pthread library" >&5 +echo "$as_me:9801: checking if you want to link with the pthread library" >&5 echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6 # Check whether --with-pthread or --without-pthread was given. @@ -9576,27 +9808,27 @@ if test "${with_pthread+set}" = set; then else with_pthread=no fi; -echo "$as_me:9579: result: $with_pthread" >&5 +echo "$as_me:9811: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 if test "$with_pthread" != no ; then - echo "$as_me:9583: checking for pthread.h" >&5 + echo "$as_me:9815: checking for pthread.h" >&5 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 if test "${ac_cv_header_pthread_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9589 "configure" +#line 9821 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:9593: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:9825: \"$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:9599: \$? = $ac_status" >&5 + echo "$as_me:9831: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9615,7 +9847,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:9618: result: $ac_cv_header_pthread_h" >&5 +echo "$as_me:9850: result: $ac_cv_header_pthread_h" >&5 echo "${ECHO_T}$ac_cv_header_pthread_h" >&6 if test $ac_cv_header_pthread_h = yes; then @@ -9625,7 +9857,7 @@ EOF for cf_lib_pthread in pthread c_r do - echo "$as_me:9628: checking if we can link with the $cf_lib_pthread library" >&5 + echo "$as_me:9860: checking if we can link with the $cf_lib_pthread library" >&5 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -9646,7 +9878,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 9649 "configure" +#line 9881 "configure" #include "confdefs.h" #include @@ -9663,16 +9895,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9666: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9898: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9669: \$? = $ac_status" >&5 + echo "$as_me:9901: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9672: \"$ac_try\"") >&5 + { (eval echo "$as_me:9904: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9675: \$? = $ac_status" >&5 + echo "$as_me:9907: \$? = $ac_status" >&5 (exit $ac_status); }; }; then with_pthread=yes else @@ -9682,7 +9914,7 @@ with_pthread=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:9685: result: $with_pthread" >&5 + echo "$as_me:9917: result: $with_pthread" >&5 echo "${ECHO_T}$with_pthread" >&6 test "$with_pthread" = yes && break done @@ -9710,7 +9942,7 @@ cat >>confdefs.h <<\EOF EOF else - { { echo "$as_me:9713: error: Cannot link with pthread library" >&5 + { { echo "$as_me:9945: error: Cannot link with pthread library" >&5 echo "$as_me: error: Cannot link with pthread library" >&2;} { (exit 1); exit 1; }; } fi @@ -9719,7 +9951,7 @@ fi fi -echo "$as_me:9722: checking if you want to use weak-symbols for pthreads" >&5 +echo "$as_me:9954: checking if you want to use weak-symbols for pthreads" >&5 echo $ECHO_N "checking if you want to use weak-symbols for pthreads... $ECHO_C" >&6 # Check whether --enable-weak-symbols or --disable-weak-symbols was given. @@ -9729,18 +9961,18 @@ if test "${enable_weak_symbols+set}" = set; then else use_weak_symbols=no fi; -echo "$as_me:9732: result: $use_weak_symbols" >&5 +echo "$as_me:9964: result: $use_weak_symbols" >&5 echo "${ECHO_T}$use_weak_symbols" >&6 if test "$use_weak_symbols" = yes ; then -echo "$as_me:9736: checking if $CC supports weak symbols" >&5 +echo "$as_me:9968: checking if $CC supports weak symbols" >&5 echo $ECHO_N "checking if $CC supports weak symbols... $ECHO_C" >&6 if test "${cf_cv_weak_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9743 "configure" +#line 9975 "configure" #include "confdefs.h" #include @@ -9766,16 +9998,16 @@ weak_symbol(fopen); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9769: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10001: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9772: \$? = $ac_status" >&5 + echo "$as_me:10004: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9775: \"$ac_try\"") >&5 + { (eval echo "$as_me:10007: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9778: \$? = $ac_status" >&5 + echo "$as_me:10010: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_weak_symbols=yes else @@ -9786,7 +10018,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:9789: result: $cf_cv_weak_symbols" >&5 +echo "$as_me:10021: result: $cf_cv_weak_symbols" >&5 echo "${ECHO_T}$cf_cv_weak_symbols" >&6 else @@ -9815,13 +10047,13 @@ EOF fi # OpenSUSE is installing ncurses6, using reentrant option. -echo "$as_me:9818: checking for _nc_TABSIZE" >&5 +echo "$as_me:10050: 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 9824 "configure" +#line 10056 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char _nc_TABSIZE (); below. */ @@ -9852,16 +10084,16 @@ f = _nc_TABSIZE; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9855: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10087: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9858: \$? = $ac_status" >&5 + echo "$as_me:10090: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9861: \"$ac_try\"") >&5 + { (eval echo "$as_me:10093: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9864: \$? = $ac_status" >&5 + echo "$as_me:10096: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func__nc_TABSIZE=yes else @@ -9871,7 +10103,7 @@ ac_cv_func__nc_TABSIZE=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9874: result: $ac_cv_func__nc_TABSIZE" >&5 +echo "$as_me:10106: 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 @@ -9883,7 +10115,7 @@ fi # 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:9886: checking if you want experimental reentrant code" >&5 +echo "$as_me:10118: 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. @@ -9893,7 +10125,7 @@ if test "${enable_reentrant+set}" = set; then else with_reentrant=$assume_reentrant fi; -echo "$as_me:9896: result: $with_reentrant" >&5 +echo "$as_me:10128: result: $with_reentrant" >&5 echo "${ECHO_T}$with_reentrant" >&6 if test "$with_reentrant" = yes ; then cf_cv_enable_reentrant=1 @@ -9916,7 +10148,7 @@ fi ### Allow using a different wrap-prefix if test "$cf_cv_enable_reentrant" != 0 || test "$BROKEN_LINKER" = 1 ; then - echo "$as_me:9919: checking for prefix used to wrap public variables" >&5 + echo "$as_me:10151: 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. @@ -9926,7 +10158,7 @@ if test "${with_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; - echo "$as_me:9929: result: $NCURSES_WRAP_PREFIX" >&5 + echo "$as_me:10161: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 else NCURSES_WRAP_PREFIX=_nc_ @@ -9940,7 +10172,7 @@ EOF ### use option --disable-echo to suppress full display compiling commands -echo "$as_me:9943: checking if you want to see long compiling messages" >&5 +echo "$as_me:10175: 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. @@ -9974,11 +10206,11 @@ else ECHO_CC='' fi; -echo "$as_me:9977: result: $enableval" >&5 +echo "$as_me:10209: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 ### use option --enable-warnings to turn on all gcc warnings -echo "$as_me:9981: checking if you want to see compiler warnings" >&5 +echo "$as_me:10213: 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. @@ -9986,7 +10218,7 @@ if test "${enable_warnings+set}" = set; then enableval="$enable_warnings" with_warnings=$enableval fi; -echo "$as_me:9989: result: $with_warnings" >&5 +echo "$as_me:10221: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "x$with_warnings" = "xyes"; then @@ -9998,12 +10230,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in (linux*|gnu*) - echo "$as_me:10001: checking if this is really Intel C compiler" >&5 + echo "$as_me:10233: 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 10006 "configure" +#line 10238 "configure" #include "confdefs.h" int @@ -10020,16 +10252,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10023: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10255: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10026: \$? = $ac_status" >&5 + echo "$as_me:10258: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10029: \"$ac_try\"") >&5 + { (eval echo "$as_me:10261: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10032: \$? = $ac_status" >&5 + echo "$as_me:10264: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -10040,7 +10272,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:10043: result: $INTEL_COMPILER" >&5 + echo "$as_me:10275: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -10049,12 +10281,12 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:10052: checking if this is really Clang C compiler" >&5 + echo "$as_me:10284: checking if this is really Clang C compiler" >&5 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Qunused-arguments" cat >conftest.$ac_ext <<_ACEOF -#line 10057 "configure" +#line 10289 "configure" #include "confdefs.h" int @@ -10071,16 +10303,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10074: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10306: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10077: \$? = $ac_status" >&5 + echo "$as_me:10309: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10080: \"$ac_try\"") >&5 + { (eval echo "$as_me:10312: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10083: \$? = $ac_status" >&5 + echo "$as_me:10315: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CLANG_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" @@ -10091,12 +10323,12 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:10094: result: $CLANG_COMPILER" >&5 + echo "$as_me:10326: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi cat > conftest.$ac_ext <&5 + { echo "$as_me:10348: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -10129,12 +10361,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:10132: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:10364: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10135: \$? = $ac_status" >&5 + echo "$as_me:10367: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:10137: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:10369: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -10143,7 +10375,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GCC" = yes then - { echo "$as_me:10146: checking for $CC warning options..." >&5 + { echo "$as_me:10378: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS= @@ -10167,12 +10399,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas Wswitch-enum do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:10170: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:10402: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10173: \$? = $ac_status" >&5 + echo "$as_me:10405: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:10175: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:10407: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in (Wcast-qual) @@ -10183,7 +10415,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}:10186: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:10418: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -10193,7 +10425,7 @@ echo "${as_me:-configure}:10186: testing feature is broken in gcc $GCC_VERSION . ([12].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:10196: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:10428: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -10226,10 +10458,10 @@ cat > conftest.i <&5 + { echo "$as_me:10461: 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:10513: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10284: \$? = $ac_status" >&5 + echo "$as_me:10516: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:10286: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:10518: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in @@ -10343,7 +10575,7 @@ rm -rf conftest* fi ### use option --enable-assertions to turn on generation of assertion code -echo "$as_me:10346: checking if you want to enable runtime assertions" >&5 +echo "$as_me:10578: 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. @@ -10353,7 +10585,7 @@ if test "${enable_assertions+set}" = set; then else with_assertions=no fi; -echo "$as_me:10356: result: $with_assertions" >&5 +echo "$as_me:10588: result: $with_assertions" >&5 echo "${ECHO_T}$with_assertions" >&6 if test -n "$GCC" then @@ -10406,7 +10638,7 @@ case "$CFLAGS $CPPFLAGS" in ;; esac -echo "$as_me:10409: checking whether to add trace feature to all models" >&5 +echo "$as_me:10641: 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. @@ -10416,7 +10648,7 @@ if test "${with_trace+set}" = set; then else cf_with_trace=$cf_all_traces fi; -echo "$as_me:10419: result: $cf_with_trace" >&5 +echo "$as_me:10651: result: $cf_with_trace" >&5 echo "${ECHO_T}$cf_with_trace" >&6 if test "$cf_with_trace" = yes ; then @@ -10504,7 +10736,7 @@ else ADA_TRACE=FALSE fi -echo "$as_me:10507: checking if we want to use GNAT projects" >&5 +echo "$as_me:10739: checking if we want to use GNAT projects" >&5 echo $ECHO_N "checking if we want to use GNAT projects... $ECHO_C" >&6 # Check whether --enable-gnat-projects or --disable-gnat-projects was given. @@ -10521,7 +10753,7 @@ else enable_gnat_projects=yes fi; -echo "$as_me:10524: result: $enable_gnat_projects" >&5 +echo "$as_me:10756: result: $enable_gnat_projects" >&5 echo "${ECHO_T}$enable_gnat_projects" >&6 ### Checks for libraries. @@ -10529,13 +10761,13 @@ case $cf_cv_system_name in (*mingw32*) ;; (*) -echo "$as_me:10532: checking for gettimeofday" >&5 +echo "$as_me:10764: 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 10538 "configure" +#line 10770 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gettimeofday (); below. */ @@ -10566,16 +10798,16 @@ f = gettimeofday; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10569: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10801: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10572: \$? = $ac_status" >&5 + echo "$as_me:10804: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10575: \"$ac_try\"") >&5 + { (eval echo "$as_me:10807: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10578: \$? = $ac_status" >&5 + echo "$as_me:10810: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gettimeofday=yes else @@ -10585,7 +10817,7 @@ ac_cv_func_gettimeofday=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10588: result: $ac_cv_func_gettimeofday" >&5 +echo "$as_me:10820: 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 @@ -10594,7 +10826,7 @@ EOF else -echo "$as_me:10597: checking for gettimeofday in -lbsd" >&5 +echo "$as_me:10829: 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 @@ -10602,7 +10834,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10605 "configure" +#line 10837 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10621,16 +10853,16 @@ gettimeofday (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10624: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10856: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10627: \$? = $ac_status" >&5 + echo "$as_me:10859: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10630: \"$ac_try\"") >&5 + { (eval echo "$as_me:10862: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10633: \$? = $ac_status" >&5 + echo "$as_me:10865: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gettimeofday=yes else @@ -10641,7 +10873,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10644: result: $ac_cv_lib_bsd_gettimeofday" >&5 +echo "$as_me:10876: 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 @@ -10657,13 +10889,13 @@ fi esac ### Checks for header files. -echo "$as_me:10660: checking for ANSI C header files" >&5 +echo "$as_me:10892: 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 10666 "configure" +#line 10898 "configure" #include "confdefs.h" #include #include @@ -10671,13 +10903,13 @@ else #include _ACEOF -if { (eval echo "$as_me:10674: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:10906: \"$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:10680: \$? = $ac_status" >&5 + echo "$as_me:10912: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -10699,7 +10931,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 10702 "configure" +#line 10934 "configure" #include "confdefs.h" #include @@ -10717,7 +10949,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 10720 "configure" +#line 10952 "configure" #include "confdefs.h" #include @@ -10738,7 +10970,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 10741 "configure" +#line 10973 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -10764,15 +10996,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:10767: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10999: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10770: \$? = $ac_status" >&5 + echo "$as_me:11002: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:10772: \"$ac_try\"") >&5 + { (eval echo "$as_me:11004: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10775: \$? = $ac_status" >&5 + echo "$as_me:11007: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -10785,7 +11017,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:10788: result: $ac_cv_header_stdc" >&5 +echo "$as_me:11020: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -10798,13 +11030,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:10801: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:11033: 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 10807 "configure" +#line 11039 "configure" #include "confdefs.h" #include #include <$ac_hdr> @@ -10819,16 +11051,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10822: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11054: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10825: \$? = $ac_status" >&5 + echo "$as_me:11057: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10828: \"$ac_try\"") >&5 + { (eval echo "$as_me:11060: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10831: \$? = $ac_status" >&5 + echo "$as_me:11063: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -10838,7 +11070,7 @@ eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:10841: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:11073: 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:11086: 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 @@ -10859,7 +11091,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10862 "configure" +#line 11094 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10878,16 +11110,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10881: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11113: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10884: \$? = $ac_status" >&5 + echo "$as_me:11116: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10887: \"$ac_try\"") >&5 + { (eval echo "$as_me:11119: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10890: \$? = $ac_status" >&5 + echo "$as_me:11122: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dir_opendir=yes else @@ -10898,14 +11130,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10901: result: $ac_cv_lib_dir_opendir" >&5 +echo "$as_me:11133: 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:10908: checking for opendir in -lx" >&5 + echo "$as_me:11140: 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 @@ -10913,7 +11145,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lx $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10916 "configure" +#line 11148 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10932,16 +11164,16 @@ opendir (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10935: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11167: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10938: \$? = $ac_status" >&5 + echo "$as_me:11170: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10941: \"$ac_try\"") >&5 + { (eval echo "$as_me:11173: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10944: \$? = $ac_status" >&5 + echo "$as_me:11176: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_x_opendir=yes else @@ -10952,7 +11184,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10955: result: $ac_cv_lib_x_opendir" >&5 +echo "$as_me:11187: 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" @@ -10960,13 +11192,13 @@ fi fi -echo "$as_me:10963: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:11195: 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 10969 "configure" +#line 11201 "configure" #include "confdefs.h" #include #include @@ -10982,16 +11214,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10985: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11217: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10988: \$? = $ac_status" >&5 + echo "$as_me:11220: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10991: \"$ac_try\"") >&5 + { (eval echo "$as_me:11223: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10994: \$? = $ac_status" >&5 + echo "$as_me:11226: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -11001,7 +11233,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11004: result: $ac_cv_header_time" >&5 +echo "$as_me:11236: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -11019,13 +11251,13 @@ 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:11022: checking for an ANSI C-conforming const" >&5 +echo "$as_me:11254: 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 11028 "configure" +#line 11260 "configure" #include "confdefs.h" int @@ -11083,16 +11315,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11086: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11318: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11089: \$? = $ac_status" >&5 + echo "$as_me:11321: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11092: \"$ac_try\"") >&5 + { (eval echo "$as_me:11324: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11095: \$? = $ac_status" >&5 + echo "$as_me:11327: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else @@ -11102,7 +11334,7 @@ ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11105: result: $ac_cv_c_const" >&5 +echo "$as_me:11337: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -11114,7 +11346,7 @@ fi ### Checks for external-data -echo "$as_me:11117: checking if data-only library module links" >&5 +echo "$as_me:11349: 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 @@ -11122,20 +11354,20 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5 + if { (eval echo "$as_me:11360: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11131: \$? = $ac_status" >&5 + echo "$as_me:11363: \$? = $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:11383: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11154: \$? = $ac_status" >&5 + echo "$as_me:11386: \$? = $ac_status" >&5 (exit $ac_status); }; then mv conftest.o func.o && \ ( $AR $ARFLAGS conftest.a func.o ) 2>&5 1>/dev/null @@ -11164,7 +11396,7 @@ EOF cf_cv_link_dataonly=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 11167 "configure" +#line 11399 "configure" #include "confdefs.h" int main() @@ -11175,15 +11407,15 @@ else _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:11178: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11410: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11181: \$? = $ac_status" >&5 + echo "$as_me:11413: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11183: \"$ac_try\"") >&5 + { (eval echo "$as_me:11415: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11186: \$? = $ac_status" >&5 + echo "$as_me:11418: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_link_dataonly=yes else @@ -11198,7 +11430,7 @@ fi fi -echo "$as_me:11201: result: $cf_cv_link_dataonly" >&5 +echo "$as_me:11433: result: $cf_cv_link_dataonly" >&5 echo "${ECHO_T}$cf_cv_link_dataonly" >&6 if test "$cf_cv_link_dataonly" = no ; then @@ -11212,7 +11444,7 @@ fi ### Checks for library functions. -echo "$as_me:11215: checking for working mkstemp" >&5 +echo "$as_me:11447: 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 @@ -11223,7 +11455,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 11226 "configure" +#line 11458 "configure" #include "confdefs.h" #include @@ -11261,15 +11493,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:11264: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11496: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11267: \$? = $ac_status" >&5 + echo "$as_me:11499: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11269: \"$ac_try\"") >&5 + { (eval echo "$as_me:11501: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11272: \$? = $ac_status" >&5 + echo "$as_me:11504: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_mkstemp=yes @@ -11284,16 +11516,16 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:11287: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:11519: result: $cf_cv_func_mkstemp" >&5 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 if test "x$cf_cv_func_mkstemp" = xmaybe ; then - echo "$as_me:11290: checking for mkstemp" >&5 + echo "$as_me:11522: 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 11296 "configure" +#line 11528 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char mkstemp (); below. */ @@ -11324,16 +11556,16 @@ f = mkstemp; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11327: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11559: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11330: \$? = $ac_status" >&5 + echo "$as_me:11562: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11333: \"$ac_try\"") >&5 + { (eval echo "$as_me:11565: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11336: \$? = $ac_status" >&5 + echo "$as_me:11568: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mkstemp=yes else @@ -11343,7 +11575,7 @@ ac_cv_func_mkstemp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11346: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:11578: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -11366,7 +11598,7 @@ if test "$cf_with_ada" != "no" ; then 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:11369: checking for $ac_word" >&5 +echo "$as_me:11601: 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 @@ -11381,7 +11613,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:11384: found $ac_dir/$ac_word" >&5 +echo "$as_me:11616: found $ac_dir/$ac_word" >&5 break done @@ -11390,10 +11622,10 @@ fi fi gnat_exists=$ac_cv_prog_gnat_exists if test -n "$gnat_exists"; then - echo "$as_me:11393: result: $gnat_exists" >&5 + echo "$as_me:11625: result: $gnat_exists" >&5 echo "${ECHO_T}$gnat_exists" >&6 else - echo "$as_me:11396: result: no" >&5 + echo "$as_me:11628: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -11402,12 +11634,12 @@ if test "$ac_cv_prog_gnat_exists" = no; then cf_cv_prog_gnat_correct=no else -echo "$as_me:11405: checking for gnat version" >&5 +echo "$as_me:11637: 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:11410: result: $cf_gnat_version" >&5 +echo "$as_me:11642: result: $cf_gnat_version" >&5 echo "${ECHO_T}$cf_gnat_version" >&6 case $cf_gnat_version in @@ -11415,7 +11647,7 @@ case $cf_gnat_version in cf_cv_prog_gnat_correct=yes ;; (*) - { echo "$as_me:11418: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + { echo "$as_me:11650: 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 ;; @@ -11423,7 +11655,7 @@ esac # Extract the first word of "m4", so it can be a program name with args. set dummy m4; ac_word=$2 -echo "$as_me:11426: checking for $ac_word" >&5 +echo "$as_me:11658: 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 @@ -11438,7 +11670,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:11441: found $ac_dir/$ac_word" >&5 +echo "$as_me:11673: found $ac_dir/$ac_word" >&5 break done @@ -11447,10 +11679,10 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:11450: result: $M4_exists" >&5 + echo "$as_me:11682: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:11453: result: no" >&5 + echo "$as_me:11685: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -11459,7 +11691,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:11462: checking if GNAT works" >&5 + echo "$as_me:11694: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -rf conftest* *~conftest* @@ -11487,14 +11719,14 @@ else fi rm -rf conftest* *~conftest* - echo "$as_me:11490: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:11722: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:11497: checking optimization options for ADAFLAGS" >&5 + echo "$as_me:11729: checking optimization options for ADAFLAGS" >&5 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 case "$CFLAGS" in (*-g*) @@ -11511,10 +11743,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ;; esac - echo "$as_me:11514: result: $ADAFLAGS" >&5 + echo "$as_me:11746: result: $ADAFLAGS" >&5 echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:11517: checking if GNATPREP supports -T option" >&5 +echo "$as_me:11749: checking if GNATPREP supports -T option" >&5 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 if test "${cf_cv_gnatprep_opt_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11524,11 +11756,11 @@ cf_cv_gnatprep_opt_t=no gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes fi -echo "$as_me:11527: result: $cf_cv_gnatprep_opt_t" >&5 +echo "$as_me:11759: result: $cf_cv_gnatprep_opt_t" >&5 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" -echo "$as_me:11531: checking if GNAT supports generics" >&5 +echo "$as_me:11763: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case $cf_gnat_version in (3.[1-9]*|[4-9].*) @@ -11538,7 +11770,7 @@ case $cf_gnat_version in cf_gnat_generics=no ;; esac -echo "$as_me:11541: result: $cf_gnat_generics" >&5 +echo "$as_me:11773: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -11550,7 +11782,7 @@ else cf_generic_objects= fi -echo "$as_me:11553: checking if GNAT supports SIGINT" >&5 +echo "$as_me:11785: checking if GNAT supports SIGINT" >&5 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 if test "${cf_cv_gnat_sigint+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11598,7 +11830,7 @@ fi rm -rf conftest* *~conftest* fi -echo "$as_me:11601: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:11833: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test $cf_cv_gnat_sigint = yes ; then @@ -11611,7 +11843,7 @@ cf_gnat_libraries=no cf_gnat_projects=no if test "$enable_gnat_projects" != no ; then -echo "$as_me:11614: checking if GNAT supports project files" >&5 +echo "$as_me:11846: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 case $cf_gnat_version in (3.[0-9]*) @@ -11671,15 +11903,15 @@ CF_EOF esac ;; esac -echo "$as_me:11674: result: $cf_gnat_projects" >&5 +echo "$as_me:11906: result: $cf_gnat_projects" >&5 echo "${ECHO_T}$cf_gnat_projects" >&6 fi # enable_gnat_projects if test $cf_gnat_projects = yes then - echo "$as_me:11680: checking if GNAT supports libraries" >&5 + echo "$as_me:11912: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:11682: result: $cf_gnat_libraries" >&5 + echo "$as_me:11914: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -11699,7 +11931,7 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:11702: checking for ada-compiler" >&5 +echo "$as_me:11934: 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. @@ -11710,12 +11942,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:11713: result: $cf_ada_compiler" >&5 +echo "$as_me:11945: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:11718: checking for ada-include" >&5 +echo "$as_me:11950: 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. @@ -11751,7 +11983,7 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:11754: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:11986: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -11760,10 +11992,10 @@ esac fi eval ADA_INCLUDE="$withval" -echo "$as_me:11763: result: $ADA_INCLUDE" >&5 +echo "$as_me:11995: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:11766: checking for ada-objects" >&5 +echo "$as_me:11998: 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. @@ -11799,7 +12031,7 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:11802: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:12034: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -11808,10 +12040,10 @@ esac fi eval ADA_OBJECTS="$withval" -echo "$as_me:11811: result: $ADA_OBJECTS" >&5 +echo "$as_me:12043: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:11814: checking if an Ada95 shared-library should be built" >&5 +echo "$as_me:12046: 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. @@ -11821,7 +12053,7 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:11824: result: $with_ada_sharedlib" >&5 +echo "$as_me:12056: result: $with_ada_sharedlib" >&5 echo "${ECHO_T}$with_ada_sharedlib" >&6 ADA_SHAREDLIB='lib$(LIB_NAME).so.1' @@ -11837,12 +12069,12 @@ then fi else - { { echo "$as_me:11840: error: No usable Ada compiler found" >&5 + { { echo "$as_me:12072: 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:11845: error: The Ada compiler is needed for this package" >&5 + { { echo "$as_me:12077: 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 @@ -11882,7 +12114,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:11885: checking default library suffix" >&5 +echo "$as_me:12117: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -11893,10 +12125,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:11896: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:12128: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:11899: checking default library-dependency suffix" >&5 +echo "$as_me:12131: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case X$DFT_LWR_MODEL in @@ -11954,10 +12186,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" fi -echo "$as_me:11957: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:12189: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:11960: checking default object directory" >&5 +echo "$as_me:12192: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -11973,7 +12205,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:11976: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:12208: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 ### Set up low-level terminfo dependencies for makefiles. @@ -12185,7 +12417,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:12188: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:12420: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -12361,7 +12593,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:12364: error: ambiguous option: $1 + { { echo "$as_me:12596: 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;} @@ -12380,7 +12612,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:12383: error: unrecognized option: $1 + -*) { { echo "$as_me:12615: 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;} @@ -12451,7 +12683,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:12454: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:12686: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -12775,7 +13007,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:12778: creating $ac_file" >&5 + { echo "$as_me:13010: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -12793,7 +13025,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:12796: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:13028: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -12806,7 +13038,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:12809: error: cannot find input file: $f" >&5 + { { echo "$as_me:13041: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -12822,7 +13054,7 @@ cat >>$CONFIG_STATUS <<\EOF if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' $ac_item` if test -z "$ac_used"; then - { echo "$as_me:12825: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:13057: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&2;} @@ -12831,7 +13063,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:12834: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:13066: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&2;} @@ -12868,7 +13100,7 @@ s,@INSTALL@,$ac_INSTALL,;t t ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:12871: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:13103: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&5 echo "$as_me: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&2;} @@ -12879,7 +13111,7 @@ $ac_seen" >&2;} egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out if test -s $tmp/out; then ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` - { echo "$as_me:12882: WARNING: Some variables may not be substituted: + { echo "$as_me:13114: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -12928,7 +13160,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:12931: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:13163: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -12939,7 +13171,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:12942: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:13174: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -12952,7 +13184,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:12955: error: cannot find input file: $f" >&5 + { { echo "$as_me:13187: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -13010,7 +13242,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:13013: $ac_file is unchanged" >&5 + { echo "$as_me:13245: $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/NEWS b/NEWS index 897589e6..eda07cde 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.2380 2015/04/18 22:22:01 tom Exp $ +-- $Id: NEWS,v 1.2390 2015/04/26 00:51:41 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,24 @@ 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. +20150425 + + expanded description of tgetstr's area pointer in manual page + (report by Todd M Lewis). + + in-progress changes to modify test-packages to use ncursesw6 rather + than ncursesw, with updated configure scripts. + + modify CF_NCURSES_CONFIG in Ada95- and test-configure scripts to + check for ".pc" files via pkg-config, but add a linkage check since + frequently pkg-config configurations are broken. + + modify misc/gen-pkgconfig.in to include EXTRA_LDFLAGS, e.g., for the + rpath option. + + add 'dim' capability to screen entry (report by Leonardo B Schenkel) + + add several key definitions to nsterm-bce to match preconfigured + keys, e.g., with OSX 10.9 and 10.10 (report by Leonardo B Schenkel) + + fix repeated "extra-suffix" in ncurses-config.in (cf: 20150418). + + improve term_variables manual page, adding section on the terminfo + long-name symbols which are defined in the term.h header. + + fix bug in lib_tracebits.c introduced in const-fixes (cf: 20150404). + 20150418 + avoid a blank line in output from tabs program by ending it with a carriage return as done in FreeBSD (patch by James Clarke). diff --git a/VERSION b/VERSION index d3401384..c81c223e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:9 5.9 20150418 +5:0:9 5.9 20150425 diff --git a/dist.mk b/dist.mk index de7e8678..73313311 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.1045 2015/04/17 20:59:31 tom Exp $ +# $Id: dist.mk,v 1.1047 2015/04/22 00:55:43 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,7 +37,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 5 NCURSES_MINOR = 9 -NCURSES_PATCH = 20150418 +NCURSES_PATCH = 20150425 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/man/curs_termcap.3x b/man/curs_termcap.3x index f8977beb..2f0eea87 100644 --- a/man/curs_termcap.3x +++ b/man/curs_termcap.3x @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. * +.\" Copyright (c) 1998-2013,2015 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,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: curs_termcap.3x,v 1.30 2013/01/19 15:58:48 tom Exp $ +.\" $Id: curs_termcap.3x,v 1.31 2015/04/26 00:49:10 tom Exp $ .TH curs_termcap 3X "" .de bP .IP \(bu 4 @@ -121,9 +121,24 @@ or \-1 if it is not available. The \fBtgetstr\fR routine returns the string entry for \fIid\fR, or zero if it is not available. Use \fBtputs\fR to output the returned string. -The return value will also be copied to the buffer pointed to by \fIarea\fR, +The \fIarea\fP parameter is used as follows: +.RS 3 +.bP +It is assumed to be the address of a pointer to a buffer managed by the +calling application. +.bP +However, ncurses checks to ensure that \fBarea\fP is not NULL, +and also that the resulting buffer pointer is not NULL. +If either check fails, the \fIarea\fP parameter is ignored. +.bP +If the checks succeed, ncurses also copies the return value to +the buffer pointed to by \fIarea\fR, and the \fIarea\fR value will be updated to point past the null ending this value. +.bP +The return value itself is an address in the terminal description which +is loaded into memory. +.RE .PP Only the first two characters of the \fBid\fR parameter of \fBtgetflag\fR, diff --git a/man/term_variables.3x b/man/term_variables.3x index 4cf9a0c8..ea247373 100644 --- a/man/term_variables.3x +++ b/man/term_variables.3x @@ -1,5 +1,5 @@ .\"*************************************************************************** -.\" Copyright (c) 2011,2013 Free Software Foundation, Inc. * +.\" Copyright (c) 2011-2013,2015 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,7 +26,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: term_variables.3x,v 1.4 2013/12/21 22:17:39 tom Exp $ +.\" $Id: term_variables.3x,v 1.6 2015/04/22 00:34:49 tom Exp $ .TH term_variables 3X "" .ds n 5 .na @@ -55,29 +55,29 @@ \fB#include \fR .PP \fBchtype acs_map[];\fR -.br +.sp +\fBTERMINAL * cur_term;\fR +.sp +\fBchar ttytype[];\fR +.sp \fBNCURSES_CONST char * const * boolcodes;\fR .br \fBNCURSES_CONST char * const * boolfnames;\fR .br \fBNCURSES_CONST char * const * boolnames;\fR -.br -\fBTERMINAL * cur_term;\fR -.br +.sp \fBNCURSES_CONST char * const * numcodes;\fR .br \fBNCURSES_CONST char * const * numfnames;\fR .br \fBNCURSES_CONST char * const * numnames;\fR -.br +.sp \fBNCURSES_CONST char * const * strcodes;\fR .br \fBNCURSES_CONST char * const * strfnames;\fR .br \fBNCURSES_CONST char * const * strnames;\fR .br -\fBchar ttytype[];\fR -.br .fi .SH DESCRIPTION This page summarizes variables provided by the \fBcurses\fP library's @@ -114,25 +114,44 @@ The \fB@TIC@\fP(1) and \fB@INFOCMP@\fP(1) programs use lookup tables for the long and short names of terminfo capabilities, as well as the corresponding names for termcap capabilities. These are available to other applications, -though the hash-tables are not available. +although the hash-tables used by +the terminfo and termcap functions are not available. .PP The long terminfo capability names use a "l" (ell) in their names: -boolfnames -numfnames -strfnames +\fBboolfnames\fP, +\fBnumfnames\fP, and +\fBstrfnames\fP. .PP These are the short names for terminfo capabilities: -boolnames, -numnames, and -strnames. +\fBboolnames\fP, +\fBnumnames\fP, and +\fBstrnames\fP. .PP These are the corresponding names used for termcap descriptions: -boolcodes, -numcodes, and -strcodes. +\fBboolcodes\fP, +\fBnumcodes\fP, and +\fBstrcodes\fP. +.\" .SS Terminal Type On initialization of the curses or terminfo interfaces, \fBsetupterm\fP copies the terminal name to the array \fBttytype\fP. +.\" +.SS Terminfo Names +.PP +In addition to the variables, \fB\fP also defines a symbol for each +terminfo capability \fIlong name\fP. +These are in terms of the symbol \fBCUR\fP, +which is defined +.PP +.nf +.ft CW +#define CUR cur_term->type. +.fi +.ft R +.PP +These symbols provide a faster method of accessing terminfo capabilities +than using \fBtigetstr\fR(3X), etc. +.\" .SH NOTES The low-level terminfo interface is initialized using .hy 0 @@ -140,6 +159,7 @@ The low-level terminfo interface is initialized using .hy The upper-level curses interface uses the low-level terminfo interface, internally. +.\" .SH PORTABILITY X/Open Curses does not describe any of these except for \fBcur_term\fP. (The inclusion of \fBcur_term\fP appears to be an oversight, @@ -148,6 +168,10 @@ since other comparable low-level information is omitted by X/Open). Other implementations may have comparable variables. Some implementations provide the variables in their libraries, but omit them from the header files. +.PP +All implementations which provide terminfo interfaces add definitions +as described in the \fBTerminfo Names\fP section. +Most, but not all, base the definition upon the \fBcur_term\fP variable. .SH SEE ALSO .hy 0 \fBcurses\fR(3X), diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in index d479db91..abee42da 100644 --- a/misc/gen-pkgconfig.in +++ b/misc/gen-pkgconfig.in @@ -1,5 +1,5 @@ #!@SHELL@ -# $Id: gen-pkgconfig.in,v 1.22 2015/04/12 15:18:19 tom Exp $ +# $Id: gen-pkgconfig.in,v 1.23 2015/04/24 23:35:33 tom Exp $ ############################################################################## # Copyright (c) 2009-2014,2015 Free Software Foundation, Inc. # # # @@ -80,6 +80,9 @@ if test "$libdir" = "/usr/lib" ; then else LDFLAGS="-L\${libdir}" fi +if test "x@EXTRA_LDFLAGS@" != "x" ; then + LDFLAGS="$LDFLAGS @EXTRA_LDFLAGS@" +fi for name in @PC_MODULES_TO_MAKE@ do diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in index a68f1714..73cbfff6 100644 --- a/misc/ncurses-config.in +++ b/misc/ncurses-config.in @@ -1,5 +1,5 @@ #!@SHELL@ -# $Id: ncurses-config.in,v 1.34 2015/04/18 17:25:07 tom Exp $ +# $Id: ncurses-config.in,v 1.35 2015/04/22 00:54:19 tom Exp $ ############################################################################## # Copyright (c) 2006-2012,2015 Free Software Foundation, Inc. # # # @@ -49,7 +49,7 @@ THIS="@LIB_NAME@@USE_LIB_SUFFIX@" TINFO_LIB="@TINFO_ARG_SUFFIX@" RPATH_LIST="@RPATH_LIST@" -includesubdir="@includedir@/${THIS}@EXTRA_SUFFIX@" +includesubdir="@includedir@/${THIS}" # Ensure that RPATH_LIST contains only absolute pathnames, if it is nonempty. # We cannot filter it out within the build-process since the variable is used diff --git a/misc/terminfo.src b/misc/terminfo.src index a9d4225f..7e576ef1 100644 --- a/misc/terminfo.src +++ b/misc/terminfo.src @@ -6,8 +6,8 @@ # Report bugs and new terminal descriptions to # bug-ncurses@gnu.org # -# $Revision: 1.525 $ -# $Date: 2014/10/19 01:16:56 $ +# $Revision: 1.531 $ +# $Date: 2015/04/22 10:20:24 $ # # The original header is preserved below for reference. It is noted that there # is a "newer" version which differs in some cosmetic details (but actually @@ -1223,8 +1223,15 @@ nsterm-16color|AppKit Terminal.app v240.2+ with Mac OS X version 10.5, # + the vt52 emulation does not give a usable shell because screen-clearing # does not work as expected. # + selecting "xterm" or "xterm-16color" sets TERM to "xterm-256color". +# + OSX 10.9 (Yosemite) added more extended keys in the default configuration +# as well as unmasking F10 (which had been used in the window manager). Those +# keys are listed in this entry. nsterm-bce|AppKit Terminal.app v71+/v100.1.8+ with Mac OS X version 10.3/10.4 (bce), - bce, use=nsterm-16color, + bce, + kDC=\E[3;2~, kLFT=\E[1;2D, kRIT=\E[1;2C, kcbt=\E[Z, + kf18=\E[32~, kDC5=\E[3;5~, kDC7=\E[3;5~, kLFT3=\Eb, + kLFT5=\E[1;5D, kRIT3=\Ef, kRIT5=\E[1;5C, + use=nsterm-16color, # This is tested with OS X 10.8 (Mountain Lion), 2012/08/11 # TERM_PROGRAM_VERSION=309 @@ -4444,7 +4451,7 @@ xterm-x11hilite|X11 mouse with highlight, # CDE's dtterm was introduced around the same time, with no mouse protocol -TD # xterm patch #83 (1998/10/7), added Jason Bacon's changes to provide an -# "any-event" mouse mode. +# "any-event" mouse mode. xterm+sm+1002|xterm any-event mouse, kmous=\E[M, XM=\E[?1002%?%p1%{1}%=%th%el%;, xterm-1002|xterm any-event mouse, @@ -5899,19 +5906,19 @@ screen|VT 100/ANSI X3.64 virtual terminal, csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM, - cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, - dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0, - flash=\Eg, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, - il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kbs=^H, kcbt=\E[Z, - kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, - kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, + cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, + dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, + enacs=\E(B\E)0, flash=\Eg, home=\E[H, ht=^I, hts=\EH, + ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, + kbs=^H, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, + kcuu1=\EOA, kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O, rmcup=\E[?1049l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[23m, rmul=\E[24m, rs2=\Ec\E[?1000l\E[?25h, sc=\E7, - sgr=\E[0%?%p6%t;1%;%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;, + sgr=\E[0%?%p6%t;1%;%?%p1%t;3%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;m%?%p9%t\016%e\017%;, sgr0=\E[m\017, smacs=^N, smcup=\E[?1049h, smir=\E[4h, smkx=\E[?1h\E=, smso=\E[3m, smul=\E[4m, tbc=\E[3g, E0=\E(B, S0=\E(%p1%c, use=ecma+color, @@ -23573,4 +23580,9 @@ v3220|LANPAR Vision II model 3220/3221/3222, # + reviewed terminology 0.6.1, add function key definitions. None of # the vt100-compatibility issues were improved -TD # +# 2015-04-22 +# + add 'dim' capability to screen entry (report by Leonardo B Schenkel) +# + add several key definitions to nsterm-bce to match preconfigured +# keys, e.g., with OSX 10.9 and 10.10 (report by Leonardo B Schenkel) +# ######## SHANTIH! SHANTIH! SHANTIH! diff --git a/ncurses/trace/lib_tracebits.c b/ncurses/trace/lib_tracebits.c index 6f7c8ca2..f880b674 100644 --- a/ncurses/trace/lib_tracebits.c +++ b/ncurses/trace/lib_tracebits.c @@ -34,7 +34,7 @@ #include -MODULE_ID("$Id: lib_tracebits.c,v 1.25 2015/04/04 13:45:27 tom Exp $") +MODULE_ID("$Id: lib_tracebits.c,v 1.26 2015/04/19 14:58:39 tom Exp $") #if HAVE_SYS_TERMIO_H #include /* needed for ISC */ @@ -85,7 +85,7 @@ lookup_bits(char *buf, const BITNAMES * table, const char *label, unsigned int v _nc_STRCAT(buf, label, TRACE_BUF_SIZE(0)); _nc_STRCAT(buf, ": {", TRACE_BUF_SIZE(0)); - for (sp = table; sp->name; sp++) + for (sp = table; sp->name[0]; sp++) if (sp->val != 0 && (val & sp->val) == sp->val) { _nc_STRCAT(buf, sp->name, TRACE_BUF_SIZE(0)); diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index 44598d39..e1109afa 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9+20150418) unstable; urgency=low +ncurses6 (5.9+20150425) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Fri, 17 Apr 2015 16:59:31 -0400 + -- Thomas E. Dickey Tue, 21 Apr 2015 20:55:43 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index 44598d39..e1109afa 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9+20150418) unstable; urgency=low +ncurses6 (5.9+20150425) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Fri, 17 Apr 2015 16:59:31 -0400 + -- Thomas E. Dickey Tue, 21 Apr 2015 20:55:43 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 3cac8cca..344399ce 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9+20150418) unstable; urgency=low +ncurses6 (5.9+20150425) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Fri, 17 Apr 2015 16:59:31 -0400 + -- Thomas E. Dickey Tue, 21 Apr 2015 20:55:43 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/debian/rules b/package/debian/rules index 1b35dfcd..4743fb7b 100644 --- a/package/debian/rules +++ b/package/debian/rules @@ -1,5 +1,5 @@ #!/usr/bin/make -f -# MAde with the aid of dh_make, by Craig Small +# 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. @@ -122,6 +122,7 @@ binary-arch: build install dh_compress dh_fixperms dh_installdeb + dh_makeshlibs dh_shlibdeps dh_gencontrol dh_md5sums diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 3ebc8d97..f5d461bc 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.98 2015/04/17 20:59:31 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.100 2015/04/22 00:55:43 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "5" !define VERSION_MINOR "9" !define VERSION_YYYY "2015" -!define VERSION_MMDD "0418" +!define VERSION_MMDD "0425" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 6e87e782..5a7529c5 100644 --- a/package/mingw-ncurses.spec +++ b/package/mingw-ncurses.spec @@ -3,7 +3,7 @@ Summary: shared libraries for terminal handling Name: mingw32-ncurses6 Version: 5.9 -Release: 20150418 +Release: 20150425 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index d3e992e8..5490cef8 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 5.9 -Release: 20150418 +Release: 20150425 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/test/aclocal.m4 b/test/aclocal.m4 index 7c1f9310..2ef2d46a 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.107 2015/04/18 13:06:59 tom Exp $ +dnl $Id: aclocal.m4,v 1.112 2015/04/26 00:54:24 tom Exp $ dnl dnl Author: Thomas E. Dickey dnl @@ -434,6 +434,19 @@ AC_TRY_LINK([#include ],[printf("Hello world");],, fi ])dnl dnl --------------------------------------------------------------------------- +dnl CF_CHECK_CURSES_LIB version: 1 updated: 2015/04/25 20:53:11 +dnl ------------------- +dnl $1 = nominal library name, used also for header lookup +dnl $2 = suffix to append to library name +dnl $3 = function to check for using AC_CHECK_LIB +AC_DEFUN([CF_CHECK_CURSES_LIB], +[ +AC_CHECK_LIB($1$2,$3,[ +CF_UPPER(cf_upper,have_lib$1) +CF_ADD_LIBS(-l$1$2) +AC_DEFINE_UNQUOTED($cf_upper,1)]) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_CLANG_COMPILER version: 2 updated: 2013/11/19 19:23:35 dnl ----------------- dnl Check if the given compiler is really clang. clang's C driver defines @@ -639,7 +652,7 @@ if (foo + 1234 > 5678) done ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_HEADER version: 4 updated: 2015/04/18 09:03:58 +dnl CF_CURSES_HEADER version: 5 updated: 2015/04/23 20:35:30 dnl ---------------- dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common dnl variations of ncurses' installs. @@ -648,11 +661,9 @@ dnl $1 = ncurses when looking for ncurses, or is empty AC_DEFUN([CF_CURSES_HEADER],[ AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[ cf_cv_ncurses_header=none -for cf_header in ifelse($1,,,[ \ - $1/ncurses.h \ - $1/curses.h]) \ - ncurses.h \ - curses.h ifelse($1,,[ncurses/ncurses.h ncurses/curses.h]) +for cf_header in \ + ncurses.h ifelse($1,,,[$1/ncurses.h]) \ + curses.h ifelse($1,,,[$1/curses.h]) ifelse($1,,[ncurses/ncurses.h ncurses/curses.h]) do AC_TRY_COMPILE([#include <${cf_header}>], [initscr(); tgoto("?", 0,0)], @@ -1899,46 +1910,86 @@ printf("old\n"); ,[$1=no]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CONFIG version: 10 updated: 2012/10/06 08:57:51 +dnl CF_NCURSES_CONFIG version: 12 updated: 2015/04/24 20:52:45 dnl ----------------- dnl Tie together the configure-script macros for ncurses. dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis. dnl Allow that to be overridden using the $NCURSES_CONFIG environment variable. dnl dnl $1 is the root library name (default: "ncurses") -AC_DEFUN([CF_NCURSES_CONFIG], -[ +AC_DEFUN([CF_NCURSES_CONFIG],[ +AC_REQUIRE([CF_PKG_CONFIG]) cf_ncuconfig_root=ifelse($1,,ncurses,$1) +cf_have_ncuconfig=no -echo "Looking for ${cf_ncuconfig_root}-config" +if test "x$PKG_CONFIG" != xnone; then + AC_MSG_CHECKING(pkg-config for $cf_ncuconfig_root) + if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then + AC_MSG_RESULT(yes) -CF_ACVERSION_CHECK(2.52, - [AC_CHECK_TOOLS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)], - [AC_PATH_PROGS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)]) + AC_MSG_CHECKING(if the $cf_ncuconfig_root package files work) + cf_have_ncuconfig=unknown -if test "$NCURSES_CONFIG" != none ; then + cf_save_CPPFLAGS="$CPPFLAGS" + cf_save_LIBS="$LIBS" -CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" -CF_ADD_LIBS(`$NCURSES_CONFIG --libs`) + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags $cf_ncuconfig_root`" + CF_ADD_LIBS(`$PKG_CONFIG --libs $cf_ncuconfig_root`) -# even with config script, some packages use no-override for curses.h -CF_CURSES_HEADER(ifelse($1,,ncurses,$1)) + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);], + [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { char *xx = curses_version(); return (xx == 0); }], + [cf_have_ncuconfig=yes], + [cf_have_ncuconfig=no])], + [cf_have_ncuconfig=no]) + + AC_MSG_RESULT($cf_have_ncuconfig) + if test "$cf_have_ncuconfig" != "yes" + then + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + else + AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries]) + fi -dnl like CF_NCURSES_CPPFLAGS -AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries]) + else + AC_MSG_RESULT(no) + fi +fi -dnl like CF_NCURSES_LIBS -CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_ncuconfig_root) -AC_DEFINE_UNQUOTED($cf_nculib_ROOT) +if test "x$cf_have_ncuconfig" = "xno"; then + echo "Looking for ${cf_ncuconfig_root}-config" -dnl like CF_NCURSES_VERSION -cf_cv_ncurses_version=`$NCURSES_CONFIG --version` + CF_ACVERSION_CHECK(2.52, + [AC_CHECK_TOOLS(NCURSES_CONFIG, ${cf_ncuconfig_root}-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)], + [AC_PATH_PROGS(NCURSES_CONFIG, ${cf_ncuconfig_root}-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)]) -else + if test "$NCURSES_CONFIG" != none ; then + + CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" + CF_ADD_LIBS(`$NCURSES_CONFIG --libs`) -CF_NCURSES_CPPFLAGS(ifelse($1,,ncurses,$1)) -CF_NCURSES_LIBS(ifelse($1,,ncurses,$1)) + # even with config script, some packages use no-override for curses.h + CF_CURSES_HEADER(ifelse($1,,ncurses,$1)) + dnl like CF_NCURSES_CPPFLAGS + AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries]) + + dnl like CF_NCURSES_LIBS + CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_ncuconfig_root) + AC_DEFINE_UNQUOTED($cf_nculib_ROOT) + + dnl like CF_NCURSES_VERSION + cf_cv_ncurses_version=`$NCURSES_CONFIG --version` + + else + + CF_NCURSES_CPPFLAGS(ifelse($1,,ncurses,$1)) + CF_NCURSES_LIBS(ifelse($1,,ncurses,$1)) + + fi fi ])dnl dnl --------------------------------------------------------------------------- @@ -3107,7 +3158,7 @@ if test "$with_dmalloc" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_NCURSES_ETC version: 3 updated: 2015/04/17 21:26:14 +dnl CF_WITH_NCURSES_ETC version: 4 updated: 2015/04/25 20:53:11 dnl ------------------- dnl Use this macro for programs which use any variant of "curses", e.g., dnl "ncurses", and "PDCurses". Programs that can use curses and some unrelated @@ -3121,6 +3172,10 @@ CF_WITH_CURSES_DIR cf_cv_screen=curses AC_MSG_CHECKING(for specified curses library type) +AC_ARG_WITH(screen, + [ --with-screen=XXX use specified curses-libraries], + [cf_cv_screen=$withval],[ + AC_ARG_WITH(ncursesw, [ --with-ncursesw use wide ncurses-libraries], [cf_cv_screen=ncursesw],[ @@ -3139,7 +3194,7 @@ AC_ARG_WITH(curses-colr, AC_ARG_WITH(curses-5lib, [ --with-curses-5lib compile/link with SunOS 5lib curses], - [cf_cv_screen=curses_5lib])])])])]) + [cf_cv_screen=curses_5lib])])])])])]) AC_MSG_RESULT($cf_cv_screen) @@ -3147,16 +3202,19 @@ case $cf_cv_screen in (curses|curses_*) CF_CURSES_CONFIG ;; -(ncurses) - CF_NCURSES_CONFIG - ;; -(ncursesw) +(ncursesw*) CF_UTF8_LIB - CF_NCURSES_CONFIG(ncursesw) + CF_NCURSES_CONFIG($cf_cv_screen) + ;; +(ncurses*) + CF_NCURSES_CONFIG($cf_cv_screen) ;; (pdcurses) CF_PDCURSES_X11 ;; +(*) + AC_MSG_ERROR(unexpected screen-value: $cf_cv_screen) + ;; esac ])dnl diff --git a/test/configure b/test/configure index b3637394..b63cd841 100755 --- a/test/configure +++ b/test/configure @@ -661,6 +661,7 @@ Curses Version-dependent Options: --with-ncurses-wrap-prefix naming-prefix for ncurses wrapped-variables --disable-widec disable checks for wide-character functions --with-curses-dir=DIR directory in which (n)curses is installed + --with-screen=XXX use specified curses-libraries --with-ncursesw use wide ncurses-libraries --with-ncurses use ncurses-libraries --with-pdcurses compile/link with pdcurses X11 library @@ -871,7 +872,7 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:874: loading site script $ac_site_file" >&5 + { echo "$as_me:875: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} cat "$ac_site_file" >&5 . "$ac_site_file" @@ -882,7 +883,7 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:885: loading cache $cache_file" >&5 + { echo "$as_me:886: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -890,7 +891,7 @@ echo "$as_me: loading cache $cache_file" >&6;} esac fi else - { echo "$as_me:893: creating cache $cache_file" >&5 + { echo "$as_me:894: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -906,21 +907,21 @@ for ac_var in `(set) 2>&1 | eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:909: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:910: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:913: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:914: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:919: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:920: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:921: former value: $ac_old_val" >&5 + { echo "$as_me:922: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:923: current value: $ac_new_val" >&5 + { echo "$as_me:924: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -939,9 +940,9 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if $ac_cache_corrupted; then - { echo "$as_me:942: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:943: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:944: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:945: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -962,10 +963,10 @@ esac echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:965: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:966: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:968: \$? = $ac_status" >&5 + echo "$as_me:969: \$? = $ac_status" >&5 (exit $ac_status); }; then ac_path_separator=';' else @@ -997,7 +998,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1000: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1001: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1007,11 +1008,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:1010: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1011: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1014: checking build system type" >&5 +echo "$as_me:1015: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1020,16 +1021,16 @@ else test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1023: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1024: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:1027: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1028: error: $ac_config_sub $ac_cv_build_alias failed." >&5 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1032: result: $ac_cv_build" >&5 +echo "$as_me:1033: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1037,7 +1038,7 @@ build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then - echo "$as_me:1040: checking host system type" >&5 + echo "$as_me:1041: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1046,12 +1047,12 @@ else test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:1049: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1050: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1054: result: $ac_cv_host" >&5 +echo "$as_me:1055: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1077,13 +1078,13 @@ else fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1080: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1081: result: Configuring for $cf_cv_system_name" >&5 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 if test ".$system_name" != ".$cf_cv_system_name" ; then - echo "$as_me:1084: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1085: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 - { { echo "$as_me:1086: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1087: error: \"Please remove config.cache and try again.\"" >&5 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} { (exit 1); exit 1; }; } fi @@ -1101,7 +1102,7 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed -echo "$as_me:1104: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:1105: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then @@ -1121,11 +1122,11 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1124: result: yes" >&5 + echo "$as_me:1125: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1128: result: no" >&5 + echo "$as_me:1129: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -1139,7 +1140,7 @@ ac_main_return=return if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1142: checking for $ac_word" >&5 +echo "$as_me:1143: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1154,7 +1155,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_CC="${ac_tool_prefix}gcc" -echo "$as_me:1157: found $ac_dir/$ac_word" >&5 +echo "$as_me:1158: found $ac_dir/$ac_word" >&5 break done @@ -1162,10 +1163,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1165: result: $CC" >&5 + echo "$as_me:1166: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1168: result: no" >&5 + echo "$as_me:1169: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1174,7 +1175,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1177: checking for $ac_word" >&5 +echo "$as_me:1178: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1189,7 +1190,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_ac_ct_CC="gcc" -echo "$as_me:1192: found $ac_dir/$ac_word" >&5 +echo "$as_me:1193: found $ac_dir/$ac_word" >&5 break done @@ -1197,10 +1198,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1200: result: $ac_ct_CC" >&5 + echo "$as_me:1201: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1203: result: no" >&5 + echo "$as_me:1204: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1213,7 +1214,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1216: checking for $ac_word" >&5 +echo "$as_me:1217: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1228,7 +1229,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_CC="${ac_tool_prefix}cc" -echo "$as_me:1231: found $ac_dir/$ac_word" >&5 +echo "$as_me:1232: found $ac_dir/$ac_word" >&5 break done @@ -1236,10 +1237,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1239: result: $CC" >&5 + echo "$as_me:1240: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1242: result: no" >&5 + echo "$as_me:1243: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1248,7 +1249,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1251: checking for $ac_word" >&5 +echo "$as_me:1252: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1263,7 +1264,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_ac_ct_CC="cc" -echo "$as_me:1266: found $ac_dir/$ac_word" >&5 +echo "$as_me:1267: found $ac_dir/$ac_word" >&5 break done @@ -1271,10 +1272,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1274: result: $ac_ct_CC" >&5 + echo "$as_me:1275: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1277: result: no" >&5 + echo "$as_me:1278: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1287,7 +1288,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1290: checking for $ac_word" >&5 +echo "$as_me:1291: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1307,7 +1308,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then continue fi ac_cv_prog_CC="cc" -echo "$as_me:1310: found $ac_dir/$ac_word" >&5 +echo "$as_me:1311: found $ac_dir/$ac_word" >&5 break done @@ -1329,10 +1330,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1332: result: $CC" >&5 + echo "$as_me:1333: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1335: result: no" >&5 + echo "$as_me:1336: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1343,7 +1344,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1346: checking for $ac_word" >&5 +echo "$as_me:1347: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1358,7 +1359,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_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1361: found $ac_dir/$ac_word" >&5 +echo "$as_me:1362: found $ac_dir/$ac_word" >&5 break done @@ -1366,10 +1367,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1369: result: $CC" >&5 + echo "$as_me:1370: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1372: result: no" >&5 + echo "$as_me:1373: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1382,7 +1383,7 @@ if test -z "$CC"; then 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:1385: checking for $ac_word" >&5 +echo "$as_me:1386: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1397,7 +1398,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_ac_ct_CC="$ac_prog" -echo "$as_me:1400: found $ac_dir/$ac_word" >&5 +echo "$as_me:1401: found $ac_dir/$ac_word" >&5 break done @@ -1405,10 +1406,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1408: result: $ac_ct_CC" >&5 + echo "$as_me:1409: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1411: result: no" >&5 + echo "$as_me:1412: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1420,32 +1421,32 @@ fi fi -test -z "$CC" && { { echo "$as_me:1423: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1424: error: no acceptable cc found in \$PATH" >&5 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1428:" \ +echo "$as_me:1429:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1431: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:1432: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1434: \$? = $ac_status" >&5 + echo "$as_me:1435: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1436: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:1437: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1439: \$? = $ac_status" >&5 + echo "$as_me:1440: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1441: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:1442: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1444: \$? = $ac_status" >&5 + echo "$as_me:1445: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1448 "configure" +#line 1449 "configure" #include "confdefs.h" int @@ -1461,13 +1462,13 @@ ac_clean_files="$ac_clean_files a.out a.exe" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1464: checking for C compiler default output" >&5 +echo "$as_me:1465: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1467: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1468: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1470: \$? = $ac_status" >&5 + echo "$as_me:1471: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last @@ -1490,34 +1491,34 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1493: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1494: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1499: result: $ac_file" >&5 +echo "$as_me:1500: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1504: checking whether the C compiler works" >&5 +echo "$as_me:1505: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1510: \"$ac_try\"") >&5 + { (eval echo "$as_me:1511: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1513: \$? = $ac_status" >&5 + echo "$as_me:1514: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1520: error: cannot run C compiled programs. + { { echo "$as_me:1521: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -1525,24 +1526,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1528: result: yes" >&5 +echo "$as_me:1529: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe conftest$ac_cv_exeext ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1535: checking whether we are cross compiling" >&5 +echo "$as_me:1536: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1537: result: $cross_compiling" >&5 +echo "$as_me:1538: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1540: checking for executable suffix" >&5 +echo "$as_me:1541: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1542: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1543: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1545: \$? = $ac_status" >&5 + echo "$as_me:1546: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -1558,25 +1559,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1561: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1562: error: cannot compute EXEEXT: cannot compile and link" >&5 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1567: result: $ac_cv_exeext" >&5 +echo "$as_me:1568: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1573: checking for object suffix" >&5 +echo "$as_me:1574: checking for object suffix" >&5 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1579 "configure" +#line 1580 "configure" #include "confdefs.h" int @@ -1588,10 +1589,10 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1591: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1592: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1594: \$? = $ac_status" >&5 + echo "$as_me:1595: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in @@ -1603,24 +1604,24 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1606: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1607: error: cannot compute OBJEXT: cannot compile" >&5 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1613: result: $ac_cv_objext" >&5 +echo "$as_me:1614: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1617: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1618: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1623 "configure" +#line 1624 "configure" #include "confdefs.h" int @@ -1635,16 +1636,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1638: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1639: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1641: \$? = $ac_status" >&5 + echo "$as_me:1642: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1644: \"$ac_try\"") >&5 + { (eval echo "$as_me:1645: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1647: \$? = $ac_status" >&5 + echo "$as_me:1648: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1656,19 +1657,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1659: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1660: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1665: checking whether $CC accepts -g" >&5 +echo "$as_me:1666: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1671 "configure" +#line 1672 "configure" #include "confdefs.h" int @@ -1680,16 +1681,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1683: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1684: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1686: \$? = $ac_status" >&5 + echo "$as_me:1687: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1689: \"$ac_try\"") >&5 + { (eval echo "$as_me:1690: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1692: \$? = $ac_status" >&5 + echo "$as_me:1693: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1699,7 +1700,7 @@ ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1702: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1703: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1726,16 +1727,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1729: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1730: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1732: \$? = $ac_status" >&5 + echo "$as_me:1733: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1735: \"$ac_try\"") >&5 + { (eval echo "$as_me:1736: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1738: \$? = $ac_status" >&5 + echo "$as_me:1739: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1747,7 +1748,7 @@ if { (eval echo "$as_me:1729: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1750 "configure" +#line 1751 "configure" #include "confdefs.h" #include $ac_declaration @@ -1760,16 +1761,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1763: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1764: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1766: \$? = $ac_status" >&5 + echo "$as_me:1767: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1769: \"$ac_try\"") >&5 + { (eval echo "$as_me:1770: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1772: \$? = $ac_status" >&5 + echo "$as_me:1773: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -1779,7 +1780,7 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1782 "configure" +#line 1783 "configure" #include "confdefs.h" $ac_declaration int @@ -1791,16 +1792,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1794: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1795: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1797: \$? = $ac_status" >&5 + echo "$as_me:1798: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1800: \"$ac_try\"") >&5 + { (eval echo "$as_me:1801: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1803: \$? = $ac_status" >&5 + echo "$as_me:1804: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -1830,15 +1831,15 @@ ac_main_return=return GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:1833: checking version of $CC" >&5 + echo "$as_me:1834: 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/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:1837: result: $GCC_VERSION" >&5 + echo "$as_me:1838: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi -echo "$as_me:1841: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:1842: 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 @@ -1846,7 +1847,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 1849 "configure" +#line 1850 "configure" #include "confdefs.h" #include #include @@ -1895,16 +1896,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:1898: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1899: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1901: \$? = $ac_status" >&5 + echo "$as_me:1902: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1904: \"$ac_try\"") >&5 + { (eval echo "$as_me:1905: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1907: \$? = $ac_status" >&5 + echo "$as_me:1908: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -1921,10 +1922,10 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:1924: result: none needed" >&5 + echo "$as_me:1925: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:1927: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:1928: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac @@ -1932,13 +1933,13 @@ esac # This should have been defined by AC_PROG_CC : ${CC:=cc} -echo "$as_me:1935: checking \$CC variable" >&5 +echo "$as_me:1936: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in (*[\ \ ]-[IUD]*) - echo "$as_me:1939: result: broken" >&5 + echo "$as_me:1940: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:1941: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:1942: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} # humor him... cf_flags=`echo "$CC" | sed -e 's/^[^ ]*[ ]//'` @@ -2024,7 +2025,7 @@ fi ;; (*) - echo "$as_me:2027: result: ok" >&5 + echo "$as_me:2028: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac @@ -2035,7 +2036,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return -echo "$as_me:2038: checking how to run the C preprocessor" >&5 +echo "$as_me:2039: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -2056,18 +2057,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 2059 "configure" +#line 2060 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2064: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2065: \"$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:2070: \$? = $ac_status" >&5 + echo "$as_me:2071: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2090,17 +2091,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 2093 "configure" +#line 2094 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2097: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2098: \"$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:2103: \$? = $ac_status" >&5 + echo "$as_me:2104: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2137,7 +2138,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2140: result: $CPP" >&5 +echo "$as_me:2141: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2147,18 +2148,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 2150 "configure" +#line 2151 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2155: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2156: \"$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:2161: \$? = $ac_status" >&5 + echo "$as_me:2162: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2181,17 +2182,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 2184 "configure" +#line 2185 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2188: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2189: \"$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:2194: \$? = $ac_status" >&5 + echo "$as_me:2195: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2219,7 +2220,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:2222: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2223: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2235,7 +2236,7 @@ for ac_prog in mawk gawk nawk awk 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:2238: checking for $ac_word" >&5 +echo "$as_me:2239: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2250,7 +2251,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_AWK="$ac_prog" -echo "$as_me:2253: found $ac_dir/$ac_word" >&5 +echo "$as_me:2254: found $ac_dir/$ac_word" >&5 break done @@ -2258,10 +2259,10 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:2261: result: $AWK" >&5 + echo "$as_me:2262: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:2264: result: no" >&5 + echo "$as_me:2265: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2280,7 +2281,7 @@ done # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:2283: checking for a BSD compatible install" >&5 +echo "$as_me:2284: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -2329,7 +2330,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:2332: result: $INSTALL" >&5 +echo "$as_me:2333: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2354,7 +2355,7 @@ for ac_prog in tdlint lint alint splint lclint 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:2357: checking for $ac_word" >&5 +echo "$as_me:2358: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_LINT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2369,7 +2370,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_LINT="$ac_prog" -echo "$as_me:2372: found $ac_dir/$ac_word" >&5 +echo "$as_me:2373: found $ac_dir/$ac_word" >&5 break done @@ -2377,17 +2378,17 @@ fi fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:2380: result: $LINT" >&5 + echo "$as_me:2381: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:2383: result: no" >&5 + echo "$as_me:2384: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$LINT" && break done -echo "$as_me:2390: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:2391: checking if filesystem supports mixed-case filenames" >&5 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 if test "${cf_cv_mixedcase+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2414,7 +2415,7 @@ else fi fi -echo "$as_me:2417: result: $cf_cv_mixedcase" >&5 +echo "$as_me:2418: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -2425,7 +2426,7 @@ for ac_prog in exctags ctags 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:2428: checking for $ac_word" >&5 +echo "$as_me:2429: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CTAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2440,7 +2441,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_CTAGS="$ac_prog" -echo "$as_me:2443: found $ac_dir/$ac_word" >&5 +echo "$as_me:2444: found $ac_dir/$ac_word" >&5 break done @@ -2448,10 +2449,10 @@ fi fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:2451: result: $CTAGS" >&5 + echo "$as_me:2452: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:2454: result: no" >&5 + echo "$as_me:2455: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2462,7 +2463,7 @@ for ac_prog in exetags etags 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:2465: checking for $ac_word" >&5 +echo "$as_me:2466: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ETAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2477,7 +2478,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_ETAGS="$ac_prog" -echo "$as_me:2480: found $ac_dir/$ac_word" >&5 +echo "$as_me:2481: found $ac_dir/$ac_word" >&5 break done @@ -2485,10 +2486,10 @@ fi fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:2488: result: $ETAGS" >&5 + echo "$as_me:2489: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:2491: result: no" >&5 + echo "$as_me:2492: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2497,7 +2498,7 @@ done # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. set dummy ${CTAGS:-ctags}; ac_word=$2 -echo "$as_me:2500: checking for $ac_word" >&5 +echo "$as_me:2501: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2512,7 +2513,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_MAKE_LOWER_TAGS="yes" -echo "$as_me:2515: found $ac_dir/$ac_word" >&5 +echo "$as_me:2516: found $ac_dir/$ac_word" >&5 break done @@ -2521,17 +2522,17 @@ fi fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:2524: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:2525: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:2527: result: no" >&5 + echo "$as_me:2528: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$cf_cv_mixedcase" = yes ; then # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. set dummy ${ETAGS:-etags}; ac_word=$2 -echo "$as_me:2534: checking for $ac_word" >&5 +echo "$as_me:2535: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2546,7 +2547,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_MAKE_UPPER_TAGS="yes" -echo "$as_me:2549: found $ac_dir/$ac_word" >&5 +echo "$as_me:2550: found $ac_dir/$ac_word" >&5 break done @@ -2555,10 +2556,10 @@ fi fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:2558: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:2559: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:2561: result: no" >&5 + echo "$as_me:2562: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2578,14 +2579,14 @@ else MAKE_LOWER_TAGS="#" fi -echo "$as_me:2581: checking if -lm needed for math functions" >&5 +echo "$as_me:2582: checking if -lm needed for math functions" >&5 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6 if test "${cf_cv_need_libm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2588 "configure" +#line 2589 "configure" #include "confdefs.h" #include @@ -2600,16 +2601,16 @@ double x = rand(); printf("result = %g\n", pow(sin(x),x)) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2603: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2604: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2606: \$? = $ac_status" >&5 + echo "$as_me:2607: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2609: \"$ac_try\"") >&5 + { (eval echo "$as_me:2610: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2612: \$? = $ac_status" >&5 + echo "$as_me:2613: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_libm=no else @@ -2619,7 +2620,7 @@ cf_cv_need_libm=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:2622: result: $cf_cv_need_libm" >&5 +echo "$as_me:2623: result: $cf_cv_need_libm" >&5 echo "${ECHO_T}$cf_cv_need_libm" >&6 if test "$cf_cv_need_libm" = yes then @@ -2678,10 +2679,10 @@ cat > conftest.i <&5 + { echo "$as_me:2682: 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:2734: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2736: \$? = $ac_status" >&5 + echo "$as_me:2737: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:2738: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:2739: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in @@ -2832,14 +2833,14 @@ case $host_os in ;; (linux*|gnu*|mint*|k*bsd*-gnu) -echo "$as_me:2835: checking if we must define _GNU_SOURCE" >&5 +echo "$as_me:2836: 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 2842 "configure" +#line 2843 "configure" #include "confdefs.h" #include int @@ -2854,16 +2855,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2857: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2858: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2860: \$? = $ac_status" >&5 + echo "$as_me:2861: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2863: \"$ac_try\"") >&5 + { (eval echo "$as_me:2864: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2866: \$? = $ac_status" >&5 + echo "$as_me:2867: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -2872,7 +2873,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 2875 "configure" +#line 2876 "configure" #include "confdefs.h" #include int @@ -2887,16 +2888,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2890: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2891: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2893: \$? = $ac_status" >&5 + echo "$as_me:2894: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2896: \"$ac_try\"") >&5 + { (eval echo "$as_me:2897: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2899: \$? = $ac_status" >&5 + echo "$as_me:2900: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -2911,7 +2912,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2914: result: $cf_cv_gnu_source" >&5 +echo "$as_me:2915: 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" @@ -2936,16 +2937,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:2939: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:2940: 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}:2945: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:2946: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 2948 "configure" +#line 2949 "configure" #include "confdefs.h" #include int @@ -2960,16 +2961,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2963: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2964: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2966: \$? = $ac_status" >&5 + echo "$as_me:2967: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2969: \"$ac_try\"") >&5 + { (eval echo "$as_me:2970: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2972: \$? = $ac_status" >&5 + echo "$as_me:2973: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -2990,7 +2991,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 2993 "configure" +#line 2994 "configure" #include "confdefs.h" #include int @@ -3005,16 +3006,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3008: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3009: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3011: \$? = $ac_status" >&5 + echo "$as_me:3012: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3014: \"$ac_try\"") >&5 + { (eval echo "$as_me:3015: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3017: \$? = $ac_status" >&5 + echo "$as_me:3018: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3025,15 +3026,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:3028: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:3029: 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}:3033: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:3034: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3036 "configure" +#line 3037 "configure" #include "confdefs.h" #include int @@ -3048,16 +3049,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3051: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3052: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3054: \$? = $ac_status" >&5 + echo "$as_me:3055: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3057: \"$ac_try\"") >&5 + { (eval echo "$as_me:3058: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3060: \$? = $ac_status" >&5 + echo "$as_me:3061: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3073,7 +3074,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3076: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:3077: 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 @@ -3191,14 +3192,14 @@ fi ;; (*) -echo "$as_me:3194: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:3195: 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 3201 "configure" +#line 3202 "configure" #include "confdefs.h" #include @@ -3217,16 +3218,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3220: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3221: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3223: \$? = $ac_status" >&5 + echo "$as_me:3224: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3226: \"$ac_try\"") >&5 + { (eval echo "$as_me:3227: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3229: \$? = $ac_status" >&5 + echo "$as_me:3230: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3235,7 +3236,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 3238 "configure" +#line 3239 "configure" #include "confdefs.h" #include @@ -3254,16 +3255,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3257: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3258: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3260: \$? = $ac_status" >&5 + echo "$as_me:3261: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3263: \"$ac_try\"") >&5 + { (eval echo "$as_me:3264: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3266: \$? = $ac_status" >&5 + echo "$as_me:3267: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3278,7 +3279,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3281: result: $cf_cv_xopen_source" >&5 +echo "$as_me:3282: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -3386,16 +3387,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:3389: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:3390: 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}:3395: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:3396: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3398 "configure" +#line 3399 "configure" #include "confdefs.h" #include int @@ -3410,16 +3411,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3413: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3414: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3416: \$? = $ac_status" >&5 + echo "$as_me:3417: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3419: \"$ac_try\"") >&5 + { (eval echo "$as_me:3420: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3422: \$? = $ac_status" >&5 + echo "$as_me:3423: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -3440,7 +3441,7 @@ cf_want_posix_source=no esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 3443 "configure" +#line 3444 "configure" #include "confdefs.h" #include int @@ -3455,16 +3456,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3458: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3459: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3461: \$? = $ac_status" >&5 + echo "$as_me:3462: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3464: \"$ac_try\"") >&5 + { (eval echo "$as_me:3465: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3467: \$? = $ac_status" >&5 + echo "$as_me:3468: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3475,15 +3476,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:3478: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:3479: 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}:3483: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:3484: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3486 "configure" +#line 3487 "configure" #include "confdefs.h" #include int @@ -3498,16 +3499,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3501: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3502: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3504: \$? = $ac_status" >&5 + echo "$as_me:3505: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3507: \"$ac_try\"") >&5 + { (eval echo "$as_me:3508: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3510: \$? = $ac_status" >&5 + echo "$as_me:3511: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3523,7 +3524,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3526: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:3527: 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 @@ -3681,7 +3682,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:3684: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:3685: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 CFLAGS="$CFLAGS $cf_new_cflags" fi @@ -3689,7 +3690,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:3692: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:3693: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 CPPFLAGS="$CPPFLAGS $cf_new_cppflags" fi @@ -3697,7 +3698,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:3700: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:3701: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi @@ -3705,10 +3706,10 @@ fi fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:3708: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:3709: checking if _XOPEN_SOURCE really is set" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3711 "configure" +#line 3712 "configure" #include "confdefs.h" #include int @@ -3723,16 +3724,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3726: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3727: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3729: \$? = $ac_status" >&5 + echo "$as_me:3730: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3732: \"$ac_try\"") >&5 + { (eval echo "$as_me:3733: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3735: \$? = $ac_status" >&5 + echo "$as_me:3736: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -3741,12 +3742,12 @@ cat conftest.$ac_ext >&5 cf_XOPEN_SOURCE_set=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:3744: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:3745: result: $cf_XOPEN_SOURCE_set" >&5 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 if test $cf_XOPEN_SOURCE_set = yes then cat >conftest.$ac_ext <<_ACEOF -#line 3749 "configure" +#line 3750 "configure" #include "confdefs.h" #include int @@ -3761,16 +3762,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3764: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3765: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3767: \$? = $ac_status" >&5 + echo "$as_me:3768: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3770: \"$ac_try\"") >&5 + { (eval echo "$as_me:3771: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3773: \$? = $ac_status" >&5 + echo "$as_me:3774: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -3781,19 +3782,19 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext if test $cf_XOPEN_SOURCE_set_ok = no then - { echo "$as_me:3784: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:3785: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:3789: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:3790: 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 3796 "configure" +#line 3797 "configure" #include "confdefs.h" #include @@ -3812,16 +3813,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3815: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3816: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3818: \$? = $ac_status" >&5 + echo "$as_me:3819: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3821: \"$ac_try\"") >&5 + { (eval echo "$as_me:3822: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3824: \$? = $ac_status" >&5 + echo "$as_me:3825: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3830,7 +3831,7 @@ cat conftest.$ac_ext >&5 cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 3833 "configure" +#line 3834 "configure" #include "confdefs.h" #include @@ -3849,16 +3850,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3852: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3853: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3855: \$? = $ac_status" >&5 + echo "$as_me:3856: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3858: \"$ac_try\"") >&5 + { (eval echo "$as_me:3859: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3861: \$? = $ac_status" >&5 + echo "$as_me:3862: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3873,7 +3874,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3876: result: $cf_cv_xopen_source" >&5 +echo "$as_me:3877: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -3971,7 +3972,7 @@ fi fi fi -echo "$as_me:3974: checking for signal global datatype" >&5 +echo "$as_me:3975: 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 @@ -3983,7 +3984,7 @@ else "int" do cat >conftest.$ac_ext <<_ACEOF -#line 3986 "configure" +#line 3987 "configure" #include "confdefs.h" #include @@ -4006,16 +4007,16 @@ signal(SIGINT, handler); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4009: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4010: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4012: \$? = $ac_status" >&5 + echo "$as_me:4013: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4015: \"$ac_try\"") >&5 + { (eval echo "$as_me:4016: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4018: \$? = $ac_status" >&5 + echo "$as_me:4019: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sig_atomic_t=$cf_type else @@ -4029,14 +4030,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4032: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:4033: 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:4040: checking if you want to use pkg-config" >&5 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 # Check whether --with-pkg-config or --without-pkg-config was given. @@ -4046,7 +4047,7 @@ if test "${with_pkg_config+set}" = set; then else cf_pkg_config=yes fi; -echo "$as_me:4049: result: $cf_pkg_config" >&5 +echo "$as_me:4050: result: $cf_pkg_config" >&5 echo "${ECHO_T}$cf_pkg_config" >&6 case $cf_pkg_config in @@ -4058,7 +4059,7 @@ case $cf_pkg_config in if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -echo "$as_me:4061: checking for $ac_word" >&5 +echo "$as_me:4062: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4075,7 +4076,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_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:4078: found $ac_dir/$ac_word" >&5 + echo "$as_me:4079: found $ac_dir/$ac_word" >&5 break fi done @@ -4086,10 +4087,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:4089: result: $PKG_CONFIG" >&5 + echo "$as_me:4090: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:4092: result: no" >&5 + echo "$as_me:4093: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4098,7 +4099,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:4101: checking for $ac_word" >&5 +echo "$as_me:4102: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4115,7 +4116,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_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:4118: found $ac_dir/$ac_word" >&5 + echo "$as_me:4119: found $ac_dir/$ac_word" >&5 break fi done @@ -4127,10 +4128,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:4130: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:4131: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:4133: result: no" >&5 + echo "$as_me:4134: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -4173,18 +4174,18 @@ case ".$PKG_CONFIG" in PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:4176: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + { { echo "$as_me:4177: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} { (exit 1); exit 1; }; } ;; esac else - { echo "$as_me:4183: WARNING: pkg-config is not installed" >&5 + { echo "$as_me:4184: WARNING: pkg-config is not installed" >&5 echo "$as_me: WARNING: pkg-config is not installed" >&2;} fi -echo "$as_me:4187: checking if you want to see long compiling messages" >&5 +echo "$as_me:4188: 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. @@ -4218,10 +4219,10 @@ else ECHO_CC='' fi; -echo "$as_me:4221: result: $enableval" >&5 +echo "$as_me:4222: result: $enableval" >&5 echo "${ECHO_T}$enableval" >&6 -echo "$as_me:4224: checking for ncurses wrap-prefix" >&5 +echo "$as_me:4225: checking for ncurses wrap-prefix" >&5 echo $ECHO_N "checking for ncurses wrap-prefix... $ECHO_C" >&6 # Check whether --with-ncurses-wrap-prefix or --without-ncurses-wrap-prefix was given. @@ -4231,10 +4232,10 @@ if test "${with_ncurses_wrap_prefix+set}" = set; then else NCURSES_WRAP_PREFIX=_nc_ fi; -echo "$as_me:4234: result: $NCURSES_WRAP_PREFIX" >&5 +echo "$as_me:4235: result: $NCURSES_WRAP_PREFIX" >&5 echo "${ECHO_T}$NCURSES_WRAP_PREFIX" >&6 -echo "$as_me:4237: checking if you want to check for wide-character functions" >&5 +echo "$as_me:4238: checking if you want to check for wide-character functions" >&5 echo $ECHO_N "checking if you want to check for wide-character functions... $ECHO_C" >&6 # Check whether --enable-widec or --disable-widec was given. @@ -4251,10 +4252,10 @@ else cf_enable_widec=yes fi; -echo "$as_me:4254: result: $cf_enable_widec" >&5 +echo "$as_me:4255: result: $cf_enable_widec" >&5 echo "${ECHO_T}$cf_enable_widec" >&6 -echo "$as_me:4257: checking for specific curses-directory" >&5 +echo "$as_me:4258: 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. @@ -4264,7 +4265,7 @@ if test "${with_curses_dir+set}" = set; then else cf_cv_curses_dir=no fi; -echo "$as_me:4267: result: $cf_cv_curses_dir" >&5 +echo "$as_me:4268: 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" ) @@ -4295,7 +4296,7 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:4298: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:4299: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -4328,7 +4329,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 4331 "configure" +#line 4332 "configure" #include "confdefs.h" #include int @@ -4340,16 +4341,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4343: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4344: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4346: \$? = $ac_status" >&5 + echo "$as_me:4347: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4349: \"$ac_try\"") >&5 + { (eval echo "$as_me:4350: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4352: \$? = $ac_status" >&5 + echo "$as_me:4353: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -4366,7 +4367,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}:4369: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:4370: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -4400,7 +4401,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}:4403: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:4404: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -4413,9 +4414,15 @@ fi cf_cv_screen=curses -echo "$as_me:4416: checking for specified curses library type" >&5 +echo "$as_me:4417: checking for specified curses library type" >&5 echo $ECHO_N "checking for specified curses library type... $ECHO_C" >&6 +# Check whether --with-screen or --without-screen was given. +if test "${with_screen+set}" = set; then + withval="$with_screen" + cf_cv_screen=$withval +else + # Check whether --with-ncursesw or --without-ncursesw was given. if test "${with_ncursesw+set}" = set; then withval="$with_ncursesw" @@ -4449,14 +4456,15 @@ fi; fi; fi; fi; +fi; -echo "$as_me:4453: result: $cf_cv_screen" >&5 +echo "$as_me:4461: result: $cf_cv_screen" >&5 echo "${ECHO_T}$cf_cv_screen" >&6 case $cf_cv_screen in (curses|curses_*) -echo "$as_me:4459: checking for extra include directories" >&5 +echo "$as_me:4467: 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 @@ -4482,23 +4490,23 @@ case $host_os in esac fi -echo "$as_me:4485: result: $cf_cv_curses_incdir" >&5 +echo "$as_me:4493: 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:4489: checking if we have identified curses headers" >&5 +echo "$as_me:4497: 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 else cf_cv_ncurses_header=none -for cf_header in \ - ncurses.h \ - curses.h ncurses/ncurses.h ncurses/curses.h +for cf_header in \ + ncurses.h \ + curses.h ncurses/ncurses.h ncurses/curses.h do cat >conftest.$ac_ext <<_ACEOF -#line 4501 "configure" +#line 4509 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -4510,16 +4518,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4513: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4521: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4516: \$? = $ac_status" >&5 + echo "$as_me:4524: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4519: \"$ac_try\"") >&5 + { (eval echo "$as_me:4527: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4522: \$? = $ac_status" >&5 + echo "$as_me:4530: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -4530,11 +4538,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:4533: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:4541: 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:4537: error: No curses header-files found" >&5 + { { echo "$as_me:4545: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -4544,23 +4552,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:4547: checking for $ac_header" >&5 +echo "$as_me:4555: 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 4553 "configure" +#line 4561 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4557: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4565: \"$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:4563: \$? = $ac_status" >&5 + echo "$as_me:4571: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4579,7 +4587,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4582: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4590: 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:4600: 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 @@ -4607,7 +4615,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 4610 "configure" +#line 4618 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -4622,16 +4630,16 @@ int x = auto_left_margin } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4625: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4633: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4628: \$? = $ac_status" >&5 + echo "$as_me:4636: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4631: \"$ac_try\"") >&5 + { (eval echo "$as_me:4639: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4634: \$? = $ac_status" >&5 + echo "$as_me:4642: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -4647,7 +4655,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:4650: result: $cf_cv_term_header" >&5 +echo "$as_me:4658: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -4679,7 +4687,7 @@ EOF ;; esac -echo "$as_me:4682: checking for ncurses version" >&5 +echo "$as_me:4690: 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 @@ -4705,10 +4713,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:4708: \"$cf_try\"") >&5 + { (eval echo "$as_me:4716: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:4711: \$? = $ac_status" >&5 + echo "$as_me:4719: \$? = $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%".*%%'` @@ -4718,7 +4726,7 @@ EOF else cat >conftest.$ac_ext <<_ACEOF -#line 4721 "configure" +#line 4729 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -4743,15 +4751,15 @@ int main() } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:4746: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4754: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4749: \$? = $ac_status" >&5 + echo "$as_me:4757: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4751: \"$ac_try\"") >&5 + { (eval echo "$as_me:4759: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4754: \$? = $ac_status" >&5 + echo "$as_me:4762: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -4765,17 +4773,17 @@ fi rm -f $cf_tempfile fi -echo "$as_me:4768: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:4776: 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:4775: checking if we have identified curses libraries" >&5 +echo "$as_me:4783: 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 4778 "configure" +#line 4786 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -4787,16 +4795,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4790: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4798: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4793: \$? = $ac_status" >&5 + echo "$as_me:4801: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4796: \"$ac_try\"") >&5 + { (eval echo "$as_me:4804: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4799: \$? = $ac_status" >&5 + echo "$as_me:4807: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -4805,13 +4813,13 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:4808: result: $cf_result" >&5 +echo "$as_me:4816: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then case $host_os in (freebsd*) - echo "$as_me:4814: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:4822: 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 @@ -4819,7 +4827,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4822 "configure" +#line 4830 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4838,16 +4846,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4841: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4849: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4844: \$? = $ac_status" >&5 + echo "$as_me:4852: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4847: \"$ac_try\"") >&5 + { (eval echo "$as_me:4855: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4850: \$? = $ac_status" >&5 + echo "$as_me:4858: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -4858,7 +4866,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4861: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:4869: 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 @@ -4888,7 +4896,7 @@ fi # term.h) for cur_colr if test "x$cf_cv_screen" = "xcurses_colr" then - echo "$as_me:4891: checking for initscr in -lcur_colr" >&5 + echo "$as_me:4899: 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 @@ -4896,7 +4904,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lcur_colr $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4899 "configure" +#line 4907 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4915,16 +4923,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4918: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4926: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4921: \$? = $ac_status" >&5 + echo "$as_me:4929: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4924: \"$ac_try\"") >&5 + { (eval echo "$as_me:4932: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4927: \$? = $ac_status" >&5 + echo "$as_me:4935: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_cur_colr_initscr=yes else @@ -4935,7 +4943,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4938: result: $ac_cv_lib_cur_colr_initscr" >&5 +echo "$as_me:4946: 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 @@ -4959,7 +4967,7 @@ LIBS="$cf_add_libs" else - echo "$as_me:4962: checking for initscr in -lHcurses" >&5 + echo "$as_me:4970: 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 @@ -4967,7 +4975,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lHcurses $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 4970 "configure" +#line 4978 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4986,16 +4994,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4989: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4997: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4992: \$? = $ac_status" >&5 + echo "$as_me:5000: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4995: \"$ac_try\"") >&5 + { (eval echo "$as_me:5003: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4998: \$? = $ac_status" >&5 + echo "$as_me:5006: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Hcurses_initscr=yes else @@ -5006,7 +5014,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5009: result: $ac_cv_lib_Hcurses_initscr" >&5 +echo "$as_me:5017: 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 @@ -5062,7 +5070,7 @@ if test -n "/lib64" ; 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}:5065: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:5073: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -5091,7 +5099,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}:5094: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:5102: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -5122,7 +5130,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}:5125: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:5133: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -5157,7 +5165,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}:5160: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:5168: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -5201,13 +5209,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then # because it may be needed to link the test-case for initscr. if test "x$cf_term_lib" = x then - echo "$as_me:5204: checking for tgoto" >&5 + echo "$as_me:5212: 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 5210 "configure" +#line 5218 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char tgoto (); below. */ @@ -5238,16 +5246,16 @@ f = tgoto; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5241: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5249: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5244: \$? = $ac_status" >&5 + echo "$as_me:5252: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5247: \"$ac_try\"") >&5 + { (eval echo "$as_me:5255: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5250: \$? = $ac_status" >&5 + echo "$as_me:5258: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_tgoto=yes else @@ -5257,7 +5265,7 @@ ac_cv_func_tgoto=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5260: result: $ac_cv_func_tgoto" >&5 +echo "$as_me:5268: 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 @@ -5266,7 +5274,7 @@ else for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown do as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` -echo "$as_me:5269: checking for tgoto in -l$cf_term_lib" >&5 +echo "$as_me:5277: 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 @@ -5274,7 +5282,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_term_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5277 "configure" +#line 5285 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5293,16 +5301,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5296: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5304: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5299: \$? = $ac_status" >&5 + echo "$as_me:5307: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5302: \"$ac_try\"") >&5 + { (eval echo "$as_me:5310: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5305: \$? = $ac_status" >&5 + echo "$as_me:5313: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -5313,7 +5321,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5316: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:5324: 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 @@ -5332,7 +5340,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:5335: checking for initscr in -l$cf_curs_lib" >&5 +echo "$as_me:5343: 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 @@ -5340,7 +5348,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_curs_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5343 "configure" +#line 5351 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5359,16 +5367,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5362: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5370: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5365: \$? = $ac_status" >&5 + echo "$as_me:5373: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5368: \"$ac_try\"") >&5 + { (eval echo "$as_me:5376: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5371: \$? = $ac_status" >&5 + echo "$as_me:5379: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -5379,7 +5387,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5382: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:5390: 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 @@ -5387,16 +5395,16 @@ fi done fi - test $cf_curs_lib = unknown && { { echo "$as_me:5390: error: no curses library found" >&5 + test $cf_curs_lib = unknown && { { echo "$as_me:5398: 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:5396: checking if we can link with $cf_curs_lib library" >&5 + echo "$as_me:5404: 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 5399 "configure" +#line 5407 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -5408,16 +5416,16 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5411: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5419: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5414: \$? = $ac_status" >&5 + echo "$as_me:5422: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5417: \"$ac_try\"") >&5 + { (eval echo "$as_me:5425: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5420: \$? = $ac_status" >&5 + echo "$as_me:5428: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -5426,18 +5434,18 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:5429: result: $cf_result" >&5 + echo "$as_me:5437: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 - test $cf_result = no && { { echo "$as_me:5431: error: Cannot link curses library" >&5 + test $cf_result = no && { { echo "$as_me:5439: 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:5437: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 + echo "$as_me:5445: 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 5440 "configure" +#line 5448 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -5449,16 +5457,16 @@ initscr(); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5452: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5460: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5455: \$? = $ac_status" >&5 + echo "$as_me:5463: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5458: \"$ac_try\"") >&5 + { (eval echo "$as_me:5466: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5461: \$? = $ac_status" >&5 + echo "$as_me:5469: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=no else @@ -5467,7 +5475,7 @@ cat conftest.$ac_ext >&5 LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5470 "configure" +#line 5478 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -5479,16 +5487,16 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5482: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5490: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5485: \$? = $ac_status" >&5 + echo "$as_me:5493: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5488: \"$ac_try\"") >&5 + { (eval echo "$as_me:5496: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5491: \$? = $ac_status" >&5 + echo "$as_me:5499: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -5500,399 +5508,143 @@ 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:5503: result: $cf_result" >&5 + echo "$as_me:5511: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 fi fi fi ;; -(ncurses) - -cf_ncuconfig_root=ncurses - -echo "Looking for ${cf_ncuconfig_root}-config" - -if test -n "$ac_tool_prefix"; then - for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:5521: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$NCURSES_CONFIG"; then - ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:5536: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG -if test -n "$NCURSES_CONFIG"; then - echo "$as_me:5544: result: $NCURSES_CONFIG" >&5 -echo "${ECHO_T}$NCURSES_CONFIG" >&6 -else - echo "$as_me:5547: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$NCURSES_CONFIG" && break - done -fi -if test -z "$NCURSES_CONFIG"; then - ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG - 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:5560: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_NCURSES_CONFIG"; then - ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:5575: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG -if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:5583: result: $ac_ct_NCURSES_CONFIG" >&5 -echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 -else - echo "$as_me:5586: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$ac_ct_NCURSES_CONFIG" && break -done -test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" - - NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG -fi - -if test "$NCURSES_CONFIG" != none ; then - -CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" - -cf_add_libs="`$NCURSES_CONFIG --libs`" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then - cf_add_1lib= - break - fi - done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" -done -LIBS="$cf_add_libs" +(ncursesw*) -# even with config script, some packages use no-override for curses.h - -echo "$as_me:5619: 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 "$as_me:5520: 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 else -cf_cv_ncurses_header=none -for cf_header in \ - ncurses/ncurses.h \ - ncurses/curses.h \ - ncurses.h \ - curses.h -do -cat >conftest.$ac_ext <<_ACEOF -#line 5633 "configure" + cf_save_LIBS="$LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line 5528 "configure" #include "confdefs.h" -#include <${cf_header}> + +#include int main () { -initscr(); tgoto("?", 0,0) +putwc(0,0); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5645: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:5541: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5648: \$? = $ac_status" >&5 + echo "$as_me:5544: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5651: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:5547: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5654: \$? = $ac_status" >&5 + echo "$as_me:5550: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_ncurses_header=$cf_header; break + cf_cv_utf8_lib=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -fi -echo "$as_me:5665: result: $cf_cv_ncurses_header" >&5 -echo "${ECHO_T}$cf_cv_ncurses_header" >&6 +# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these +# will be set on completion of the AC_TRY_LINK below. +cf_cv_header_path_utf8= +cf_cv_library_path_utf8= -if test "$cf_cv_ncurses_header" = none ; then - { { echo "$as_me:5669: error: No curses header-files found" >&5 -echo "$as_me: error: No curses header-files found" >&2;} - { (exit 1); exit 1; }; } -fi +echo "${as_me:-configure}:5562: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 -# cheat, to get the right #define's for HAVE_NCURSES_H, etc. +cf_save_LIBS="$LIBS" -for ac_header in $cf_cv_ncurses_header -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5679: 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 5685 "configure" +cat >conftest.$ac_ext <<_ACEOF +#line 5567 "configure" #include "confdefs.h" -#include <$ac_header> + +#include +int +main () +{ +putwc(0,0); + ; + return 0; +} _ACEOF -if { (eval echo "$as_me:5689: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:5580: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:5695: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:5714: 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 <>confdefs.h <<\EOF -#define NCURSES 1 -EOF - -cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - -cat >>confdefs.h <&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:5586: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5589: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then -cf_cv_ncurses_version=`$NCURSES_CONFIG --version` + cf_cv_find_linkage_utf8=yes + cf_cv_header_path_utf8=/usr/include + cf_cv_library_path_utf8=/usr/lib else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 -cf_ncuhdr_root=ncurses - -test -n "$cf_cv_curses_dir" && \ -test "$cf_cv_curses_dir" != "no" && { \ - -if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then - for cf_add_incdir in $cf_cv_curses_dir/include/$cf_ncuhdr_root - do - while test $cf_add_incdir != /usr/include - do - if test -d $cf_add_incdir - then - cf_have_incdir=no - if test -n "$CFLAGS$CPPFLAGS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then - cf_have_incdir=yes; break - fi - done - fi +LIBS="-lutf8 $cf_save_LIBS" - if test "$cf_have_incdir" = no ; then - if test "$cf_add_incdir" = /usr/local/include ; then - if test "$GCC" = yes - then - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 5767 "configure" +cat >conftest.$ac_ext <<_ACEOF +#line 5603 "configure" #include "confdefs.h" -#include + +#include int main () { -printf("Hello") +putwc(0,0); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5779: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:5616: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5782: \$? = $ac_status" >&5 + echo "$as_me:5619: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5785: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:5622: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5788: \$? = $ac_status" >&5 + echo "$as_me:5625: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + + cf_cv_find_linkage_utf8=yes + cf_cv_header_path_utf8=/usr/include + cf_cv_library_path_utf8=/usr/lib + cf_cv_library_file_utf8="-lutf8" + else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_have_incdir=yes -fi -rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - -echo "${as_me:-configure}:5805: testing adding $cf_add_incdir to include-path ..." 1>&5 - - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break - fi - fi - done - done -fi - -} - -echo "$as_me:5822: 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 -else - - cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h" - ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h" - for cf_header in $cf_header_list - do - - cat >conftest.$ac_ext <<_ACEOF -#line 5834 "configure" -#include "confdefs.h" - -#include <$cf_header> -int -main () -{ - -#ifdef NCURSES_VERSION - -printf("%s\n", NCURSES_VERSION); -#else -#ifdef __NCURSES_H -printf("old\n"); -#else - make an error -#endif -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5858: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:5861: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5864: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5867: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ncurses_h=$cf_header - -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_ncurses_h=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext - test "$cf_cv_ncurses_h" != no && break - done + cf_cv_find_linkage_utf8=no + LIBS="$cf_save_LIBS" -fi -echo "$as_me:5882: result: $cf_cv_ncurses_h" >&5 -echo "${ECHO_T}$cf_cv_ncurses_h" >&6 + test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -if test "$cf_cv_ncurses_h" != no ; then - cf_cv_ncurses_header=$cf_cv_ncurses_h -else +echo "${as_me:-configure}:5642: testing find linkage for utf8 library ..." 1>&5 -echo "$as_me:5889: 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 -else +echo "${as_me:-configure}:5644: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 - test -n "$verbose" && echo + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" cf_search= @@ -5910,10 +5662,10 @@ test -d "$cf_header_path" && \ { test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" - test -d $cf_header_path/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root" - test -d $cf_header_path/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include" - test -d $cf_header_path/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include" - test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" + test -d $cf_header_path/include/utf8 && cf_search="$cf_search $cf_header_path/include/utf8" + test -d $cf_header_path/include/utf8/include && cf_search="$cf_search $cf_header_path/include/utf8/include" + test -d $cf_header_path/utf8/include && cf_search="$cf_search $cf_header_path/utf8/include" + test -d $cf_header_path/utf8/include/utf8 && cf_search="$cf_search $cf_header_path/utf8/include/utf8" } cf_header_path_list="$cf_header_path_list $cf_search" @@ -5931,10 +5683,10 @@ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for include-directories under $prefix" test -d $prefix/include && cf_search="$cf_search $prefix/include" - test -d $prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root" - test -d $prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include" - test -d $prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include" - test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" + test -d $prefix/include/utf8 && cf_search="$cf_search $prefix/include/utf8" + test -d $prefix/include/utf8/include && cf_search="$cf_search $prefix/include/utf8/include" + test -d $prefix/utf8/include && cf_search="$cf_search $prefix/utf8/include" + test -d $prefix/utf8/include/utf8 && cf_search="$cf_search $prefix/utf8/include/utf8" } for cf_subdir_prefix in \ @@ -5951,10 +5703,10 @@ test -d "$cf_subdir_prefix" && \ (test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" test -d $cf_subdir_prefix/include && cf_search="$cf_search $cf_subdir_prefix/include" - test -d $cf_subdir_prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root" - test -d $cf_subdir_prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include" - test -d $cf_subdir_prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include" - test -d $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" + test -d $cf_subdir_prefix/include/utf8 && cf_search="$cf_search $cf_subdir_prefix/include/utf8" + test -d $cf_subdir_prefix/include/utf8/include && cf_search="$cf_search $cf_subdir_prefix/include/utf8/include" + test -d $cf_subdir_prefix/utf8/include && cf_search="$cf_search $cf_subdir_prefix/utf8/include" + test -d $cf_subdir_prefix/utf8/include/utf8 && cf_search="$cf_search $cf_subdir_prefix/utf8/include/utf8" } done @@ -5963,176 +5715,235 @@ test "$includedir" != NONE && \ test "$includedir" != "/usr/include" && \ test -d "$includedir" && { test -d $includedir && cf_search="$cf_search $includedir" - test -d $includedir/$cf_ncuhdr_root && cf_search="$cf_search $includedir/$cf_ncuhdr_root" + test -d $includedir/utf8 && cf_search="$cf_search $includedir/utf8" } test "$oldincludedir" != NONE && \ test "$oldincludedir" != "/usr/include" && \ test -d "$oldincludedir" && { test -d $oldincludedir && cf_search="$cf_search $oldincludedir" - test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" + test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8" } cf_search="$cf_search $cf_header_path_list" - test -n "$verbose" && echo search path $cf_search - cf_save2_CPPFLAGS="$CPPFLAGS" - for cf_incdir in $cf_search + for cf_cv_header_path_utf8 in $cf_search do + if test -d $cf_cv_header_path_utf8 ; then + test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 -if test -n "$cf_incdir" ; then - for cf_add_incdir in $cf_incdir - do - while test $cf_add_incdir != /usr/include - do - if test -d $cf_add_incdir - then - cf_have_incdir=no - if test -n "$CFLAGS$CPPFLAGS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then - cf_have_incdir=yes; break - fi - done - fi +echo "${as_me:-configure}:5735: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 - if test "$cf_have_incdir" = no ; then - if test "$cf_add_incdir" = /usr/local/include ; then - if test "$GCC" = yes - then - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 6007 "configure" + CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" + cat >conftest.$ac_ext <<_ACEOF +#line 5739 "configure" #include "confdefs.h" -#include + +#include int main () { -printf("Hello") +putwc(0,0); ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6019: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5752: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6022: \$? = $ac_status" >&5 + echo "$as_me:5755: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6025: \"$ac_try\"") >&5 + { (eval echo "$as_me:5758: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6028: \$? = $ac_status" >&5 + echo "$as_me:5761: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + + test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 + +echo "${as_me:-configure}:5766: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=maybe + cf_test_CPPFLAGS="$CPPFLAGS" + break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_have_incdir=yes -fi -rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 - -echo "${as_me:-configure}:6045: testing adding $cf_add_incdir to include-path ..." 1>&5 - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + CPPFLAGS="$cf_save_CPPFLAGS" - cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` - test "$cf_top_incdir" = "$cf_add_incdir" && break - cf_add_incdir="$cf_top_incdir" - else - break +fi +rm -f conftest.$ac_objext conftest.$ac_ext fi - fi done - done -fi - for cf_header in \ - ncurses.h \ - curses.h - do + if test "$cf_cv_find_linkage_utf8" = maybe ; then - cat >conftest.$ac_ext <<_ACEOF -#line 6066 "configure" -#include "confdefs.h" +echo "${as_me:-configure}:5784: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 -#include <$cf_header> -int -main () -{ + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" -#ifdef NCURSES_VERSION + if test "$cf_cv_find_linkage_utf8" != yes ; then -printf("%s\n", NCURSES_VERSION); -#else -#ifdef __NCURSES_H -printf("old\n"); -#else - make an error -#endif -#endif +cf_search= +cf_library_path_list="" +if test -n "${LDFLAGS}${LIBS}" ; then + for cf_library_path in $LDFLAGS $LIBS + do + case $cf_library_path in + (-L*) + cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` - ; - return 0; +test "x$cf_library_path" != "xNONE" && \ +test -d "$cf_library_path" && \ + { + test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" + test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" + test -d $cf_library_path/lib/utf8 && cf_search="$cf_search $cf_library_path/lib/utf8" + test -d $cf_library_path/lib/utf8/lib && cf_search="$cf_search $cf_library_path/lib/utf8/lib" + test -d $cf_library_path/utf8/lib && cf_search="$cf_search $cf_library_path/utf8/lib" + test -d $cf_library_path/utf8/lib/utf8 && cf_search="$cf_search $cf_library_path/utf8/lib/utf8" } -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:6090: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:6093: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6096: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:6099: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_ncurses_h2=$cf_header -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_ncurses_h2=no + cf_library_path_list="$cf_library_path_list $cf_search" + ;; + esac + done fi -rm -f conftest.$ac_objext conftest.$ac_ext - if test "$cf_cv_ncurses_h2" != no ; then - cf_cv_ncurses_h2=$cf_incdir/$cf_header - test -n "$verbose" && echo $ac_n " ... found $ac_c" 1>&6 - break - fi - test -n "$verbose" && echo " ... tested $cf_incdir/$cf_header" 1>&6 - done - CPPFLAGS="$cf_save2_CPPFLAGS" - test "$cf_cv_ncurses_h2" != no && break - done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6120: error: not found" >&5 -echo "$as_me: error: not found" >&2;} - { (exit 1); exit 1; }; } +cf_search= + +test "x$prefix" != "xNONE" && \ +test -d "$prefix" && \ + { + test -n "$verbose" && echo " ... testing for lib-directories under $prefix" + test -d $prefix/lib && cf_search="$cf_search $prefix/lib" + test -d $prefix/lib/utf8 && cf_search="$cf_search $prefix/lib/utf8" + test -d $prefix/lib/utf8/lib && cf_search="$cf_search $prefix/lib/utf8/lib" + test -d $prefix/utf8/lib && cf_search="$cf_search $prefix/utf8/lib" + test -d $prefix/utf8/lib/utf8 && cf_search="$cf_search $prefix/utf8/lib/utf8" +} + +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do + +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix" + test -d $cf_subdir_prefix/lib && cf_search="$cf_search $cf_subdir_prefix/lib" + test -d $cf_subdir_prefix/lib/utf8 && cf_search="$cf_search $cf_subdir_prefix/lib/utf8" + test -d $cf_subdir_prefix/lib/utf8/lib && cf_search="$cf_search $cf_subdir_prefix/lib/utf8/lib" + test -d $cf_subdir_prefix/utf8/lib && cf_search="$cf_search $cf_subdir_prefix/utf8/lib" + test -d $cf_subdir_prefix/utf8/lib/utf8 && cf_search="$cf_search $cf_subdir_prefix/utf8/lib/utf8" +} + +done + +cf_search="$cf_library_path_list $cf_search" + + for cf_cv_library_path_utf8 in $cf_search + do + if test -d $cf_cv_library_path_utf8 ; then + test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 + +echo "${as_me:-configure}:5859: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 + + CPPFLAGS="$cf_test_CPPFLAGS" + LIBS="-lutf8 $cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" + cat >conftest.$ac_ext <<_ACEOF +#line 5865 "configure" +#include "confdefs.h" + +#include +int +main () +{ +putwc(0,0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:5878: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:5881: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:5884: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5887: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 + +echo "${as_me:-configure}:5892: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 + + cf_cv_find_linkage_utf8=yes + cf_cv_library_file_utf8="-lutf8" + break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 + + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS" fi -echo "$as_me:6125: result: $cf_cv_ncurses_h2" >&5 -echo "${ECHO_T}$cf_cv_ncurses_h2" >&6 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi + done + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi - cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'` - cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2` - if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then - cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header + else + cf_cv_find_linkage_utf8=no fi -if test -n "$cf_1st_incdir" ; then - for cf_add_incdir in $cf_1st_incdir +fi +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_LIBS" + +if test "$cf_cv_find_linkage_utf8" = yes ; then +cf_cv_utf8_lib=add-on +else +cf_cv_utf8_lib=no +fi + +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:5934: result: $cf_cv_utf8_lib" >&5 +echo "${ECHO_T}$cf_cv_utf8_lib" >&6 + +# HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between +# ncurses/ncursesw: +if test "$cf_cv_utf8_lib" = "add-on" ; then + +cat >>confdefs.h <<\EOF +#define HAVE_LIBUTF8_H 1 +EOF + +if test -n "$cf_cv_header_path_utf8" ; then + for cf_add_incdir in $cf_cv_header_path_utf8 do while test $cf_add_incdir != /usr/include do @@ -6155,7 +5966,7 @@ if test -n "$cf_1st_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 6158 "configure" +#line 5969 "configure" #include "confdefs.h" #include int @@ -6167,16 +5978,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6170: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5981: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6173: \$? = $ac_status" >&5 + echo "$as_me:5984: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6176: \"$ac_try\"") >&5 + { (eval echo "$as_me:5987: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6179: \$? = $ac_status" >&5 + echo "$as_me:5990: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -6193,7 +6004,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}:6196: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6007: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6208,988 +6019,1398 @@ echo "${as_me:-configure}:6196: testing adding $cf_add_incdir to include-path .. done fi -fi - -# Set definitions to allow ifdef'ing for ncurses.h - -case $cf_cv_ncurses_header in -(*ncurses.h) +if test -n "$cf_cv_library_path_utf8" ; then + for cf_add_libdir in $cf_cv_library_path_utf8 + 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 -cat >>confdefs.h <<\EOF -#define HAVE_NCURSES_H 1 -EOF +echo "${as_me:-configure}:6041: testing adding $cf_add_libdir to library-path ..." 1>&5 - ;; -esac + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done +fi -case $cf_cv_ncurses_header in -(ncurses/curses.h|ncurses/ncurses.h) +cf_add_libs="$cf_cv_library_file_utf8" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" -cat >>confdefs.h <<\EOF -#define HAVE_NCURSES_NCURSES_H 1 -EOF +fi - ;; -(ncursesw/curses.h|ncursesw/ncurses.h) +cf_ncuconfig_root=$cf_cv_screen +cf_have_ncuconfig=no -cat >>confdefs.h <<\EOF -#define HAVE_NCURSESW_NCURSES_H 1 -EOF +if test "x$PKG_CONFIG" != xnone; then + echo "$as_me:6071: checking pkg-config for $cf_ncuconfig_root" >&5 +echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 + if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then + echo "$as_me:6074: result: yes" >&5 +echo "${ECHO_T}yes" >&6 - ;; -esac + echo "$as_me:6077: checking if the $cf_ncuconfig_root package files work" >&5 +echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 + cf_have_ncuconfig=unknown -echo "$as_me:6242: 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 -else + cf_save_CPPFLAGS="$CPPFLAGS" + cf_save_LIBS="$LIBS" -case ${cf_cv_ncurses_header} in -(*/ncurses.h|*/ncursesw.h) - cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` - ;; -(*) - cf_term_header=term.h - ;; -esac + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags $cf_ncuconfig_root`" -for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" +cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS do -cat >conftest.$ac_ext <<_ACEOF -#line 6260 "configure" + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + + cat >conftest.$ac_ext <<_ACEOF +#line 6103 "configure" #include "confdefs.h" -#include #include <${cf_cv_ncurses_header:-curses.h}> -#include <$cf_test> - int main () { -int x = auto_left_margin +initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:6275: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:6115: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6278: \$? = $ac_status" >&5 + echo "$as_me:6118: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6281: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:6121: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6284: \$? = $ac_status" >&5 + echo "$as_me:6124: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - cf_cv_term_header="$cf_test" + if test "$cross_compiling" = yes; then + { { echo "$as_me:6127: 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 6132 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { char *xx = curses_version(); return (xx == 0); } +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:6139: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6142: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:6144: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6147: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_have_ncuconfig=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_ncuconfig=no +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +cf_have_ncuconfig=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - cf_cv_term_header=unknown + echo "$as_me:6165: result: $cf_have_ncuconfig" >&5 +echo "${ECHO_T}$cf_have_ncuconfig" >&6 + if test "$cf_have_ncuconfig" != "yes" + then + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + else -fi -rm -f conftest.$ac_objext conftest.$ac_ext - test "$cf_cv_term_header" != unknown && break -done +cat >>confdefs.h <<\EOF +#define NCURSES 1 +EOF + fi + + else + echo "$as_me:6180: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi fi -echo "$as_me:6300: result: $cf_cv_term_header" >&5 -echo "${ECHO_T}$cf_cv_term_header" >&6 -# Set definitions to allow ifdef'ing to accommodate subdirectories +if test "x$cf_have_ncuconfig" = "xno"; then + echo "Looking for ${cf_ncuconfig_root}-config" -case $cf_cv_term_header in -(*term.h) +if test -n "$ac_tool_prefix"; then + for ac_prog in ${cf_ncuconfig_root}-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +echo "$as_me:6193: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$NCURSES_CONFIG"; then + ac_cv_prog_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" +echo "$as_me:6208: found $ac_dir/$ac_word" >&5 +break +done -cat >>confdefs.h <<\EOF -#define HAVE_TERM_H 1 -EOF +fi +fi +NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG +if test -n "$NCURSES_CONFIG"; then + echo "$as_me:6216: result: $NCURSES_CONFIG" >&5 +echo "${ECHO_T}$NCURSES_CONFIG" >&6 +else + echo "$as_me:6219: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi - ;; -esac + test -n "$NCURSES_CONFIG" && break + done +fi +if test -z "$NCURSES_CONFIG"; then + ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG + for ac_prog in ${cf_ncuconfig_root}-config ${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:6232: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_NCURSES_CONFIG"; then + ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_ct_NCURSES_CONFIG" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog" +echo "$as_me:6247: found $ac_dir/$ac_word" >&5 +break +done -case $cf_cv_term_header in -(ncurses/term.h) +fi +fi +ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG +if test -n "$ac_ct_NCURSES_CONFIG"; then + echo "$as_me:6255: result: $ac_ct_NCURSES_CONFIG" >&5 +echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 +else + echo "$as_me:6258: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi -cat >>confdefs.h <<\EOF -#define HAVE_NCURSES_TERM_H 1 -EOF + test -n "$ac_ct_NCURSES_CONFIG" && break +done +test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" - ;; -(ncursesw/term.h) + NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG +fi -cat >>confdefs.h <<\EOF -#define HAVE_NCURSESW_TERM_H 1 -EOF + if test "$NCURSES_CONFIG" != none ; then - ;; -esac + CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" -# some applications need this, but should check for NCURSES_VERSION +cf_add_libs="`$NCURSES_CONFIG --libs`" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" -cat >>confdefs.h <<\EOF -#define NCURSES 1 -EOF + # even with config script, some packages use no-override for curses.h -echo "$as_me:6338: 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 "$as_me:6291: 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 else - cf_cv_ncurses_version=no - cf_tempfile=out$$ - rm -f $cf_tempfile - if test "$cross_compiling" = yes; then - - # This will not work if the preprocessor splits the line after the - # Autoconf token. The 'unproto' program does that. - cat > conftest.$ac_ext < -#undef Autoconf -#ifdef NCURSES_VERSION -Autoconf NCURSES_VERSION -#else -#ifdef __NCURSES_H -Autoconf "old" -#endif -; -#endif -EOF - cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:6364: \"$cf_try\"") >&5 - (eval $cf_try) 2>&5 +cf_cv_ncurses_header=none +for cf_header in \ + ncurses.h $cf_cv_screen/ncurses.h \ + curses.h $cf_cv_screen/curses.h +do +cat >conftest.$ac_ext <<_ACEOF +#line 6303 "configure" +#include "confdefs.h" +#include <${cf_header}> +int +main () +{ +initscr(); tgoto("?", 0,0) + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6315: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6367: \$? = $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%".*%%'` - test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" - rm -f conftest.out - fi + echo "$as_me:6318: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6321: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6324: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_ncurses_header=$cf_header; break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest.$ac_ext +done + +fi +echo "$as_me:6335: 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:6339: error: No curses header-files found" >&5 +echo "$as_me: error: No curses header-files found" >&2;} + { (exit 1); exit 1; }; } +fi + +# cheat, to get the right #define's for HAVE_NCURSES_H, etc. + +for ac_header in $cf_cv_ncurses_header +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:6349: 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 6377 "configure" +#line 6355 "configure" #include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:6359: \"$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:6365: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:6384: 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 < +fi +done + +cat >>confdefs.h <<\EOF +#define NCURSES 1 +EOF + +cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h <conftest.$ac_ext <<_ACEOF +#line 6437 "configure" +#include "confdefs.h" #include -int main() +int +main () { - FILE *fp = fopen("$cf_tempfile", "w"); -#ifdef NCURSES_VERSION -# ifdef NCURSES_VERSION_PATCH - fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); -# else - fprintf(fp, "%s\n", NCURSES_VERSION); -# endif -#else -# ifdef __NCURSES_H - fprintf(fp, "old\n"); -# else - make an error -# endif -#endif - ${cf_cv_main_return:-return}(0); +printf("Hello") + ; + return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:6402: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6449: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6405: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6407: \"$ac_try\"") >&5 + echo "$as_me:6452: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6455: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6410: \$? = $ac_status" >&5 + echo "$as_me:6458: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - cf_cv_ncurses_version=`cat $cf_tempfile` + : else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +cf_have_incdir=yes fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - rm -f $cf_tempfile +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 + +echo "${as_me:-configure}:6475: testing adding $cf_add_incdir to include-path ..." 1>&5 + + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + fi + done + done fi -echo "$as_me:6424: 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 -cf_nculib_root=ncurses - # This works, except for the special case where we find gpm, but - # ncurses is in a nonstandard location via $LIBS, and we really want - # to link gpm. -cf_ncurses_LIBS="" -cf_ncurses_SAVE="$LIBS" -echo "$as_me:6437: 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 "$as_me:6492: 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 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgpm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 6445 "configure" + + cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h" + ( test "$cf_ncuhdr_root" = ncurses || test "$cf_ncuhdr_root" = ncursesw ) && cf_header_list="$cf_header_list curses.h ncurses.h" + for cf_header in $cf_header_list + do + + cat >conftest.$ac_ext <<_ACEOF +#line 6504 "configure" #include "confdefs.h" -/* 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 Gpm_Open (); +#include <$cf_header> int main () { -Gpm_Open (); + +#ifdef NCURSES_VERSION + +printf("%s\n", NCURSES_VERSION); +#else +#ifdef __NCURSES_H +printf("old\n"); +#else + make an error +#endif +#endif + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6464: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6528: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6467: \$? = $ac_status" >&5 + echo "$as_me:6531: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6470: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6534: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6473: \$? = $ac_status" >&5 + echo "$as_me:6537: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_gpm_Gpm_Open=yes + cf_cv_ncurses_h=$cf_header + else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_gpm_Gpm_Open=no +cf_cv_ncurses_h=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.$ac_objext conftest.$ac_ext + + test "$cf_cv_ncurses_h" != no && break + done + fi -echo "$as_me:6484: 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:6487: 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 "$as_me:6552: 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:6559: 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 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgpm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 6495 "configure" -#include "confdefs.h" -/* 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 initscr (); -int -main () -{ -initscr (); - ; - return 0; + test -n "$verbose" && echo + +cf_search= + +# collect the current set of include-directories from compiler flags +cf_header_path_list="" +if test -n "${CFLAGS}${CPPFLAGS}" ; then + for cf_header_path in $CPPFLAGS $CFLAGS + do + case $cf_header_path in + (-I*) + cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` + +test "x$cf_header_path" != "xNONE" && \ +test -d "$cf_header_path" && \ + { + test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" + test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" + test -d $cf_header_path/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root" + test -d $cf_header_path/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include" + test -d $cf_header_path/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include" + test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root" +} + + cf_header_path_list="$cf_header_path_list $cf_search" + ;; + esac + done +fi + +# add the variations for the package we are looking for + +cf_search= + +test "x$prefix" != "xNONE" && \ +test -d "$prefix" && \ + { + test -n "$verbose" && echo " ... testing for include-directories under $prefix" + test -d $prefix/include && cf_search="$cf_search $prefix/include" + test -d $prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root" + test -d $prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include" + test -d $prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include" + test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" +} + +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do + +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" + test -d $cf_subdir_prefix/include && cf_search="$cf_search $cf_subdir_prefix/include" + test -d $cf_subdir_prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root" + test -d $cf_subdir_prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include" + test -d $cf_subdir_prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include" + test -d $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" } -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6514: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:6517: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6520: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:6523: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gpm_initscr=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_gpm_initscr=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:6534: 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" -else - cf_ncurses_LIBS="-lgpm" -fi -fi +done -case $host_os in -(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:6549: 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 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmytinfo $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 6557 "configure" -#include "confdefs.h" +test "$includedir" != NONE && \ +test "$includedir" != "/usr/include" && \ +test -d "$includedir" && { + test -d $includedir && cf_search="$cf_search $includedir" + test -d $includedir/$cf_ncuhdr_root && cf_search="$cf_search $includedir/$cf_ncuhdr_root" +} -/* 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 tgoto (); +test "$oldincludedir" != NONE && \ +test "$oldincludedir" != "/usr/include" && \ +test -d "$oldincludedir" && { + test -d $oldincludedir && cf_search="$cf_search $oldincludedir" + test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root" +} + +cf_search="$cf_search $cf_header_path_list" + + test -n "$verbose" && echo search path $cf_search + cf_save2_CPPFLAGS="$CPPFLAGS" + for cf_incdir in $cf_search + do + +if test -n "$cf_incdir" ; then + for cf_add_incdir in $cf_incdir + do + while test $cf_add_incdir != /usr/include + do + if test -d $cf_add_incdir + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi + + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +#line 6677 "configure" +#include "confdefs.h" +#include int main () { -tgoto (); +printf("Hello") ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6576: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6689: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6579: \$? = $ac_status" >&5 + echo "$as_me:6692: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6582: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6695: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6585: \$? = $ac_status" >&5 + echo "$as_me:6698: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_mytinfo_tgoto=yes + : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_mytinfo_tgoto=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:6596: 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" +cf_have_incdir=yes fi +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi - fi - ;; -esac + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -cf_add_libs="$cf_ncurses_LIBS" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then - cf_add_1lib= - break - fi - done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" -done -LIBS="$cf_add_libs" +echo "${as_me:-configure}:6715: testing adding $cf_add_incdir to include-path ..." 1>&5 -if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) -then + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" -cf_add_libs="-l$cf_nculib_root" -# Filter out duplicates - this happens with badly-designed ".pc" files... -for cf_add_1lib in $LIBS -do - for cf_add_2lib in $cf_add_libs - do - if test "x$cf_add_1lib" = "x$cf_add_2lib" - then - cf_add_1lib= - break + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break fi + fi done - test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" -done -LIBS="$cf_add_libs" + done +fi -else + for cf_header in \ + ncurses.h \ + curses.h + do - eval 'cf_cv_have_lib_'$cf_nculib_root'=no' - cf_libdir="" - echo "$as_me:6645: 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 6651 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 6736 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char initscr (); 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 initscr (); -char (*f) (); +#include <$cf_header> 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_initscr) || defined (__stub___initscr) -choke me + +#ifdef NCURSES_VERSION + +printf("%s\n", NCURSES_VERSION); #else -f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#ifdef __NCURSES_H +printf("old\n"); +#else + make an error +#endif #endif ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6682: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6760: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6685: \$? = $ac_status" >&5 + echo "$as_me:6763: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6688: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6766: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6691: \$? = $ac_status" >&5 + echo "$as_me:6769: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_initscr=yes + cf_cv_ncurses_h2=$cf_header + else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_initscr=no +cf_cv_ncurses_h2=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext + + if test "$cf_cv_ncurses_h2" != no ; then + cf_cv_ncurses_h2=$cf_incdir/$cf_header + test -n "$verbose" && echo $ac_n " ... found $ac_c" 1>&6 + break + fi + test -n "$verbose" && echo " ... tested $cf_incdir/$cf_header" 1>&6 + done + CPPFLAGS="$cf_save2_CPPFLAGS" + test "$cf_cv_ncurses_h2" != no && break + done + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:6790: error: not found" >&5 +echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } + fi -echo "$as_me:6701: 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 +echo "$as_me:6795: 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%/[^/]*$%%'` + cf_cv_ncurses_header=`basename $cf_cv_ncurses_h2` + if test `basename $cf_1st_incdir` = $cf_ncuhdr_root ; then + cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header + fi - cf_save_LIBS="$LIBS" - echo "$as_me:6708: 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 6712 "configure" +if test -n "$cf_1st_incdir" ; then + for cf_add_incdir in $cf_1st_incdir + do + while test $cf_add_incdir != /usr/include + do + if test -d $cf_add_incdir + then + cf_have_incdir=no + if test -n "$CFLAGS$CPPFLAGS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_incdir in $CFLAGS $CPPFLAGS ; do + if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then + cf_have_incdir=yes; break + fi + done + fi + + if test "$cf_have_incdir" = no ; then + if test "$cf_add_incdir" = /usr/local/include ; then + if test "$GCC" = yes + then + cf_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + cat >conftest.$ac_ext <<_ACEOF +#line 6828 "configure" #include "confdefs.h" -#include <${cf_cv_ncurses_header:-curses.h}> +#include int main () { -initscr() +printf("Hello") ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6724: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6840: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6727: \$? = $ac_status" >&5 + echo "$as_me:6843: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6730: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6846: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6733: \$? = $ac_status" >&5 + echo "$as_me:6849: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:6735: 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:6742: result: no" >&5 -echo "${ECHO_T}no" >&6 +cf_have_incdir=yes +fi +rm -f conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$cf_save_CPPFLAGS + fi + fi + fi -cf_search= -cf_library_path_list="" -if test -n "${LDFLAGS}${LIBS}" ; then - for cf_library_path in $LDFLAGS $LIBS - do - case $cf_library_path in - (-L*) - cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` + if test "$cf_have_incdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -test "x$cf_library_path" != "xNONE" && \ -test -d "$cf_library_path" && \ - { - test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" - test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" - test -d $cf_library_path/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root" - test -d $cf_library_path/lib/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib" - test -d $cf_library_path/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib" - test -d $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" -} +echo "${as_me:-configure}:6866: testing adding $cf_add_incdir to include-path ..." 1>&5 - cf_library_path_list="$cf_library_path_list $cf_search" - ;; - esac + CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" + + cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'` + test "$cf_top_incdir" = "$cf_add_incdir" && break + cf_add_incdir="$cf_top_incdir" + else + break + fi + fi done + done fi -cf_search= +fi -test "x$prefix" != "xNONE" && \ -test -d "$prefix" && \ - { - test -n "$verbose" && echo " ... testing for lib-directories under $prefix" - test -d $prefix/lib && cf_search="$cf_search $prefix/lib" - test -d $prefix/lib/$cf_nculib_root && cf_search="$cf_search $prefix/lib/$cf_nculib_root" - test -d $prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib" - test -d $prefix/$cf_nculib_root/lib && cf_search="$cf_search $prefix/$cf_nculib_root/lib" - test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root" -} +# Set definitions to allow ifdef'ing for ncurses.h -for cf_subdir_prefix in \ - /usr \ - /usr/local \ - /usr/pkg \ - /opt \ - /opt/local \ - $HOME -do +case $cf_cv_ncurses_header in +(*ncurses.h) -test "x$cf_subdir_prefix" != "x$prefix" && \ -test -d "$cf_subdir_prefix" && \ -(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { - test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix" - test -d $cf_subdir_prefix/lib && cf_search="$cf_search $cf_subdir_prefix/lib" - test -d $cf_subdir_prefix/lib/$cf_nculib_root && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root" - test -d $cf_subdir_prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib" - test -d $cf_subdir_prefix/$cf_nculib_root/lib && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib" - test -d $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root" -} +cat >>confdefs.h <<\EOF +#define HAVE_NCURSES_H 1 +EOF -done + ;; +esac -cf_search="$cf_library_path_list $cf_search" +case $cf_cv_ncurses_header in +(ncurses/curses.h|ncurses/ncurses.h) - for cf_libdir in $cf_search - do - echo "$as_me:6810: 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 6814 "configure" +cat >>confdefs.h <<\EOF +#define HAVE_NCURSES_NCURSES_H 1 +EOF + + ;; +(ncursesw/curses.h|ncursesw/ncurses.h) + +cat >>confdefs.h <<\EOF +#define HAVE_NCURSESW_NCURSES_H 1 +EOF + + ;; +esac + +echo "$as_me:6912: 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 +else + +case ${cf_cv_ncurses_header} in +(*/ncurses.h|*/ncursesw.h) + cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` + ;; +(*) + cf_term_header=term.h + ;; +esac + +for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" +do +cat >conftest.$ac_ext <<_ACEOF +#line 6930 "configure" #include "confdefs.h" +#include #include <${cf_cv_ncurses_header:-curses.h}> +#include <$cf_test> + int main () { -initscr() +int x = auto_left_margin ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6826: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6945: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6829: \$? = $ac_status" >&5 + echo "$as_me:6948: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6832: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6951: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6835: \$? = $ac_status" >&5 + echo "$as_me:6954: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:6837: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' - break + + cf_cv_term_header="$cf_test" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:6844: result: no" >&5 -echo "${ECHO_T}no" >&6 - LIBS="$cf_save_LIBS" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - done + + cf_cv_term_header=unknown fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext + test "$cf_cv_term_header" != unknown && break +done fi +echo "$as_me:6970: result: $cf_cv_term_header" >&5 +echo "${ECHO_T}$cf_cv_term_header" >&6 -eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root +# Set definitions to allow ifdef'ing to accommodate subdirectories -if test $cf_found_library = no ; then - { { echo "$as_me:6859: error: Cannot link $cf_nculib_root library" >&5 -echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} - { (exit 1); exit 1; }; } -fi +case $cf_cv_term_header in +(*term.h) -fi +cat >>confdefs.h <<\EOF +#define HAVE_TERM_H 1 +EOF + + ;; +esac + +case $cf_cv_term_header in +(ncurses/term.h) + +cat >>confdefs.h <<\EOF +#define HAVE_NCURSES_TERM_H 1 +EOF + + ;; +(ncursesw/term.h) + +cat >>confdefs.h <<\EOF +#define HAVE_NCURSESW_TERM_H 1 +EOF + + ;; +esac + +# some applications need this, but should check for NCURSES_VERSION + +cat >>confdefs.h <<\EOF +#define NCURSES 1 +EOF + +echo "$as_me:7008: 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 +else + + cf_cv_ncurses_version=no + cf_tempfile=out$$ + rm -f $cf_tempfile + if test "$cross_compiling" = yes; then + + # This will not work if the preprocessor splits the line after the + # Autoconf token. The 'unproto' program does that. + cat > conftest.$ac_ext < +#undef Autoconf +#ifdef NCURSES_VERSION +Autoconf NCURSES_VERSION +#else +#ifdef __NCURSES_H +Autoconf "old" +#endif +; +#endif +EOF + cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" + { (eval echo "$as_me:7034: \"$cf_try\"") >&5 + (eval $cf_try) 2>&5 + ac_status=$? + echo "$as_me:7037: \$? = $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%".*%%'` + test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" + rm -f conftest.out + fi -if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:6867: 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 - q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` - if test "$q" != "$LIBS" ; then - LIBS="$q" - fi - done - cat >conftest.$ac_ext <<_ACEOF -#line 6877 "configure" +else + cat >conftest.$ac_ext <<_ACEOF +#line 7047 "configure" #include "confdefs.h" + #include <${cf_cv_ncurses_header:-curses.h}> -int -main () +#include +int main() { -initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); - ; - return 0; + FILE *fp = fopen("$cf_tempfile", "w"); +#ifdef NCURSES_VERSION +# ifdef NCURSES_VERSION_PATCH + fprintf(fp, "%s.%d\n", NCURSES_VERSION, NCURSES_VERSION_PATCH); +# else + fprintf(fp, "%s\n", NCURSES_VERSION); +# endif +#else +# ifdef __NCURSES_H + fprintf(fp, "old\n"); +# else + make an error +# endif +#endif + ${cf_cv_main_return:-return}(0); } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6889: \"$ac_link\"") >&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:7072: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6892: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6895: \"$ac_try\"") >&5 + echo "$as_me:7075: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:7077: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6898: \$? = $ac_status" >&5 + echo "$as_me:7080: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:6900: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + + cf_cv_ncurses_version=`cat $cf_tempfile` else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:6905: result: no" >&5 -echo "${ECHO_T}no" >&6 - LIBS="$cf_ncurses_SAVE" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - -cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - -cat >>confdefs.h <&5 +echo "${ECHO_T}$cf_cv_ncurses_version" >&6 +test "$cf_cv_ncurses_version" = no || +cat >>confdefs.h <<\EOF +#define NCURSES 1 +EOF - ;; -(ncursesw) - -echo "$as_me:6923: 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 +cf_nculib_root=$cf_cv_screen + # This works, except for the special case where we find gpm, but + # ncurses is in a nonstandard location via $LIBS, and we really want + # to link gpm. +cf_ncurses_LIBS="" +cf_ncurses_SAVE="$LIBS" +echo "$as_me:7107: 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 else - - cf_save_LIBS="$LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 6931 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgpm $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 7115 "configure" #include "confdefs.h" -#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 Gpm_Open (); int main () { -putwc(0,0); +Gpm_Open (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6944: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7134: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6947: \$? = $ac_status" >&5 + echo "$as_me:7137: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6950: \"$ac_try\"") >&5 + { (eval echo "$as_me:7140: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6953: \$? = $ac_status" >&5 + echo "$as_me:7143: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_utf8_lib=yes + ac_cv_lib_gpm_Gpm_Open=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - -# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these -# will be set on completion of the AC_TRY_LINK below. -cf_cv_header_path_utf8= -cf_cv_library_path_utf8= - -echo "${as_me:-configure}:6965: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 - -cf_save_LIBS="$LIBS" - +ac_cv_lib_gpm_Gpm_Open=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7154: 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:7157: 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 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6970 "configure" +#line 7165 "configure" #include "confdefs.h" -#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 initscr (); int main () { -putwc(0,0); +initscr (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6983: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7184: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6986: \$? = $ac_status" >&5 + echo "$as_me:7187: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6989: \"$ac_try\"") >&5 + { (eval echo "$as_me:7190: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6992: \$? = $ac_status" >&5 + echo "$as_me:7193: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - cf_cv_find_linkage_utf8=yes - cf_cv_header_path_utf8=/usr/include - cf_cv_library_path_utf8=/usr/lib - + ac_cv_lib_gpm_initscr=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +ac_cv_lib_gpm_initscr=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7204: 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" +else + cf_ncurses_LIBS="-lgpm" +fi -LIBS="-lutf8 $cf_save_LIBS" +fi +case $host_os in +(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:7219: 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 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7006 "configure" +#line 7227 "configure" #include "confdefs.h" -#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 tgoto (); int main () { -putwc(0,0); +tgoto (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7019: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7246: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7022: \$? = $ac_status" >&5 + echo "$as_me:7249: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7025: \"$ac_try\"") >&5 + { (eval echo "$as_me:7252: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7028: \$? = $ac_status" >&5 + echo "$as_me:7255: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - cf_cv_find_linkage_utf8=yes - cf_cv_header_path_utf8=/usr/include - cf_cv_library_path_utf8=/usr/lib - cf_cv_library_file_utf8="-lutf8" - + ac_cv_lib_mytinfo_tgoto=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +ac_cv_lib_mytinfo_tgoto=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7266: 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" +fi - cf_cv_find_linkage_utf8=no - LIBS="$cf_save_LIBS" - - test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 - -echo "${as_me:-configure}:7045: testing find linkage for utf8 library ..." 1>&5 - -echo "${as_me:-configure}:7047: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 - - cf_save_CPPFLAGS="$CPPFLAGS" - cf_test_CPPFLAGS="$CPPFLAGS" - -cf_search= - -# collect the current set of include-directories from compiler flags -cf_header_path_list="" -if test -n "${CFLAGS}${CPPFLAGS}" ; then - for cf_header_path in $CPPFLAGS $CFLAGS - do - case $cf_header_path in - (-I*) - cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` - -test "x$cf_header_path" != "xNONE" && \ -test -d "$cf_header_path" && \ - { - test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" - test -d $cf_header_path/include && cf_search="$cf_search $cf_header_path/include" - test -d $cf_header_path/include/utf8 && cf_search="$cf_search $cf_header_path/include/utf8" - test -d $cf_header_path/include/utf8/include && cf_search="$cf_search $cf_header_path/include/utf8/include" - test -d $cf_header_path/utf8/include && cf_search="$cf_search $cf_header_path/utf8/include" - test -d $cf_header_path/utf8/include/utf8 && cf_search="$cf_search $cf_header_path/utf8/include/utf8" -} - - cf_header_path_list="$cf_header_path_list $cf_search" - ;; - esac - done -fi - -# add the variations for the package we are looking for - -cf_search= - -test "x$prefix" != "xNONE" && \ -test -d "$prefix" && \ - { - test -n "$verbose" && echo " ... testing for include-directories under $prefix" - test -d $prefix/include && cf_search="$cf_search $prefix/include" - test -d $prefix/include/utf8 && cf_search="$cf_search $prefix/include/utf8" - test -d $prefix/include/utf8/include && cf_search="$cf_search $prefix/include/utf8/include" - test -d $prefix/utf8/include && cf_search="$cf_search $prefix/utf8/include" - test -d $prefix/utf8/include/utf8 && cf_search="$cf_search $prefix/utf8/include/utf8" -} - -for cf_subdir_prefix in \ - /usr \ - /usr/local \ - /usr/pkg \ - /opt \ - /opt/local \ - $HOME -do - -test "x$cf_subdir_prefix" != "x$prefix" && \ -test -d "$cf_subdir_prefix" && \ -(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { - test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" - test -d $cf_subdir_prefix/include && cf_search="$cf_search $cf_subdir_prefix/include" - test -d $cf_subdir_prefix/include/utf8 && cf_search="$cf_search $cf_subdir_prefix/include/utf8" - test -d $cf_subdir_prefix/include/utf8/include && cf_search="$cf_search $cf_subdir_prefix/include/utf8/include" - test -d $cf_subdir_prefix/utf8/include && cf_search="$cf_search $cf_subdir_prefix/utf8/include" - test -d $cf_subdir_prefix/utf8/include/utf8 && cf_search="$cf_search $cf_subdir_prefix/utf8/include/utf8" -} - -done - -test "$includedir" != NONE && \ -test "$includedir" != "/usr/include" && \ -test -d "$includedir" && { - test -d $includedir && cf_search="$cf_search $includedir" - test -d $includedir/utf8 && cf_search="$cf_search $includedir/utf8" -} + fi + ;; +esac -test "$oldincludedir" != NONE && \ -test "$oldincludedir" != "/usr/include" && \ -test -d "$oldincludedir" && { - test -d $oldincludedir && cf_search="$cf_search $oldincludedir" - test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8" -} +cf_add_libs="$cf_ncurses_LIBS" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" -cf_search="$cf_search $cf_header_path_list" +if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) +then - for cf_cv_header_path_utf8 in $cf_search +cf_add_libs="-l$cf_nculib_root" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs do - if test -d $cf_cv_header_path_utf8 ; then - test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" -echo "${as_me:-configure}:7138: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +else - CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8" - cat >conftest.$ac_ext <<_ACEOF -#line 7142 "configure" + eval 'cf_cv_have_lib_'$cf_nculib_root'=no' + cf_libdir="" + echo "$as_me:7315: 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 7321 "configure" #include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char initscr (); 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 initscr (); +char (*f) (); -#include int main () { -putwc(0,0); +/* 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_initscr) || defined (__stub___initscr) +choke me +#else +f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#endif + ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7155: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7352: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7158: \$? = $ac_status" >&5 + echo "$as_me:7355: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7161: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7358: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7164: \$? = $ac_status" >&5 + echo "$as_me:7361: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - test -n "$verbose" && echo " ... found utf8 headers in $cf_cv_header_path_utf8" 1>&6 - -echo "${as_me:-configure}:7169: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 - - cf_cv_find_linkage_utf8=maybe - cf_test_CPPFLAGS="$CPPFLAGS" - break + ac_cv_func_initscr=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - - CPPFLAGS="$cf_save_CPPFLAGS" - +ac_cv_func_initscr=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - fi - done - - if test "$cf_cv_find_linkage_utf8" = maybe ; then - -echo "${as_me:-configure}:7187: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:7371: 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" - cf_save_LDFLAGS="$LDFLAGS" + echo "$as_me:7378: 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 7382 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main () +{ +initscr() + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7394: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7397: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7400: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7403: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:7405: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' - if test "$cf_cv_find_linkage_utf8" != yes ; then +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +echo "$as_me:7412: result: no" >&5 +echo "${ECHO_T}no" >&6 cf_search= cf_library_path_list="" @@ -7205,10 +7426,10 @@ test -d "$cf_library_path" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" test -d $cf_library_path/lib && cf_search="$cf_search $cf_library_path/lib" - test -d $cf_library_path/lib/utf8 && cf_search="$cf_search $cf_library_path/lib/utf8" - test -d $cf_library_path/lib/utf8/lib && cf_search="$cf_search $cf_library_path/lib/utf8/lib" - test -d $cf_library_path/utf8/lib && cf_search="$cf_search $cf_library_path/utf8/lib" - test -d $cf_library_path/utf8/lib/utf8 && cf_search="$cf_search $cf_library_path/utf8/lib/utf8" + test -d $cf_library_path/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root" + test -d $cf_library_path/lib/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib" + test -d $cf_library_path/$cf_nculib_root/lib && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib" + test -d $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root" } cf_library_path_list="$cf_library_path_list $cf_search" @@ -7224,10 +7445,10 @@ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $prefix" test -d $prefix/lib && cf_search="$cf_search $prefix/lib" - test -d $prefix/lib/utf8 && cf_search="$cf_search $prefix/lib/utf8" - test -d $prefix/lib/utf8/lib && cf_search="$cf_search $prefix/lib/utf8/lib" - test -d $prefix/utf8/lib && cf_search="$cf_search $prefix/utf8/lib" - test -d $prefix/utf8/lib/utf8 && cf_search="$cf_search $prefix/utf8/lib/utf8" + test -d $prefix/lib/$cf_nculib_root && cf_search="$cf_search $prefix/lib/$cf_nculib_root" + test -d $prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib" + test -d $prefix/$cf_nculib_root/lib && cf_search="$cf_search $prefix/$cf_nculib_root/lib" + test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root" } for cf_subdir_prefix in \ @@ -7244,212 +7465,152 @@ test -d "$cf_subdir_prefix" && \ (test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix" test -d $cf_subdir_prefix/lib && cf_search="$cf_search $cf_subdir_prefix/lib" - test -d $cf_subdir_prefix/lib/utf8 && cf_search="$cf_search $cf_subdir_prefix/lib/utf8" - test -d $cf_subdir_prefix/lib/utf8/lib && cf_search="$cf_search $cf_subdir_prefix/lib/utf8/lib" - test -d $cf_subdir_prefix/utf8/lib && cf_search="$cf_search $cf_subdir_prefix/utf8/lib" - test -d $cf_subdir_prefix/utf8/lib/utf8 && cf_search="$cf_search $cf_subdir_prefix/utf8/lib/utf8" + test -d $cf_subdir_prefix/lib/$cf_nculib_root && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root" + test -d $cf_subdir_prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib" + test -d $cf_subdir_prefix/$cf_nculib_root/lib && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib" + test -d $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root" } done cf_search="$cf_library_path_list $cf_search" - for cf_cv_library_path_utf8 in $cf_search + for cf_libdir in $cf_search do - if test -d $cf_cv_library_path_utf8 ; then - test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 - -echo "${as_me:-configure}:7262: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 - - CPPFLAGS="$cf_test_CPPFLAGS" - LIBS="-lutf8 $cf_save_LIBS" - LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8" - cat >conftest.$ac_ext <<_ACEOF -#line 7268 "configure" + echo "$as_me:7480: 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 7484 "configure" #include "confdefs.h" - -#include +#include <${cf_cv_ncurses_header:-curses.h}> int main () { -putwc(0,0); +initscr() ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7281: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7496: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7284: \$? = $ac_status" >&5 + echo "$as_me:7499: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7287: \"$ac_try\"") >&5 + { (eval echo "$as_me:7502: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7290: \$? = $ac_status" >&5 + echo "$as_me:7505: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - test -n "$verbose" && echo " ... found utf8 library in $cf_cv_library_path_utf8" 1>&6 - -echo "${as_me:-configure}:7295: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 - - cf_cv_find_linkage_utf8=yes - cf_cv_library_file_utf8="-lutf8" - break + echo "$as_me:7507: 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 - - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - LDFLAGS="$cf_save_LDFLAGS" - +echo "$as_me:7514: result: no" >&5 +echo "${ECHO_T}no" >&6 + LIBS="$cf_save_LIBS" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi done - CPPFLAGS="$cf_save_CPPFLAGS" - LDFLAGS="$cf_save_LDFLAGS" - fi - - else - cf_cv_find_linkage_utf8=no - fi fi 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_LIBS" -if test "$cf_cv_find_linkage_utf8" = yes ; then -cf_cv_utf8_lib=add-on -else -cf_cv_utf8_lib=no -fi +eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root +if test $cf_found_library = no ; then + { { echo "$as_me:7529: error: Cannot link $cf_nculib_root library" >&5 +echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} + { (exit 1); exit 1; }; } fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:7337: result: $cf_cv_utf8_lib" >&5 -echo "${ECHO_T}$cf_cv_utf8_lib" >&6 - -# HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between -# ncurses/ncursesw: -if test "$cf_cv_utf8_lib" = "add-on" ; then - -cat >>confdefs.h <<\EOF -#define HAVE_LIBUTF8_H 1 -EOF - -if test -n "$cf_cv_header_path_utf8" ; then - for cf_add_incdir in $cf_cv_header_path_utf8 - do - while test $cf_add_incdir != /usr/include - do - if test -d $cf_add_incdir - then - cf_have_incdir=no - if test -n "$CFLAGS$CPPFLAGS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_incdir in $CFLAGS $CPPFLAGS ; do - if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then - cf_have_incdir=yes; break - fi - done - fi - if test "$cf_have_incdir" = no ; then - if test "$cf_add_incdir" = /usr/local/include ; then - if test "$GCC" = yes - then - cf_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" - cat >conftest.$ac_ext <<_ACEOF -#line 7372 "configure" +fi + +if test -n "$cf_ncurses_LIBS" ; then + echo "$as_me:7537: 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 + q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` + if test "$q" != "$LIBS" ; then + LIBS="$q" + fi + done + cat >conftest.$ac_ext <<_ACEOF +#line 7547 "configure" #include "confdefs.h" -#include +#include <${cf_cv_ncurses_header:-curses.h}> int main () { -printf("Hello") +initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7384: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7559: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7387: \$? = $ac_status" >&5 + echo "$as_me:7562: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7390: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7565: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7393: \$? = $ac_status" >&5 + echo "$as_me:7568: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + echo "$as_me:7570: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_have_incdir=yes +echo "$as_me:7575: result: no" >&5 +echo "${ECHO_T}no" >&6 + LIBS="$cf_ncurses_SAVE" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -rm -f conftest.$ac_objext conftest.$ac_ext - CPPFLAGS=$cf_save_CPPFLAGS - fi - fi - fi - - if test "$cf_have_incdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:7410: testing adding $cf_add_incdir to include-path ..." 1>&5 +cf_nculib_ROOT=`echo "HAVE_LIB$cf_nculib_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" +cat >>confdefs.h <&6 + ;; +(ncurses*) -echo "${as_me:-configure}:7444: testing adding $cf_add_libdir to library-path ..." 1>&5 +cf_ncuconfig_root=$cf_cv_screen +cf_have_ncuconfig=no - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done -fi +if test "x$PKG_CONFIG" != xnone; then + echo "$as_me:7598: checking pkg-config for $cf_ncuconfig_root" >&5 +echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6 + if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then + echo "$as_me:7601: result: yes" >&5 +echo "${ECHO_T}yes" >&6 -cf_add_libs="$cf_cv_library_file_utf8" + echo "$as_me:7604: checking if the $cf_ncuconfig_root package files work" >&5 +echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6 + cf_have_ncuconfig=unknown + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_save_LIBS="$LIBS" + + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags $cf_ncuconfig_root`" + +cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" # Filter out duplicates - this happens with badly-designed ".pc" files... for cf_add_1lib in $LIBS do @@ -7465,18 +7626,98 @@ do done LIBS="$cf_add_libs" + cat >conftest.$ac_ext <<_ACEOF +#line 7630 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> +int +main () +{ +initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7642: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7645: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7648: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7651: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + if test "$cross_compiling" = yes; then + { { echo "$as_me:7654: 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 7659 "configure" +#include "confdefs.h" +#include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { char *xx = curses_version(); return (xx == 0); } +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:7666: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7669: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:7671: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7674: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_have_ncuconfig=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_ncuconfig=no +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_have_ncuconfig=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + + echo "$as_me:7692: result: $cf_have_ncuconfig" >&5 +echo "${ECHO_T}$cf_have_ncuconfig" >&6 + if test "$cf_have_ncuconfig" != "yes" + then + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + else + +cat >>confdefs.h <<\EOF +#define NCURSES 1 +EOF + + fi -cf_ncuconfig_root=ncursesw + else + echo "$as_me:7707: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi +fi -echo "Looking for ${cf_ncuconfig_root}-config" +if test "x$cf_have_ncuconfig" = "xno"; then + echo "Looking for ${cf_ncuconfig_root}-config" if test -n "$ac_tool_prefix"; then - for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + for ac_prog in ${cf_ncuconfig_root}-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:7479: checking for $ac_word" >&5 +echo "$as_me:7720: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7491,7 +7732,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_NCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:7494: found $ac_dir/$ac_word" >&5 +echo "$as_me:7735: found $ac_dir/$ac_word" >&5 break done @@ -7499,10 +7740,10 @@ fi fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:7502: result: $NCURSES_CONFIG" >&5 + echo "$as_me:7743: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:7505: result: no" >&5 + echo "$as_me:7746: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7511,11 +7752,11 @@ fi fi if test -z "$NCURSES_CONFIG"; then ac_ct_NCURSES_CONFIG=$NCURSES_CONFIG - for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + for ac_prog in ${cf_ncuconfig_root}-config ${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:7518: checking for $ac_word" >&5 +echo "$as_me:7759: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7530,7 +7771,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_ac_ct_NCURSES_CONFIG="$ac_prog" -echo "$as_me:7533: found $ac_dir/$ac_word" >&5 +echo "$as_me:7774: found $ac_dir/$ac_word" >&5 break done @@ -7538,10 +7779,10 @@ fi fi ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:7541: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:7782: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:7544: result: no" >&5 + echo "$as_me:7785: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -7552,9 +7793,9 @@ test -n "$ac_ct_NCURSES_CONFIG" || ac_ct_NCURSES_CONFIG="none" NCURSES_CONFIG=$ac_ct_NCURSES_CONFIG fi -if test "$NCURSES_CONFIG" != none ; then + if test "$NCURSES_CONFIG" != none ; then -CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" + CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" cf_add_libs="`$NCURSES_CONFIG --libs`" # Filter out duplicates - this happens with badly-designed ".pc" files... @@ -7572,23 +7813,21 @@ do done LIBS="$cf_add_libs" -# even with config script, some packages use no-override for curses.h + # even with config script, some packages use no-override for curses.h -echo "$as_me:7577: checking if we have identified curses headers" >&5 +echo "$as_me:7818: 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 else cf_cv_ncurses_header=none -for cf_header in \ - ncursesw/ncurses.h \ - ncursesw/curses.h \ - ncurses.h \ - curses.h +for cf_header in \ + ncurses.h $cf_cv_screen/ncurses.h \ + curses.h $cf_cv_screen/curses.h do cat >conftest.$ac_ext <<_ACEOF -#line 7591 "configure" +#line 7830 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -7600,16 +7839,16 @@ initscr(); tgoto("?", 0,0) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7603: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7842: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7606: \$? = $ac_status" >&5 + echo "$as_me:7845: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7609: \"$ac_try\"") >&5 + { (eval echo "$as_me:7848: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7612: \$? = $ac_status" >&5 + echo "$as_me:7851: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -7620,11 +7859,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:7623: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:7862: 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:7627: error: No curses header-files found" >&5 + { { echo "$as_me:7866: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -7634,23 +7873,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:7637: checking for $ac_header" >&5 +echo "$as_me:7876: 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 7643 "configure" +#line 7882 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:7647: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:7886: \"$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:7653: \$? = $ac_status" >&5 + echo "$as_me:7892: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -7669,7 +7908,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:7672: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:7911: 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 <>confdefs.h <>confdefs.h <conftest.$ac_ext <<_ACEOF -#line 7725 "configure" +#line 7964 "configure" #include "confdefs.h" #include int @@ -7734,16 +7973,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7737: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7976: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7740: \$? = $ac_status" >&5 + echo "$as_me:7979: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7743: \"$ac_try\"") >&5 + { (eval echo "$as_me:7982: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7746: \$? = $ac_status" >&5 + echo "$as_me:7985: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -7760,7 +7999,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}:7763: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8002: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7777,7 +8016,7 @@ fi } -echo "$as_me:7780: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:8019: 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 @@ -7789,13 +8028,9 @@ else do cat >conftest.$ac_ext <<_ACEOF -#line 7792 "configure" +#line 8031 "configure" #include "confdefs.h" -#define _XOPEN_SOURCE_EXTENDED -#undef HAVE_LIBUTF8_H /* in case we used CF_UTF8_LIB */ -#define HAVE_LIBUTF8_H /* to force ncurses' header file to use cchar_t */ - #include <$cf_header> int main () @@ -7803,10 +8038,6 @@ main () #ifdef NCURSES_VERSION -#ifndef WACS_BSSB - make an error -#endif - printf("%s\n", NCURSES_VERSION); #else #ifdef __NCURSES_H @@ -7821,16 +8052,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7824: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8055: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7827: \$? = $ac_status" >&5 + echo "$as_me:8058: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7830: \"$ac_try\"") >&5 + { (eval echo "$as_me:8061: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7833: \$? = $ac_status" >&5 + echo "$as_me:8064: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h=$cf_header @@ -7845,14 +8076,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:7848: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:8079: 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:7855: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:8086: 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 @@ -7970,7 +8201,7 @@ if test -n "$cf_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 7973 "configure" +#line 8204 "configure" #include "confdefs.h" #include int @@ -7982,16 +8213,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7985: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8216: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7988: \$? = $ac_status" >&5 + echo "$as_me:8219: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7991: \"$ac_try\"") >&5 + { (eval echo "$as_me:8222: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7994: \$? = $ac_status" >&5 + echo "$as_me:8225: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8008,7 +8239,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}:8011: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8242: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8029,7 +8260,7 @@ fi do cat >conftest.$ac_ext <<_ACEOF -#line 8032 "configure" +#line 8263 "configure" #include "confdefs.h" #include <$cf_header> @@ -8053,16 +8284,16 @@ printf("old\n"); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8056: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8287: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8059: \$? = $ac_status" >&5 + echo "$as_me:8290: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8062: \"$ac_try\"") >&5 + { (eval echo "$as_me:8293: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8065: \$? = $ac_status" >&5 + echo "$as_me:8296: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h2=$cf_header @@ -8083,12 +8314,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:8086: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:8317: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:8091: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:8322: 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%/[^/]*$%%'` @@ -8121,7 +8352,7 @@ if test -n "$cf_1st_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 8124 "configure" +#line 8355 "configure" #include "confdefs.h" #include int @@ -8133,16 +8364,16 @@ printf("Hello") } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8136: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8367: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8139: \$? = $ac_status" >&5 + echo "$as_me:8370: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8142: \"$ac_try\"") >&5 + { (eval echo "$as_me:8373: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8145: \$? = $ac_status" >&5 + echo "$as_me:8376: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8159,7 +8390,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}:8162: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8393: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8205,7 +8436,7 @@ EOF ;; esac -echo "$as_me:8208: checking for terminfo header" >&5 +echo "$as_me:8439: 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 @@ -8223,7 +8454,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >conftest.$ac_ext <<_ACEOF -#line 8226 "configure" +#line 8457 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -8238,16 +8469,16 @@ int x = auto_left_margin } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:8241: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8472: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:8244: \$? = $ac_status" >&5 + echo "$as_me:8475: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8247: \"$ac_try\"") >&5 + { (eval echo "$as_me:8478: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8250: \$? = $ac_status" >&5 + echo "$as_me:8481: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header="$cf_test" @@ -8263,7 +8494,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:8266: result: $cf_cv_term_header" >&5 +echo "$as_me:8497: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -8301,7 +8532,7 @@ cat >>confdefs.h <<\EOF #define NCURSES 1 EOF -echo "$as_me:8304: checking for ncurses version" >&5 +echo "$as_me:8535: 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 @@ -8327,10 +8558,10 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:8330: \"$cf_try\"") >&5 + { (eval echo "$as_me:8561: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:8333: \$? = $ac_status" >&5 + echo "$as_me:8564: \$? = $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%".*%%'` @@ -8340,7 +8571,7 @@ EOF else cat >conftest.$ac_ext <<_ACEOF -#line 8343 "configure" +#line 8574 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -8365,15 +8596,15 @@ int main() } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:8368: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8599: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8371: \$? = $ac_status" >&5 + echo "$as_me:8602: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:8373: \"$ac_try\"") >&5 + { (eval echo "$as_me:8604: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8376: \$? = $ac_status" >&5 + echo "$as_me:8607: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -8387,20 +8618,20 @@ fi rm -f $cf_tempfile fi -echo "$as_me:8390: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:8621: 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 -cf_nculib_root=ncursesw +cf_nculib_root=$cf_cv_screen # This works, except for the special case where we find gpm, but # ncurses is in a nonstandard location via $LIBS, and we really want # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:8403: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:8634: 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 @@ -8408,7 +8639,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8411 "configure" +#line 8642 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8427,16 +8658,16 @@ Gpm_Open (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8430: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8661: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8433: \$? = $ac_status" >&5 + echo "$as_me:8664: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8436: \"$ac_try\"") >&5 + { (eval echo "$as_me:8667: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8439: \$? = $ac_status" >&5 + echo "$as_me:8670: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -8447,10 +8678,10 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8450: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:8681: 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:8453: checking for initscr in -lgpm" >&5 + echo "$as_me:8684: 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 @@ -8458,7 +8689,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8461 "configure" +#line 8692 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8477,16 +8708,16 @@ initscr (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8480: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8711: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8483: \$? = $ac_status" >&5 + echo "$as_me:8714: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8486: \"$ac_try\"") >&5 + { (eval echo "$as_me:8717: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8489: \$? = $ac_status" >&5 + echo "$as_me:8720: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -8497,7 +8728,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8500: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:8731: 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" @@ -8512,7 +8743,7 @@ case $host_os in # 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:8515: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:8746: 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 @@ -8520,7 +8751,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8523 "configure" +#line 8754 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8539,16 +8770,16 @@ tgoto (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8542: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8773: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8545: \$? = $ac_status" >&5 + echo "$as_me:8776: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8548: \"$ac_try\"") >&5 + { (eval echo "$as_me:8779: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8551: \$? = $ac_status" >&5 + echo "$as_me:8782: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -8559,7 +8790,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8562: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:8793: 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" @@ -8608,13 +8839,13 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" - echo "$as_me:8611: checking for initscr" >&5 + echo "$as_me:8842: 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 8617 "configure" +#line 8848 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr (); below. */ @@ -8645,16 +8876,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8648: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8879: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8651: \$? = $ac_status" >&5 + echo "$as_me:8882: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8654: \"$ac_try\"") >&5 + { (eval echo "$as_me:8885: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8657: \$? = $ac_status" >&5 + echo "$as_me:8888: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_initscr=yes else @@ -8664,18 +8895,18 @@ ac_cv_func_initscr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8667: result: $ac_cv_func_initscr" >&5 +echo "$as_me:8898: 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:8674: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:8905: 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 8678 "configure" +#line 8909 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8687,25 +8918,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8690: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8921: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8693: \$? = $ac_status" >&5 + echo "$as_me:8924: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8696: \"$ac_try\"") >&5 + { (eval echo "$as_me:8927: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8699: \$? = $ac_status" >&5 + echo "$as_me:8930: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:8701: result: yes" >&5 + echo "$as_me:8932: 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:8708: result: no" >&5 +echo "$as_me:8939: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -8773,11 +9004,11 @@ cf_search="$cf_library_path_list $cf_search" for cf_libdir in $cf_search do - echo "$as_me:8776: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:9007: 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 8780 "configure" +#line 9011 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8789,25 +9020,25 @@ initscr() } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8792: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9023: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8795: \$? = $ac_status" >&5 + echo "$as_me:9026: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8798: \"$ac_try\"") >&5 + { (eval echo "$as_me:9029: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8801: \$? = $ac_status" >&5 + echo "$as_me:9032: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:8803: result: yes" >&5 + echo "$as_me:9034: 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:8810: result: no" >&5 +echo "$as_me:9041: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -8822,7 +9053,7 @@ fi eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root if test $cf_found_library = no ; then - { { echo "$as_me:8825: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:9056: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -8830,7 +9061,7 @@ fi fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:8833: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:9064: 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 @@ -8840,7 +9071,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS.. fi done cat >conftest.$ac_ext <<_ACEOF -#line 8843 "configure" +#line 9074 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -8852,23 +9083,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8855: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9086: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8858: \$? = $ac_status" >&5 + echo "$as_me:9089: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8861: \"$ac_try\"") >&5 + { (eval echo "$as_me:9092: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8864: \$? = $ac_status" >&5 + echo "$as_me:9095: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:8866: result: yes" >&5 + echo "$as_me:9097: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:8871: result: no" >&5 +echo "$as_me:9102: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -8881,11 +9112,12 @@ cat >>confdefs.h <&5 + echo "$as_me:9120: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -8982,17 +9214,17 @@ if test "$ac_x_includes" = no; then # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF -#line 8985 "configure" +#line 9217 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:8989: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:9221: \"$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:8995: \$? = $ac_status" >&5 + echo "$as_me:9227: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9025,7 +9257,7 @@ if test "$ac_x_libraries" = no; then ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9028 "configure" +#line 9260 "configure" #include "confdefs.h" #include int @@ -9037,16 +9269,16 @@ XtMalloc (0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9040: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9272: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9043: \$? = $ac_status" >&5 + echo "$as_me:9275: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9046: \"$ac_try\"") >&5 + { (eval echo "$as_me:9278: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9049: \$? = $ac_status" >&5 + echo "$as_me:9281: \$? = $ac_status" >&5 (exit $ac_status); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. @@ -9084,7 +9316,7 @@ fi fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:9087: result: $have_x" >&5 + echo "$as_me:9319: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -9094,7 +9326,7 @@ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:9097: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:9329: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -9118,11 +9350,11 @@ else # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:9121: checking whether -R must be followed by a space" >&5 + echo "$as_me:9353: checking whether -R must be followed by a space" >&5 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" cat >conftest.$ac_ext <<_ACEOF -#line 9125 "configure" +#line 9357 "configure" #include "confdefs.h" int @@ -9134,16 +9366,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9137: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9369: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9140: \$? = $ac_status" >&5 + echo "$as_me:9372: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9143: \"$ac_try\"") >&5 + { (eval echo "$as_me:9375: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9146: \$? = $ac_status" >&5 + echo "$as_me:9378: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_R_nospace=yes else @@ -9153,13 +9385,13 @@ ac_R_nospace=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_nospace = yes; then - echo "$as_me:9156: result: no" >&5 + echo "$as_me:9388: result: no" >&5 echo "${ECHO_T}no" >&6 X_LIBS="$X_LIBS -R$x_libraries" else LIBS="$ac_xsave_LIBS -R $x_libraries" cat >conftest.$ac_ext <<_ACEOF -#line 9162 "configure" +#line 9394 "configure" #include "confdefs.h" int @@ -9171,16 +9403,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9174: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9406: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9177: \$? = $ac_status" >&5 + echo "$as_me:9409: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9180: \"$ac_try\"") >&5 + { (eval echo "$as_me:9412: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9183: \$? = $ac_status" >&5 + echo "$as_me:9415: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_R_space=yes else @@ -9190,11 +9422,11 @@ ac_R_space=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_space = yes; then - echo "$as_me:9193: result: yes" >&5 + echo "$as_me:9425: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:9197: result: neither works" >&5 + echo "$as_me:9429: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -9214,7 +9446,7 @@ echo "${ECHO_T}neither works" >&6 # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >conftest.$ac_ext <<_ACEOF -#line 9217 "configure" +#line 9449 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9233,22 +9465,22 @@ XOpenDisplay (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9236: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9468: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9239: \$? = $ac_status" >&5 + echo "$as_me:9471: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9242: \"$ac_try\"") >&5 + { (eval echo "$as_me:9474: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9245: \$? = $ac_status" >&5 + echo "$as_me:9477: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:9251: checking for dnet_ntoa in -ldnet" >&5 +echo "$as_me:9483: checking for dnet_ntoa in -ldnet" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9256,7 +9488,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9259 "configure" +#line 9491 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9275,16 +9507,16 @@ dnet_ntoa (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9278: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9510: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9281: \$? = $ac_status" >&5 + echo "$as_me:9513: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9284: \"$ac_try\"") >&5 + { (eval echo "$as_me:9516: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9287: \$? = $ac_status" >&5 + echo "$as_me:9519: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else @@ -9295,14 +9527,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9298: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:9530: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:9305: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:9537: checking for dnet_ntoa in -ldnet_stub" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9310,7 +9542,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9313 "configure" +#line 9545 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9329,16 +9561,16 @@ dnet_ntoa (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9332: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9564: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9335: \$? = $ac_status" >&5 + echo "$as_me:9567: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9338: \"$ac_try\"") >&5 + { (eval echo "$as_me:9570: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9341: \$? = $ac_status" >&5 + echo "$as_me:9573: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -9349,7 +9581,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9352: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:9584: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" @@ -9368,13 +9600,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:9371: checking for gethostbyname" >&5 + echo "$as_me:9603: checking for gethostbyname" >&5 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 if test "${ac_cv_func_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9377 "configure" +#line 9609 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname (); below. */ @@ -9405,16 +9637,16 @@ f = gethostbyname; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9408: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9640: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9411: \$? = $ac_status" >&5 + echo "$as_me:9643: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9414: \"$ac_try\"") >&5 + { (eval echo "$as_me:9646: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9417: \$? = $ac_status" >&5 + echo "$as_me:9649: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gethostbyname=yes else @@ -9424,11 +9656,11 @@ ac_cv_func_gethostbyname=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9427: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:9659: result: $ac_cv_func_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:9431: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:9663: checking for gethostbyname in -lnsl" >&5 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9436,7 +9668,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9439 "configure" +#line 9671 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9455,16 +9687,16 @@ gethostbyname (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9458: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9690: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9461: \$? = $ac_status" >&5 + echo "$as_me:9693: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9464: \"$ac_try\"") >&5 + { (eval echo "$as_me:9696: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9467: \$? = $ac_status" >&5 + echo "$as_me:9699: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -9475,14 +9707,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9478: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:9710: result: $ac_cv_lib_nsl_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 if test $ac_cv_lib_nsl_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:9485: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:9717: checking for gethostbyname in -lbsd" >&5 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9490,7 +9722,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9493 "configure" +#line 9725 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9509,16 +9741,16 @@ gethostbyname (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9512: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9744: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9515: \$? = $ac_status" >&5 + echo "$as_me:9747: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9518: \"$ac_try\"") >&5 + { (eval echo "$as_me:9750: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9521: \$? = $ac_status" >&5 + echo "$as_me:9753: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gethostbyname=yes else @@ -9529,7 +9761,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9532: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:9764: result: $ac_cv_lib_bsd_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 if test $ac_cv_lib_bsd_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" @@ -9545,13 +9777,13 @@ fi # variants that don't use the nameserver (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:9548: checking for connect" >&5 + echo "$as_me:9780: checking for connect" >&5 echo $ECHO_N "checking for connect... $ECHO_C" >&6 if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9554 "configure" +#line 9786 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect (); below. */ @@ -9582,16 +9814,16 @@ f = connect; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9585: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9817: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9588: \$? = $ac_status" >&5 + echo "$as_me:9820: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9591: \"$ac_try\"") >&5 + { (eval echo "$as_me:9823: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9594: \$? = $ac_status" >&5 + echo "$as_me:9826: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_connect=yes else @@ -9601,11 +9833,11 @@ ac_cv_func_connect=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9604: result: $ac_cv_func_connect" >&5 +echo "$as_me:9836: result: $ac_cv_func_connect" >&5 echo "${ECHO_T}$ac_cv_func_connect" >&6 if test $ac_cv_func_connect = no; then - echo "$as_me:9608: checking for connect in -lsocket" >&5 + echo "$as_me:9840: checking for connect in -lsocket" >&5 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9613,7 +9845,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9616 "configure" +#line 9848 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9632,16 +9864,16 @@ connect (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9635: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9867: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9638: \$? = $ac_status" >&5 + echo "$as_me:9870: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9641: \"$ac_try\"") >&5 + { (eval echo "$as_me:9873: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9644: \$? = $ac_status" >&5 + echo "$as_me:9876: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_socket_connect=yes else @@ -9652,7 +9884,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9655: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:9887: result: $ac_cv_lib_socket_connect" >&5 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" @@ -9661,13 +9893,13 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:9664: checking for remove" >&5 + echo "$as_me:9896: checking for remove" >&5 echo $ECHO_N "checking for remove... $ECHO_C" >&6 if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9670 "configure" +#line 9902 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove (); below. */ @@ -9698,16 +9930,16 @@ f = remove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9701: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9933: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9704: \$? = $ac_status" >&5 + echo "$as_me:9936: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9707: \"$ac_try\"") >&5 + { (eval echo "$as_me:9939: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9710: \$? = $ac_status" >&5 + echo "$as_me:9942: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_remove=yes else @@ -9717,11 +9949,11 @@ ac_cv_func_remove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9720: result: $ac_cv_func_remove" >&5 +echo "$as_me:9952: result: $ac_cv_func_remove" >&5 echo "${ECHO_T}$ac_cv_func_remove" >&6 if test $ac_cv_func_remove = no; then - echo "$as_me:9724: checking for remove in -lposix" >&5 + echo "$as_me:9956: checking for remove in -lposix" >&5 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 if test "${ac_cv_lib_posix_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9729,7 +9961,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9732 "configure" +#line 9964 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9748,16 +9980,16 @@ remove (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9751: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9983: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9754: \$? = $ac_status" >&5 + echo "$as_me:9986: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9757: \"$ac_try\"") >&5 + { (eval echo "$as_me:9989: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9760: \$? = $ac_status" >&5 + echo "$as_me:9992: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_posix_remove=yes else @@ -9768,7 +10000,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9771: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:10003: result: $ac_cv_lib_posix_remove" >&5 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" @@ -9777,13 +10009,13 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:9780: checking for shmat" >&5 + echo "$as_me:10012: checking for shmat" >&5 echo $ECHO_N "checking for shmat... $ECHO_C" >&6 if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9786 "configure" +#line 10018 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat (); below. */ @@ -9814,16 +10046,16 @@ f = shmat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9817: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10049: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9820: \$? = $ac_status" >&5 + echo "$as_me:10052: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9823: \"$ac_try\"") >&5 + { (eval echo "$as_me:10055: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9826: \$? = $ac_status" >&5 + echo "$as_me:10058: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_shmat=yes else @@ -9833,11 +10065,11 @@ ac_cv_func_shmat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9836: result: $ac_cv_func_shmat" >&5 +echo "$as_me:10068: result: $ac_cv_func_shmat" >&5 echo "${ECHO_T}$ac_cv_func_shmat" >&6 if test $ac_cv_func_shmat = no; then - echo "$as_me:9840: checking for shmat in -lipc" >&5 + echo "$as_me:10072: checking for shmat in -lipc" >&5 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 if test "${ac_cv_lib_ipc_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9845,7 +10077,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9848 "configure" +#line 10080 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9864,16 +10096,16 @@ shmat (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9867: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10099: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9870: \$? = $ac_status" >&5 + echo "$as_me:10102: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9873: \"$ac_try\"") >&5 + { (eval echo "$as_me:10105: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9876: \$? = $ac_status" >&5 + echo "$as_me:10108: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ipc_shmat=yes else @@ -9884,7 +10116,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9887: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:10119: result: $ac_cv_lib_ipc_shmat" >&5 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" @@ -9902,7 +10134,7 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - echo "$as_me:9905: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:10137: checking for IceConnectionNumber in -lICE" >&5 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9910,7 +10142,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9913 "configure" +#line 10145 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9929,16 +10161,16 @@ IceConnectionNumber (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9932: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10164: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9935: \$? = $ac_status" >&5 + echo "$as_me:10167: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9938: \"$ac_try\"") >&5 + { (eval echo "$as_me:10170: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9941: \$? = $ac_status" >&5 + echo "$as_me:10173: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -9949,7 +10181,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9952: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:10184: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" @@ -9961,7 +10193,7 @@ fi cf_x_athena=${cf_x_athena:-Xaw} -echo "$as_me:9964: checking if you want to link with Xaw 3d library" >&5 +echo "$as_me:10196: checking if you want to link with Xaw 3d library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d library... $ECHO_C" >&6 withval= @@ -9972,14 +10204,14 @@ if test "${with_Xaw3d+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3d - echo "$as_me:9975: result: yes" >&5 + echo "$as_me:10207: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:9978: result: no" >&5 + echo "$as_me:10210: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:9982: checking if you want to link with Xaw 3d xft library" >&5 +echo "$as_me:10214: checking if you want to link with Xaw 3d xft library" >&5 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6 withval= @@ -9990,14 +10222,14 @@ if test "${with_Xaw3dxft+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=Xaw3dxft - echo "$as_me:9993: result: yes" >&5 + echo "$as_me:10225: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:9996: result: no" >&5 + echo "$as_me:10228: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:10000: checking if you want to link with neXT Athena library" >&5 +echo "$as_me:10232: checking if you want to link with neXT Athena library" >&5 echo $ECHO_N "checking if you want to link with neXT Athena library... $ECHO_C" >&6 withval= @@ -10008,14 +10240,14 @@ if test "${with_neXtaw+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=neXtaw - echo "$as_me:10011: result: yes" >&5 + echo "$as_me:10243: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:10014: result: no" >&5 + echo "$as_me:10246: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:10018: checking if you want to link with Athena-Plus library" >&5 +echo "$as_me:10250: checking if you want to link with Athena-Plus library" >&5 echo $ECHO_N "checking if you want to link with Athena-Plus library... $ECHO_C" >&6 withval= @@ -10026,10 +10258,10 @@ if test "${with_XawPlus+set}" = set; then fi; if test "$withval" = yes ; then cf_x_athena=XawPlus - echo "$as_me:10029: result: yes" >&5 + echo "$as_me:10261: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:10032: result: no" >&5 + echo "$as_me:10264: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -10049,17 +10281,17 @@ if test "$PKG_CONFIG" != none ; then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then test -n "$verbose" && echo " found package $cf_athena_pkg" 1>&6 -echo "${as_me:-configure}:10052: testing found package $cf_athena_pkg ..." 1>&5 +echo "${as_me:-configure}:10284: testing found package $cf_athena_pkg ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs $cf_athena_pkg 2>/dev/null`" test -n "$verbose" && echo " package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:10058: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:10290: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:10062: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:10294: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -10170,20 +10402,20 @@ EOF LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6 -echo "${as_me:-configure}:10173: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:10405: testing ..trimmed $LIBS ..." 1>&5 ;; esac done -echo "$as_me:10179: checking for usable $cf_x_athena/Xmu package" >&5 +echo "$as_me:10411: checking for usable $cf_x_athena/Xmu package" >&5 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6 if test "${cf_cv_xaw_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10186 "configure" +#line 10418 "configure" #include "confdefs.h" #include @@ -10199,16 +10431,16 @@ int check = XmuCompareISOLatin1("big", "small") } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10202: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10434: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10205: \$? = $ac_status" >&5 + echo "$as_me:10437: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10208: \"$ac_try\"") >&5 + { (eval echo "$as_me:10440: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10211: \$? = $ac_status" >&5 + echo "$as_me:10443: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xaw_compat=yes else @@ -10218,7 +10450,7 @@ cf_cv_xaw_compat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10221: result: $cf_cv_xaw_compat" >&5 +echo "$as_me:10453: result: $cf_cv_xaw_compat" >&5 echo "${ECHO_T}$cf_cv_xaw_compat" >&6 if test "$cf_cv_xaw_compat" = no @@ -10230,7 +10462,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6 (*) test -n "$verbose" && echo " work around broken package" 1>&6 -echo "${as_me:-configure}:10233: testing work around broken package ..." 1>&5 +echo "${as_me:-configure}:10465: testing work around broken package ..." 1>&5 cf_save_xmu="$LIBS" cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^ *//' -e 's/ .*//'` @@ -10238,17 +10470,17 @@ echo "${as_me:-configure}:10233: testing work around broken package ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then test -n "$verbose" && echo " found package xmu" 1>&6 -echo "${as_me:-configure}:10241: testing found package xmu ..." 1>&5 +echo "${as_me:-configure}:10473: testing found package xmu ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs xmu 2>/dev/null`" test -n "$verbose" && echo " package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:10247: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:10479: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xmu LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:10251: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:10483: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -10348,12 +10580,12 @@ LIBS="$cf_add_libs" test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:10351: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:10583: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:10356: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:10588: testing ...after $LIBS ..." 1>&5 else cf_pkgconfig_incs= @@ -10361,12 +10593,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:10364: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:10596: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:10369: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:10601: testing ...after $LIBS ..." 1>&5 fi @@ -10377,7 +10609,7 @@ fi LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6 -echo "${as_me:-configure}:10380: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:10612: testing ..trimmed $LIBS ..." 1>&5 ;; esac @@ -10402,17 +10634,17 @@ if test -z "$cf_x_athena_lib" ; then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then test -n "$verbose" && echo " found package Xext" 1>&6 -echo "${as_me:-configure}:10405: testing found package Xext ..." 1>&5 +echo "${as_me:-configure}:10637: testing found package Xext ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs Xext 2>/dev/null`" test -n "$verbose" && echo " package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:10411: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:10643: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package Xext LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:10415: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:10647: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -10513,7 +10745,7 @@ else cf_pkgconfig_incs= cf_pkgconfig_libs= - echo "$as_me:10516: checking for XextCreateExtension in -lXext" >&5 + echo "$as_me:10748: checking for XextCreateExtension in -lXext" >&5 echo $ECHO_N "checking for XextCreateExtension in -lXext... $ECHO_C" >&6 if test "${ac_cv_lib_Xext_XextCreateExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -10521,7 +10753,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10524 "configure" +#line 10756 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10540,16 +10772,16 @@ XextCreateExtension (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10543: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10775: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10546: \$? = $ac_status" >&5 + echo "$as_me:10778: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10549: \"$ac_try\"") >&5 + { (eval echo "$as_me:10781: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10552: \$? = $ac_status" >&5 + echo "$as_me:10784: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xext_XextCreateExtension=yes else @@ -10560,7 +10792,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10563: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "$as_me:10795: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then @@ -10596,17 +10828,17 @@ then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:10599: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:10831: testing found package x11 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs x11 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:10605: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:10837: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:10609: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:10841: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -10706,24 +10938,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:10709: WARNING: unable to find X11 library" >&5 + { echo "$as_me:10941: WARNING: unable to find X11 library" >&5 echo "$as_me: WARNING: unable to find X11 library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:10716: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:10948: testing found package ice ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs ice 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:10722: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:10954: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:10726: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:10958: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -10823,24 +11055,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:10826: WARNING: unable to find ICE library" >&5 + { echo "$as_me:11058: WARNING: unable to find ICE library" >&5 echo "$as_me: WARNING: unable to find ICE library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:10833: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:11065: testing found package sm ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs sm 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:10839: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:11071: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:10843: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:11075: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -10940,24 +11172,24 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:10943: WARNING: unable to find SM library" >&5 + { echo "$as_me:11175: WARNING: unable to find SM library" >&5 echo "$as_me: WARNING: unable to find SM library" >&2;} fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:10950: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:11182: testing found package xt ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs xt 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:10956: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:11188: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:10960: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:11192: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -11057,7 +11289,7 @@ LIBS="$cf_add_libs" else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:11060: WARNING: unable to find Xt library" >&5 + { echo "$as_me:11292: WARNING: unable to find Xt library" >&5 echo "$as_me: WARNING: unable to find Xt library" >&2;} fi @@ -11068,17 +11300,17 @@ cf_have_X_LIBS=no if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:11071: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:11303: testing found package xt ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs xt 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:11077: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:11309: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:11081: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:11313: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -11179,14 +11411,14 @@ LIBS="$cf_add_libs" ;; (*) # we have an "xt" package, but it may omit Xt's dependency on X11 -echo "$as_me:11182: checking for usable X dependency" >&5 +echo "$as_me:11414: checking for usable X dependency" >&5 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6 if test "${cf_cv_xt_x11_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11189 "configure" +#line 11421 "configure" #include "confdefs.h" #include @@ -11205,16 +11437,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11208: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11440: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11211: \$? = $ac_status" >&5 + echo "$as_me:11443: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11214: \"$ac_try\"") >&5 + { (eval echo "$as_me:11446: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11217: \$? = $ac_status" >&5 + echo "$as_me:11449: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xt_x11_compat=yes else @@ -11224,30 +11456,30 @@ cf_cv_xt_x11_compat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11227: result: $cf_cv_xt_x11_compat" >&5 +echo "$as_me:11459: result: $cf_cv_xt_x11_compat" >&5 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6 if test "$cf_cv_xt_x11_compat" = no then test -n "$verbose" && echo " work around broken X11 dependency" 1>&6 -echo "${as_me:-configure}:11233: testing work around broken X11 dependency ..." 1>&5 +echo "${as_me:-configure}:11465: testing work around broken X11 dependency ..." 1>&5 # 2010/11/19 - good enough until a working Xt on Xcb is delivered. if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:11240: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:11472: testing found package x11 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs x11 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:11246: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:11478: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:11250: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:11482: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -11350,12 +11582,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:11353: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:11585: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:11358: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:11590: testing ...after $LIBS ..." 1>&5 fi @@ -11363,14 +11595,14 @@ fi ;; esac -echo "$as_me:11366: checking for usable X Toolkit package" >&5 +echo "$as_me:11598: checking for usable X Toolkit package" >&5 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6 if test "${cf_cv_xt_ice_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11373 "configure" +#line 11605 "configure" #include "confdefs.h" #include @@ -11385,16 +11617,16 @@ int num = IceConnectionNumber(0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11388: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11620: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11391: \$? = $ac_status" >&5 + echo "$as_me:11623: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11394: \"$ac_try\"") >&5 + { (eval echo "$as_me:11626: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11397: \$? = $ac_status" >&5 + echo "$as_me:11629: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xt_ice_compat=yes else @@ -11404,7 +11636,7 @@ cf_cv_xt_ice_compat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11407: result: $cf_cv_xt_ice_compat" >&5 +echo "$as_me:11639: result: $cf_cv_xt_ice_compat" >&5 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 if test "$cf_cv_xt_ice_compat" = no @@ -11418,22 +11650,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 (*) test -n "$verbose" && echo " work around broken ICE dependency" 1>&6 -echo "${as_me:-configure}:11421: testing work around broken ICE dependency ..." 1>&5 +echo "${as_me:-configure}:11653: testing work around broken ICE dependency ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:11426: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:11658: testing found package ice ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs ice 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:11432: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:11664: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:11436: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:11668: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -11532,17 +11764,17 @@ LIBS="$cf_add_libs" if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:11535: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:11767: testing found package sm ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs sm 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:11541: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:11773: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:11545: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:11777: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -11651,12 +11883,12 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:11654: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:11886: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:11659: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:11891: testing ...after $LIBS ..." 1>&5 fi @@ -11676,7 +11908,7 @@ else test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:11679: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:11911: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -11747,7 +11979,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:11750: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:11982: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 CFLAGS="$CFLAGS $cf_new_cflags" fi @@ -11755,7 +11987,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:11758: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:11990: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 CPPFLAGS="$CPPFLAGS $cf_new_cppflags" fi @@ -11763,14 +11995,14 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:11766: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:11998: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat >conftest.$ac_ext <<_ACEOF -#line 11773 "configure" +#line 12005 "configure" #include "confdefs.h" #include int @@ -11782,16 +12014,16 @@ printf("Hello world"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11785: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12017: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11788: \$? = $ac_status" >&5 + echo "$as_me:12020: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11791: \"$ac_try\"") >&5 + { (eval echo "$as_me:12023: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11794: \$? = $ac_status" >&5 + echo "$as_me:12026: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -11799,12 +12031,12 @@ else cat conftest.$ac_ext >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:11802: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:12034: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:11807: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:12039: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_flags" @@ -11812,13 +12044,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - echo "$as_me:11815: checking for XOpenDisplay" >&5 + echo "$as_me:12047: checking for XOpenDisplay" >&5 echo $ECHO_N "checking for XOpenDisplay... $ECHO_C" >&6 if test "${ac_cv_func_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11821 "configure" +#line 12053 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char XOpenDisplay (); below. */ @@ -11849,16 +12081,16 @@ f = XOpenDisplay; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11852: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12084: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11855: \$? = $ac_status" >&5 + echo "$as_me:12087: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11858: \"$ac_try\"") >&5 + { (eval echo "$as_me:12090: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11861: \$? = $ac_status" >&5 + echo "$as_me:12093: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_XOpenDisplay=yes else @@ -11868,13 +12100,13 @@ ac_cv_func_XOpenDisplay=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11871: result: $ac_cv_func_XOpenDisplay" >&5 +echo "$as_me:12103: result: $ac_cv_func_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_func_XOpenDisplay" >&6 if test $ac_cv_func_XOpenDisplay = yes; then : else - echo "$as_me:11877: checking for XOpenDisplay in -lX11" >&5 + echo "$as_me:12109: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11882,7 +12114,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11885 "configure" +#line 12117 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11901,16 +12133,16 @@ XOpenDisplay (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11904: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12136: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11907: \$? = $ac_status" >&5 + echo "$as_me:12139: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11910: \"$ac_try\"") >&5 + { (eval echo "$as_me:12142: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11913: \$? = $ac_status" >&5 + echo "$as_me:12145: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -11921,7 +12153,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11924: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:12156: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 if test $ac_cv_lib_X11_XOpenDisplay = yes; then @@ -11945,13 +12177,13 @@ fi fi - echo "$as_me:11948: checking for XtAppInitialize" >&5 + echo "$as_me:12180: checking for XtAppInitialize" >&5 echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6 if test "${ac_cv_func_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11954 "configure" +#line 12186 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char XtAppInitialize (); below. */ @@ -11982,16 +12214,16 @@ f = XtAppInitialize; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11985: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12217: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11988: \$? = $ac_status" >&5 + echo "$as_me:12220: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11991: \"$ac_try\"") >&5 + { (eval echo "$as_me:12223: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11994: \$? = $ac_status" >&5 + echo "$as_me:12226: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_XtAppInitialize=yes else @@ -12001,13 +12233,13 @@ ac_cv_func_XtAppInitialize=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12004: result: $ac_cv_func_XtAppInitialize" >&5 +echo "$as_me:12236: result: $ac_cv_func_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6 if test $ac_cv_func_XtAppInitialize = yes; then : else - echo "$as_me:12010: checking for XtAppInitialize in -lXt" >&5 + echo "$as_me:12242: checking for XtAppInitialize in -lXt" >&5 echo $ECHO_N "checking for XtAppInitialize in -lXt... $ECHO_C" >&6 if test "${ac_cv_lib_Xt_XtAppInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12015,7 +12247,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12018 "configure" +#line 12250 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12034,16 +12266,16 @@ XtAppInitialize (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12037: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12269: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12040: \$? = $ac_status" >&5 + echo "$as_me:12272: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12043: \"$ac_try\"") >&5 + { (eval echo "$as_me:12275: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12046: \$? = $ac_status" >&5 + echo "$as_me:12278: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xt_XtAppInitialize=yes else @@ -12054,7 +12286,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12057: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 +echo "$as_me:12289: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6 if test $ac_cv_lib_Xt_XtAppInitialize = yes; then @@ -12071,7 +12303,7 @@ fi fi if test $cf_have_X_LIBS = no ; then - { echo "$as_me:12074: WARNING: Unable to successfully link X Toolkit library (-lXt) with + { echo "$as_me:12306: WARNING: Unable to successfully link X Toolkit library (-lXt) with test program. You will have to check and add the proper libraries by hand to makefile." >&5 echo "$as_me: WARNING: Unable to successfully link X Toolkit library (-lXt) with @@ -12093,14 +12325,14 @@ do cf_test=X11/$cf_x_athena_root/SimpleMenu.h if test $cf_path != default ; then CPPFLAGS="$cf_save -I$cf_path/include" - echo "$as_me:12096: checking for $cf_test in $cf_path" >&5 + echo "$as_me:12328: checking for $cf_test in $cf_path" >&5 echo $ECHO_N "checking for $cf_test in $cf_path... $ECHO_C" >&6 else - echo "$as_me:12099: checking for $cf_test" >&5 + echo "$as_me:12331: checking for $cf_test" >&5 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 fi cat >conftest.$ac_ext <<_ACEOF -#line 12103 "configure" +#line 12335 "configure" #include "confdefs.h" #include @@ -12114,16 +12346,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12117: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12349: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12120: \$? = $ac_status" >&5 + echo "$as_me:12352: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12123: \"$ac_try\"") >&5 + { (eval echo "$as_me:12355: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12126: \$? = $ac_status" >&5 + echo "$as_me:12358: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -12132,7 +12364,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:12135: result: $cf_result" >&5 + echo "$as_me:12367: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_x_athena_inc=$cf_path @@ -12144,7 +12376,7 @@ echo "${ECHO_T}$cf_result" >&6 done if test -z "$cf_x_athena_inc" ; then - { echo "$as_me:12147: WARNING: Unable to successfully find Athena header files with test program" >&5 + { echo "$as_me:12379: WARNING: Unable to successfully find Athena header files with test program" >&5 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;} elif test "$cf_x_athena_inc" != default ; then CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc" @@ -12190,7 +12422,7 @@ do done LIBS="$cf_add_libs" - echo "$as_me:12193: checking for $cf_libs in $cf_path" >&5 + echo "$as_me:12425: checking for $cf_libs in $cf_path" >&5 echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6 else @@ -12210,11 +12442,11 @@ do done LIBS="$cf_add_libs" - echo "$as_me:12213: checking for $cf_test in $cf_libs" >&5 + echo "$as_me:12445: checking for $cf_test in $cf_libs" >&5 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6 fi cat >conftest.$ac_ext <<_ACEOF -#line 12217 "configure" +#line 12449 "configure" #include "confdefs.h" #include @@ -12230,16 +12462,16 @@ $cf_test((XtAppContext) 0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12233: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12465: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12236: \$? = $ac_status" >&5 + echo "$as_me:12468: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12239: \"$ac_try\"") >&5 + { (eval echo "$as_me:12471: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12242: \$? = $ac_status" >&5 + echo "$as_me:12474: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -12248,7 +12480,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:12251: result: $cf_result" >&5 + echo "$as_me:12483: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_x_athena_lib="$cf_libs" @@ -12262,7 +12494,7 @@ echo "${ECHO_T}$cf_result" >&6 done if test -z "$cf_x_athena_lib" ; then - { { echo "$as_me:12265: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 + { { echo "$as_me:12497: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 echo "$as_me: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&2;} { (exit 1); exit 1; }; } fi @@ -12280,7 +12512,7 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:12283: checking for $ac_word" >&5 +echo "$as_me:12515: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12295,7 +12527,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_XCURSES_CONFIG="$ac_tool_prefix$ac_prog" -echo "$as_me:12298: found $ac_dir/$ac_word" >&5 +echo "$as_me:12530: found $ac_dir/$ac_word" >&5 break done @@ -12303,10 +12535,10 @@ fi fi XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG if test -n "$XCURSES_CONFIG"; then - echo "$as_me:12306: result: $XCURSES_CONFIG" >&5 + echo "$as_me:12538: result: $XCURSES_CONFIG" >&5 echo "${ECHO_T}$XCURSES_CONFIG" >&6 else - echo "$as_me:12309: result: no" >&5 + echo "$as_me:12541: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -12319,7 +12551,7 @@ if test -z "$XCURSES_CONFIG"; then 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:12322: checking for $ac_word" >&5 +echo "$as_me:12554: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12334,7 +12566,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_ac_ct_XCURSES_CONFIG="$ac_prog" -echo "$as_me:12337: found $ac_dir/$ac_word" >&5 +echo "$as_me:12569: found $ac_dir/$ac_word" >&5 break done @@ -12342,10 +12574,10 @@ fi fi ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG if test -n "$ac_ct_XCURSES_CONFIG"; then - echo "$as_me:12345: result: $ac_ct_XCURSES_CONFIG" >&5 + echo "$as_me:12577: result: $ac_ct_XCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6 else - echo "$as_me:12348: result: no" >&5 + echo "$as_me:12580: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -12384,7 +12616,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:12387: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:12619: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -12455,7 +12687,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:12458: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:12690: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 CFLAGS="$CFLAGS $cf_new_cflags" fi @@ -12463,7 +12695,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:12466: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:12698: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 CPPFLAGS="$CPPFLAGS $cf_new_cppflags" fi @@ -12471,14 +12703,14 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:12474: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:12706: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat >conftest.$ac_ext <<_ACEOF -#line 12481 "configure" +#line 12713 "configure" #include "confdefs.h" #include int @@ -12490,16 +12722,16 @@ printf("Hello world"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12493: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12725: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12496: \$? = $ac_status" >&5 + echo "$as_me:12728: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12499: \"$ac_try\"") >&5 + { (eval echo "$as_me:12731: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12502: \$? = $ac_status" >&5 + echo "$as_me:12734: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -12507,12 +12739,12 @@ else cat conftest.$ac_ext >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:12510: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:12742: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:12515: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:12747: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_flags" @@ -12520,7 +12752,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12523: checking for XOpenDisplay in -lX11" >&5 +echo "$as_me:12755: checking for XOpenDisplay in -lX11" >&5 echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12528,7 +12760,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12531 "configure" +#line 12763 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12547,16 +12779,16 @@ XOpenDisplay (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12550: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12782: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12553: \$? = $ac_status" >&5 + echo "$as_me:12785: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12556: \"$ac_try\"") >&5 + { (eval echo "$as_me:12788: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12559: \$? = $ac_status" >&5 + echo "$as_me:12791: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -12567,7 +12799,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12570: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:12802: result: $ac_cv_lib_X11_XOpenDisplay" >&5 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 if test $ac_cv_lib_X11_XOpenDisplay = yes; then @@ -12589,7 +12821,7 @@ LIBS="$cf_add_libs" fi -echo "$as_me:12592: checking for XCurses library" >&5 +echo "$as_me:12824: checking for XCurses library" >&5 echo $ECHO_N "checking for XCurses library... $ECHO_C" >&6 if test "${cf_cv_lib_XCurses+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12612,7 +12844,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 12615 "configure" +#line 12847 "configure" #include "confdefs.h" #include @@ -12627,16 +12859,16 @@ XCursesExit(); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12630: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12862: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12633: \$? = $ac_status" >&5 + echo "$as_me:12865: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12636: \"$ac_try\"") >&5 + { (eval echo "$as_me:12868: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12639: \$? = $ac_status" >&5 + echo "$as_me:12871: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_lib_XCurses=yes else @@ -12647,7 +12879,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12650: result: $cf_cv_lib_XCurses" >&5 +echo "$as_me:12882: result: $cf_cv_lib_XCurses" >&5 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6 fi @@ -12662,23 +12894,23 @@ cat >>confdefs.h <<\EOF #define XCURSES 1 EOF - echo "$as_me:12665: checking for xcurses.h" >&5 + echo "$as_me:12897: checking for xcurses.h" >&5 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6 if test "${ac_cv_header_xcurses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12671 "configure" +#line 12903 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:12675: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:12907: \"$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:12681: \$? = $ac_status" >&5 + echo "$as_me:12913: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12697,7 +12929,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:12700: result: $ac_cv_header_xcurses_h" >&5 +echo "$as_me:12932: result: $ac_cv_header_xcurses_h" >&5 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6 if test $ac_cv_header_xcurses_h = yes; then @@ -12708,25 +12940,33 @@ EOF fi else - { { echo "$as_me:12711: error: Cannot link with XCurses" >&5 + { { echo "$as_me:12943: error: Cannot link with XCurses" >&5 echo "$as_me: error: Cannot link with XCurses" >&2;} { (exit 1); exit 1; }; } fi + ;; +(*) + { { echo "$as_me:12950: error: unexpected screen-value: $cf_cv_screen" >&5 +echo "$as_me: error: unexpected screen-value: $cf_cv_screen" >&2;} + { (exit 1); exit 1; }; } ;; esac case $cf_cv_screen in +(ncurses*) + cf_cv_libtype=`echo "$cf_cv_screen" | sed -e 's/^ncurses//'` + ;; (curses|curses_*) -echo "$as_me:12722: checking for NetBSD form.h" >&5 +echo "$as_me:12962: 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 12729 "configure" +#line 12969 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -12745,16 +12985,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12748: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12988: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12751: \$? = $ac_status" >&5 + echo "$as_me:12991: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12754: \"$ac_try\"") >&5 + { (eval echo "$as_me:12994: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12757: \$? = $ac_status" >&5 + echo "$as_me:12997: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_netbsd_form_h=yes @@ -12766,7 +13006,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12769: result: $cf_cv_netbsd_form_h" >&5 +echo "$as_me:13009: result: $cf_cv_netbsd_form_h" >&5 echo "${ECHO_T}$cf_cv_netbsd_form_h" >&6 test "$cf_cv_netbsd_form_h" = yes && @@ -12774,14 +13014,14 @@ cat >>confdefs.h <<\EOF #define HAVE_NETBSD_FORM_H 1 EOF -echo "$as_me:12777: checking for NetBSD menu.h" >&5 +echo "$as_me:13017: 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 12784 "configure" +#line 13024 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -12799,16 +13039,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12802: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13042: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12805: \$? = $ac_status" >&5 + echo "$as_me:13045: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12808: \"$ac_try\"") >&5 + { (eval echo "$as_me:13048: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12811: \$? = $ac_status" >&5 + echo "$as_me:13051: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_netbsd_menu_h=yes @@ -12820,7 +13060,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12823: result: $cf_cv_netbsd_menu_h" >&5 +echo "$as_me:13063: result: $cf_cv_netbsd_menu_h" >&5 echo "${ECHO_T}$cf_cv_netbsd_menu_h" >&6 test "$cf_cv_netbsd_menu_h" = yes && @@ -12828,9 +13068,6 @@ cat >>confdefs.h <<\EOF #define HAVE_NETBSD_MENU_H 1 EOF - ;; -(ncursesw) - cf_cv_libtype=w ;; esac @@ -12839,20 +13076,17 @@ case $cf_cv_screen in ;; (*) # look for curses-related libraries - : ${cf_panel_lib:=panel} - : ${cf_menu_lib:=menu} - : ${cf_form_lib:=form} -as_ac_Lib=`echo "ac_cv_lib_$cf_panel_lib$cf_cv_libtype''_new_panel" | $as_tr_sh` -echo "$as_me:12847: checking for new_panel in -l$cf_panel_lib$cf_cv_libtype" >&5 -echo $ECHO_N "checking for new_panel in -l$cf_panel_lib$cf_cv_libtype... $ECHO_C" >&6 +as_ac_Lib=`echo "ac_cv_lib_panel$cf_cv_libtype''_new_panel" | $as_tr_sh` +echo "$as_me:13081: checking for new_panel in -lpanel$cf_cv_libtype" >&5 +echo $ECHO_N "checking for new_panel in -lpanel$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-l$cf_panel_lib$cf_cv_libtype $LIBS" +LIBS="-lpanel$cf_cv_libtype $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12855 "configure" +#line 13089 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12871,16 +13105,16 @@ new_panel (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12874: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13108: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12877: \$? = $ac_status" >&5 + echo "$as_me:13111: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12880: \"$ac_try\"") >&5 + { (eval echo "$as_me:13114: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12883: \$? = $ac_status" >&5 + echo "$as_me:13117: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -12891,27 +13125,44 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12894: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:13128: 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 - cat >>confdefs.h <>confdefs.h <&5 -echo $ECHO_N "checking for menu_driver in -l$cf_menu_lib$cf_cv_libtype... $ECHO_C" >&6 +as_ac_Lib=`echo "ac_cv_lib_menu$cf_cv_libtype''_menu_driver" | $as_tr_sh` +echo "$as_me:13157: checking for menu_driver in -lmenu$cf_cv_libtype" >&5 +echo $ECHO_N "checking for menu_driver in -lmenu$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-l$cf_menu_lib$cf_cv_libtype $LIBS" +LIBS="-lmenu$cf_cv_libtype $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12914 "configure" +#line 13165 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12930,16 +13181,16 @@ menu_driver (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12933: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13184: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12936: \$? = $ac_status" >&5 + echo "$as_me:13187: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12939: \"$ac_try\"") >&5 + { (eval echo "$as_me:13190: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12942: \$? = $ac_status" >&5 + echo "$as_me:13193: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -12950,27 +13201,44 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12953: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:13204: 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 - cat >>confdefs.h <>confdefs.h <&5 -echo $ECHO_N "checking for form_driver in -l$cf_form_lib$cf_cv_libtype... $ECHO_C" >&6 +as_ac_Lib=`echo "ac_cv_lib_form$cf_cv_libtype''_form_driver" | $as_tr_sh` +echo "$as_me:13233: checking for form_driver in -lform$cf_cv_libtype" >&5 +echo $ECHO_N "checking for form_driver in -lform$cf_cv_libtype... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-l$cf_form_lib$cf_cv_libtype $LIBS" +LIBS="-lform$cf_cv_libtype $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12973 "configure" +#line 13241 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12989,16 +13257,16 @@ form_driver (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12992: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13260: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12995: \$? = $ac_status" >&5 + echo "$as_me:13263: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12998: \"$ac_try\"") >&5 + { (eval echo "$as_me:13266: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13001: \$? = $ac_status" >&5 + echo "$as_me:13269: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -13009,14 +13277,31 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13012: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:13280: 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 - cat >>confdefs.h <>confdefs.h <&5 +echo "$as_me:13320: 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 13041 "configure" +#line 13326 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:13045: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13330: \"$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:13051: \$? = $ac_status" >&5 + echo "$as_me:13336: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13067,7 +13352,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:13070: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:13355: 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:13368: 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 13089 "configure" +#line 13374 "configure" #include "confdefs.h" #include #include @@ -13094,13 +13379,13 @@ else #include _ACEOF -if { (eval echo "$as_me:13097: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13382: \"$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:13103: \$? = $ac_status" >&5 + echo "$as_me:13388: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13122,7 +13407,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 13125 "configure" +#line 13410 "configure" #include "confdefs.h" #include @@ -13140,7 +13425,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 13143 "configure" +#line 13428 "configure" #include "confdefs.h" #include @@ -13161,7 +13446,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 13164 "configure" +#line 13449 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -13187,15 +13472,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:13190: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13475: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13193: \$? = $ac_status" >&5 + echo "$as_me:13478: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:13195: \"$ac_try\"") >&5 + { (eval echo "$as_me:13480: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13198: \$? = $ac_status" >&5 + echo "$as_me:13483: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -13208,7 +13493,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:13211: result: $ac_cv_header_stdc" >&5 +echo "$as_me:13496: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -13218,13 +13503,13 @@ EOF fi -echo "$as_me:13221: checking whether time.h and sys/time.h may both be included" >&5 +echo "$as_me:13506: 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 13227 "configure" +#line 13512 "configure" #include "confdefs.h" #include #include @@ -13240,16 +13525,16 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13243: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13528: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13246: \$? = $ac_status" >&5 + echo "$as_me:13531: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13249: \"$ac_try\"") >&5 + { (eval echo "$as_me:13534: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13252: \$? = $ac_status" >&5 + echo "$as_me:13537: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -13259,7 +13544,7 @@ ac_cv_header_time=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13262: result: $ac_cv_header_time" >&5 +echo "$as_me:13547: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -13282,23 +13567,23 @@ unistd.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:13285: checking for $ac_header" >&5 +echo "$as_me:13570: 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 13291 "configure" +#line 13576 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:13295: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13580: \"$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:13301: \$? = $ac_status" >&5 + echo "$as_me:13586: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13317,7 +13602,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:13320: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:13605: 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:13618: 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 13339 "configure" +#line 13624 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:13343: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13628: \"$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:13349: \$? = $ac_status" >&5 + echo "$as_me:13634: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -13365,7 +13650,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:13368: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:13653: 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:13663: checking for header declaring getopt variables" >&5 echo $ECHO_N "checking for header declaring getopt variables... $ECHO_C" >&6 if test "${cf_cv_getopt_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13385,7 +13670,7 @@ cf_cv_getopt_header=none for cf_header in stdio.h stdlib.h unistd.h getopt.h do cat >conftest.$ac_ext <<_ACEOF -#line 13388 "configure" +#line 13673 "configure" #include "confdefs.h" #include <$cf_header> @@ -13398,16 +13683,16 @@ int x = optind; char *y = optarg } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13401: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13686: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13404: \$? = $ac_status" >&5 + echo "$as_me:13689: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13407: \"$ac_try\"") >&5 + { (eval echo "$as_me:13692: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13410: \$? = $ac_status" >&5 + echo "$as_me:13695: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_getopt_header=$cf_header break @@ -13419,7 +13704,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:13422: result: $cf_cv_getopt_header" >&5 +echo "$as_me:13707: result: $cf_cv_getopt_header" >&5 echo "${ECHO_T}$cf_cv_getopt_header" >&6 if test $cf_cv_getopt_header != none ; then @@ -13442,13 +13727,13 @@ gettimeofday \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:13445: checking for $ac_func" >&5 +echo "$as_me:13730: 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 13451 "configure" +#line 13736 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -13479,16 +13764,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13482: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13767: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13485: \$? = $ac_status" >&5 + echo "$as_me:13770: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13488: \"$ac_try\"") >&5 + { (eval echo "$as_me:13773: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13491: \$? = $ac_status" >&5 + echo "$as_me:13776: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -13498,7 +13783,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13501: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:13786: 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:13797: error: getopt is required for building programs" >&5 echo "$as_me: error: getopt is required for building programs" >&2;} { (exit 1); exit 1; }; } fi @@ -13528,13 +13813,13 @@ wcstombs \ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:13531: checking for $ac_func" >&5 +echo "$as_me:13816: 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 13537 "configure" +#line 13822 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -13565,16 +13850,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13568: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13853: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13571: \$? = $ac_status" >&5 + echo "$as_me:13856: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13574: \"$ac_try\"") >&5 + { (eval echo "$as_me:13859: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13577: \$? = $ac_status" >&5 + echo "$as_me:13862: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -13584,7 +13869,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13587: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:13872: 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:13884: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6 if test "${cf_cv_need_xopen_extension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13606 "configure" +#line 13891 "configure" #include "confdefs.h" #include @@ -13625,23 +13910,23 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13628: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13913: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13631: \$? = $ac_status" >&5 + echo "$as_me:13916: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13634: \"$ac_try\"") >&5 + { (eval echo "$as_me:13919: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13637: \$? = $ac_status" >&5 + echo "$as_me:13922: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_xopen_extension=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 13644 "configure" +#line 13929 "configure" #include "confdefs.h" #define _XOPEN_SOURCE_EXTENDED @@ -13663,16 +13948,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13666: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13951: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13669: \$? = $ac_status" >&5 + echo "$as_me:13954: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13672: \"$ac_try\"") >&5 + { (eval echo "$as_me:13957: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13675: \$? = $ac_status" >&5 + echo "$as_me:13960: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_xopen_extension=yes else @@ -13684,11 +13969,11 @@ 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:13687: result: $cf_cv_need_xopen_extension" >&5 +echo "$as_me:13972: result: $cf_cv_need_xopen_extension" >&5 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" -echo "$as_me:13691: checking for term.h" >&5 +echo "$as_me:13976: checking for term.h" >&5 echo $ECHO_N "checking for term.h... $ECHO_C" >&6 if test "${cf_cv_term_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13709,7 +13994,7 @@ esac for cf_header in $cf_header_list do cat >conftest.$ac_ext <<_ACEOF -#line 13712 "configure" +#line 13997 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -13723,16 +14008,16 @@ WINDOW *x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13726: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14011: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13729: \$? = $ac_status" >&5 + echo "$as_me:14014: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13732: \"$ac_try\"") >&5 + { (eval echo "$as_me:14017: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13735: \$? = $ac_status" >&5 + echo "$as_me:14020: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header=$cf_header break @@ -13751,7 +14036,7 @@ case $cf_cv_term_header in for cf_header in ncurses/term.h ncursesw/term.h do cat >conftest.$ac_ext <<_ACEOF -#line 13754 "configure" +#line 14039 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -13769,16 +14054,16 @@ WINDOW *x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13772: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14057: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13775: \$? = $ac_status" >&5 + echo "$as_me:14060: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13778: \"$ac_try\"") >&5 + { (eval echo "$as_me:14063: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13781: \$? = $ac_status" >&5 + echo "$as_me:14066: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header=$cf_header break @@ -13793,7 +14078,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext esac fi -echo "$as_me:13796: result: $cf_cv_term_header" >&5 +echo "$as_me:14081: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 case $cf_cv_term_header in @@ -13820,7 +14105,7 @@ EOF ;; esac -echo "$as_me:13823: checking for unctrl.h" >&5 +echo "$as_me:14108: checking for unctrl.h" >&5 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6 if test "${cf_cv_unctrl_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13841,7 +14126,7 @@ esac for cf_header in $cf_header_list do cat >conftest.$ac_ext <<_ACEOF -#line 13844 "configure" +#line 14129 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -13855,16 +14140,16 @@ WINDOW *x } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13858: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14143: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13861: \$? = $ac_status" >&5 + echo "$as_me:14146: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13864: \"$ac_try\"") >&5 + { (eval echo "$as_me:14149: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13867: \$? = $ac_status" >&5 + echo "$as_me:14152: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_unctrl_header=$cf_header break @@ -13877,12 +14162,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:13880: result: $cf_cv_unctrl_header" >&5 +echo "$as_me:14165: result: $cf_cv_unctrl_header" >&5 echo "${ECHO_T}$cf_cv_unctrl_header" >&6 case $cf_cv_unctrl_header in (no) - { echo "$as_me:13885: WARNING: unctrl.h header not found" >&5 + { echo "$as_me:14170: WARNING: unctrl.h header not found" >&5 echo "$as_me: WARNING: unctrl.h header not found" >&2;} ;; esac @@ -13956,10 +14241,10 @@ do cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:13959: checking for ${cf_func}" >&5 + echo "$as_me:14244: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:13962: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:14247: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13968,7 +14253,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >conftest.$ac_ext <<_ACEOF -#line 13971 "configure" +#line 14256 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -14001,16 +14286,16 @@ if (foo + 1234 > 5678) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14004: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14289: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14007: \$? = $ac_status" >&5 + echo "$as_me:14292: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14010: \"$ac_try\"") >&5 + { (eval echo "$as_me:14295: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14013: \$? = $ac_status" >&5 + echo "$as_me:14298: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -14026,7 +14311,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:14029: result: $cf_result" >&5 + echo "$as_me:14314: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result != no; then cat >>confdefs.h <&5 + echo "$as_me:14329: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:14047: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:14332: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14053,7 +14338,7 @@ else eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >conftest.$ac_ext <<_ACEOF -#line 14056 "configure" +#line 14341 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -14086,16 +14371,16 @@ if (foo + 1234 > 5678) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14089: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14374: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14092: \$? = $ac_status" >&5 + echo "$as_me:14377: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14095: \"$ac_try\"") >&5 + { (eval echo "$as_me:14380: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14098: \$? = $ac_status" >&5 + echo "$as_me:14383: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -14111,7 +14396,7 @@ fi # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:14114: result: $cf_result" >&5 + echo "$as_me:14399: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result != no; then cat >>confdefs.h <conftest.$ac_ext <<_ACEOF -#line 14138 "configure" +#line 14423 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -14155,21 +14440,21 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14158: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14443: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14161: \$? = $ac_status" >&5 + echo "$as_me:14446: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14164: \"$ac_try\"") >&5 + { (eval echo "$as_me:14449: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14167: \$? = $ac_status" >&5 + echo "$as_me:14452: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test -n "$verbose" && echo " prototype $cf_ret func($cf_arg value)" 1>&6 -echo "${as_me:-configure}:14172: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 +echo "${as_me:-configure}:14457: testing prototype $cf_ret func($cf_arg value) ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:14477: checking for ncurses extended functions" >&5 echo $ECHO_N "checking for ncurses extended functions... $ECHO_C" >&6 if test "${cf_cv_ncurses_ext_funcs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14199 "configure" +#line 14484 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -14211,16 +14496,16 @@ int x = NCURSES_EXT_FUNCS } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14214: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14499: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14217: \$? = $ac_status" >&5 + echo "$as_me:14502: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14220: \"$ac_try\"") >&5 + { (eval echo "$as_me:14505: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14223: \$? = $ac_status" >&5 + echo "$as_me:14508: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_ext_funcs=defined else @@ -14228,7 +14513,7 @@ else cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 14231 "configure" +#line 14516 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -14253,16 +14538,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14256: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14541: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14259: \$? = $ac_status" >&5 + echo "$as_me:14544: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14262: \"$ac_try\"") >&5 + { (eval echo "$as_me:14547: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14265: \$? = $ac_status" >&5 + echo "$as_me:14550: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_ext_funcs=yes else @@ -14276,7 +14561,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14279: result: $cf_cv_ncurses_ext_funcs" >&5 +echo "$as_me:14564: result: $cf_cv_ncurses_ext_funcs" >&5 echo "${ECHO_T}$cf_cv_ncurses_ext_funcs" >&6 test "$cf_cv_ncurses_ext_funcs" = yes && cat >>confdefs.h <<\EOF @@ -14290,11 +14575,11 @@ then if test -n "$cf_cv_ncurses_version" && test "x$cf_cv_ncurses_version" != xno then cf_define_xpg5=no - echo "$as_me:14293: checking if _XPG5 should be defined to enable wide-characters" >&5 + echo "$as_me:14578: checking if _XPG5 should be defined to enable wide-characters" >&5 echo $ECHO_N "checking if _XPG5 should be defined to enable wide-characters... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 14297 "configure" +#line 14582 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -14307,16 +14592,16 @@ int x = _XPG5 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14310: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14595: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14313: \$? = $ac_status" >&5 + echo "$as_me:14598: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14316: \"$ac_try\"") >&5 + { (eval echo "$as_me:14601: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14319: \$? = $ac_status" >&5 + echo "$as_me:14604: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -14325,7 +14610,7 @@ cat conftest.$ac_ext >&5 cf_save_cppflags="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XPG5" cat >conftest.$ac_ext <<_ACEOF -#line 14328 "configure" +#line 14613 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -14338,16 +14623,16 @@ int x = _XPG5 } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14341: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14626: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14344: \$? = $ac_status" >&5 + echo "$as_me:14629: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14347: \"$ac_try\"") >&5 + { (eval echo "$as_me:14632: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14350: \$? = $ac_status" >&5 + echo "$as_me:14635: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_define_xpg5=yes else @@ -14358,7 +14643,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext CPPFLAGS="$cf_save_cppflags" fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:14361: result: $cf_define_xpg5" >&5 + echo "$as_me:14646: result: $cf_define_xpg5" >&5 echo "${ECHO_T}$cf_define_xpg5" >&6 if test "$cf_define_xpg5" = yes @@ -14367,14 +14652,14 @@ echo "${ECHO_T}$cf_define_xpg5" >&6 fi fi - echo "$as_me:14370: checking for wide-character functions" >&5 + echo "$as_me:14655: checking for wide-character functions" >&5 echo $ECHO_N "checking for wide-character functions... $ECHO_C" >&6 if test "${cf_cv_widechar_funcs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14377 "configure" +#line 14662 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -14391,16 +14676,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14394: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14679: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14397: \$? = $ac_status" >&5 + echo "$as_me:14682: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14400: \"$ac_try\"") >&5 + { (eval echo "$as_me:14685: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14403: \$? = $ac_status" >&5 + echo "$as_me:14688: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_widechar_funcs=yes else @@ -14411,7 +14696,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14414: result: $cf_cv_widechar_funcs" >&5 +echo "$as_me:14699: result: $cf_cv_widechar_funcs" >&5 echo "${ECHO_T}$cf_cv_widechar_funcs" >&6 if test "$cf_cv_widechar_funcs" != no ; then @@ -14432,14 +14717,14 @@ EOF fi -echo "$as_me:14435: checking if sys/time.h works with sys/select.h" >&5 +echo "$as_me:14720: 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 14442 "configure" +#line 14727 "configure" #include "confdefs.h" #include @@ -14459,16 +14744,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14462: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14747: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14465: \$? = $ac_status" >&5 + echo "$as_me:14750: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14468: \"$ac_try\"") >&5 + { (eval echo "$as_me:14753: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14471: \$? = $ac_status" >&5 + echo "$as_me:14756: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sys_time_select=yes else @@ -14480,14 +14765,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14483: result: $cf_cv_sys_time_select" >&5 +echo "$as_me:14768: 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 EOF -echo "$as_me:14490: checking for function curses_version" >&5 +echo "$as_me:14775: checking for function curses_version" >&5 echo $ECHO_N "checking for function curses_version... $ECHO_C" >&6 if test "${cf_cv_func_curses_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14497,7 +14782,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_curses_version=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 14500 "configure" +#line 14785 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -14510,15 +14795,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:14513: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14798: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14516: \$? = $ac_status" >&5 + echo "$as_me:14801: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14518: \"$ac_try\"") >&5 + { (eval echo "$as_me:14803: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14521: \$? = $ac_status" >&5 + echo "$as_me:14806: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_curses_version=yes @@ -14533,14 +14818,14 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f core fi -echo "$as_me:14536: result: $cf_cv_func_curses_version" >&5 +echo "$as_me:14821: result: $cf_cv_func_curses_version" >&5 echo "${ECHO_T}$cf_cv_func_curses_version" >&6 test "$cf_cv_func_curses_version" = yes && cat >>confdefs.h <<\EOF #define HAVE_CURSES_VERSION 1 EOF -echo "$as_me:14543: checking for alternate character set array" >&5 +echo "$as_me:14828: checking for alternate character set array" >&5 echo $ECHO_N "checking for alternate character set array... $ECHO_C" >&6 if test "${cf_cv_curses_acs_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14550,7 +14835,7 @@ cf_cv_curses_acs_map=unknown for name in acs_map _acs_map __acs_map ${NCURSES_WRAP_PREFIX}acs_map do cat >conftest.$ac_ext <<_ACEOF -#line 14553 "configure" +#line 14838 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -14566,16 +14851,16 @@ $name['k'] = ACS_PLUS } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14569: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14854: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14572: \$? = $ac_status" >&5 + echo "$as_me:14857: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14575: \"$ac_try\"") >&5 + { (eval echo "$as_me:14860: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14578: \$? = $ac_status" >&5 + echo "$as_me:14863: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_acs_map=$name; break else @@ -14586,7 +14871,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:14589: result: $cf_cv_curses_acs_map" >&5 +echo "$as_me:14874: result: $cf_cv_curses_acs_map" >&5 echo "${ECHO_T}$cf_cv_curses_acs_map" >&6 test "$cf_cv_curses_acs_map" != unknown && @@ -14596,7 +14881,7 @@ EOF if test "$cf_enable_widec" = yes; then -echo "$as_me:14599: checking for wide alternate character set array" >&5 +echo "$as_me:14884: checking for wide alternate character set array" >&5 echo $ECHO_N "checking for wide alternate character set array... $ECHO_C" >&6 if test "${cf_cv_curses_wacs_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14606,7 +14891,7 @@ else for name in wacs_map _wacs_map __wacs_map _nc_wacs _wacs_char do cat >conftest.$ac_ext <<_ACEOF -#line 14609 "configure" +#line 14894 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -14622,16 +14907,16 @@ void *foo = &($name['k']) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14625: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14910: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14628: \$? = $ac_status" >&5 + echo "$as_me:14913: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14631: \"$ac_try\"") >&5 + { (eval echo "$as_me:14916: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14634: \$? = $ac_status" >&5 + echo "$as_me:14919: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_wacs_map=$name break @@ -14642,7 +14927,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext done fi -echo "$as_me:14645: result: $cf_cv_curses_wacs_map" >&5 +echo "$as_me:14930: result: $cf_cv_curses_wacs_map" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_map" >&6 test "$cf_cv_curses_wacs_map" != unknown && @@ -14650,7 +14935,7 @@ cat >>confdefs.h <&5 +echo "$as_me:14938: checking for wide alternate character constants" >&5 echo $ECHO_N "checking for wide alternate character constants... $ECHO_C" >&6 if test "${cf_cv_curses_wacs_symbols+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14660,7 +14945,7 @@ cf_cv_curses_wacs_symbols=no if test "$cf_cv_curses_wacs_map" != unknown then cat >conftest.$ac_ext <<_ACEOF -#line 14663 "configure" +#line 14948 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -14677,16 +14962,16 @@ cchar_t *foo = WACS_PLUS; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14680: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14965: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14683: \$? = $ac_status" >&5 + echo "$as_me:14968: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14686: \"$ac_try\"") >&5 + { (eval echo "$as_me:14971: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14689: \$? = $ac_status" >&5 + echo "$as_me:14974: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -14696,7 +14981,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 14699 "configure" +#line 14984 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -14712,16 +14997,16 @@ cchar_t *foo = WACS_PLUS } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14715: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15000: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14718: \$? = $ac_status" >&5 + echo "$as_me:15003: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14721: \"$ac_try\"") >&5 + { (eval echo "$as_me:15006: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14724: \$? = $ac_status" >&5 + echo "$as_me:15009: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_curses_wacs_symbols=yes else @@ -14732,7 +15017,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi fi -echo "$as_me:14735: result: $cf_cv_curses_wacs_symbols" >&5 +echo "$as_me:15020: result: $cf_cv_curses_wacs_symbols" >&5 echo "${ECHO_T}$cf_cv_curses_wacs_symbols" >&6 test "$cf_cv_curses_wacs_symbols" != no && @@ -14742,10 +15027,10 @@ EOF fi -echo "$as_me:14745: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:15030: checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type attr_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 14748 "configure" +#line 15033 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -14763,16 +15048,16 @@ attr_t foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14766: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15051: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14769: \$? = $ac_status" >&5 + echo "$as_me:15054: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14772: \"$ac_try\"") >&5 + { (eval echo "$as_me:15057: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14775: \$? = $ac_status" >&5 + echo "$as_me:15060: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -14781,7 +15066,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:14784: result: $cf_result" >&5 +echo "$as_me:15069: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -14802,14 +15087,14 @@ fi if test "$cf_enable_widec" = yes; then # This is needed on Tru64 5.0 to declare mbstate_t -echo "$as_me:14805: checking if we must include wchar.h to declare mbstate_t" >&5 +echo "$as_me:15090: checking if we must include wchar.h to declare mbstate_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6 if test "${cf_cv_mbstate_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14812 "configure" +#line 15097 "configure" #include "confdefs.h" #include @@ -14827,23 +15112,23 @@ mbstate_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14830: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15115: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14833: \$? = $ac_status" >&5 + echo "$as_me:15118: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14836: \"$ac_try\"") >&5 + { (eval echo "$as_me:15121: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14839: \$? = $ac_status" >&5 + echo "$as_me:15124: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_mbstate_t=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 14846 "configure" +#line 15131 "configure" #include "confdefs.h" #include @@ -14862,16 +15147,16 @@ mbstate_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14865: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15150: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14868: \$? = $ac_status" >&5 + echo "$as_me:15153: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14871: \"$ac_try\"") >&5 + { (eval echo "$as_me:15156: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14874: \$? = $ac_status" >&5 + echo "$as_me:15159: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_mbstate_t=yes else @@ -14883,7 +15168,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14886: result: $cf_cv_mbstate_t" >&5 +echo "$as_me:15171: result: $cf_cv_mbstate_t" >&5 echo "${ECHO_T}$cf_cv_mbstate_t" >&6 if test "$cf_cv_mbstate_t" = yes ; then @@ -14906,14 +15191,14 @@ if test "$cf_cv_mbstate_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wchar_t -echo "$as_me:14909: checking if we must include wchar.h to declare wchar_t" >&5 +echo "$as_me:15194: checking if we must include wchar.h to declare wchar_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6 if test "${cf_cv_wchar_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14916 "configure" +#line 15201 "configure" #include "confdefs.h" #include @@ -14931,23 +15216,23 @@ wchar_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14934: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15219: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14937: \$? = $ac_status" >&5 + echo "$as_me:15222: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14940: \"$ac_try\"") >&5 + { (eval echo "$as_me:15225: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14943: \$? = $ac_status" >&5 + echo "$as_me:15228: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wchar_t=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 14950 "configure" +#line 15235 "configure" #include "confdefs.h" #include @@ -14966,16 +15251,16 @@ wchar_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14969: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15254: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14972: \$? = $ac_status" >&5 + echo "$as_me:15257: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14975: \"$ac_try\"") >&5 + { (eval echo "$as_me:15260: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14978: \$? = $ac_status" >&5 + echo "$as_me:15263: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wchar_t=yes else @@ -14987,7 +15272,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:14990: result: $cf_cv_wchar_t" >&5 +echo "$as_me:15275: result: $cf_cv_wchar_t" >&5 echo "${ECHO_T}$cf_cv_wchar_t" >&6 if test "$cf_cv_wchar_t" = yes ; then @@ -15010,14 +15295,14 @@ if test "$cf_cv_wchar_t" != unknown ; then fi # This is needed on Tru64 5.0 to declare wint_t -echo "$as_me:15013: checking if we must include wchar.h to declare wint_t" >&5 +echo "$as_me:15298: checking if we must include wchar.h to declare wint_t" >&5 echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6 if test "${cf_cv_wint_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15020 "configure" +#line 15305 "configure" #include "confdefs.h" #include @@ -15035,23 +15320,23 @@ wint_t state } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15038: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15323: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15041: \$? = $ac_status" >&5 + echo "$as_me:15326: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15044: \"$ac_try\"") >&5 + { (eval echo "$as_me:15329: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15047: \$? = $ac_status" >&5 + echo "$as_me:15332: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wint_t=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 15054 "configure" +#line 15339 "configure" #include "confdefs.h" #include @@ -15070,16 +15355,16 @@ wint_t value } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15073: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15358: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15076: \$? = $ac_status" >&5 + echo "$as_me:15361: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15079: \"$ac_try\"") >&5 + { (eval echo "$as_me:15364: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15082: \$? = $ac_status" >&5 + echo "$as_me:15367: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_wint_t=yes else @@ -15091,7 +15376,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:15094: result: $cf_cv_wint_t" >&5 +echo "$as_me:15379: result: $cf_cv_wint_t" >&5 echo "${ECHO_T}$cf_cv_wint_t" >&6 if test "$cf_cv_wint_t" = yes ; then @@ -15115,10 +15400,10 @@ fi if test "$NCURSES_OK_MBSTATE_T" = 0 ; then -echo "$as_me:15118: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:15403: checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type mbstate_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 15121 "configure" +#line 15406 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -15136,16 +15421,16 @@ mbstate_t foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15139: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15424: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15142: \$? = $ac_status" >&5 + echo "$as_me:15427: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15145: \"$ac_try\"") >&5 + { (eval echo "$as_me:15430: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15148: \$? = $ac_status" >&5 + echo "$as_me:15433: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -15154,7 +15439,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:15157: result: $cf_result" >&5 +echo "$as_me:15442: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -15176,10 +15461,10 @@ fi if test "$NCURSES_OK_WCHAR_T" = 0 ; then -echo "$as_me:15179: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:15464: checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type wchar_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 15182 "configure" +#line 15467 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -15197,16 +15482,16 @@ wchar_t foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15200: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15485: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15203: \$? = $ac_status" >&5 + echo "$as_me:15488: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15206: \"$ac_try\"") >&5 + { (eval echo "$as_me:15491: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15209: \$? = $ac_status" >&5 + echo "$as_me:15494: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -15215,7 +15500,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:15218: result: $cf_result" >&5 +echo "$as_me:15503: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -15237,10 +15522,10 @@ fi if test "$NCURSES_OK_WINT_T" = 0 ; then -echo "$as_me:15240: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:15525: checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for type wint_t in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 15243 "configure" +#line 15528 "configure" #include "confdefs.h" #ifndef _XOPEN_SOURCE_EXTENDED @@ -15258,16 +15543,16 @@ wint_t foo } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15261: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15546: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15264: \$? = $ac_status" >&5 + echo "$as_me:15549: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15267: \"$ac_try\"") >&5 + { (eval echo "$as_me:15552: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15270: \$? = $ac_status" >&5 + echo "$as_me:15555: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -15276,7 +15561,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:15279: result: $cf_result" >&5 +echo "$as_me:15564: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -15297,11 +15582,11 @@ fi fi fi -echo "$as_me:15300: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:15585: checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for data boolnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 15304 "configure" +#line 15589 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -15329,16 +15614,16 @@ void *foo = &(boolnames) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15332: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15617: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15335: \$? = $ac_status" >&5 + echo "$as_me:15620: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15338: \"$ac_try\"") >&5 + { (eval echo "$as_me:15623: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15341: \$? = $ac_status" >&5 + echo "$as_me:15626: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -15347,7 +15632,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:15350: result: $cf_result" >&5 +echo "$as_me:15635: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -15359,14 +15644,14 @@ cf_result=`echo "have_curses_data_boolnames" | sed y%abcdefghijklmnopqrstuvwxyz. EOF else - echo "$as_me:15362: checking for data boolnames in library" >&5 + echo "$as_me:15647: checking for data boolnames in library" >&5 echo $ECHO_N "checking for data boolnames in library... $ECHO_C" >&6 # BSD linkers insist on making weak linkage, but resolve at runtime. if test "$cross_compiling" = yes; then # cross-compiling cat >conftest.$ac_ext <<_ACEOF -#line 15369 "configure" +#line 15654 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -15399,16 +15684,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15402: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15687: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15405: \$? = $ac_status" >&5 + echo "$as_me:15690: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15408: \"$ac_try\"") >&5 + { (eval echo "$as_me:15693: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15411: \$? = $ac_status" >&5 + echo "$as_me:15696: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -15420,7 +15705,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 15423 "configure" +#line 15708 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -15446,15 +15731,15 @@ int main(void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15449: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15734: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15452: \$? = $ac_status" >&5 + echo "$as_me:15737: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15454: \"$ac_try\"") >&5 + { (eval echo "$as_me:15739: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15457: \$? = $ac_status" >&5 + echo "$as_me:15742: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -15465,7 +15750,7 @@ cf_result=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:15468: result: $cf_result" >&5 + echo "$as_me:15753: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -15478,11 +15763,11 @@ EOF fi fi -echo "$as_me:15481: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 +echo "$as_me:15766: checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}" >&5 echo $ECHO_N "checking for data boolfnames declaration in ${cf_cv_ncurses_header:-curses.h}... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 15485 "configure" +#line 15770 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -15510,16 +15795,16 @@ void *foo = &(boolfnames) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15513: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15798: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15516: \$? = $ac_status" >&5 + echo "$as_me:15801: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15519: \"$ac_try\"") >&5 + { (eval echo "$as_me:15804: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15522: \$? = $ac_status" >&5 + echo "$as_me:15807: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -15528,7 +15813,7 @@ cat conftest.$ac_ext >&5 cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext -echo "$as_me:15531: result: $cf_result" >&5 +echo "$as_me:15816: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -15540,14 +15825,14 @@ cf_result=`echo "have_curses_data_boolfnames" | sed y%abcdefghijklmnopqrstuvwxyz EOF else - echo "$as_me:15543: checking for data boolfnames in library" >&5 + echo "$as_me:15828: checking for data boolfnames in library" >&5 echo $ECHO_N "checking for data boolfnames in library... $ECHO_C" >&6 # BSD linkers insist on making weak linkage, but resolve at runtime. if test "$cross_compiling" = yes; then # cross-compiling cat >conftest.$ac_ext <<_ACEOF -#line 15550 "configure" +#line 15835 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -15580,16 +15865,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15583: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15868: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15586: \$? = $ac_status" >&5 + echo "$as_me:15871: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15589: \"$ac_try\"") >&5 + { (eval echo "$as_me:15874: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15592: \$? = $ac_status" >&5 + echo "$as_me:15877: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -15601,7 +15886,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else cat >conftest.$ac_ext <<_ACEOF -#line 15604 "configure" +#line 15889 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -15627,15 +15912,15 @@ int main(void) } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:15630: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15915: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15633: \$? = $ac_status" >&5 + echo "$as_me:15918: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:15635: \"$ac_try\"") >&5 + { (eval echo "$as_me:15920: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15638: \$? = $ac_status" >&5 + echo "$as_me:15923: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -15646,7 +15931,7 @@ cf_result=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:15649: result: $cf_result" >&5 + echo "$as_me:15934: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test $cf_result = yes ; then @@ -15661,7 +15946,7 @@ fi if ( test "$GCC" = yes || test "$GXX" = yes ) then -echo "$as_me:15664: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:15949: 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. @@ -15678,7 +15963,7 @@ else with_warnings=no fi; -echo "$as_me:15681: result: $with_warnings" >&5 +echo "$as_me:15966: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "$with_warnings" = "yes" then @@ -15701,10 +15986,10 @@ cat > conftest.i <&5 + { echo "$as_me:15989: 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:16041: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15759: \$? = $ac_status" >&5 + echo "$as_me:16044: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:15761: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:16046: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in @@ -15822,12 +16107,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in (linux*|gnu*) - echo "$as_me:15825: checking if this is really Intel C compiler" >&5 + echo "$as_me:16110: 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 15830 "configure" +#line 16115 "configure" #include "confdefs.h" int @@ -15844,16 +16129,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15847: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16132: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15850: \$? = $ac_status" >&5 + echo "$as_me:16135: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15853: \"$ac_try\"") >&5 + { (eval echo "$as_me:16138: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15856: \$? = $ac_status" >&5 + echo "$as_me:16141: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -15864,7 +16149,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:15867: result: $INTEL_COMPILER" >&5 + echo "$as_me:16152: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -15873,12 +16158,12 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:15876: checking if this is really Clang C compiler" >&5 + echo "$as_me:16161: checking if this is really Clang C compiler" >&5 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Qunused-arguments" cat >conftest.$ac_ext <<_ACEOF -#line 15881 "configure" +#line 16166 "configure" #include "confdefs.h" int @@ -15895,16 +16180,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15898: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:16183: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15901: \$? = $ac_status" >&5 + echo "$as_me:16186: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15904: \"$ac_try\"") >&5 + { (eval echo "$as_me:16189: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15907: \$? = $ac_status" >&5 + echo "$as_me:16192: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CLANG_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" @@ -15915,12 +16200,12 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:15918: result: $CLANG_COMPILER" >&5 + echo "$as_me:16203: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi cat > conftest.$ac_ext <&5 + { echo "$as_me:16225: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -15953,12 +16238,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:15956: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:16241: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15959: \$? = $ac_status" >&5 + echo "$as_me:16244: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:15961: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:16246: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -15967,7 +16252,7 @@ echo "${ECHO_T}... -$cf_opt" >&6 elif test "$GCC" = yes then - { echo "$as_me:15970: checking for $CC warning options..." >&5 + { echo "$as_me:16255: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS= @@ -15991,12 +16276,12 @@ echo "$as_me: checking for $CC warning options..." >&6;} Wundef $cf_gcc_warnings $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:15994: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:16279: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15997: \$? = $ac_status" >&5 + echo "$as_me:16282: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:15999: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:16284: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in (Wcast-qual) @@ -16007,7 +16292,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}:16010: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:16295: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -16017,7 +16302,7 @@ echo "${as_me:-configure}:16010: testing feature is broken in gcc $GCC_VERSION . ([12].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:16020: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:16305: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -16033,7 +16318,7 @@ rm -rf conftest* fi fi -echo "$as_me:16036: checking if you want to use dmalloc for testing" >&5 +echo "$as_me:16321: 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. @@ -16050,7 +16335,7 @@ EOF else with_dmalloc= fi; -echo "$as_me:16053: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:16338: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case .$with_cflags in @@ -16144,23 +16429,23 @@ fi esac if test "$with_dmalloc" = yes ; then - echo "$as_me:16147: checking for dmalloc.h" >&5 + echo "$as_me:16432: 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 16153 "configure" +#line 16438 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:16157: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16442: \"$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:16163: \$? = $ac_status" >&5 + echo "$as_me:16448: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16179,11 +16464,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:16182: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:16467: 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:16186: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:16471: 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 @@ -16191,7 +16476,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16194 "configure" +#line 16479 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16210,16 +16495,16 @@ dmalloc_debug (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16213: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16498: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16216: \$? = $ac_status" >&5 + echo "$as_me:16501: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16219: \"$ac_try\"") >&5 + { (eval echo "$as_me:16504: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16222: \$? = $ac_status" >&5 + echo "$as_me:16507: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -16230,7 +16515,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16233: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:16518: 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:16533: 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. @@ -16262,7 +16547,7 @@ EOF else with_dbmalloc= fi; -echo "$as_me:16265: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:16550: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case .$with_cflags in @@ -16356,23 +16641,23 @@ fi esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:16359: checking for dbmalloc.h" >&5 + echo "$as_me:16644: 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 16365 "configure" +#line 16650 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:16369: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:16654: \"$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:16375: \$? = $ac_status" >&5 + echo "$as_me:16660: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -16391,11 +16676,11 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:16394: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:16679: 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:16398: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:16683: 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 @@ -16403,7 +16688,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16406 "configure" +#line 16691 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16422,16 +16707,16 @@ debug_malloc (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16425: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16710: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16428: \$? = $ac_status" >&5 + echo "$as_me:16713: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16431: \"$ac_try\"") >&5 + { (eval echo "$as_me:16716: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16434: \$? = $ac_status" >&5 + echo "$as_me:16719: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -16442,7 +16727,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16445: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:16730: 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:16745: 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. @@ -16474,7 +16759,7 @@ EOF else with_valgrind= fi; -echo "$as_me:16477: result: ${with_valgrind:-no}" >&5 +echo "$as_me:16762: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case .$with_cflags in @@ -16567,7 +16852,7 @@ fi ;; esac -echo "$as_me:16570: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:16855: 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. @@ -16577,7 +16862,7 @@ if test "${enable_leaks+set}" = set; then else : ${with_no_leaks:=no} fi; -echo "$as_me:16580: result: $with_no_leaks" >&5 +echo "$as_me:16865: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "$with_no_leaks" = yes ; then @@ -16593,7 +16878,7 @@ EOF fi LD_RPATH_OPT= -echo "$as_me:16596: checking for an rpath option" >&5 +echo "$as_me:16881: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case $cf_cv_system_name in (irix*) @@ -16624,12 +16909,12 @@ case $cf_cv_system_name in (*) ;; esac -echo "$as_me:16627: result: $LD_RPATH_OPT" >&5 +echo "$as_me:16912: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:16632: checking if we need a space after rpath option" >&5 + echo "$as_me:16917: checking if we need a space after rpath option" >&5 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -16650,7 +16935,7 @@ done LIBS="$cf_add_libs" cat >conftest.$ac_ext <<_ACEOF -#line 16653 "configure" +#line 16938 "configure" #include "confdefs.h" int @@ -16662,16 +16947,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16665: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16950: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16668: \$? = $ac_status" >&5 + echo "$as_me:16953: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16671: \"$ac_try\"") >&5 + { (eval echo "$as_me:16956: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16674: \$? = $ac_status" >&5 + echo "$as_me:16959: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_space=no else @@ -16681,13 +16966,13 @@ cf_rpath_space=yes fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:16684: result: $cf_rpath_space" >&5 + echo "$as_me:16969: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; esac -echo "$as_me:16690: checking if rpath-hack should be disabled" >&5 +echo "$as_me:16975: checking if rpath-hack should be disabled" >&5 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6 # Check whether --enable-rpath-hack or --disable-rpath-hack was given. @@ -16704,21 +16989,21 @@ else cf_disable_rpath_hack=no fi; -echo "$as_me:16707: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:16992: result: $cf_disable_rpath_hack" >&5 echo "${ECHO_T}$cf_disable_rpath_hack" >&6 if test "$cf_disable_rpath_hack" = no ; then -echo "$as_me:16711: checking for updated LDFLAGS" >&5 +echo "$as_me:16996: checking for updated LDFLAGS" >&5 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 if test -n "$LD_RPATH_OPT" ; then - echo "$as_me:16714: result: maybe" >&5 + echo "$as_me:16999: result: maybe" >&5 echo "${ECHO_T}maybe" >&6 for ac_prog in ldd 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:16721: checking for $ac_word" >&5 +echo "$as_me:17006: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16733,7 +17018,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_cf_ldd_prog="$ac_prog" -echo "$as_me:16736: found $ac_dir/$ac_word" >&5 +echo "$as_me:17021: found $ac_dir/$ac_word" >&5 break done @@ -16741,10 +17026,10 @@ fi fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:16744: result: $cf_ldd_prog" >&5 + echo "$as_me:17029: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:16747: result: no" >&5 + echo "$as_me:17032: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -16758,7 +17043,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no" cf_rpath_oops= cat >conftest.$ac_ext <<_ACEOF -#line 16761 "configure" +#line 17046 "configure" #include "confdefs.h" #include int @@ -16770,16 +17055,16 @@ printf("Hello"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16773: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17058: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16776: \$? = $ac_status" >&5 + echo "$as_me:17061: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16779: \"$ac_try\"") >&5 + { (eval echo "$as_me:17064: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16782: \$? = $ac_status" >&5 + echo "$as_me:17067: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq` cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` @@ -16807,7 +17092,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext then test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 -echo "${as_me:-configure}:16810: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:17095: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -16819,11 +17104,11 @@ echo "${as_me:-configure}:16810: testing ...adding -L$cf_rpath_dir/lib to LDFLAG test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:16822: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:17107: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:16826: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:17111: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS @@ -16860,7 +17145,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:16863: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:17148: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -16873,11 +17158,11 @@ LDFLAGS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:16876: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:17161: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:16880: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:17165: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS @@ -16914,7 +17199,7 @@ do then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:16917: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:17202: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -16927,14 +17212,14 @@ LIBS=$cf_rpath_dst test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:16930: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:17215: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:16934: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:17219: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 else - echo "$as_me:16937: result: no" >&5 + echo "$as_me:17222: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -17024,7 +17309,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:17027: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:17312: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -17200,7 +17485,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:17203: error: ambiguous option: $1 + { { echo "$as_me:17488: 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;} @@ -17219,7 +17504,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:17222: error: unrecognized option: $1 + -*) { { echo "$as_me:17507: 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;} @@ -17269,7 +17554,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ncurses_cfg.h:ncurses_tst.hin" ;; - *) { { echo "$as_me:17272: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:17557: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -17542,7 +17827,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:17545: creating $ac_file" >&5 + { echo "$as_me:17830: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -17560,7 +17845,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:17563: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:17848: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -17573,7 +17858,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:17576: error: cannot find input file: $f" >&5 + { { echo "$as_me:17861: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -17589,7 +17874,7 @@ cat >>$CONFIG_STATUS <<\EOF if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' $ac_item` if test -z "$ac_used"; then - { echo "$as_me:17592: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:17877: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&2;} @@ -17598,7 +17883,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:17601: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:17886: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&2;} @@ -17635,7 +17920,7 @@ s,@INSTALL@,$ac_INSTALL,;t t ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:17638: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:17923: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&5 echo "$as_me: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&2;} @@ -17646,7 +17931,7 @@ $ac_seen" >&2;} egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out if test -s $tmp/out; then ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` - { echo "$as_me:17649: WARNING: Some variables may not be substituted: + { echo "$as_me:17934: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -17695,7 +17980,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:17698: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:17983: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -17706,7 +17991,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:17709: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:17994: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -17719,7 +18004,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:17722: error: cannot find input file: $f" >&5 + { { echo "$as_me:18007: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -17777,7 +18062,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:17780: $ac_file is unchanged" >&5 + { echo "$as_me:18065: $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/test/configure.in b/test/configure.in index 6b3478ed..dca87a56 100644 --- a/test/configure.in +++ b/test/configure.in @@ -28,7 +28,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1996, etc. dnl -dnl $Id: configure.in,v 1.119 2015/04/18 18:11:16 tom Exp $ +dnl $Id: configure.in,v 1.122 2015/04/25 11:39:47 tom Exp $ dnl This is a simple configuration-script for the ncurses test programs that dnl allows the test-directory to be separately configured against a reference dnl system (i.e., sysvr4 curses) @@ -122,13 +122,13 @@ CF_HELP_MESSAGE(Curses Version-dependent Options:) CF_WITH_NCURSES_ETC case $cf_cv_screen in +(ncurses*) + cf_cv_libtype=`echo "$cf_cv_screen" | sed -e 's/^ncurses//'` + ;; (curses|curses_*) CF_NETBSD_FORM_H CF_NETBSD_MENU_H ;; -(ncursesw) - cf_cv_libtype=w - ;; esac dnl If we've not specified a library, assume we're using sysvr4 libraries @@ -141,12 +141,9 @@ case $cf_cv_screen in ;; (*) # look for curses-related libraries - : ${cf_panel_lib:=panel} - : ${cf_menu_lib:=menu} - : ${cf_form_lib:=form} - AC_CHECK_LIB($cf_panel_lib$cf_cv_libtype,new_panel) - AC_CHECK_LIB($cf_menu_lib$cf_cv_libtype,menu_driver) - AC_CHECK_LIB($cf_form_lib$cf_cv_libtype,form_driver) + CF_CHECK_CURSES_LIB(panel,$cf_cv_libtype,new_panel) + CF_CHECK_CURSES_LIB(menu,$cf_cv_libtype,menu_driver) + CF_CHECK_CURSES_LIB(form,$cf_cv_libtype,form_driver) # look for curses-related headers AC_CHECK_HEADERS( \ diff --git a/test/package/debian/rules b/test/package/debian/rules index 4d4146b8..8079b193 100644 --- a/test/package/debian/rules +++ b/test/package/debian/rules @@ -32,7 +32,7 @@ configure-stamp: --build=$(DEB_BUILD_GNU_TYPE) \ --bindir=\$${prefix}/bin/ncurses-examples \ --prefix=/usr \ - --with-ncursesw \ + --with-screen=ncursesw6 \ --disable-rpath-hack touch configure-stamp diff --git a/test/package/ncurses-examples.spec b/test/package/ncurses-examples.spec index 8a016780..d552b818 100644 --- a/test/package/ncurses-examples.spec +++ b/test/package/ncurses-examples.spec @@ -2,7 +2,7 @@ Summary: ncurses-examples - example/test programs from ncurses %define AppProgram ncurses-examples %define AppVersion MAJOR.MINOR %define AppRelease YYYYMMDD -# $Id: ncurses-examples.spec,v 1.3 2013/10/05 23:44:19 tom Exp $ +# $Id: ncurses-examples.spec,v 1.5 2015/04/25 10:55:22 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: %{AppRelease} @@ -29,7 +29,7 @@ INSTALL_PROGRAM='${INSTALL}' \ --target %{_target_platform} \ --prefix=%{_prefix} \ --bindir=%{_bindir}/%{AppProgram} \ - --with-ncursesw \ + --with-screen=ncursesw6 \ --disable-rpath-hack make