diff -Nru vile-9.8v/aclocal.m4 vile-9.8w/aclocal.m4 --- vile-9.8v/aclocal.m4 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/aclocal.m4 2022-08-22 05:11:05.000000000 +0000 @@ -1,7 +1,7 @@ -dnl $Id: aclocal.m4,v 1.351 2021/11/25 22:10:54 tom Exp $ +dnl $Id: aclocal.m4,v 1.353 2022/08/21 17:11:58 tom Exp $ dnl --------------------------------------------------------------------------- dnl -dnl Copyright 1996-2020,2021 by Thomas E. Dickey +dnl Copyright 1996-2021,2022 by Thomas E. Dickey dnl dnl All Rights Reserved dnl @@ -1977,7 +1977,7 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FIX_WARNINGS version: 3 updated: 2020/12/31 18:40:20 +dnl CF_FIX_WARNINGS version: 4 updated: 2021/12/16 18:22:31 dnl --------------- dnl Warning flags do not belong in CFLAGS, CPPFLAGS, etc. Any of gcc's dnl "-Werror" flags can interfere with configure-checks. Those go into @@ -1989,11 +1989,13 @@ then case [$]$1 in (*-Werror=*) - CF_VERBOSE(repairing $1: [$]$1) cf_temp_flags= for cf_temp_scan in [$]$1 do case "x$cf_temp_scan" in + (x-Werror=format*) + CF_APPEND_TEXT(cf_temp_flags,$cf_temp_scan) + ;; (x-Werror=*) CF_APPEND_TEXT(EXTRA_CFLAGS,$cf_temp_scan) ;; @@ -2002,9 +2004,13 @@ ;; esac done - $1="$cf_temp_flags" - CF_VERBOSE(... fixed [$]$1) - CF_VERBOSE(... extra $EXTRA_CFLAGS) + if test "x[$]$1" != "x$cf_temp_flags" + then + CF_VERBOSE(repairing $1: [$]$1) + $1="$cf_temp_flags" + CF_VERBOSE(... fixed [$]$1) + CF_VERBOSE(... extra $EXTRA_CFLAGS) + fi ;; esac fi @@ -4329,7 +4335,7 @@ AC_SUBST(NROFF_NOTE) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_LINT version: 4 updated: 2019/11/20 18:55:37 +dnl CF_PROG_LINT version: 5 updated: 2022/08/20 15:44:13 dnl ------------ AC_DEFUN([CF_PROG_LINT], [ @@ -4340,6 +4346,7 @@ ;; esac AC_SUBST(LINT_OPTS) +AC_SUBST(LINT_LIBS) ])dnl dnl --------------------------------------------------------------------------- dnl CF_PROG_PERL version: 6 updated: 2020/12/31 20:19:42 @@ -5767,7 +5774,7 @@ AC_SUBST(ICON_NAME) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_IMAKE_CFLAGS version: 10 updated: 2015/04/12 15:39:00 +dnl CF_WITH_IMAKE_CFLAGS version: 12 updated: 2022/02/24 17:10:03 dnl -------------------- dnl xterm and similar programs build more readily when propped up with imake's dnl hand-tuned definitions. If we do not use imake, provide fallbacks for the @@ -5836,6 +5843,23 @@ ;; esac + # "modern" systems install X applications in /usr/bin. Other systems may + # use one of the X release-based directories. + case "$CFLAGS $CPPFLAGS $IMAKE_CFLAGS" in + (*-DPROJECTROOT*) + ;; + (*) + for cf_dir in /usr/X11R7 /usr/X11R6 /usr/X11R5 + do + if test -d "$cf_dir/bin" + then + IMAKE_CFLAGS="$IMAKE_CFLAGS -DPROJECTROOT=\\\"$cf_dir\\\"" + break + fi + done + ;; + esac + CF_ADD_CFLAGS($IMAKE_CFLAGS) AC_SUBST(IMAKE_CFLAGS) diff -Nru vile-9.8v/basic.c vile-9.8w/basic.c --- vile-9.8v/basic.c 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/basic.c 2022-08-22 05:11:05.000000000 +0000 @@ -5,7 +5,7 @@ * functions that adjust the top line in the window and invalidate the * framing, are hard. * - * $Id: basic.c,v 1.178 2020/08/30 23:47:37 tom Exp $ + * $Id: basic.c,v 1.179 2022/08/04 21:19:27 tom Exp $ * */ @@ -1085,7 +1085,7 @@ } #if OPT_MULTIBYTE else if (b_is_utfXX(curbp)) { - if (vl_conv_to_utf8((UCHAR *) 0, (UINT) c, (B_COUNT) 10) > 1) + if (vl_conv_to_utf8((UCHAR *) 0, (UINT) c, (B_COUNT) MAX_UTF8) > 1) rc = col + COLS_UTF8; /* "\uXXXX" */ } #endif diff -Nru vile-9.8v/CHANGES vile-9.8w/CHANGES --- vile-9.8v/CHANGES 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/CHANGES 2022-08-22 05:11:05.000000000 +0000 @@ -1,5 +1,35 @@ Changes for vile 9.9 (released ??? ??? ?? ????) + 20220821 (w) + > Brendan O'Dea: + + the font specification in /etc/X11/app-defaults/UXVile was being + overridden by the one in XVile. Additionally update the xvile font + to use the Latin-1 equivalent (9x18 instead of 8x13). + + apply memory-leak fix from pl-filt.c in 9.8v to pl6filt.c + + rename perl6mode and corresponding syntax filter to "raku" (report by + Steve Lembark). + + update suffix-list for rakumode. + > Tom Dickey: + + portability-fixes for plink.sh + + fixes for regexp.c: + + build-fix for test_regexp + + add parentheses in non-multibyte is_CLASS() macro to correct a + problem with pointer expressions. + + add I/i toggle in test_regexp to exercise ignorecase. + + revise change for lins_chars() to handle UTF-8 in scripts, as that + interfered with normal insertions (report by Chris Green). + + fix a check in vile-manfilt, to ensure that stepping into previous + lines does not use flushed/discarded rows. + + build-fix for perl 5.36 (Debian #1014289) + + modify error-message from vile-manfilt to show the program name. + + fix a state-transition in sh-filt.l, which left some text uncolored + (report by Wayne Cuddy). + + add markdown mode (mdmode). + + update copyright dates + + update package/freebsd/* + + fix some issues found with Coverity. + + fix a few compiler-warnings. + 20211212 (v) > Lois Mansot + corrected range for &random function. diff -Nru vile-9.8v/configure vile-9.8w/configure --- vile-9.8v/configure 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/configure 2022-08-22 05:11:05.000000000 +0000 @@ -13735,6 +13735,23 @@ ;; esac + # "modern" systems install X applications in /usr/bin. Other systems may + # use one of the X release-based directories. + case "$CFLAGS $CPPFLAGS $IMAKE_CFLAGS" in + (*-DPROJECTROOT*) + ;; + (*) + for cf_dir in /usr/X11R7 /usr/X11R6 /usr/X11R5 + do + if test -d "$cf_dir/bin" + then + IMAKE_CFLAGS="$IMAKE_CFLAGS -DPROJECTROOT=\\\"$cf_dir\\\"" + break + fi + done + ;; + esac + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -13840,7 +13857,7 @@ test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:13843: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:13860: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -13925,7 +13942,7 @@ if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:13928: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:13945: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -13935,7 +13952,7 @@ if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:13938: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:13955: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -13945,7 +13962,7 @@ 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}:13948: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:13965: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -13954,7 +13971,7 @@ if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 13957 "configure" +#line 13974 "configure" #include "confdefs.h" #include int @@ -13966,16 +13983,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:13969: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13986: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13972: \$? = $ac_status" >&5 + echo "$as_me:13989: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:13975: \"$ac_try\"") >&5 + { (eval echo "$as_me:13992: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13978: \$? = $ac_status" >&5 + echo "$as_me:13995: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -13983,12 +14000,12 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:13986: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:14003: 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}:13991: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:14008: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_cflags" @@ -14001,7 +14018,7 @@ X11_FONT=x11 X11_SETS=plain - echo "$as_me:14004: checking if you want to use FreeType library" >&5 + echo "$as_me:14021: checking if you want to use FreeType library" >&5 echo $ECHO_N "checking if you want to use FreeType library... $ECHO_C" >&6 # Check whether --enable-freetype or --disable-freetype was given. @@ -14018,7 +14035,7 @@ enable_freetype=no fi; - echo "$as_me:14021: result: $enable_freetype" >&5 + echo "$as_me:14038: result: $enable_freetype" >&5 echo "${ECHO_T}$enable_freetype" >&6 if test "$enable_freetype" = yes ; then @@ -14028,7 +14045,7 @@ FREETYPE_CONFIG=none FREETYPE_PARAMS= -echo "$as_me:14031: checking for FreeType configuration script" >&5 +echo "$as_me:14048: checking for FreeType configuration script" >&5 echo $ECHO_N "checking for FreeType configuration script... $ECHO_C" >&6 # Check whether --with-freetype-config or --without-freetype-config was given. @@ -14040,12 +14057,12 @@ fi; test -z $cf_cv_x_freetype_cfgs && cf_cv_x_freetype_cfgs=auto test $cf_cv_x_freetype_cfgs = no && cf_cv_x_freetype_cfgs=none -echo "$as_me:14043: result: $cf_cv_x_freetype_cfgs" >&5 +echo "$as_me:14060: result: $cf_cv_x_freetype_cfgs" >&5 echo "${ECHO_T}$cf_cv_x_freetype_cfgs" >&6 case $cf_cv_x_freetype_cfgs in (none) - echo "$as_me:14048: checking if you specified -D/-I options for FreeType" >&5 + echo "$as_me:14065: checking if you specified -D/-I options for FreeType" >&5 echo $ECHO_N "checking if you specified -D/-I options for FreeType... $ECHO_C" >&6 # Check whether --with-freetype-cflags or --without-freetype-cflags was given. @@ -14055,10 +14072,10 @@ else cf_cv_x_freetype_incs=no fi; - echo "$as_me:14058: result: $cf_cv_x_freetype_incs" >&5 + echo "$as_me:14075: result: $cf_cv_x_freetype_incs" >&5 echo "${ECHO_T}$cf_cv_x_freetype_incs" >&6 - echo "$as_me:14061: checking if you specified -L/-l options for FreeType" >&5 + echo "$as_me:14078: checking if you specified -L/-l options for FreeType" >&5 echo $ECHO_N "checking if you specified -L/-l options for FreeType... $ECHO_C" >&6 # Check whether --with-freetype-libs or --without-freetype-libs was given. @@ -14068,7 +14085,7 @@ else cf_cv_x_freetype_libs=no fi; - echo "$as_me:14071: result: $cf_cv_x_freetype_libs" >&5 + echo "$as_me:14088: result: $cf_cv_x_freetype_libs" >&5 echo "${ECHO_T}$cf_cv_x_freetype_libs" >&6 ;; (auto) @@ -14078,7 +14095,7 @@ else # Extract the first word of "freetype-config", so it can be a program name with args. set dummy freetype-config; ac_word=$2 -echo "$as_me:14081: checking for $ac_word" >&5 +echo "$as_me:14098: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FREETYPE_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14095,7 +14112,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_FREETYPE_CONFIG="$ac_dir/$ac_word" - echo "$as_me:14098: found $ac_dir/$ac_word" >&5 + echo "$as_me:14115: found $ac_dir/$ac_word" >&5 break fi done @@ -14107,10 +14124,10 @@ FREETYPE_CONFIG=$ac_cv_path_FREETYPE_CONFIG if test -n "$FREETYPE_CONFIG"; then - echo "$as_me:14110: result: $FREETYPE_CONFIG" >&5 + echo "$as_me:14127: result: $FREETYPE_CONFIG" >&5 echo "${ECHO_T}$FREETYPE_CONFIG" >&6 else - echo "$as_me:14113: result: no" >&5 + echo "$as_me:14130: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -14120,7 +14137,7 @@ else # Extract the first word of "xft-config", so it can be a program name with args. set dummy xft-config; ac_word=$2 -echo "$as_me:14123: checking for $ac_word" >&5 +echo "$as_me:14140: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FREETYPE_OLD_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14137,7 +14154,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_FREETYPE_OLD_CONFIG="$ac_dir/$ac_word" - echo "$as_me:14140: found $ac_dir/$ac_word" >&5 + echo "$as_me:14157: found $ac_dir/$ac_word" >&5 break fi done @@ -14149,10 +14166,10 @@ FREETYPE_OLD_CONFIG=$ac_cv_path_FREETYPE_OLD_CONFIG if test -n "$FREETYPE_OLD_CONFIG"; then - echo "$as_me:14152: result: $FREETYPE_OLD_CONFIG" >&5 + echo "$as_me:14169: result: $FREETYPE_OLD_CONFIG" >&5 echo "${ECHO_T}$FREETYPE_OLD_CONFIG" >&6 else - echo "$as_me:14155: result: no" >&5 + echo "$as_me:14172: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -14167,14 +14184,14 @@ FREETYPE_CONFIG=$cf_cv_x_freetype_cfgs FREETYPE_PARAMS=xft else - { echo "$as_me:14170: WARNING: cannot find pkg-config for Xft" >&5 + { echo "$as_me:14187: WARNING: cannot find pkg-config for Xft" >&5 echo "$as_me: WARNING: cannot find pkg-config for Xft" >&2;} fi ;; (*) # Extract the first word of "$cf_cv_x_freetype_cfgs", so it can be a program name with args. set dummy $cf_cv_x_freetype_cfgs; ac_word=$2 -echo "$as_me:14177: checking for $ac_word" >&5 +echo "$as_me:14194: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FREETYPE_XFT_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14191,7 +14208,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_FREETYPE_XFT_CONFIG="$ac_dir/$ac_word" - echo "$as_me:14194: found $ac_dir/$ac_word" >&5 + echo "$as_me:14211: found $ac_dir/$ac_word" >&5 break fi done @@ -14203,41 +14220,41 @@ FREETYPE_XFT_CONFIG=$ac_cv_path_FREETYPE_XFT_CONFIG if test -n "$FREETYPE_XFT_CONFIG"; then - echo "$as_me:14206: result: $FREETYPE_XFT_CONFIG" >&5 + echo "$as_me:14223: result: $FREETYPE_XFT_CONFIG" >&5 echo "${ECHO_T}$FREETYPE_XFT_CONFIG" >&6 else - echo "$as_me:14209: result: no" >&5 + echo "$as_me:14226: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$FREETYPE_XFT_CONFIG" != none; then FREETYPE_CONFIG=$FREETYPE_XFT_CONFIG else - { echo "$as_me:14216: WARNING: cannot find config script for Xft" >&5 + { echo "$as_me:14233: WARNING: cannot find config script for Xft" >&5 echo "$as_me: WARNING: cannot find config script for Xft" >&2;} fi ;; esac if test "$FREETYPE_CONFIG" != none ; then - echo "$as_me:14223: checking for FreeType config" >&5 + echo "$as_me:14240: checking for FreeType config" >&5 echo $ECHO_N "checking for FreeType config... $ECHO_C" >&6 - echo "$as_me:14225: result: $FREETYPE_CONFIG $FREETYPE_PARAMS" >&5 + echo "$as_me:14242: result: $FREETYPE_CONFIG $FREETYPE_PARAMS" >&5 echo "${ECHO_T}$FREETYPE_CONFIG $FREETYPE_PARAMS" >&6 if test "$cf_cv_x_freetype_incs" = no ; then - echo "$as_me:14229: checking for $FREETYPE_CONFIG cflags" >&5 + echo "$as_me:14246: checking for $FREETYPE_CONFIG cflags" >&5 echo $ECHO_N "checking for $FREETYPE_CONFIG cflags... $ECHO_C" >&6 cf_cv_x_freetype_incs="`$FREETYPE_CONFIG $FREETYPE_PARAMS --cflags 2>/dev/null`" - echo "$as_me:14232: result: $cf_cv_x_freetype_incs" >&5 + echo "$as_me:14249: result: $cf_cv_x_freetype_incs" >&5 echo "${ECHO_T}$cf_cv_x_freetype_incs" >&6 fi if test "$cf_cv_x_freetype_libs" = no ; then - echo "$as_me:14237: checking for $FREETYPE_CONFIG libs" >&5 + echo "$as_me:14254: checking for $FREETYPE_CONFIG libs" >&5 echo $ECHO_N "checking for $FREETYPE_CONFIG libs... $ECHO_C" >&6 cf_cv_x_freetype_libs="$cf_extra_freetype_libs `$FREETYPE_CONFIG $FREETYPE_PARAMS --libs 2>/dev/null`" - echo "$as_me:14240: result: $cf_cv_x_freetype_libs" >&5 + echo "$as_me:14257: result: $cf_cv_x_freetype_libs" >&5 echo "${ECHO_T}$cf_cv_x_freetype_libs" >&6 fi fi @@ -14250,7 +14267,7 @@ cf_cv_x_freetype_libs=-lXft fi -echo "$as_me:14253: checking if we can link with FreeType libraries" >&5 +echo "$as_me:14270: checking if we can link with FreeType libraries" >&5 echo $ECHO_N "checking if we can link with FreeType libraries... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -14275,7 +14292,7 @@ CPPFLAGS="$CPPFLAGS $cf_cv_x_freetype_incs" cat >"conftest.$ac_ext" <<_ACEOF -#line 14278 "configure" +#line 14295 "configure" #include "confdefs.h" #include @@ -14291,16 +14308,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14294: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14311: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14297: \$? = $ac_status" >&5 + echo "$as_me:14314: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14300: \"$ac_try\"") >&5 + { (eval echo "$as_me:14317: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14303: \$? = $ac_status" >&5 + echo "$as_me:14320: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_found_freetype=yes else @@ -14309,7 +14326,7 @@ cf_cv_found_freetype=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -echo "$as_me:14312: result: $cf_cv_found_freetype" >&5 +echo "$as_me:14329: result: $cf_cv_found_freetype" >&5 echo "${ECHO_T}$cf_cv_found_freetype" >&6 LIBS="$cf_save_LIBS" @@ -14442,13 +14459,13 @@ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:14445: checking for $ac_func" >&5 +echo "$as_me:14462: 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 14451 "configure" +#line 14468 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -14479,16 +14496,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14482: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14499: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14485: \$? = $ac_status" >&5 + echo "$as_me:14502: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14488: \"$ac_try\"") >&5 + { (eval echo "$as_me:14505: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14491: \$? = $ac_status" >&5 + echo "$as_me:14508: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -14498,7 +14515,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:14501: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:14518: 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:14529: WARNING: No libraries found for FreeType" >&5 echo "$as_me: WARNING: No libraries found for FreeType" >&2;} CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//` fi @@ -14517,14 +14534,14 @@ # FIXME: revisit this if needed if test "$cf_cv_found_freetype" = yes ; then -echo "$as_me:14520: checking for usable Xft/fontconfig package" >&5 +echo "$as_me:14537: checking for usable Xft/fontconfig package" >&5 echo $ECHO_N "checking for usable Xft/fontconfig package... $ECHO_C" >&6 if test "${cf_cv_xft_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 14527 "configure" +#line 14544 "configure" #include "confdefs.h" #include @@ -14543,16 +14560,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14546: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14563: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14549: \$? = $ac_status" >&5 + echo "$as_me:14566: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14552: \"$ac_try\"") >&5 + { (eval echo "$as_me:14569: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14555: \$? = $ac_status" >&5 + echo "$as_me:14572: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xft_compat=yes else @@ -14563,7 +14580,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:14566: result: $cf_cv_xft_compat" >&5 +echo "$as_me:14583: result: $cf_cv_xft_compat" >&5 echo "${ECHO_T}$cf_cv_xft_compat" >&6 if test "$cf_cv_xft_compat" = no @@ -14575,24 +14592,24 @@ (*) test -n "$verbose" && echo " work around broken package" 1>&6 -echo "${as_me:-configure}:14578: testing work around broken package ..." 1>&5 +echo "${as_me:-configure}:14595: testing work around broken package ..." 1>&5 cf_save_fontconfig="$LIBS" if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "fontconfig"; then test -n "$verbose" && echo " found package fontconfig" 1>&6 -echo "${as_me:-configure}:14585: testing found package fontconfig ..." 1>&5 +echo "${as_me:-configure}:14602: testing found package fontconfig ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags "fontconfig" 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs "fontconfig" 2>/dev/null`" test -n "$verbose" && echo " package fontconfig CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14591: testing package fontconfig CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14608: testing package fontconfig CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package fontconfig LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14595: testing package fontconfig LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14612: testing package fontconfig LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -14810,12 +14827,12 @@ test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:14813: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:14830: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXft %-lXft $cf_pkgconfig_libs %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:14818: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:14835: testing ...after $LIBS ..." 1>&5 else cf_pkgconfig_incs= @@ -14823,12 +14840,12 @@ test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:14826: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:14843: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXft %-lXft -lfontconfig %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:14831: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:14848: testing ...after $LIBS ..." 1>&5 fi @@ -14840,7 +14857,7 @@ X11_FONT=xft fi - echo "$as_me:14843: checking if you want to use fontsets" >&5 + echo "$as_me:14860: checking if you want to use fontsets" >&5 echo $ECHO_N "checking if you want to use fontsets... $ECHO_C" >&6 # Check whether --enable-fontsets or --disable-fontsets was given. @@ -14857,7 +14874,7 @@ enable_fontsets=no fi; - echo "$as_me:14860: result: $enable_fontsets" >&5 + echo "$as_me:14877: result: $enable_fontsets" >&5 echo "${ECHO_T}$enable_fontsets" >&6 if test "$enable_fontsets" = yes ; then X11_SETS=fancy @@ -14876,23 +14893,23 @@ for ac_header in X11/IntrinsicI.h X11/Xpoll.h X11/Xmu/Atoms.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:14879: checking for $ac_header" >&5 +echo "$as_me:14896: 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 14885 "configure" +#line 14902 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:14889: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:14906: \"$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:14895: \$? = $ac_status" >&5 + echo "$as_me:14912: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14911,7 +14928,7 @@ fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:14914: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:14931: 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:14944: 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 14933 "configure" +#line 14950 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -14961,16 +14978,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:14964: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14981: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14967: \$? = $ac_status" >&5 + echo "$as_me:14984: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:14970: \"$ac_try\"") >&5 + { (eval echo "$as_me:14987: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14973: \$? = $ac_status" >&5 + echo "$as_me:14990: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -14980,7 +14997,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:14983: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:15000: 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:15024: 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 15013 "configure" +#line 15030 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:15017: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:15034: \"$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:15023: \$? = $ac_status" >&5 + echo "$as_me:15040: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -15039,7 +15056,7 @@ fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:15042: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:15059: 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:15069: checking for regcmp in -lgen" >&5 echo $ECHO_N "checking for regcmp in -lgen... $ECHO_C" >&6 if test "${ac_cv_lib_gen_regcmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15057,7 +15074,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgen $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15060 "configure" +#line 15077 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15076,16 +15093,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15079: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15096: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15082: \$? = $ac_status" >&5 + echo "$as_me:15099: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15085: \"$ac_try\"") >&5 + { (eval echo "$as_me:15102: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15088: \$? = $ac_status" >&5 + echo "$as_me:15105: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gen_regcmp=yes else @@ -15096,7 +15113,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15099: result: $ac_cv_lib_gen_regcmp" >&5 +echo "$as_me:15116: result: $ac_cv_lib_gen_regcmp" >&5 echo "${ECHO_T}$ac_cv_lib_gen_regcmp" >&6 if test "$ac_cv_lib_gen_regcmp" = yes; then cat >>confdefs.h <&5 +echo "$as_me:15127: checking for XmuClientWindow in -lXmu" >&5 echo $ECHO_N "checking for XmuClientWindow in -lXmu... $ECHO_C" >&6 if test "${ac_cv_lib_Xmu_XmuClientWindow+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15115,7 +15132,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXmu $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15118 "configure" +#line 15135 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15134,16 +15151,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15137: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15154: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15140: \$? = $ac_status" >&5 + echo "$as_me:15157: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15143: \"$ac_try\"") >&5 + { (eval echo "$as_me:15160: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15146: \$? = $ac_status" >&5 + echo "$as_me:15163: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Xmu_XmuClientWindow=yes else @@ -15154,7 +15171,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15157: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5 +echo "$as_me:15174: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5 echo "${ECHO_T}$ac_cv_lib_Xmu_XmuClientWindow" >&6 if test "$ac_cv_lib_Xmu_XmuClientWindow" = yes; then cat >>confdefs.h <&5 +echo "$as_me:15185: checking for XpStartDoc in -lXp" >&5 echo $ECHO_N "checking for XpStartDoc in -lXp... $ECHO_C" >&6 if test "${ac_cv_lib_Xp_XpStartDoc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15173,7 +15190,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXp $LIBS $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15176 "configure" +#line 15193 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15192,16 +15209,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15195: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15212: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15198: \$? = $ac_status" >&5 + echo "$as_me:15215: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15201: \"$ac_try\"") >&5 + { (eval echo "$as_me:15218: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15204: \$? = $ac_status" >&5 + echo "$as_me:15221: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Xp_XpStartDoc=yes else @@ -15212,7 +15229,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15215: result: $ac_cv_lib_Xp_XpStartDoc" >&5 +echo "$as_me:15232: result: $ac_cv_lib_Xp_XpStartDoc" >&5 echo "${ECHO_T}$ac_cv_lib_Xp_XpStartDoc" >&6 if test "$ac_cv_lib_Xp_XpStartDoc" = yes; then cat >>confdefs.h <&5 +echo "$as_me:15243: 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 @@ -15231,7 +15248,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15234 "configure" +#line 15251 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15250,16 +15267,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15253: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15270: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15256: \$? = $ac_status" >&5 + echo "$as_me:15273: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15259: \"$ac_try\"") >&5 + { (eval echo "$as_me:15276: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15262: \$? = $ac_status" >&5 + echo "$as_me:15279: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Xext_XextCreateExtension=yes else @@ -15270,13 +15287,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15273: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "$as_me:15290: 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 LIBS="-lXext $LIBS" fi -echo "$as_me:15279: checking for XpmCreatePixmapFromXpmImage in -lXpm" >&5 +echo "$as_me:15296: checking for XpmCreatePixmapFromXpmImage in -lXpm" >&5 echo $ECHO_N "checking for XpmCreatePixmapFromXpmImage in -lXpm... $ECHO_C" >&6 if test "${ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15284,7 +15301,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXpm $LIBS $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15287 "configure" +#line 15304 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15303,16 +15320,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15306: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15323: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15309: \$? = $ac_status" >&5 + echo "$as_me:15326: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15312: \"$ac_try\"") >&5 + { (eval echo "$as_me:15329: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15315: \$? = $ac_status" >&5 + echo "$as_me:15332: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage=yes else @@ -15323,13 +15340,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15326: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage" >&5 +echo "$as_me:15343: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage" >&5 echo "${ECHO_T}$ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage" >&6 if test "$ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage" = yes; then LIBS="-lXpm $LIBS" fi -echo "$as_me:15332: checking for XmbTextListToTextProperty in -lXIM" >&5 +echo "$as_me:15349: checking for XmbTextListToTextProperty in -lXIM" >&5 echo $ECHO_N "checking for XmbTextListToTextProperty in -lXIM... $ECHO_C" >&6 if test "${ac_cv_lib_XIM_XmbTextListToTextProperty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15337,7 +15354,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXIM $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15340 "configure" +#line 15357 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15356,16 +15373,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15359: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15376: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15362: \$? = $ac_status" >&5 + echo "$as_me:15379: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15365: \"$ac_try\"") >&5 + { (eval echo "$as_me:15382: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15368: \$? = $ac_status" >&5 + echo "$as_me:15385: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_XIM_XmbTextListToTextProperty=yes else @@ -15376,7 +15393,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15379: result: $ac_cv_lib_XIM_XmbTextListToTextProperty" >&5 +echo "$as_me:15396: result: $ac_cv_lib_XIM_XmbTextListToTextProperty" >&5 echo "${ECHO_T}$ac_cv_lib_XIM_XmbTextListToTextProperty" >&6 if test "$ac_cv_lib_XIM_XmbTextListToTextProperty" = yes; then cat >>confdefs.h <&5 +echo "$as_me:15406: checking for XmProcessTraversal in -lXm" >&5 echo $ECHO_N "checking for XmProcessTraversal in -lXm... $ECHO_C" >&6 if test "${ac_cv_lib_Xm_XmProcessTraversal+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15394,7 +15411,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXm $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 15397 "configure" +#line 15414 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15413,16 +15430,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15416: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15433: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15419: \$? = $ac_status" >&5 + echo "$as_me:15436: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15422: \"$ac_try\"") >&5 + { (eval echo "$as_me:15439: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15425: \$? = $ac_status" >&5 + echo "$as_me:15442: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Xm_XmProcessTraversal=yes else @@ -15433,12 +15450,12 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15436: result: $ac_cv_lib_Xm_XmProcessTraversal" >&5 +echo "$as_me:15453: result: $ac_cv_lib_Xm_XmProcessTraversal" >&5 echo "${ECHO_T}$ac_cv_lib_Xm_XmProcessTraversal" >&6 if test "$ac_cv_lib_Xm_XmProcessTraversal" = yes; then LIBS="-lXm $LIBS" else - { { echo "$as_me:15441: error: Unable to successfully link Motif library (-lXm) with test program" >&5 + { { echo "$as_me:15458: error: Unable to successfully link Motif library (-lXm) with test program" >&5 echo "$as_me: error: Unable to successfully link Motif library (-lXm) with test program" >&2;} { (exit 1); exit 1; }; } fi @@ -15460,7 +15477,7 @@ cf_x_athena=${cf_x_athena:-Xaw} -echo "$as_me:15463: checking if you want to link with Xaw 3d library" >&5 +echo "$as_me:15480: 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= @@ -15471,14 +15488,14 @@ fi; if test "$withval" = yes ; then cf_x_athena=Xaw3d - echo "$as_me:15474: result: yes" >&5 + echo "$as_me:15491: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:15477: result: no" >&5 + echo "$as_me:15494: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:15481: checking if you want to link with Xaw 3d xft library" >&5 +echo "$as_me:15498: 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= @@ -15489,14 +15506,14 @@ fi; if test "$withval" = yes ; then cf_x_athena=Xaw3dxft - echo "$as_me:15492: result: yes" >&5 + echo "$as_me:15509: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:15495: result: no" >&5 + echo "$as_me:15512: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:15499: checking if you want to link with neXT Athena library" >&5 +echo "$as_me:15516: 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= @@ -15507,14 +15524,14 @@ fi; if test "$withval" = yes ; then cf_x_athena=neXtaw - echo "$as_me:15510: result: yes" >&5 + echo "$as_me:15527: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:15513: result: no" >&5 + echo "$as_me:15530: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:15517: checking if you want to link with Athena-Plus library" >&5 +echo "$as_me:15534: 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= @@ -15525,10 +15542,10 @@ fi; if test "$withval" = yes ; then cf_x_athena=XawPlus - echo "$as_me:15528: result: yes" >&5 + echo "$as_me:15545: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:15531: result: no" >&5 + echo "$as_me:15548: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -15548,17 +15565,17 @@ 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}:15551: testing found package $cf_athena_pkg ..." 1>&5 +echo "${as_me:-configure}:15568: 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}:15557: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15574: 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}:15561: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15578: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -15689,20 +15706,20 @@ 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}:15692: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:15709: testing ..trimmed $LIBS ..." 1>&5 ;; esac done -echo "$as_me:15698: checking for usable $cf_x_athena/Xmu package" >&5 +echo "$as_me:15715: 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 15705 "configure" +#line 15722 "configure" #include "confdefs.h" #include @@ -15719,16 +15736,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:15722: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15739: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15725: \$? = $ac_status" >&5 + echo "$as_me:15742: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:15728: \"$ac_try\"") >&5 + { (eval echo "$as_me:15745: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15731: \$? = $ac_status" >&5 + echo "$as_me:15748: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xaw_compat=yes else @@ -15738,7 +15755,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:15741: result: $cf_cv_xaw_compat" >&5 +echo "$as_me:15758: result: $cf_cv_xaw_compat" >&5 echo "${ECHO_T}$cf_cv_xaw_compat" >&6 if test "$cf_cv_xaw_compat" = no @@ -15750,7 +15767,7 @@ (*) test -n "$verbose" && echo " work around broken package" 1>&6 -echo "${as_me:-configure}:15753: testing work around broken package ..." 1>&5 +echo "${as_me:-configure}:15770: testing work around broken package ..." 1>&5 cf_save_xmu="$LIBS" cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^ *//' -e 's/ .*//'` @@ -15758,17 +15775,17 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xmu"; then test -n "$verbose" && echo " found package xmu" 1>&6 -echo "${as_me:-configure}:15761: testing found package xmu ..." 1>&5 +echo "${as_me:-configure}:15778: 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}:15767: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15784: 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}:15771: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15788: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -15888,12 +15905,12 @@ test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:15891: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:15908: 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}:15896: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:15913: testing ...after $LIBS ..." 1>&5 else cf_pkgconfig_incs= @@ -15901,12 +15918,12 @@ test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:15904: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:15921: 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}:15909: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:15926: testing ...after $LIBS ..." 1>&5 fi @@ -15917,7 +15934,7 @@ 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}:15920: testing ..trimmed $LIBS ..." 1>&5 +echo "${as_me:-configure}:15937: testing ..trimmed $LIBS ..." 1>&5 ;; esac @@ -15942,17 +15959,17 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "Xext"; then test -n "$verbose" && echo " found package Xext" 1>&6 -echo "${as_me:-configure}:15945: testing found package Xext ..." 1>&5 +echo "${as_me:-configure}:15962: 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}:15951: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15968: 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}:15955: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15972: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -16073,7 +16090,7 @@ cf_pkgconfig_incs= cf_pkgconfig_libs= - echo "$as_me:16076: checking for XextCreateExtension in -lXext" >&5 + echo "$as_me:16093: 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 @@ -16081,7 +16098,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 16084 "configure" +#line 16101 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16100,16 +16117,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16103: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16120: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16106: \$? = $ac_status" >&5 + echo "$as_me:16123: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16109: \"$ac_try\"") >&5 + { (eval echo "$as_me:16126: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16112: \$? = $ac_status" >&5 + echo "$as_me:16129: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Xext_XextCreateExtension=yes else @@ -16120,7 +16137,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16123: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "$as_me:16140: 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 @@ -16156,17 +16173,17 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "x11"; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:16159: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:16176: 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}:16165: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:16182: 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}:16169: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:16186: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -16286,24 +16303,24 @@ else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:16289: WARNING: unable to find X11 library" >&5 + { echo "$as_me:16306: 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}:16296: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:16313: 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}:16302: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:16319: 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}:16306: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:16323: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -16423,24 +16440,24 @@ else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:16426: WARNING: unable to find ICE library" >&5 + { echo "$as_me:16443: 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}:16433: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:16450: 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}:16439: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:16456: 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}:16443: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:16460: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -16560,24 +16577,24 @@ else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:16563: WARNING: unable to find SM library" >&5 + { echo "$as_me:16580: 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}:16570: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:16587: 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}:16576: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:16593: 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}:16580: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:16597: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -16697,7 +16714,7 @@ else cf_pkgconfig_incs= cf_pkgconfig_libs= - { echo "$as_me:16700: WARNING: unable to find Xt library" >&5 + { echo "$as_me:16717: WARNING: unable to find Xt library" >&5 echo "$as_me: WARNING: unable to find Xt library" >&2;} fi @@ -16710,17 +16727,17 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "xt"; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:16713: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:16730: 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}:16719: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:16736: 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}:16723: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:16740: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -16841,14 +16858,14 @@ ;; (*) # we have an "xt" package, but it may omit Xt's dependency on X11 -echo "$as_me:16844: checking for usable X dependency" >&5 +echo "$as_me:16861: 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 16851 "configure" +#line 16868 "configure" #include "confdefs.h" #include @@ -16867,16 +16884,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:16870: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16887: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16873: \$? = $ac_status" >&5 + echo "$as_me:16890: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:16876: \"$ac_try\"") >&5 + { (eval echo "$as_me:16893: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16879: \$? = $ac_status" >&5 + echo "$as_me:16896: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xt_x11_compat=yes else @@ -16886,30 +16903,30 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:16889: result: $cf_cv_xt_x11_compat" >&5 +echo "$as_me:16906: 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}:16895: testing work around broken X11 dependency ..." 1>&5 +echo "${as_me:-configure}:16912: 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}:16902: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:16919: 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}:16908: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:16925: 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}:16912: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:16929: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -17032,12 +17049,12 @@ test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:17035: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:17052: 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}:17040: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:17057: testing ...after $LIBS ..." 1>&5 fi @@ -17045,14 +17062,14 @@ ;; esac -echo "$as_me:17048: checking for usable X Toolkit package" >&5 +echo "$as_me:17065: 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 17055 "configure" +#line 17072 "configure" #include "confdefs.h" #include @@ -17067,16 +17084,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17070: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17087: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17073: \$? = $ac_status" >&5 + echo "$as_me:17090: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17076: \"$ac_try\"") >&5 + { (eval echo "$as_me:17093: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17079: \$? = $ac_status" >&5 + echo "$as_me:17096: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_xt_ice_compat=yes else @@ -17086,7 +17103,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:17089: result: $cf_cv_xt_ice_compat" >&5 +echo "$as_me:17106: result: $cf_cv_xt_ice_compat" >&5 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 if test "$cf_cv_xt_ice_compat" = no @@ -17100,22 +17117,22 @@ (*) test -n "$verbose" && echo " work around broken ICE dependency" 1>&6 -echo "${as_me:-configure}:17103: testing work around broken ICE dependency ..." 1>&5 +echo "${as_me:-configure}:17120: 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}:17108: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:17125: 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}:17114: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:17131: 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}:17118: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:17135: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -17234,17 +17251,17 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "sm"; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:17237: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:17254: 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}:17243: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:17260: 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}:17247: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:17264: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -17373,12 +17390,12 @@ test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:17376: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:17393: 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}:17381: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:17398: testing ...after $LIBS ..." 1>&5 fi @@ -17398,7 +17415,7 @@ test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:17401: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17418: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -17483,7 +17500,7 @@ if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:17486: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:17503: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 test -n "$CFLAGS" && CFLAGS="$CFLAGS " CFLAGS="${CFLAGS}$cf_new_cflags" @@ -17493,7 +17510,7 @@ if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:17496: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:17513: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}$cf_new_cppflags" @@ -17503,7 +17520,7 @@ 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}:17506: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:17523: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS " EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags" @@ -17512,7 +17529,7 @@ if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat >"conftest.$ac_ext" <<_ACEOF -#line 17515 "configure" +#line 17532 "configure" #include "confdefs.h" #include int @@ -17524,16 +17541,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17527: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17544: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17530: \$? = $ac_status" >&5 + echo "$as_me:17547: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17533: \"$ac_try\"") >&5 + { (eval echo "$as_me:17550: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17536: \$? = $ac_status" >&5 + echo "$as_me:17553: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -17541,12 +17558,12 @@ cat "conftest.$ac_ext" >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:17544: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:17561: 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}:17549: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:17566: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_cflags" @@ -17554,13 +17571,13 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi - echo "$as_me:17557: checking for XOpenDisplay" >&5 + echo "$as_me:17574: 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 17563 "configure" +#line 17580 "configure" #include "confdefs.h" #define XOpenDisplay autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -17591,16 +17608,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17594: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17611: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17597: \$? = $ac_status" >&5 + echo "$as_me:17614: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17600: \"$ac_try\"") >&5 + { (eval echo "$as_me:17617: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17603: \$? = $ac_status" >&5 + echo "$as_me:17620: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_XOpenDisplay=yes else @@ -17610,13 +17627,13 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:17613: result: $ac_cv_func_XOpenDisplay" >&5 +echo "$as_me:17630: 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:17619: checking for XOpenDisplay in -lX11" >&5 + echo "$as_me:17636: 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 @@ -17624,7 +17641,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 17627 "configure" +#line 17644 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17643,16 +17660,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17646: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17663: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17649: \$? = $ac_status" >&5 + echo "$as_me:17666: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17652: \"$ac_try\"") >&5 + { (eval echo "$as_me:17669: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17655: \$? = $ac_status" >&5 + echo "$as_me:17672: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -17663,7 +17680,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17666: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:17683: 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 @@ -17687,13 +17704,13 @@ fi - echo "$as_me:17690: checking for XtAppInitialize" >&5 + echo "$as_me:17707: 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 17696 "configure" +#line 17713 "configure" #include "confdefs.h" #define XtAppInitialize autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -17724,16 +17741,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17727: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17744: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17730: \$? = $ac_status" >&5 + echo "$as_me:17747: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17733: \"$ac_try\"") >&5 + { (eval echo "$as_me:17750: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17736: \$? = $ac_status" >&5 + echo "$as_me:17753: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_XtAppInitialize=yes else @@ -17743,13 +17760,13 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:17746: result: $ac_cv_func_XtAppInitialize" >&5 +echo "$as_me:17763: 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:17752: checking for XtAppInitialize in -lXt" >&5 + echo "$as_me:17769: 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 @@ -17757,7 +17774,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 17760 "configure" +#line 17777 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -17776,16 +17793,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17779: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17796: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17782: \$? = $ac_status" >&5 + echo "$as_me:17799: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:17785: \"$ac_try\"") >&5 + { (eval echo "$as_me:17802: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17788: \$? = $ac_status" >&5 + echo "$as_me:17805: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Xt_XtAppInitialize=yes else @@ -17796,7 +17813,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:17799: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 +echo "$as_me:17816: 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 @@ -17813,7 +17830,7 @@ fi if test "$cf_have_X_LIBS" = no ; then - { echo "$as_me:17816: WARNING: Unable to successfully link X Toolkit library (-lXt) with + { echo "$as_me:17833: 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 @@ -17854,14 +17871,14 @@ test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS " CPPFLAGS="${CPPFLAGS}-I$cf_path/include" - echo "$as_me:17857: checking for $cf_test in $cf_path" >&5 + echo "$as_me:17874: 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:17860: checking for $cf_test" >&5 + echo "$as_me:17877: checking for $cf_test" >&5 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 fi cat >"conftest.$ac_ext" <<_ACEOF -#line 17864 "configure" +#line 17881 "configure" #include "confdefs.h" #include @@ -17875,16 +17892,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:17878: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17895: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17881: \$? = $ac_status" >&5 + echo "$as_me:17898: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:17884: \"$ac_try\"") >&5 + { (eval echo "$as_me:17901: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17887: \$? = $ac_status" >&5 + echo "$as_me:17904: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -17893,7 +17910,7 @@ cf_result=no fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" - echo "$as_me:17896: result: $cf_result" >&5 + echo "$as_me:17913: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS" @@ -17909,7 +17926,7 @@ done if test -z "$cf_x_athena_inc" ; then - { echo "$as_me:17912: WARNING: Unable to find Athena header files" >&5 + { echo "$as_me:17929: WARNING: Unable to find Athena header files" >&5 echo "$as_me: WARNING: Unable to find Athena header files" >&2;} elif test "$cf_x_athena_inc" != default ; then @@ -17974,10 +17991,10 @@ done LIBS="$cf_add_libs" - echo "$as_me:17977: checking for $cf_test in $cf_libs" >&5 + echo "$as_me:17994: checking for $cf_test in $cf_libs" >&5 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 17980 "configure" +#line 17997 "configure" #include "confdefs.h" #include @@ -17993,16 +18010,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:17996: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18013: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17999: \$? = $ac_status" >&5 + echo "$as_me:18016: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18002: \"$ac_try\"") >&5 + { (eval echo "$as_me:18019: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18005: \$? = $ac_status" >&5 + echo "$as_me:18022: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -18011,7 +18028,7 @@ cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:18014: result: $cf_result" >&5 + echo "$as_me:18031: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS" @@ -18028,7 +18045,7 @@ done if test -z "$cf_x_athena_lib" ; then - { { echo "$as_me:18031: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 + { { echo "$as_me:18048: 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 @@ -18085,7 +18102,7 @@ #define DISP_CURSES 1 EOF -echo "$as_me:18088: checking for extra include directories" >&5 +echo "$as_me:18105: 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 @@ -18111,7 +18128,7 @@ esac fi -echo "$as_me:18114: result: $cf_cv_curses_incdir" >&5 +echo "$as_me:18131: result: $cf_cv_curses_incdir" >&5 echo "${ECHO_T}$cf_cv_curses_incdir" >&6 if test "$cf_cv_curses_incdir" != no then @@ -18121,7 +18138,7 @@ fi -echo "$as_me:18124: checking if we have identified curses headers" >&5 +echo "$as_me:18141: 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 @@ -18133,7 +18150,7 @@ curses.h ncurses/ncurses.h ncurses/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 18136 "configure" +#line 18153 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -18145,16 +18162,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18148: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18165: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18151: \$? = $ac_status" >&5 + echo "$as_me:18168: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18154: \"$ac_try\"") >&5 + { (eval echo "$as_me:18171: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18157: \$? = $ac_status" >&5 + echo "$as_me:18174: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -18165,11 +18182,11 @@ done fi -echo "$as_me:18168: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:18185: 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:18172: error: No curses header-files found" >&5 + { { echo "$as_me:18189: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -18179,23 +18196,23 @@ for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:18182: checking for $ac_header" >&5 +echo "$as_me:18199: 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 18188 "configure" +#line 18205 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:18192: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:18209: \"$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:18198: \$? = $ac_status" >&5 + echo "$as_me:18215: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -18214,7 +18231,7 @@ fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:18217: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:18234: 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:18244: 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 @@ -18242,7 +18259,7 @@ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 18245 "configure" +#line 18262 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -18257,16 +18274,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:18260: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:18277: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:18263: \$? = $ac_status" >&5 + echo "$as_me:18280: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:18266: \"$ac_try\"") >&5 + { (eval echo "$as_me:18283: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18269: \$? = $ac_status" >&5 + echo "$as_me:18286: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -18282,7 +18299,7 @@ done fi -echo "$as_me:18285: result: $cf_cv_term_header" >&5 +echo "$as_me:18302: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -18314,7 +18331,7 @@ ;; esac -echo "$as_me:18317: checking for ncurses version" >&5 +echo "$as_me:18334: 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 @@ -18340,10 +18357,10 @@ #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:18343: \"$cf_try\"") >&5 + { (eval echo "$as_me:18360: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:18346: \$? = $ac_status" >&5 + echo "$as_me:18363: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -18353,7 +18370,7 @@ else cat >"conftest.$ac_ext" <<_ACEOF -#line 18356 "configure" +#line 18373 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -18378,15 +18395,15 @@ } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:18381: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18398: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18384: \$? = $ac_status" >&5 + echo "$as_me:18401: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:18386: \"$ac_try\"") >&5 + { (eval echo "$as_me:18403: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18389: \$? = $ac_status" >&5 + echo "$as_me:18406: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -18400,17 +18417,17 @@ rm -f "$cf_tempfile" fi -echo "$as_me:18403: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:18420: 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:18410: checking if we have identified curses libraries" >&5 +echo "$as_me:18427: 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 18413 "configure" +#line 18430 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -18422,16 +18439,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18425: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18442: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18428: \$? = $ac_status" >&5 + echo "$as_me:18445: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18431: \"$ac_try\"") >&5 + { (eval echo "$as_me:18448: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18434: \$? = $ac_status" >&5 + echo "$as_me:18451: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -18440,13 +18457,13 @@ cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" -echo "$as_me:18443: result: $cf_result" >&5 +echo "$as_me:18460: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then case "$host_os" in (freebsd*) - echo "$as_me:18449: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:18466: 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 @@ -18454,7 +18471,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 18457 "configure" +#line 18474 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18473,16 +18490,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18476: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18493: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18479: \$? = $ac_status" >&5 + echo "$as_me:18496: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18482: \"$ac_try\"") >&5 + { (eval echo "$as_me:18499: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18485: \$? = $ac_status" >&5 + echo "$as_me:18502: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -18493,7 +18510,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18496: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:18513: 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 @@ -18523,7 +18540,7 @@ # term.h) for cur_colr if test "x$cf_cv_screen" = "xcurses_colr" then - echo "$as_me:18526: checking for initscr in -lcur_colr" >&5 + echo "$as_me:18543: 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 @@ -18531,7 +18548,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lcur_colr $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 18534 "configure" +#line 18551 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18550,16 +18567,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18553: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18570: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18556: \$? = $ac_status" >&5 + echo "$as_me:18573: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18559: \"$ac_try\"") >&5 + { (eval echo "$as_me:18576: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18562: \$? = $ac_status" >&5 + echo "$as_me:18579: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_cur_colr_initscr=yes else @@ -18570,7 +18587,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18573: result: $ac_cv_lib_cur_colr_initscr" >&5 +echo "$as_me:18590: 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 @@ -18594,7 +18611,7 @@ else - echo "$as_me:18597: checking for initscr in -lHcurses" >&5 + echo "$as_me:18614: 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 @@ -18602,7 +18619,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lHcurses $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 18605 "configure" +#line 18622 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18621,16 +18638,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18624: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18641: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18627: \$? = $ac_status" >&5 + echo "$as_me:18644: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18630: \"$ac_try\"") >&5 + { (eval echo "$as_me:18647: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18633: \$? = $ac_status" >&5 + echo "$as_me:18650: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Hcurses_initscr=yes else @@ -18641,7 +18658,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18644: result: $ac_cv_lib_Hcurses_initscr" >&5 +echo "$as_me:18661: 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 @@ -18699,7 +18716,7 @@ if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:18702: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:18719: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -18728,7 +18745,7 @@ if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:18731: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:18748: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -18759,7 +18776,7 @@ if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:18762: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:18779: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -18794,7 +18811,7 @@ if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:18797: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:18814: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -18838,13 +18855,13 @@ # because it may be needed to link the test-case for initscr. if test "x$cf_term_lib" = x then - echo "$as_me:18841: checking for tgoto" >&5 + echo "$as_me:18858: 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 18847 "configure" +#line 18864 "configure" #include "confdefs.h" #define tgoto autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -18875,16 +18892,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18878: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18895: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18881: \$? = $ac_status" >&5 + echo "$as_me:18898: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18884: \"$ac_try\"") >&5 + { (eval echo "$as_me:18901: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18887: \$? = $ac_status" >&5 + echo "$as_me:18904: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_tgoto=yes else @@ -18894,7 +18911,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:18897: result: $ac_cv_func_tgoto" >&5 +echo "$as_me:18914: 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 @@ -18903,7 +18920,7 @@ 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:18906: checking for tgoto in -l$cf_term_lib" >&5 +echo "$as_me:18923: 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 @@ -18911,7 +18928,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_term_lib $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 18914 "configure" +#line 18931 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -18930,16 +18947,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18933: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18950: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18936: \$? = $ac_status" >&5 + echo "$as_me:18953: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18939: \"$ac_try\"") >&5 + { (eval echo "$as_me:18956: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:18942: \$? = $ac_status" >&5 + echo "$as_me:18959: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_Lib=yes" else @@ -18950,7 +18967,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:18953: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5 +echo "$as_me:18970: 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 @@ -18973,10 +18990,10 @@ do LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown || test "$cf_term_lib" = "$cf_curs_lib" ; then - echo "$as_me:18976: checking if we can link with $cf_curs_lib library" >&5 + echo "$as_me:18993: 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 18979 "configure" +#line 18996 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -18988,16 +19005,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:18991: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19008: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:18994: \$? = $ac_status" >&5 + echo "$as_me:19011: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:18997: \"$ac_try\"") >&5 + { (eval echo "$as_me:19014: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19000: \$? = $ac_status" >&5 + echo "$as_me:19017: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -19006,16 +19023,16 @@ cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:19009: result: $cf_result" >&5 + echo "$as_me:19026: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test "$cf_result" = yes && break elif test "$cf_curs_lib" = "$cf_term_lib" ; then cf_result=no elif test "$cf_term_lib" != predefined ; then - echo "$as_me:19015: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 + echo "$as_me:19032: 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 19018 "configure" +#line 19035 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -19027,16 +19044,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19030: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19047: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19033: \$? = $ac_status" >&5 + echo "$as_me:19050: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19036: \"$ac_try\"") >&5 + { (eval echo "$as_me:19053: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19039: \$? = $ac_status" >&5 + echo "$as_me:19056: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=no else @@ -19045,7 +19062,7 @@ LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19048 "configure" +#line 19065 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -19057,16 +19074,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19060: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19077: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19063: \$? = $ac_status" >&5 + echo "$as_me:19080: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19066: \"$ac_try\"") >&5 + { (eval echo "$as_me:19083: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19069: \$? = $ac_status" >&5 + echo "$as_me:19086: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -19078,13 +19095,13 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:19081: result: $cf_result" >&5 + echo "$as_me:19098: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test "$cf_result" != error && break fi done fi - test "$cf_curs_lib" = unknown && { { echo "$as_me:19087: error: no curses library found" >&5 + test "$cf_curs_lib" = unknown && { { echo "$as_me:19104: error: no curses library found" >&5 echo "$as_me: error: no curses library found" >&2;} { (exit 1); exit 1; }; } fi @@ -19101,23 +19118,23 @@ for ac_header in wchar.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:19104: checking for $ac_header" >&5 +echo "$as_me:19121: 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 19110 "configure" +#line 19127 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:19114: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:19131: \"$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:19120: \$? = $ac_status" >&5 + echo "$as_me:19137: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -19136,7 +19153,7 @@ fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:19139: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:19156: 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:19166: 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 @@ -19154,7 +19171,7 @@ cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19157 "configure" +#line 19174 "configure" #include "confdefs.h" #include @@ -19172,16 +19189,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19175: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19192: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19178: \$? = $ac_status" >&5 + echo "$as_me:19195: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19181: \"$ac_try\"") >&5 + { (eval echo "$as_me:19198: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19184: \$? = $ac_status" >&5 + echo "$as_me:19201: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_utf8_lib=yes else @@ -19193,12 +19210,12 @@ cf_cv_header_path_utf8= cf_cv_library_path_utf8= -echo "${as_me:-configure}:19196: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:19213: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19201 "configure" +#line 19218 "configure" #include "confdefs.h" #include @@ -19211,16 +19228,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19214: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19231: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19217: \$? = $ac_status" >&5 + echo "$as_me:19234: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19220: \"$ac_try\"") >&5 + { (eval echo "$as_me:19237: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19223: \$? = $ac_status" >&5 + echo "$as_me:19240: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -19234,7 +19251,7 @@ LIBS="-lutf8 $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 19237 "configure" +#line 19254 "configure" #include "confdefs.h" #include @@ -19247,16 +19264,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19250: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19267: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19253: \$? = $ac_status" >&5 + echo "$as_me:19270: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19256: \"$ac_try\"") >&5 + { (eval echo "$as_me:19273: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19259: \$? = $ac_status" >&5 + echo "$as_me:19276: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_utf8=yes @@ -19273,9 +19290,9 @@ test -n "$verbose" && echo " find linkage for utf8 library" 1>&6 -echo "${as_me:-configure}:19276: testing find linkage for utf8 library ..." 1>&5 +echo "${as_me:-configure}:19293: testing find linkage for utf8 library ..." 1>&5 -echo "${as_me:-configure}:19278: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:19295: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -19366,7 +19383,7 @@ if test -d "$cf_cv_header_path_utf8" ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_utf8" 1>&6 -echo "${as_me:-configure}:19369: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:19386: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -19374,7 +19391,7 @@ CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8" cat >"conftest.$ac_ext" <<_ACEOF -#line 19377 "configure" +#line 19394 "configure" #include "confdefs.h" #include @@ -19387,21 +19404,21 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19390: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19407: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19393: \$? = $ac_status" >&5 + echo "$as_me:19410: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19396: \"$ac_try\"") >&5 + { (eval echo "$as_me:19413: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19399: \$? = $ac_status" >&5 + echo "$as_me:19416: \$? = $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}:19404: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:19421: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -19419,7 +19436,7 @@ if test "$cf_cv_find_linkage_utf8" = maybe ; then -echo "${as_me:-configure}:19422: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 +echo "${as_me:-configure}:19439: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -19494,13 +19511,13 @@ if test -d "$cf_cv_library_path_utf8" ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_utf8" 1>&6 -echo "${as_me:-configure}:19497: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:19514: 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 19503 "configure" +#line 19520 "configure" #include "confdefs.h" #include @@ -19513,21 +19530,21 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:19516: \"$ac_link\"") >&5 +if { (eval echo "$as_me:19533: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:19519: \$? = $ac_status" >&5 + echo "$as_me:19536: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:19522: \"$ac_try\"") >&5 + { (eval echo "$as_me:19539: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19525: \$? = $ac_status" >&5 + echo "$as_me:19542: \$? = $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}:19530: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 +echo "${as_me:-configure}:19547: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5 cf_cv_find_linkage_utf8=yes cf_cv_library_file_utf8="-lutf8" @@ -19569,7 +19586,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:19572: result: $cf_cv_utf8_lib" >&5 +echo "$as_me:19589: 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 @@ -19607,7 +19624,7 @@ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 19610 "configure" +#line 19627 "configure" #include "confdefs.h" #include int @@ -19619,16 +19636,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19622: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19639: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19625: \$? = $ac_status" >&5 + echo "$as_me:19642: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19628: \"$ac_try\"") >&5 + { (eval echo "$as_me:19645: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19631: \$? = $ac_status" >&5 + echo "$as_me:19648: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -19645,7 +19662,7 @@ if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:19648: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:19665: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -19681,7 +19698,7 @@ if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:19684: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:19701: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -19707,7 +19724,7 @@ fi -echo "$as_me:19710: checking for specific curses-directory" >&5 +echo "$as_me:19727: 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. @@ -19717,7 +19734,7 @@ else cf_cv_curses_dir=no fi; -echo "$as_me:19720: result: $cf_cv_curses_dir" >&5 +echo "$as_me:19737: 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" @@ -19748,7 +19765,7 @@ withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:19751: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:19768: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -19784,7 +19801,7 @@ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 19787 "configure" +#line 19804 "configure" #include "confdefs.h" #include int @@ -19796,16 +19813,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:19799: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:19816: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:19802: \$? = $ac_status" >&5 + echo "$as_me:19819: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:19805: \"$ac_try\"") >&5 + { (eval echo "$as_me:19822: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:19808: \$? = $ac_status" >&5 + echo "$as_me:19825: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -19822,7 +19839,7 @@ if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:19825: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:19842: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -19858,7 +19875,7 @@ if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:19861: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:19878: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -19873,13 +19890,13 @@ cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:19876: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:19893: 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:19879: result: yes" >&5 + echo "$as_me:19896: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:19882: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:19899: 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 @@ -20012,7 +20029,7 @@ LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 20015 "configure" +#line 20032 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -20024,37 +20041,37 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20027: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20044: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20030: \$? = $ac_status" >&5 + echo "$as_me:20047: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20033: \"$ac_try\"") >&5 + { (eval echo "$as_me:20050: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20036: \$? = $ac_status" >&5 + echo "$as_me:20053: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 20042 "configure" +#line 20059 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:20049: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20066: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20052: \$? = $ac_status" >&5 + echo "$as_me:20069: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:20054: \"$ac_try\"") >&5 + { (eval echo "$as_me:20071: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20057: \$? = $ac_status" >&5 + echo "$as_me:20074: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -20228,7 +20245,7 @@ LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 20231 "configure" +#line 20248 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -20240,37 +20257,37 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:20243: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20260: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20246: \$? = $ac_status" >&5 + echo "$as_me:20263: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:20249: \"$ac_try\"") >&5 + { (eval echo "$as_me:20266: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20252: \$? = $ac_status" >&5 + echo "$as_me:20269: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 20258 "configure" +#line 20275 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:20265: \"$ac_link\"") >&5 +if { (eval echo "$as_me:20282: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:20268: \$? = $ac_status" >&5 + echo "$as_me:20285: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:20270: \"$ac_try\"") >&5 + { (eval echo "$as_me:20287: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20273: \$? = $ac_status" >&5 + echo "$as_me:20290: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -20287,7 +20304,7 @@ cf_have_ncuconfig=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:20290: result: $cf_have_ncuconfig" >&5 + echo "$as_me:20307: result: $cf_have_ncuconfig" >&5 echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" @@ -20303,7 +20320,7 @@ NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:20306: checking for terminfo header" >&5 +echo "$as_me:20323: 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 @@ -20321,7 +20338,7 @@ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 20324 "configure" +#line 20341 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -20336,16 +20353,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20339: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20356: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20342: \$? = $ac_status" >&5 + echo "$as_me:20359: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20345: \"$ac_try\"") >&5 + { (eval echo "$as_me:20362: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20348: \$? = $ac_status" >&5 + echo "$as_me:20365: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -20361,7 +20378,7 @@ done fi -echo "$as_me:20364: result: $cf_cv_term_header" >&5 +echo "$as_me:20381: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -20396,7 +20413,7 @@ fi else - echo "$as_me:20399: result: no" >&5 + echo "$as_me:20416: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -20412,7 +20429,7 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:20415: checking for $ac_word" >&5 +echo "$as_me:20432: 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 @@ -20427,7 +20444,7 @@ 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:20430: found $ac_dir/$ac_word" >&5 +echo "$as_me:20447: found $ac_dir/$ac_word" >&5 break done @@ -20435,10 +20452,10 @@ fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:20438: result: $NCURSES_CONFIG" >&5 + echo "$as_me:20455: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:20441: result: no" >&5 + echo "$as_me:20458: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -20451,7 +20468,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:20454: checking for $ac_word" >&5 +echo "$as_me:20471: 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 @@ -20466,7 +20483,7 @@ 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:20469: found $ac_dir/$ac_word" >&5 +echo "$as_me:20486: found $ac_dir/$ac_word" >&5 break done @@ -20474,10 +20491,10 @@ fi ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:20477: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:20494: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:20480: result: no" >&5 + echo "$as_me:20497: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -20634,7 +20651,7 @@ # even with config script, some packages use no-override for curses.h -echo "$as_me:20637: checking if we have identified curses headers" >&5 +echo "$as_me:20654: 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 @@ -20646,7 +20663,7 @@ curses.h $screen/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 20649 "configure" +#line 20666 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -20658,16 +20675,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20661: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20678: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20664: \$? = $ac_status" >&5 + echo "$as_me:20681: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20667: \"$ac_try\"") >&5 + { (eval echo "$as_me:20684: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20670: \$? = $ac_status" >&5 + echo "$as_me:20687: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -20678,11 +20695,11 @@ done fi -echo "$as_me:20681: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:20698: 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:20685: error: No curses header-files found" >&5 + { { echo "$as_me:20702: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -20692,23 +20709,23 @@ for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:20695: checking for $ac_header" >&5 +echo "$as_me:20712: 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 20701 "configure" +#line 20718 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:20705: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:20722: \"$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:20711: \$? = $ac_status" >&5 + echo "$as_me:20728: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -20727,7 +20744,7 @@ fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:20730: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:20747: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF -#line 20786 "configure" +#line 20803 "configure" #include "confdefs.h" #include int @@ -20795,16 +20812,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20798: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20815: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20801: \$? = $ac_status" >&5 + echo "$as_me:20818: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20804: \"$ac_try\"") >&5 + { (eval echo "$as_me:20821: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20807: \$? = $ac_status" >&5 + echo "$as_me:20824: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -20821,7 +20838,7 @@ if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:20824: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:20841: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -20840,7 +20857,7 @@ } -echo "$as_me:20843: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:20860: 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 @@ -20852,7 +20869,7 @@ do cat >"conftest.$ac_ext" <<_ACEOF -#line 20855 "configure" +#line 20872 "configure" #include "confdefs.h" #include <$cf_header> @@ -20876,16 +20893,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:20879: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:20896: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:20882: \$? = $ac_status" >&5 + echo "$as_me:20899: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:20885: \"$ac_try\"") >&5 + { (eval echo "$as_me:20902: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:20888: \$? = $ac_status" >&5 + echo "$as_me:20905: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -20900,14 +20917,14 @@ done fi -echo "$as_me:20903: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:20920: 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:20910: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:20927: 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 @@ -21028,7 +21045,7 @@ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 21031 "configure" +#line 21048 "configure" #include "confdefs.h" #include int @@ -21040,16 +21057,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21043: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21060: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21046: \$? = $ac_status" >&5 + echo "$as_me:21063: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21049: \"$ac_try\"") >&5 + { (eval echo "$as_me:21066: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21052: \$? = $ac_status" >&5 + echo "$as_me:21069: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -21066,7 +21083,7 @@ if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:21069: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:21086: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -21089,7 +21106,7 @@ do cat >"conftest.$ac_ext" <<_ACEOF -#line 21092 "configure" +#line 21109 "configure" #include "confdefs.h" #include <$cf_header> @@ -21113,16 +21130,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21116: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21133: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21119: \$? = $ac_status" >&5 + echo "$as_me:21136: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21122: \"$ac_try\"") >&5 + { (eval echo "$as_me:21139: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21125: \$? = $ac_status" >&5 + echo "$as_me:21142: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -21143,12 +21160,12 @@ CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:21146: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:21163: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:21151: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:21168: 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%/[^/]*$%%'` @@ -21184,7 +21201,7 @@ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 21187 "configure" +#line 21204 "configure" #include "confdefs.h" #include int @@ -21196,16 +21213,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21199: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21216: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21202: \$? = $ac_status" >&5 + echo "$as_me:21219: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21205: \"$ac_try\"") >&5 + { (eval echo "$as_me:21222: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21208: \$? = $ac_status" >&5 + echo "$as_me:21225: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -21222,7 +21239,7 @@ if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:21225: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:21242: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -21270,7 +21287,7 @@ ;; esac -echo "$as_me:21273: checking for terminfo header" >&5 +echo "$as_me:21290: 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 @@ -21288,7 +21305,7 @@ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 21291 "configure" +#line 21308 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -21303,16 +21320,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:21306: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:21323: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:21309: \$? = $ac_status" >&5 + echo "$as_me:21326: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:21312: \"$ac_try\"") >&5 + { (eval echo "$as_me:21329: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21315: \$? = $ac_status" >&5 + echo "$as_me:21332: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -21328,7 +21345,7 @@ done fi -echo "$as_me:21331: result: $cf_cv_term_header" >&5 +echo "$as_me:21348: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -21366,7 +21383,7 @@ #define NCURSES 1 EOF -echo "$as_me:21369: checking for ncurses version" >&5 +echo "$as_me:21386: 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 @@ -21392,10 +21409,10 @@ #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:21395: \"$cf_try\"") >&5 + { (eval echo "$as_me:21412: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:21398: \$? = $ac_status" >&5 + echo "$as_me:21415: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -21405,7 +21422,7 @@ else cat >"conftest.$ac_ext" <<_ACEOF -#line 21408 "configure" +#line 21425 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -21430,15 +21447,15 @@ } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:21433: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21450: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21436: \$? = $ac_status" >&5 + echo "$as_me:21453: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:21438: \"$ac_try\"") >&5 + { (eval echo "$as_me:21455: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21441: \$? = $ac_status" >&5 + echo "$as_me:21458: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -21452,7 +21469,7 @@ rm -f "$cf_tempfile" fi -echo "$as_me:21455: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:21472: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -21465,7 +21482,7 @@ # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:21468: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:21485: 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 @@ -21473,7 +21490,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21476 "configure" +#line 21493 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21492,16 +21509,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21495: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21512: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21498: \$? = $ac_status" >&5 + echo "$as_me:21515: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21501: \"$ac_try\"") >&5 + { (eval echo "$as_me:21518: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21504: \$? = $ac_status" >&5 + echo "$as_me:21521: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -21512,10 +21529,10 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21515: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:21532: 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:21518: checking for initscr in -lgpm" >&5 + echo "$as_me:21535: 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 @@ -21523,7 +21540,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21526 "configure" +#line 21543 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21542,16 +21559,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21545: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21562: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21548: \$? = $ac_status" >&5 + echo "$as_me:21565: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21551: \"$ac_try\"") >&5 + { (eval echo "$as_me:21568: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21554: \$? = $ac_status" >&5 + echo "$as_me:21571: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -21562,7 +21579,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21565: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:21582: 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" @@ -21577,7 +21594,7 @@ # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:21580: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:21597: 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 @@ -21585,7 +21602,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 21588 "configure" +#line 21605 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -21604,16 +21621,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21607: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21624: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21610: \$? = $ac_status" >&5 + echo "$as_me:21627: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21613: \"$ac_try\"") >&5 + { (eval echo "$as_me:21630: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21616: \$? = $ac_status" >&5 + echo "$as_me:21633: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -21624,7 +21641,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:21627: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:21644: 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" @@ -21673,13 +21690,13 @@ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:21676: checking for initscr" >&5 + echo "$as_me:21693: 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 21682 "configure" +#line 21699 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -21710,16 +21727,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21713: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21730: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21716: \$? = $ac_status" >&5 + echo "$as_me:21733: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21719: \"$ac_try\"") >&5 + { (eval echo "$as_me:21736: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21722: \$? = $ac_status" >&5 + echo "$as_me:21739: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -21729,18 +21746,18 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:21732: result: $ac_cv_func_initscr" >&5 +echo "$as_me:21749: 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:21739: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:21756: 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 21743 "configure" +#line 21760 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -21752,25 +21769,25 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21755: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21772: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21758: \$? = $ac_status" >&5 + echo "$as_me:21775: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21761: \"$ac_try\"") >&5 + { (eval echo "$as_me:21778: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21764: \$? = $ac_status" >&5 + echo "$as_me:21781: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:21766: result: yes" >&5 + echo "$as_me:21783: 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:21773: result: no" >&5 +echo "$as_me:21790: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -21838,11 +21855,11 @@ for cf_libdir in $cf_search do - echo "$as_me:21841: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:21858: 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 21845 "configure" +#line 21862 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -21854,25 +21871,25 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21857: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21874: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21860: \$? = $ac_status" >&5 + echo "$as_me:21877: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21863: \"$ac_try\"") >&5 + { (eval echo "$as_me:21880: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21866: \$? = $ac_status" >&5 + echo "$as_me:21883: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:21868: result: yes" >&5 + echo "$as_me:21885: 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:21875: result: no" >&5 +echo "$as_me:21892: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -21887,7 +21904,7 @@ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:21890: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:21907: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -21895,7 +21912,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:21898: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:21915: 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 @@ -21905,7 +21922,7 @@ fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 21908 "configure" +#line 21925 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -21917,23 +21934,23 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:21920: \"$ac_link\"") >&5 +if { (eval echo "$as_me:21937: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:21923: \$? = $ac_status" >&5 + echo "$as_me:21940: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:21926: \"$ac_try\"") >&5 + { (eval echo "$as_me:21943: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:21929: \$? = $ac_status" >&5 + echo "$as_me:21946: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:21931: result: yes" >&5 + echo "$as_me:21948: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:21936: result: no" >&5 +echo "$as_me:21953: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -21964,13 +21981,13 @@ cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:21967: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:21984: 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:21970: result: yes" >&5 + echo "$as_me:21987: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:21973: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:21990: 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 @@ -22103,7 +22120,7 @@ LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 22106 "configure" +#line 22123 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -22115,37 +22132,37 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22118: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22135: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22121: \$? = $ac_status" >&5 + echo "$as_me:22138: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22124: \"$ac_try\"") >&5 + { (eval echo "$as_me:22141: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22127: \$? = $ac_status" >&5 + echo "$as_me:22144: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 22133 "configure" +#line 22150 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:22140: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22157: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22143: \$? = $ac_status" >&5 + echo "$as_me:22160: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:22145: \"$ac_try\"") >&5 + { (eval echo "$as_me:22162: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22148: \$? = $ac_status" >&5 + echo "$as_me:22165: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -22319,7 +22336,7 @@ LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 22322 "configure" +#line 22339 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -22331,37 +22348,37 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:22334: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22351: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22337: \$? = $ac_status" >&5 + echo "$as_me:22354: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:22340: \"$ac_try\"") >&5 + { (eval echo "$as_me:22357: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22343: \$? = $ac_status" >&5 + echo "$as_me:22360: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 22349 "configure" +#line 22366 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:22356: \"$ac_link\"") >&5 +if { (eval echo "$as_me:22373: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:22359: \$? = $ac_status" >&5 + echo "$as_me:22376: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:22361: \"$ac_try\"") >&5 + { (eval echo "$as_me:22378: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22364: \$? = $ac_status" >&5 + echo "$as_me:22381: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -22378,7 +22395,7 @@ cf_have_ncuconfig=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:22381: result: $cf_have_ncuconfig" >&5 + echo "$as_me:22398: result: $cf_have_ncuconfig" >&5 echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" @@ -22394,7 +22411,7 @@ NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:22397: checking for terminfo header" >&5 +echo "$as_me:22414: 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 @@ -22412,7 +22429,7 @@ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 22415 "configure" +#line 22432 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -22427,16 +22444,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22430: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22447: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22433: \$? = $ac_status" >&5 + echo "$as_me:22450: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22436: \"$ac_try\"") >&5 + { (eval echo "$as_me:22453: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22439: \$? = $ac_status" >&5 + echo "$as_me:22456: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -22452,7 +22469,7 @@ done fi -echo "$as_me:22455: result: $cf_cv_term_header" >&5 +echo "$as_me:22472: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -22487,7 +22504,7 @@ fi else - echo "$as_me:22490: result: no" >&5 + echo "$as_me:22507: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -22503,7 +22520,7 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:22506: checking for $ac_word" >&5 +echo "$as_me:22523: 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 @@ -22518,7 +22535,7 @@ 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:22521: found $ac_dir/$ac_word" >&5 +echo "$as_me:22538: found $ac_dir/$ac_word" >&5 break done @@ -22526,10 +22543,10 @@ fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:22529: result: $NCURSES_CONFIG" >&5 + echo "$as_me:22546: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:22532: result: no" >&5 + echo "$as_me:22549: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -22542,7 +22559,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:22545: checking for $ac_word" >&5 +echo "$as_me:22562: 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 @@ -22557,7 +22574,7 @@ 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:22560: found $ac_dir/$ac_word" >&5 +echo "$as_me:22577: found $ac_dir/$ac_word" >&5 break done @@ -22565,10 +22582,10 @@ fi ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:22568: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:22585: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:22571: result: no" >&5 + echo "$as_me:22588: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -22725,7 +22742,7 @@ # even with config script, some packages use no-override for curses.h -echo "$as_me:22728: checking if we have identified curses headers" >&5 +echo "$as_me:22745: 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 @@ -22737,7 +22754,7 @@ curses.h $screen/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 22740 "configure" +#line 22757 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -22749,16 +22766,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22752: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22769: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22755: \$? = $ac_status" >&5 + echo "$as_me:22772: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22758: \"$ac_try\"") >&5 + { (eval echo "$as_me:22775: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22761: \$? = $ac_status" >&5 + echo "$as_me:22778: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -22769,11 +22786,11 @@ done fi -echo "$as_me:22772: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:22789: 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:22776: error: No curses header-files found" >&5 + { { echo "$as_me:22793: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -22783,23 +22800,23 @@ for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:22786: checking for $ac_header" >&5 +echo "$as_me:22803: 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 22792 "configure" +#line 22809 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:22796: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:22813: \"$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:22802: \$? = $ac_status" >&5 + echo "$as_me:22819: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -22818,7 +22835,7 @@ fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:22821: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:22838: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF -#line 22877 "configure" +#line 22894 "configure" #include "confdefs.h" #include int @@ -22886,16 +22903,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22889: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22906: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22892: \$? = $ac_status" >&5 + echo "$as_me:22909: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22895: \"$ac_try\"") >&5 + { (eval echo "$as_me:22912: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22898: \$? = $ac_status" >&5 + echo "$as_me:22915: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -22912,7 +22929,7 @@ if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:22915: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:22932: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -22931,7 +22948,7 @@ } -echo "$as_me:22934: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:22951: 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 @@ -22943,7 +22960,7 @@ do cat >"conftest.$ac_ext" <<_ACEOF -#line 22946 "configure" +#line 22963 "configure" #include "confdefs.h" #include <$cf_header> @@ -22967,16 +22984,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:22970: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:22987: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:22973: \$? = $ac_status" >&5 + echo "$as_me:22990: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:22976: \"$ac_try\"") >&5 + { (eval echo "$as_me:22993: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:22979: \$? = $ac_status" >&5 + echo "$as_me:22996: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -22991,14 +23008,14 @@ done fi -echo "$as_me:22994: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:23011: 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:23001: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:23018: 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 @@ -23119,7 +23136,7 @@ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 23122 "configure" +#line 23139 "configure" #include "confdefs.h" #include int @@ -23131,16 +23148,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:23134: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23151: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23137: \$? = $ac_status" >&5 + echo "$as_me:23154: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:23140: \"$ac_try\"") >&5 + { (eval echo "$as_me:23157: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23143: \$? = $ac_status" >&5 + echo "$as_me:23160: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -23157,7 +23174,7 @@ if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:23160: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:23177: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -23180,7 +23197,7 @@ do cat >"conftest.$ac_ext" <<_ACEOF -#line 23183 "configure" +#line 23200 "configure" #include "confdefs.h" #include <$cf_header> @@ -23204,16 +23221,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:23207: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23224: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23210: \$? = $ac_status" >&5 + echo "$as_me:23227: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:23213: \"$ac_try\"") >&5 + { (eval echo "$as_me:23230: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23216: \$? = $ac_status" >&5 + echo "$as_me:23233: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -23234,12 +23251,12 @@ CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:23237: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:23254: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:23242: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:23259: 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%/[^/]*$%%'` @@ -23275,7 +23292,7 @@ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 23278 "configure" +#line 23295 "configure" #include "confdefs.h" #include int @@ -23287,16 +23304,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:23290: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23307: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23293: \$? = $ac_status" >&5 + echo "$as_me:23310: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:23296: \"$ac_try\"") >&5 + { (eval echo "$as_me:23313: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23299: \$? = $ac_status" >&5 + echo "$as_me:23316: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -23313,7 +23330,7 @@ if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:23316: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:23333: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -23361,7 +23378,7 @@ ;; esac -echo "$as_me:23364: checking for terminfo header" >&5 +echo "$as_me:23381: 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 @@ -23379,7 +23396,7 @@ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 23382 "configure" +#line 23399 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -23394,16 +23411,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:23397: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:23414: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:23400: \$? = $ac_status" >&5 + echo "$as_me:23417: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:23403: \"$ac_try\"") >&5 + { (eval echo "$as_me:23420: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23406: \$? = $ac_status" >&5 + echo "$as_me:23423: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -23419,7 +23436,7 @@ done fi -echo "$as_me:23422: result: $cf_cv_term_header" >&5 +echo "$as_me:23439: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -23457,7 +23474,7 @@ #define NCURSES 1 EOF -echo "$as_me:23460: checking for ncurses version" >&5 +echo "$as_me:23477: 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 @@ -23483,10 +23500,10 @@ #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:23486: \"$cf_try\"") >&5 + { (eval echo "$as_me:23503: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:23489: \$? = $ac_status" >&5 + echo "$as_me:23506: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -23496,7 +23513,7 @@ else cat >"conftest.$ac_ext" <<_ACEOF -#line 23499 "configure" +#line 23516 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -23521,15 +23538,15 @@ } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:23524: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23541: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23527: \$? = $ac_status" >&5 + echo "$as_me:23544: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:23529: \"$ac_try\"") >&5 + { (eval echo "$as_me:23546: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23532: \$? = $ac_status" >&5 + echo "$as_me:23549: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -23543,7 +23560,7 @@ rm -f "$cf_tempfile" fi -echo "$as_me:23546: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:23563: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -23556,7 +23573,7 @@ # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:23559: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:23576: 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 @@ -23564,7 +23581,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 23567 "configure" +#line 23584 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -23583,16 +23600,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23586: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23603: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23589: \$? = $ac_status" >&5 + echo "$as_me:23606: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23592: \"$ac_try\"") >&5 + { (eval echo "$as_me:23609: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23595: \$? = $ac_status" >&5 + echo "$as_me:23612: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -23603,10 +23620,10 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:23606: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:23623: 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:23609: checking for initscr in -lgpm" >&5 + echo "$as_me:23626: 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 @@ -23614,7 +23631,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 23617 "configure" +#line 23634 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -23633,16 +23650,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23636: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23653: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23639: \$? = $ac_status" >&5 + echo "$as_me:23656: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23642: \"$ac_try\"") >&5 + { (eval echo "$as_me:23659: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23645: \$? = $ac_status" >&5 + echo "$as_me:23662: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -23653,7 +23670,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:23656: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:23673: 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" @@ -23668,7 +23685,7 @@ # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:23671: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:23688: 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 @@ -23676,7 +23693,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 23679 "configure" +#line 23696 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -23695,16 +23712,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23698: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23715: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23701: \$? = $ac_status" >&5 + echo "$as_me:23718: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23704: \"$ac_try\"") >&5 + { (eval echo "$as_me:23721: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23707: \$? = $ac_status" >&5 + echo "$as_me:23724: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -23715,7 +23732,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:23718: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:23735: 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" @@ -23764,13 +23781,13 @@ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:23767: checking for initscr" >&5 + echo "$as_me:23784: 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 23773 "configure" +#line 23790 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -23801,16 +23818,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23804: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23821: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23807: \$? = $ac_status" >&5 + echo "$as_me:23824: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23810: \"$ac_try\"") >&5 + { (eval echo "$as_me:23827: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23813: \$? = $ac_status" >&5 + echo "$as_me:23830: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -23820,18 +23837,18 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:23823: result: $ac_cv_func_initscr" >&5 +echo "$as_me:23840: 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:23830: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:23847: 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 23834 "configure" +#line 23851 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -23843,25 +23860,25 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23846: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23863: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23849: \$? = $ac_status" >&5 + echo "$as_me:23866: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23852: \"$ac_try\"") >&5 + { (eval echo "$as_me:23869: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23855: \$? = $ac_status" >&5 + echo "$as_me:23872: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:23857: result: yes" >&5 + echo "$as_me:23874: 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:23864: result: no" >&5 +echo "$as_me:23881: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -23929,11 +23946,11 @@ for cf_libdir in $cf_search do - echo "$as_me:23932: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:23949: 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 23936 "configure" +#line 23953 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -23945,25 +23962,25 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:23948: \"$ac_link\"") >&5 +if { (eval echo "$as_me:23965: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:23951: \$? = $ac_status" >&5 + echo "$as_me:23968: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:23954: \"$ac_try\"") >&5 + { (eval echo "$as_me:23971: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:23957: \$? = $ac_status" >&5 + echo "$as_me:23974: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:23959: result: yes" >&5 + echo "$as_me:23976: 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:23966: result: no" >&5 +echo "$as_me:23983: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -23978,7 +23995,7 @@ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:23981: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:23998: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -23986,7 +24003,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:23989: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:24006: 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 @@ -23996,7 +24013,7 @@ fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 23999 "configure" +#line 24016 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -24008,23 +24025,23 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:24011: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24028: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24014: \$? = $ac_status" >&5 + echo "$as_me:24031: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:24017: \"$ac_try\"") >&5 + { (eval echo "$as_me:24034: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24020: \$? = $ac_status" >&5 + echo "$as_me:24037: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:24022: result: yes" >&5 + echo "$as_me:24039: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:24027: result: no" >&5 +echo "$as_me:24044: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -24069,7 +24086,7 @@ #define DISP_TERMCAP 1 EOF - echo "$as_me:24072: checking if you want to use ncurses" >&5 + echo "$as_me:24089: checking if you want to use ncurses" >&5 echo $ECHO_N "checking if you want to use ncurses... $ECHO_C" >&6 # Check whether --with-ncurses or --without-ncurses was given. @@ -24079,7 +24096,7 @@ else withval=no fi; - echo "$as_me:24082: result: $withval" >&5 + echo "$as_me:24099: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 if test "${cf_cv_termlib+set}" = set; then @@ -24088,7 +24105,7 @@ cf_cv_termlib=none cat >"conftest.$ac_ext" <<_ACEOF -#line 24091 "configure" +#line 24108 "configure" #include "confdefs.h" int @@ -24100,19 +24117,19 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:24103: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24120: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24106: \$? = $ac_status" >&5 + echo "$as_me:24123: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:24109: \"$ac_try\"") >&5 + { (eval echo "$as_me:24126: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24112: \$? = $ac_status" >&5 + echo "$as_me:24129: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cat >"conftest.$ac_ext" <<_ACEOF -#line 24115 "configure" +#line 24132 "configure" #include "confdefs.h" int @@ -24124,16 +24141,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:24127: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24144: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24130: \$? = $ac_status" >&5 + echo "$as_me:24147: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:24133: \"$ac_try\"") >&5 + { (eval echo "$as_me:24150: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24136: \$? = $ac_status" >&5 + echo "$as_me:24153: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_termlib=terminfo else @@ -24144,7 +24161,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" test -n "$verbose" && echo " using functions in predefined $cf_cv_termlib LIBS" 1>&6 -echo "${as_me:-configure}:24147: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 +echo "${as_me:-configure}:24164: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 else echo "$as_me: failed program was:" >&5 @@ -24157,13 +24174,13 @@ cf_have_ncuconfig=no if test "x${PKG_CONFIG:=none}" != xnone; then - echo "$as_me:24160: checking pkg-config for $cf_ncuconfig_root" >&5 + echo "$as_me:24177: 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:24163: result: yes" >&5 + echo "$as_me:24180: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:24166: checking if the $cf_ncuconfig_root package files work" >&5 + echo "$as_me:24183: 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 @@ -24296,7 +24313,7 @@ LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 24299 "configure" +#line 24316 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -24308,37 +24325,37 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:24311: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24328: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24314: \$? = $ac_status" >&5 + echo "$as_me:24331: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:24317: \"$ac_try\"") >&5 + { (eval echo "$as_me:24334: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24320: \$? = $ac_status" >&5 + echo "$as_me:24337: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_test_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 24326 "configure" +#line 24343 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:24333: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24350: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24336: \$? = $ac_status" >&5 + echo "$as_me:24353: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:24338: \"$ac_try\"") >&5 + { (eval echo "$as_me:24355: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24341: \$? = $ac_status" >&5 + echo "$as_me:24358: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_test_ncuconfig=yes else @@ -24512,7 +24529,7 @@ LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 24515 "configure" +#line 24532 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -24524,37 +24541,37 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:24527: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24544: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24530: \$? = $ac_status" >&5 + echo "$as_me:24547: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:24533: \"$ac_try\"") >&5 + { (eval echo "$as_me:24550: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24536: \$? = $ac_status" >&5 + echo "$as_me:24553: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then if test "$cross_compiling" = yes; then cf_have_ncuconfig=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 24542 "configure" +#line 24559 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int main(void) { const char *xx = curses_version(); return (xx == 0); } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:24549: \"$ac_link\"") >&5 +if { (eval echo "$as_me:24566: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:24552: \$? = $ac_status" >&5 + echo "$as_me:24569: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:24554: \"$ac_try\"") >&5 + { (eval echo "$as_me:24571: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24557: \$? = $ac_status" >&5 + echo "$as_me:24574: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_have_ncuconfig=yes else @@ -24571,7 +24588,7 @@ cf_have_ncuconfig=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:24574: result: $cf_have_ncuconfig" >&5 + echo "$as_me:24591: result: $cf_have_ncuconfig" >&5 echo "${ECHO_T}$cf_have_ncuconfig" >&6 test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes if test "$cf_have_ncuconfig" != "yes" @@ -24587,7 +24604,7 @@ NCURSES_CONFIG_PKG=$cf_ncuconfig_root -echo "$as_me:24590: checking for terminfo header" >&5 +echo "$as_me:24607: 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 @@ -24605,7 +24622,7 @@ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 24608 "configure" +#line 24625 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -24620,16 +24637,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:24623: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24640: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24626: \$? = $ac_status" >&5 + echo "$as_me:24643: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:24629: \"$ac_try\"") >&5 + { (eval echo "$as_me:24646: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24632: \$? = $ac_status" >&5 + echo "$as_me:24649: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -24645,7 +24662,7 @@ done fi -echo "$as_me:24648: result: $cf_cv_term_header" >&5 +echo "$as_me:24665: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -24680,7 +24697,7 @@ fi else - echo "$as_me:24683: result: no" >&5 + echo "$as_me:24700: result: no" >&5 echo "${ECHO_T}no" >&6 NCURSES_CONFIG_PKG=none fi @@ -24696,7 +24713,7 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:24699: checking for $ac_word" >&5 +echo "$as_me:24716: 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 @@ -24711,7 +24728,7 @@ 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:24714: found $ac_dir/$ac_word" >&5 +echo "$as_me:24731: found $ac_dir/$ac_word" >&5 break done @@ -24719,10 +24736,10 @@ fi NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG if test -n "$NCURSES_CONFIG"; then - echo "$as_me:24722: result: $NCURSES_CONFIG" >&5 + echo "$as_me:24739: result: $NCURSES_CONFIG" >&5 echo "${ECHO_T}$NCURSES_CONFIG" >&6 else - echo "$as_me:24725: result: no" >&5 + echo "$as_me:24742: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -24735,7 +24752,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:24738: checking for $ac_word" >&5 +echo "$as_me:24755: 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 @@ -24750,7 +24767,7 @@ 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:24753: found $ac_dir/$ac_word" >&5 +echo "$as_me:24770: found $ac_dir/$ac_word" >&5 break done @@ -24758,10 +24775,10 @@ fi ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG if test -n "$ac_ct_NCURSES_CONFIG"; then - echo "$as_me:24761: result: $ac_ct_NCURSES_CONFIG" >&5 + echo "$as_me:24778: result: $ac_ct_NCURSES_CONFIG" >&5 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6 else - echo "$as_me:24764: result: no" >&5 + echo "$as_me:24781: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -24918,7 +24935,7 @@ # even with config script, some packages use no-override for curses.h -echo "$as_me:24921: checking if we have identified curses headers" >&5 +echo "$as_me:24938: 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 @@ -24930,7 +24947,7 @@ curses.h $screen/curses.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 24933 "configure" +#line 24950 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -24942,16 +24959,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:24945: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:24962: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:24948: \$? = $ac_status" >&5 + echo "$as_me:24965: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:24951: \"$ac_try\"") >&5 + { (eval echo "$as_me:24968: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:24954: \$? = $ac_status" >&5 + echo "$as_me:24971: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -24962,11 +24979,11 @@ done fi -echo "$as_me:24965: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:24982: 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:24969: error: No curses header-files found" >&5 + { { echo "$as_me:24986: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -24976,23 +24993,23 @@ for ac_header in $cf_cv_ncurses_header do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:24979: checking for $ac_header" >&5 +echo "$as_me:24996: 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 24985 "configure" +#line 25002 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:24989: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:25006: \"$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:24995: \$? = $ac_status" >&5 + echo "$as_me:25012: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -25011,7 +25028,7 @@ fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:25014: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:25031: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 echo "${ECHO_T}`eval echo '${'"$as_ac_Header"'}'`" >&6 if test "`eval echo '${'"$as_ac_Header"'}'`" = yes; then cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF -#line 25070 "configure" +#line 25087 "configure" #include "confdefs.h" #include int @@ -25079,16 +25096,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:25082: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25099: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25085: \$? = $ac_status" >&5 + echo "$as_me:25102: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:25088: \"$ac_try\"") >&5 + { (eval echo "$as_me:25105: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25091: \$? = $ac_status" >&5 + echo "$as_me:25108: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -25105,7 +25122,7 @@ if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:25108: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:25125: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -25124,7 +25141,7 @@ } -echo "$as_me:25127: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:25144: 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 @@ -25136,7 +25153,7 @@ do cat >"conftest.$ac_ext" <<_ACEOF -#line 25139 "configure" +#line 25156 "configure" #include "confdefs.h" #include <$cf_header> @@ -25160,16 +25177,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:25163: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25180: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25166: \$? = $ac_status" >&5 + echo "$as_me:25183: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:25169: \"$ac_try\"") >&5 + { (eval echo "$as_me:25186: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25172: \$? = $ac_status" >&5 + echo "$as_me:25189: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h=$cf_header @@ -25184,14 +25201,14 @@ done fi -echo "$as_me:25187: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:25204: 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:25194: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:25211: 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 @@ -25312,7 +25329,7 @@ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 25315 "configure" +#line 25332 "configure" #include "confdefs.h" #include int @@ -25324,16 +25341,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:25327: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25344: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25330: \$? = $ac_status" >&5 + echo "$as_me:25347: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:25333: \"$ac_try\"") >&5 + { (eval echo "$as_me:25350: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25336: \$? = $ac_status" >&5 + echo "$as_me:25353: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -25350,7 +25367,7 @@ if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:25353: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:25370: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -25373,7 +25390,7 @@ do cat >"conftest.$ac_ext" <<_ACEOF -#line 25376 "configure" +#line 25393 "configure" #include "confdefs.h" #include <$cf_header> @@ -25397,16 +25414,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:25400: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25417: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25403: \$? = $ac_status" >&5 + echo "$as_me:25420: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:25406: \"$ac_try\"") >&5 + { (eval echo "$as_me:25423: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25409: \$? = $ac_status" >&5 + echo "$as_me:25426: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_h2=$cf_header @@ -25427,12 +25444,12 @@ CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:25430: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:25447: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:25435: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:25452: 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%/[^/]*$%%'` @@ -25468,7 +25485,7 @@ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 25471 "configure" +#line 25488 "configure" #include "confdefs.h" #include int @@ -25480,16 +25497,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:25483: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25500: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25486: \$? = $ac_status" >&5 + echo "$as_me:25503: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:25489: \"$ac_try\"") >&5 + { (eval echo "$as_me:25506: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25492: \$? = $ac_status" >&5 + echo "$as_me:25509: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -25506,7 +25523,7 @@ if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:25509: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:25526: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -25554,7 +25571,7 @@ ;; esac -echo "$as_me:25557: checking for terminfo header" >&5 +echo "$as_me:25574: 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 @@ -25572,7 +25589,7 @@ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat >"conftest.$ac_ext" <<_ACEOF -#line 25575 "configure" +#line 25592 "configure" #include "confdefs.h" #include #include <${cf_cv_ncurses_header:-curses.h}> @@ -25587,16 +25604,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:25590: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:25607: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:25593: \$? = $ac_status" >&5 + echo "$as_me:25610: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:25596: \"$ac_try\"") >&5 + { (eval echo "$as_me:25613: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25599: \$? = $ac_status" >&5 + echo "$as_me:25616: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header="$cf_test" @@ -25612,7 +25629,7 @@ done fi -echo "$as_me:25615: result: $cf_cv_term_header" >&5 +echo "$as_me:25632: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 # Set definitions to allow ifdef'ing to accommodate subdirectories @@ -25650,7 +25667,7 @@ #define NCURSES 1 EOF -echo "$as_me:25653: checking for ncurses version" >&5 +echo "$as_me:25670: 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 @@ -25676,10 +25693,10 @@ #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:25679: \"$cf_try\"") >&5 + { (eval echo "$as_me:25696: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:25682: \$? = $ac_status" >&5 + echo "$as_me:25699: \$? = $ac_status" >&5 (exit "$ac_status"); } if test -f conftest.out ; then cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out` @@ -25689,7 +25706,7 @@ else cat >"conftest.$ac_ext" <<_ACEOF -#line 25692 "configure" +#line 25709 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -25714,15 +25731,15 @@ } _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:25717: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25734: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25720: \$? = $ac_status" >&5 + echo "$as_me:25737: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:25722: \"$ac_try\"") >&5 + { (eval echo "$as_me:25739: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25725: \$? = $ac_status" >&5 + echo "$as_me:25742: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -25736,7 +25753,7 @@ rm -f "$cf_tempfile" fi -echo "$as_me:25739: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:25756: result: $cf_cv_ncurses_version" >&5 echo "${ECHO_T}$cf_cv_ncurses_version" >&6 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF @@ -25749,7 +25766,7 @@ # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:25752: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:25769: 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 @@ -25757,7 +25774,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 25760 "configure" +#line 25777 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -25776,16 +25793,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:25779: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25796: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25782: \$? = $ac_status" >&5 + echo "$as_me:25799: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:25785: \"$ac_try\"") >&5 + { (eval echo "$as_me:25802: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25788: \$? = $ac_status" >&5 + echo "$as_me:25805: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -25796,10 +25813,10 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:25799: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:25816: 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:25802: checking for initscr in -lgpm" >&5 + echo "$as_me:25819: 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 @@ -25807,7 +25824,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 25810 "configure" +#line 25827 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -25826,16 +25843,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:25829: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25846: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25832: \$? = $ac_status" >&5 + echo "$as_me:25849: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:25835: \"$ac_try\"") >&5 + { (eval echo "$as_me:25852: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25838: \$? = $ac_status" >&5 + echo "$as_me:25855: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -25846,7 +25863,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:25849: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:25866: 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" @@ -25861,7 +25878,7 @@ # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it is static). if test "$cf_nculib_root" = ncurses ; then - echo "$as_me:25864: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:25881: 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 @@ -25869,7 +25886,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 25872 "configure" +#line 25889 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -25888,16 +25905,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:25891: \"$ac_link\"") >&5 +if { (eval echo "$as_me:25908: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:25894: \$? = $ac_status" >&5 + echo "$as_me:25911: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:25897: \"$ac_try\"") >&5 + { (eval echo "$as_me:25914: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:25900: \$? = $ac_status" >&5 + echo "$as_me:25917: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -25908,7 +25925,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:25911: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:25928: 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" @@ -25957,13 +25974,13 @@ eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no' cf_libdir="" - echo "$as_me:25960: checking for initscr" >&5 + echo "$as_me:25977: 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 25966 "configure" +#line 25983 "configure" #include "confdefs.h" #define initscr autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -25994,16 +26011,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:25997: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26014: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26000: \$? = $ac_status" >&5 + echo "$as_me:26017: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:26003: \"$ac_try\"") >&5 + { (eval echo "$as_me:26020: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26006: \$? = $ac_status" >&5 + echo "$as_me:26023: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_initscr=yes else @@ -26013,18 +26030,18 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:26016: result: $ac_cv_func_initscr" >&5 +echo "$as_me:26033: 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:26023: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:26040: 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 26027 "configure" +#line 26044 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -26036,25 +26053,25 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:26039: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26056: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26042: \$? = $ac_status" >&5 + echo "$as_me:26059: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:26045: \"$ac_try\"") >&5 + { (eval echo "$as_me:26062: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26048: \$? = $ac_status" >&5 + echo "$as_me:26065: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:26050: result: yes" >&5 + echo "$as_me:26067: 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:26057: result: no" >&5 +echo "$as_me:26074: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search= @@ -26122,11 +26139,11 @@ for cf_libdir in $cf_search do - echo "$as_me:26125: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:26142: 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 26129 "configure" +#line 26146 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -26138,25 +26155,25 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:26141: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26158: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26144: \$? = $ac_status" >&5 + echo "$as_me:26161: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:26147: \"$ac_try\"") >&5 + { (eval echo "$as_me:26164: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26150: \$? = $ac_status" >&5 + echo "$as_me:26167: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:26152: result: yes" >&5 + echo "$as_me:26169: 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:26159: result: no" >&5 +echo "$as_me:26176: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -26171,7 +26188,7 @@ eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\" if test "$cf_found_library" = no ; then - { { echo "$as_me:26174: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:26191: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -26179,7 +26196,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:26182: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:26199: 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 @@ -26189,7 +26206,7 @@ fi done cat >"conftest.$ac_ext" <<_ACEOF -#line 26192 "configure" +#line 26209 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> int @@ -26201,23 +26218,23 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:26204: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26221: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26207: \$? = $ac_status" >&5 + echo "$as_me:26224: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:26210: \"$ac_try\"") >&5 + { (eval echo "$as_me:26227: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26213: \$? = $ac_status" >&5 + echo "$as_me:26230: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then - echo "$as_me:26215: result: yes" >&5 + echo "$as_me:26232: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "$as_me:26220: result: no" >&5 +echo "$as_me:26237: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -26248,10 +26265,10 @@ LIBS="-l$cf_lib $cf_save_LIBS" for cf_func in tigetstr tgetstr do - echo "$as_me:26251: checking for $cf_func in -l$cf_lib" >&5 + echo "$as_me:26268: checking for $cf_func in -l$cf_lib" >&5 echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 26254 "configure" +#line 26271 "configure" #include "confdefs.h" int @@ -26263,16 +26280,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:26266: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26283: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26269: \$? = $ac_status" >&5 + echo "$as_me:26286: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:26272: \"$ac_try\"") >&5 + { (eval echo "$as_me:26289: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26275: \$? = $ac_status" >&5 + echo "$as_me:26292: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -26281,7 +26298,7 @@ cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:26284: result: $cf_result" >&5 + echo "$as_me:26301: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then if test "$cf_func" = tigetstr ; then @@ -26298,7 +26315,7 @@ fi if test "$cf_cv_termlib" = none; then # allow curses library for broken AIX system. - echo "$as_me:26301: checking for initscr in -lcurses" >&5 + echo "$as_me:26318: checking for initscr in -lcurses" >&5 echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6 if test "${ac_cv_lib_curses_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26306,7 +26323,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lcurses $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 26309 "configure" +#line 26326 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -26325,16 +26342,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:26328: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26345: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26331: \$? = $ac_status" >&5 + echo "$as_me:26348: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:26334: \"$ac_try\"") >&5 + { (eval echo "$as_me:26351: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26337: \$? = $ac_status" >&5 + echo "$as_me:26354: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_curses_initscr=yes else @@ -26345,7 +26362,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:26348: result: $ac_cv_lib_curses_initscr" >&5 +echo "$as_me:26365: result: $ac_cv_lib_curses_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6 if test "$ac_cv_lib_curses_initscr" = yes; then @@ -26367,7 +26384,7 @@ fi - echo "$as_me:26370: checking for tgoto in -ltermcap" >&5 + echo "$as_me:26387: checking for tgoto in -ltermcap" >&5 echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6 if test "${ac_cv_lib_termcap_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26375,7 +26392,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ltermcap $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 26378 "configure" +#line 26395 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -26394,16 +26411,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:26397: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26414: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26400: \$? = $ac_status" >&5 + echo "$as_me:26417: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:26403: \"$ac_try\"") >&5 + { (eval echo "$as_me:26420: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26406: \$? = $ac_status" >&5 + echo "$as_me:26423: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_termcap_tgoto=yes else @@ -26414,7 +26431,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:26417: result: $ac_cv_lib_termcap_tgoto" >&5 +echo "$as_me:26434: result: $ac_cv_lib_termcap_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6 if test "$ac_cv_lib_termcap_tgoto" = yes; then @@ -26441,7 +26458,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test "$cf_cv_termlib" = none; then - { echo "$as_me:26444: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5 + { echo "$as_me:26461: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;} fi @@ -26472,7 +26489,7 @@ cf_cv_termlib=none cat >"conftest.$ac_ext" <<_ACEOF -#line 26475 "configure" +#line 26492 "configure" #include "confdefs.h" int @@ -26484,19 +26501,19 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:26487: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26504: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26490: \$? = $ac_status" >&5 + echo "$as_me:26507: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:26493: \"$ac_try\"") >&5 + { (eval echo "$as_me:26510: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26496: \$? = $ac_status" >&5 + echo "$as_me:26513: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cat >"conftest.$ac_ext" <<_ACEOF -#line 26499 "configure" +#line 26516 "configure" #include "confdefs.h" int @@ -26508,16 +26525,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:26511: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26528: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26514: \$? = $ac_status" >&5 + echo "$as_me:26531: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:26517: \"$ac_try\"") >&5 + { (eval echo "$as_me:26534: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26520: \$? = $ac_status" >&5 + echo "$as_me:26537: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_termlib=terminfo else @@ -26528,7 +26545,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" test -n "$verbose" && echo " using functions in predefined $cf_cv_termlib LIBS" 1>&6 -echo "${as_me:-configure}:26531: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 +echo "${as_me:-configure}:26548: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 else echo "$as_me: failed program was:" >&5 @@ -26543,10 +26560,10 @@ LIBS="-l$cf_lib $cf_save_LIBS" for cf_func in tigetstr tgetstr do - echo "$as_me:26546: checking for $cf_func in -l$cf_lib" >&5 + echo "$as_me:26563: checking for $cf_func in -l$cf_lib" >&5 echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 26549 "configure" +#line 26566 "configure" #include "confdefs.h" int @@ -26558,16 +26575,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:26561: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26578: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26564: \$? = $ac_status" >&5 + echo "$as_me:26581: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:26567: \"$ac_try\"") >&5 + { (eval echo "$as_me:26584: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26570: \$? = $ac_status" >&5 + echo "$as_me:26587: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -26576,7 +26593,7 @@ cf_result=no fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:26579: result: $cf_result" >&5 + echo "$as_me:26596: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then if test "$cf_func" = tigetstr ; then @@ -26593,7 +26610,7 @@ fi if test "$cf_cv_termlib" = none; then # allow curses library for broken AIX system. - echo "$as_me:26596: checking for initscr in -lcurses" >&5 + echo "$as_me:26613: checking for initscr in -lcurses" >&5 echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6 if test "${ac_cv_lib_curses_initscr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26601,7 +26618,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lcurses $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 26604 "configure" +#line 26621 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -26620,16 +26637,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:26623: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26640: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26626: \$? = $ac_status" >&5 + echo "$as_me:26643: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:26629: \"$ac_try\"") >&5 + { (eval echo "$as_me:26646: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26632: \$? = $ac_status" >&5 + echo "$as_me:26649: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_curses_initscr=yes else @@ -26640,7 +26657,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:26643: result: $ac_cv_lib_curses_initscr" >&5 +echo "$as_me:26660: result: $ac_cv_lib_curses_initscr" >&5 echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6 if test "$ac_cv_lib_curses_initscr" = yes; then @@ -26662,7 +26679,7 @@ fi - echo "$as_me:26665: checking for tgoto in -ltermcap" >&5 + echo "$as_me:26682: checking for tgoto in -ltermcap" >&5 echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6 if test "${ac_cv_lib_termcap_tgoto+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26670,7 +26687,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ltermcap $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 26673 "configure" +#line 26690 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -26689,16 +26706,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:26692: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26709: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26695: \$? = $ac_status" >&5 + echo "$as_me:26712: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:26698: \"$ac_try\"") >&5 + { (eval echo "$as_me:26715: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26701: \$? = $ac_status" >&5 + echo "$as_me:26718: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_termcap_tgoto=yes else @@ -26709,7 +26726,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:26712: result: $ac_cv_lib_termcap_tgoto" >&5 +echo "$as_me:26729: result: $ac_cv_lib_termcap_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6 if test "$ac_cv_lib_termcap_tgoto" = yes; then @@ -26736,13 +26753,13 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" if test "$cf_cv_termlib" = none; then - { echo "$as_me:26739: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5 + { echo "$as_me:26756: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;} fi fi -echo "$as_me:26745: checking definition to turn on extended curses functions" >&5 +echo "$as_me:26762: checking definition to turn on extended curses functions" >&5 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6 if test "${cf_cv_need_xopen_extension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -26750,7 +26767,7 @@ cf_cv_need_xopen_extension=unknown cat >"conftest.$ac_ext" <<_ACEOF -#line 26753 "configure" +#line 26770 "configure" #include "confdefs.h" #include @@ -26782,16 +26799,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:26785: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26802: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26788: \$? = $ac_status" >&5 + echo "$as_me:26805: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:26791: \"$ac_try\"") >&5 + { (eval echo "$as_me:26808: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26794: \$? = $ac_status" >&5 + echo "$as_me:26811: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_xopen_extension=none else @@ -26801,7 +26818,7 @@ for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR do cat >"conftest.$ac_ext" <<_ACEOF -#line 26804 "configure" +#line 26821 "configure" #include "confdefs.h" #define $cf_try_xopen_extension 1 @@ -26826,16 +26843,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:26829: \"$ac_link\"") >&5 +if { (eval echo "$as_me:26846: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:26832: \$? = $ac_status" >&5 + echo "$as_me:26849: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:26835: \"$ac_try\"") >&5 + { (eval echo "$as_me:26852: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26838: \$? = $ac_status" >&5 + echo "$as_me:26855: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_xopen_extension=$cf_try_xopen_extension; break else @@ -26849,7 +26866,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:26852: result: $cf_cv_need_xopen_extension" >&5 +echo "$as_me:26869: result: $cf_cv_need_xopen_extension" >&5 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6 case "$cf_cv_need_xopen_extension" in @@ -26861,7 +26878,7 @@ ;; esac -echo "$as_me:26864: checking for term.h" >&5 +echo "$as_me:26881: 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 @@ -26882,7 +26899,7 @@ for cf_header in $cf_header_list do cat >"conftest.$ac_ext" <<_ACEOF -#line 26885 "configure" +#line 26902 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -26896,16 +26913,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26899: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26916: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26902: \$? = $ac_status" >&5 + echo "$as_me:26919: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26905: \"$ac_try\"") >&5 + { (eval echo "$as_me:26922: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26908: \$? = $ac_status" >&5 + echo "$as_me:26925: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header=$cf_header break @@ -26924,7 +26941,7 @@ for cf_header in ncurses/term.h ncursesw/term.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 26927 "configure" +#line 26944 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -26942,16 +26959,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:26945: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:26962: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:26948: \$? = $ac_status" >&5 + echo "$as_me:26965: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:26951: \"$ac_try\"") >&5 + { (eval echo "$as_me:26968: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:26954: \$? = $ac_status" >&5 + echo "$as_me:26971: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header=$cf_header break @@ -26966,7 +26983,7 @@ esac fi -echo "$as_me:26969: result: $cf_cv_term_header" >&5 +echo "$as_me:26986: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 case "$cf_cv_term_header" in @@ -26993,7 +27010,7 @@ ;; esac -echo "$as_me:26996: checking for unctrl.h" >&5 +echo "$as_me:27013: 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 @@ -27014,7 +27031,7 @@ for cf_header in $cf_header_list do cat >"conftest.$ac_ext" <<_ACEOF -#line 27017 "configure" +#line 27034 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -27028,16 +27045,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27031: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27048: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27034: \$? = $ac_status" >&5 + echo "$as_me:27051: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27037: \"$ac_try\"") >&5 + { (eval echo "$as_me:27054: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27040: \$? = $ac_status" >&5 + echo "$as_me:27057: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_unctrl_header=$cf_header break @@ -27050,12 +27067,12 @@ done fi -echo "$as_me:27053: result: $cf_cv_unctrl_header" >&5 +echo "$as_me:27070: result: $cf_cv_unctrl_header" >&5 echo "${ECHO_T}$cf_cv_unctrl_header" >&6 case "$cf_cv_unctrl_header" in (no) - { echo "$as_me:27058: WARNING: unctrl.h header not found" >&5 + { echo "$as_me:27075: WARNING: unctrl.h header not found" >&5 echo "$as_me: WARNING: unctrl.h header not found" >&2;} ;; esac @@ -27089,10 +27106,10 @@ cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - echo "$as_me:27092: checking for ${cf_func}" >&5 + echo "$as_me:27109: checking for ${cf_func}" >&5 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6 -echo "${as_me:-configure}:27095: testing ${cf_func} ..." 1>&5 +echo "${as_me:-configure}:27112: testing ${cf_func} ..." 1>&5 if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27101,7 +27118,7 @@ eval cf_result='$ac_cv_func_'$cf_func if test ".$cf_result" != ".no"; then cat >"conftest.$ac_ext" <<_ACEOF -#line 27104 "configure" +#line 27121 "configure" #include "confdefs.h" #ifdef HAVE_XCURSES @@ -27134,16 +27151,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:27137: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27154: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27140: \$? = $ac_status" >&5 + echo "$as_me:27157: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:27143: \"$ac_try\"") >&5 + { (eval echo "$as_me:27160: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27146: \$? = $ac_status" >&5 + echo "$as_me:27163: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_result=yes else @@ -27159,7 +27176,7 @@ # use the computed/retrieved cache-value: eval 'cf_result=$cf_cv_func_'$cf_func - echo "$as_me:27162: result: $cf_result" >&5 + echo "$as_me:27179: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" != no; then cat >>confdefs.h <"conftest.$ac_ext" <<_ACEOF -#line 27190 "configure" +#line 27207 "configure" #include "confdefs.h" int @@ -27199,16 +27216,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:27202: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27219: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27205: \$? = $ac_status" >&5 + echo "$as_me:27222: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:27208: \"$ac_try\"") >&5 + { (eval echo "$as_me:27225: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27211: \$? = $ac_status" >&5 + echo "$as_me:27228: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cat >>confdefs.h <<\EOF @@ -27228,14 +27245,14 @@ LIBS="$LIBS $X_EXTRA_LIBS" -echo "$as_me:27231: checking for termios type tcflag_t" >&5 +echo "$as_me:27248: checking for termios type tcflag_t" >&5 echo $ECHO_N "checking for termios type tcflag_t... $ECHO_C" >&6 if test "${cf_cv_havetype_tcflag_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 27238 "configure" +#line 27255 "configure" #include "confdefs.h" #include int @@ -27248,16 +27265,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27251: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27268: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27254: \$? = $ac_status" >&5 + echo "$as_me:27271: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27257: \"$ac_try\"") >&5 + { (eval echo "$as_me:27274: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27260: \$? = $ac_status" >&5 + echo "$as_me:27277: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_havetype_tcflag_t=yes else @@ -27268,21 +27285,21 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:27271: result: $cf_cv_havetype_tcflag_t" >&5 +echo "$as_me:27288: result: $cf_cv_havetype_tcflag_t" >&5 echo "${ECHO_T}$cf_cv_havetype_tcflag_t" >&6 test "$cf_cv_havetype_tcflag_t" = no && cat >>confdefs.h <<\EOF #define tcflag_t unsigned long EOF -echo "$as_me:27278: checking for termios type speed_t" >&5 +echo "$as_me:27295: checking for termios type speed_t" >&5 echo $ECHO_N "checking for termios type speed_t... $ECHO_C" >&6 if test "${cf_cv_havetype_speed_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 27285 "configure" +#line 27302 "configure" #include "confdefs.h" #include int @@ -27295,16 +27312,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27298: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27315: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27301: \$? = $ac_status" >&5 + echo "$as_me:27318: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27304: \"$ac_try\"") >&5 + { (eval echo "$as_me:27321: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27307: \$? = $ac_status" >&5 + echo "$as_me:27324: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_havetype_speed_t=yes else @@ -27315,21 +27332,21 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:27318: result: $cf_cv_havetype_speed_t" >&5 +echo "$as_me:27335: result: $cf_cv_havetype_speed_t" >&5 echo "${ECHO_T}$cf_cv_havetype_speed_t" >&6 test "$cf_cv_havetype_speed_t" = no && cat >>confdefs.h <<\EOF #define speed_t unsigned short EOF -echo "$as_me:27325: checking for termios type cc_t" >&5 +echo "$as_me:27342: checking for termios type cc_t" >&5 echo $ECHO_N "checking for termios type cc_t... $ECHO_C" >&6 if test "${cf_cv_havetype_cc_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 27332 "configure" +#line 27349 "configure" #include "confdefs.h" #include int @@ -27342,16 +27359,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27345: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27362: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27348: \$? = $ac_status" >&5 + echo "$as_me:27365: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27351: \"$ac_try\"") >&5 + { (eval echo "$as_me:27368: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27354: \$? = $ac_status" >&5 + echo "$as_me:27371: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_havetype_cc_t=yes else @@ -27362,21 +27379,21 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:27365: result: $cf_cv_havetype_cc_t" >&5 +echo "$as_me:27382: result: $cf_cv_havetype_cc_t" >&5 echo "${ECHO_T}$cf_cv_havetype_cc_t" >&6 test "$cf_cv_havetype_cc_t" = no && cat >>confdefs.h <<\EOF #define cc_t unsigned char EOF -echo "$as_me:27372: checking for /dev/tty" >&5 +echo "$as_me:27389: checking for /dev/tty" >&5 echo $ECHO_N "checking for /dev/tty... $ECHO_C" >&6 if test -c /dev/tty ; then cf_result=yes else cf_result=no fi -echo "$as_me:27379: result: $cf_result" >&5 +echo "$as_me:27396: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_result="`echo "/dev/tty" | sed -e s%/%_%g`" @@ -27395,7 +27412,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. set dummy ${ac_tool_prefix}windres; ac_word=$2 -echo "$as_me:27398: checking for $ac_word" >&5 +echo "$as_me:27415: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_WINDRES+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27412,7 +27429,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_WINDRES="$ac_dir/$ac_word" - echo "$as_me:27415: found $ac_dir/$ac_word" >&5 + echo "$as_me:27432: found $ac_dir/$ac_word" >&5 break fi done @@ -27423,10 +27440,10 @@ WINDRES=$ac_cv_path_WINDRES if test -n "$WINDRES"; then - echo "$as_me:27426: result: $WINDRES" >&5 + echo "$as_me:27443: result: $WINDRES" >&5 echo "${ECHO_T}$WINDRES" >&6 else - echo "$as_me:27429: result: no" >&5 + echo "$as_me:27446: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -27435,7 +27452,7 @@ ac_pt_WINDRES=$WINDRES # Extract the first word of "windres", so it can be a program name with args. set dummy windres; ac_word=$2 -echo "$as_me:27438: checking for $ac_word" >&5 +echo "$as_me:27455: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ac_pt_WINDRES+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27452,7 +27469,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_ac_pt_WINDRES="$ac_dir/$ac_word" - echo "$as_me:27455: found $ac_dir/$ac_word" >&5 + echo "$as_me:27472: found $ac_dir/$ac_word" >&5 break fi done @@ -27464,10 +27481,10 @@ ac_pt_WINDRES=$ac_cv_path_ac_pt_WINDRES if test -n "$ac_pt_WINDRES"; then - echo "$as_me:27467: result: $ac_pt_WINDRES" >&5 + echo "$as_me:27484: result: $ac_pt_WINDRES" >&5 echo "${ECHO_T}$ac_pt_WINDRES" >&6 else - echo "$as_me:27470: result: no" >&5 + echo "$as_me:27487: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -27476,14 +27493,14 @@ WINDRES="$ac_cv_path_WINDRES" fi -echo "$as_me:27479: checking if ssp library is needed" >&5 +echo "$as_me:27496: checking if ssp library is needed" >&5 echo $ECHO_N "checking if ssp library is needed... $ECHO_C" >&6 if test "${cf_cv_need_libssp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 27486 "configure" +#line 27503 "configure" #include "confdefs.h" #include @@ -27500,16 +27517,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:27503: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27520: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27506: \$? = $ac_status" >&5 + echo "$as_me:27523: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:27509: \"$ac_try\"") >&5 + { (eval echo "$as_me:27526: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27512: \$? = $ac_status" >&5 + echo "$as_me:27529: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_libssp=no else @@ -27519,7 +27536,7 @@ cf_save_LIBS="$LIBS" LIBS="$LIBS -lssp" cat >"conftest.$ac_ext" <<_ACEOF -#line 27522 "configure" +#line 27539 "configure" #include "confdefs.h" #include @@ -27536,16 +27553,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:27539: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27556: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27542: \$? = $ac_status" >&5 + echo "$as_me:27559: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:27545: \"$ac_try\"") >&5 + { (eval echo "$as_me:27562: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27548: \$? = $ac_status" >&5 + echo "$as_me:27565: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_libssp=yes else @@ -27559,7 +27576,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:27562: result: $cf_cv_need_libssp" >&5 +echo "$as_me:27579: result: $cf_cv_need_libssp" >&5 echo "${ECHO_T}$cf_cv_need_libssp" >&6 if test "x$cf_cv_need_libssp" = xyes @@ -27586,7 +27603,7 @@ ;; (*) -echo "$as_me:27589: checking for crypt function" >&5 +echo "$as_me:27606: checking for crypt function" >&5 echo $ECHO_N "checking for crypt function... $ECHO_C" >&6 if test "${cf_cv_crypt_func+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27594,7 +27611,7 @@ cf_cv_crypt_func= cat >"conftest.$ac_ext" <<_ACEOF -#line 27597 "configure" +#line 27614 "configure" #include "confdefs.h" int @@ -27606,16 +27623,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:27609: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27626: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27612: \$? = $ac_status" >&5 + echo "$as_me:27629: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:27615: \"$ac_try\"") >&5 + { (eval echo "$as_me:27632: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27618: \$? = $ac_status" >&5 + echo "$as_me:27635: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_crypt_func=yes @@ -27626,7 +27643,7 @@ cf_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 27629 "configure" +#line 27646 "configure" #include "confdefs.h" int @@ -27638,16 +27655,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:27641: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27658: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27644: \$? = $ac_status" >&5 + echo "$as_me:27661: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:27647: \"$ac_try\"") >&5 + { (eval echo "$as_me:27664: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27650: \$? = $ac_status" >&5 + echo "$as_me:27667: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_crypt_func="-lcrypt" @@ -27664,12 +27681,12 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:27667: result: $cf_cv_crypt_func" >&5 +echo "$as_me:27684: result: $cf_cv_crypt_func" >&5 echo "${ECHO_T}$cf_cv_crypt_func" >&6 if test "$cf_cv_crypt_func" != no ; then cf_save_LIBS="$LIBS" test "$cf_cv_crypt_func" != yes && LIBS="$cf_cv_crypt_func $LIBS" -echo "$as_me:27672: checking if crypt works" >&5 +echo "$as_me:27689: checking if crypt works" >&5 echo $ECHO_N "checking if crypt works... $ECHO_C" >&6 if test "${cf_cv_crypt_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27680,7 +27697,7 @@ cf_cv_crypt_works=unknown else cat >"conftest.$ac_ext" <<_ACEOF -#line 27683 "configure" +#line 27700 "configure" #include "confdefs.h" #include @@ -27692,15 +27709,15 @@ _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:27695: \"$ac_link\"") >&5 +if { (eval echo "$as_me:27712: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:27698: \$? = $ac_status" >&5 + echo "$as_me:27715: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:27700: \"$ac_try\"") >&5 + { (eval echo "$as_me:27717: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27703: \$? = $ac_status" >&5 + echo "$as_me:27720: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_crypt_works=yes @@ -27715,7 +27732,7 @@ fi LIBS="$cf_save_LIBS" fi -echo "$as_me:27718: result: $cf_cv_crypt_works" >&5 +echo "$as_me:27735: result: $cf_cv_crypt_works" >&5 echo "${ECHO_T}$cf_cv_crypt_works" >&6 if test "$cf_cv_crypt_works" != no ; then cat >>confdefs.h <<\EOF @@ -27734,23 +27751,23 @@ for ac_header in X11/Xpoll.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:27737: checking for $ac_header" >&5 +echo "$as_me:27754: 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 27743 "configure" +#line 27760 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:27747: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:27764: \"$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:27753: \$? = $ac_status" >&5 + echo "$as_me:27770: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -27769,7 +27786,7 @@ fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:27772: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:27789: 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:27799: checking for declaration of fd_set" >&5 echo $ECHO_N "checking for declaration of fd_set... $ECHO_C" >&6 if test "${cf_cv_type_fd_set+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:27788: testing sys/types alone ..." 1>&5 +echo "${as_me:-configure}:27805: testing sys/types alone ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 27791 "configure" +#line 27808 "configure" #include "confdefs.h" #include @@ -27801,26 +27818,26 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27804: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27821: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27807: \$? = $ac_status" >&5 + echo "$as_me:27824: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27810: \"$ac_try\"") >&5 + { (eval echo "$as_me:27827: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27813: \$? = $ac_status" >&5 + echo "$as_me:27830: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_type_fd_set=sys/types.h else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "${as_me:-configure}:27820: testing X11/Xpoll.h ..." 1>&5 +echo "${as_me:-configure}:27837: testing X11/Xpoll.h ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 27823 "configure" +#line 27840 "configure" #include "confdefs.h" #ifdef HAVE_X11_XPOLL_H @@ -27835,26 +27852,26 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27838: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27855: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27841: \$? = $ac_status" >&5 + echo "$as_me:27858: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27844: \"$ac_try\"") >&5 + { (eval echo "$as_me:27861: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27847: \$? = $ac_status" >&5 + echo "$as_me:27864: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_type_fd_set=X11/Xpoll.h else echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 -echo "${as_me:-configure}:27854: testing sys/select.h ..." 1>&5 +echo "${as_me:-configure}:27871: testing sys/select.h ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 27857 "configure" +#line 27874 "configure" #include "confdefs.h" #include @@ -27868,16 +27885,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27871: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27888: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27874: \$? = $ac_status" >&5 + echo "$as_me:27891: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27877: \"$ac_try\"") >&5 + { (eval echo "$as_me:27894: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27880: \$? = $ac_status" >&5 + echo "$as_me:27897: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_type_fd_set=sys/select.h else @@ -27891,7 +27908,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:27894: result: $cf_cv_type_fd_set" >&5 +echo "$as_me:27911: result: $cf_cv_type_fd_set" >&5 echo "${ECHO_T}$cf_cv_type_fd_set" >&6 if test $cf_cv_type_fd_set = sys/select.h ; then @@ -27901,14 +27918,14 @@ fi -echo "$as_me:27904: checking for fd_set macros" >&5 +echo "$as_me:27921: checking for fd_set macros" >&5 echo $ECHO_N "checking for fd_set macros... $ECHO_C" >&6 if test "${cf_cv_macros_fd_set+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 27911 "configure" +#line 27928 "configure" #include "confdefs.h" #include @@ -27937,16 +27954,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:27940: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:27957: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:27943: \$? = $ac_status" >&5 + echo "$as_me:27960: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:27946: \"$ac_try\"") >&5 + { (eval echo "$as_me:27963: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:27949: \$? = $ac_status" >&5 + echo "$as_me:27966: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_macros_fd_set=yes else @@ -27956,7 +27973,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:27959: result: $cf_cv_macros_fd_set" >&5 +echo "$as_me:27976: result: $cf_cv_macros_fd_set" >&5 echo "${ECHO_T}$cf_cv_macros_fd_set" >&6 test $cf_cv_macros_fd_set = yes && cat >>confdefs.h <<\EOF @@ -27968,13 +27985,13 @@ for ac_func in getc_unlocked putc_unlocked do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:27971: checking for $ac_func" >&5 +echo "$as_me:27988: 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 27977 "configure" +#line 27994 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -28005,16 +28022,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:28008: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28025: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28011: \$? = $ac_status" >&5 + echo "$as_me:28028: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:28014: \"$ac_try\"") >&5 + { (eval echo "$as_me:28031: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28017: \$? = $ac_status" >&5 + echo "$as_me:28034: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -28024,7 +28041,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:28027: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:28044: 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:28059: checking if we should define _REENTRANT" >&5 echo $ECHO_N "checking if we should define _REENTRANT... $ECHO_C" >&6 if test "${cf_cv_stdio_unlocked+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 28049 "configure" +#line 28066 "configure" #include "confdefs.h" #include int @@ -28060,16 +28077,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:28063: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:28080: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:28066: \$? = $ac_status" >&5 + echo "$as_me:28083: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:28069: \"$ac_try\"") >&5 + { (eval echo "$as_me:28086: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28072: \$? = $ac_status" >&5 + echo "$as_me:28089: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_stdio_unlocked=yes else @@ -28079,7 +28096,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:28082: result: $cf_cv_stdio_unlocked" >&5 +echo "$as_me:28099: result: $cf_cv_stdio_unlocked" >&5 echo "${ECHO_T}$cf_cv_stdio_unlocked" >&6 if test "$cf_cv_stdio_unlocked" = yes ; then @@ -28142,13 +28159,13 @@ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:28145: checking for $ac_func" >&5 +echo "$as_me:28162: 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 28151 "configure" +#line 28168 "configure" #include "confdefs.h" #define $ac_func autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -28179,16 +28196,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:28182: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28199: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28185: \$? = $ac_status" >&5 + echo "$as_me:28202: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:28188: \"$ac_try\"") >&5 + { (eval echo "$as_me:28205: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28191: \$? = $ac_status" >&5 + echo "$as_me:28208: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval "$as_ac_var=yes" else @@ -28198,7 +28215,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:28201: result: `eval echo '${'"$as_ac_var"'}'`" >&5 +echo "$as_me:28218: 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:28233: 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 28222 "configure" +#line 28239 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:28226: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:28243: \"$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:28232: \$? = $ac_status" >&5 + echo "$as_me:28249: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -28248,7 +28265,7 @@ fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:28251: result: `eval echo '${'"$as_ac_Header"'}'`" >&5 +echo "$as_me:28268: 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:28278: 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 @@ -28269,7 +28286,7 @@ cf_cv_func_mkstemp=maybe else cat >"conftest.$ac_ext" <<_ACEOF -#line 28272 "configure" +#line 28289 "configure" #include "confdefs.h" #include @@ -28310,15 +28327,15 @@ _ACEOF rm -f "conftest$ac_exeext" -if { (eval echo "$as_me:28313: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28330: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28316: \$? = $ac_status" >&5 + echo "$as_me:28333: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"' - { (eval echo "$as_me:28318: \"$ac_try\"") >&5 + { (eval echo "$as_me:28335: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28321: \$? = $ac_status" >&5 + echo "$as_me:28338: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_func_mkstemp=yes @@ -28333,16 +28350,16 @@ fi fi -echo "$as_me:28336: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:28353: 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:28339: checking for mkstemp" >&5 + echo "$as_me:28356: 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 28345 "configure" +#line 28362 "configure" #include "confdefs.h" #define mkstemp autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -28373,16 +28390,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:28376: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28393: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28379: \$? = $ac_status" >&5 + echo "$as_me:28396: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:28382: \"$ac_try\"") >&5 + { (eval echo "$as_me:28399: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28385: \$? = $ac_status" >&5 + echo "$as_me:28402: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_mkstemp=yes else @@ -28392,7 +28409,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:28395: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:28412: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -28455,7 +28472,7 @@ cf_save_cppflags="${CPPFLAGS}" cf_save_ldflags="${LDFLAGS}" -echo "$as_me:28458: checking if you want to use the Xpm library for colored icon" >&5 +echo "$as_me:28475: checking if you want to use the Xpm library for colored icon" >&5 echo $ECHO_N "checking if you want to use the Xpm library for colored icon... $ECHO_C" >&6 # Check whether --with-xpm or --without-xpm was given. @@ -28465,7 +28482,7 @@ else cf_Xpm_library=yes fi; -echo "$as_me:28468: result: $cf_Xpm_library" >&5 +echo "$as_me:28485: result: $cf_Xpm_library" >&5 echo "${ECHO_T}$cf_Xpm_library" >&6 if test "$cf_Xpm_library" != no ; then @@ -28473,23 +28490,23 @@ CPPFLAGS="$CPPFLAGS -I$withval/include" LDFLAGS="$LDFLAGS -L$withval/lib" fi - echo "$as_me:28476: checking for X11/xpm.h" >&5 + echo "$as_me:28493: checking for X11/xpm.h" >&5 echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6 if test "${ac_cv_header_X11_xpm_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 28482 "configure" +#line 28499 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:28486: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:28503: \"$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:28492: \$? = $ac_status" >&5 + echo "$as_me:28509: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -28508,11 +28525,11 @@ fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:28511: result: $ac_cv_header_X11_xpm_h" >&5 +echo "$as_me:28528: result: $ac_cv_header_X11_xpm_h" >&5 echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6 if test "$ac_cv_header_X11_xpm_h" = yes; then - echo "$as_me:28515: checking for XpmCreatePixmapFromData in -lXpm" >&5 + echo "$as_me:28532: checking for XpmCreatePixmapFromData in -lXpm" >&5 echo $ECHO_N "checking for XpmCreatePixmapFromData in -lXpm... $ECHO_C" >&6 if test "${ac_cv_lib_Xpm_XpmCreatePixmapFromData+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -28520,7 +28537,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXpm -lX11 $X_LIBS $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 28523 "configure" +#line 28540 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -28539,16 +28556,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:28542: \"$ac_link\"") >&5 +if { (eval echo "$as_me:28559: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:28545: \$? = $ac_status" >&5 + echo "$as_me:28562: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:28548: \"$ac_try\"") >&5 + { (eval echo "$as_me:28565: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28551: \$? = $ac_status" >&5 + echo "$as_me:28568: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_Xpm_XpmCreatePixmapFromData=yes else @@ -28559,7 +28576,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:28562: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5 +echo "$as_me:28579: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5 echo "${ECHO_T}$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6 if test "$ac_cv_lib_Xpm_XpmCreatePixmapFromData" = yes; then @@ -28579,7 +28596,7 @@ fi - echo "$as_me:28582: checking if you want to enable colored-menus" >&5 + echo "$as_me:28599: checking if you want to enable colored-menus" >&5 echo $ECHO_N "checking if you want to enable colored-menus... $ECHO_C" >&6 # Check whether --enable-colored-menus or --disable-colored-menus was given. @@ -28596,7 +28613,7 @@ enable_colored_menus=no fi; - echo "$as_me:28599: result: $enable_colored_menus" >&5 + echo "$as_me:28616: result: $enable_colored_menus" >&5 echo "${ECHO_T}$enable_colored_menus" >&6 test "$enable_colored_menus" = yes && cat >>confdefs.h <<\EOF @@ -28604,7 +28621,7 @@ EOF if test -n "$cf_x_athena" ; then - echo "$as_me:28607: checking if you want to use Xaw scrollbars rather than our own" >&5 + echo "$as_me:28624: checking if you want to use Xaw scrollbars rather than our own" >&5 echo $ECHO_N "checking if you want to use Xaw scrollbars rather than our own... $ECHO_C" >&6 # Check whether --with-Xaw-scrollbars or --without-Xaw-scrollbars was given. @@ -28614,7 +28631,7 @@ else cf_Xaw_scrollbars=no fi; - echo "$as_me:28617: result: $cf_Xaw_scrollbars" >&5 + echo "$as_me:28634: result: $cf_Xaw_scrollbars" >&5 echo "${ECHO_T}$cf_Xaw_scrollbars" >&6 if test "$cf_Xaw_scrollbars" = no ; then @@ -28633,7 +28650,7 @@ #define OPT_XAW_SCROLLBARS 1 EOF - echo "$as_me:28636: checking if you want to use the drag/scrolling extension with Xaw" >&5 + echo "$as_me:28653: checking if you want to use the drag/scrolling extension with Xaw" >&5 echo $ECHO_N "checking if you want to use the drag/scrolling extension with Xaw... $ECHO_C" >&6 # Check whether --with-drag-extension or --without-drag-extension was given. @@ -28643,7 +28660,7 @@ else cf_drag_extension=no fi; - echo "$as_me:28646: result: $cf_drag_extension" >&5 + echo "$as_me:28663: result: $cf_drag_extension" >&5 echo "${ECHO_T}$cf_drag_extension" >&6 if test "$cf_drag_extension" != "no" ; then @@ -28668,7 +28685,7 @@ if test -n "$ICON_SUFFIX" then - echo "$as_me:28671: checking for the icon name" >&5 + echo "$as_me:28688: checking for the icon name" >&5 echo $ECHO_N "checking for the icon name... $ECHO_C" >&6 # Check whether --with-icon-name or --without-icon-name was given. @@ -28683,13 +28700,13 @@ ICON_NAME=vile ;; esac - echo "$as_me:28686: result: $ICON_NAME" >&5 + echo "$as_me:28703: result: $ICON_NAME" >&5 echo "${ECHO_T}$ICON_NAME" >&6 fi ############################################################################### -echo "$as_me:28692: checking if you want to compile-in plugin support" >&5 +echo "$as_me:28709: checking if you want to compile-in plugin support" >&5 echo $ECHO_N "checking if you want to compile-in plugin support... $ECHO_C" >&6 # Check whether --enable-plugins or --disable-plugins was given. @@ -28706,7 +28723,7 @@ enable_plugins=no fi; -echo "$as_me:28709: result: $enable_plugins" >&5 +echo "$as_me:28726: result: $enable_plugins" >&5 echo "${ECHO_T}$enable_plugins" >&6 # Check whether --enable-largefile or --disable-largefile was given. @@ -28716,7 +28733,7 @@ fi; if test "$enable_largefile" != no; then - echo "$as_me:28719: checking for special C compiler options needed for large files" >&5 + echo "$as_me:28736: 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 @@ -28728,7 +28745,7 @@ # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. cat >"conftest.$ac_ext" <<_ACEOF -#line 28731 "configure" +#line 28748 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -28748,16 +28765,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:28751: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:28768: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:28754: \$? = $ac_status" >&5 + echo "$as_me:28771: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:28757: \"$ac_try\"") >&5 + { (eval echo "$as_me:28774: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28760: \$? = $ac_status" >&5 + echo "$as_me:28777: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -28767,16 +28784,16 @@ rm -f "conftest.$ac_objext" CC="$CC -n32" rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:28770: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:28787: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:28773: \$? = $ac_status" >&5 + echo "$as_me:28790: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:28776: \"$ac_try\"") >&5 + { (eval echo "$as_me:28793: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28779: \$? = $ac_status" >&5 + echo "$as_me:28796: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -28790,13 +28807,13 @@ rm -f "conftest.$ac_ext" fi fi -echo "$as_me:28793: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:28810: 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:28799: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:28816: 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 @@ -28804,7 +28821,7 @@ while :; do ac_cv_sys_file_offset_bits=no cat >"conftest.$ac_ext" <<_ACEOF -#line 28807 "configure" +#line 28824 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -28824,16 +28841,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:28827: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:28844: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:28830: \$? = $ac_status" >&5 + echo "$as_me:28847: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:28833: \"$ac_try\"") >&5 + { (eval echo "$as_me:28850: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28836: \$? = $ac_status" >&5 + echo "$as_me:28853: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -28842,7 +28859,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 28845 "configure" +#line 28862 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include @@ -28863,16 +28880,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:28866: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:28883: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:28869: \$? = $ac_status" >&5 + echo "$as_me:28886: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:28872: \"$ac_try\"") >&5 + { (eval echo "$as_me:28889: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28875: \$? = $ac_status" >&5 + echo "$as_me:28892: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -28883,7 +28900,7 @@ break done fi -echo "$as_me:28886: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:28903: 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 @@ -28893,7 +28910,7 @@ fi rm -rf conftest* - echo "$as_me:28896: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:28913: 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 @@ -28901,7 +28918,7 @@ while :; do ac_cv_sys_large_files=no cat >"conftest.$ac_ext" <<_ACEOF -#line 28904 "configure" +#line 28921 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -28921,16 +28938,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:28924: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:28941: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:28927: \$? = $ac_status" >&5 + echo "$as_me:28944: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:28930: \"$ac_try\"") >&5 + { (eval echo "$as_me:28947: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28933: \$? = $ac_status" >&5 + echo "$as_me:28950: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -28939,7 +28956,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 28942 "configure" +#line 28959 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include @@ -28960,16 +28977,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:28963: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:28980: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:28966: \$? = $ac_status" >&5 + echo "$as_me:28983: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:28969: \"$ac_try\"") >&5 + { (eval echo "$as_me:28986: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:28972: \$? = $ac_status" >&5 + echo "$as_me:28989: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_large_files=1; break else @@ -28980,7 +28997,7 @@ break done fi -echo "$as_me:28983: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:29000: 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 @@ -28993,7 +29010,7 @@ fi if test "$enable_largefile" != no ; then - echo "$as_me:28996: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + echo "$as_me:29013: 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 @@ -29001,7 +29018,7 @@ while :; do ac_cv_sys_largefile_source=no cat >"conftest.$ac_ext" <<_ACEOF -#line 29004 "configure" +#line 29021 "configure" #include "confdefs.h" #include int @@ -29013,16 +29030,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:29016: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:29033: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:29019: \$? = $ac_status" >&5 + echo "$as_me:29036: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:29022: \"$ac_try\"") >&5 + { (eval echo "$as_me:29039: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29025: \$? = $ac_status" >&5 + echo "$as_me:29042: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then break else @@ -29031,7 +29048,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" cat >"conftest.$ac_ext" <<_ACEOF -#line 29034 "configure" +#line 29051 "configure" #include "confdefs.h" #define _LARGEFILE_SOURCE 1 #include @@ -29044,16 +29061,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:29047: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:29064: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:29050: \$? = $ac_status" >&5 + echo "$as_me:29067: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:29053: \"$ac_try\"") >&5 + { (eval echo "$as_me:29070: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29056: \$? = $ac_status" >&5 + echo "$as_me:29073: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_sys_largefile_source=1; break else @@ -29064,7 +29081,7 @@ break done fi -echo "$as_me:29067: result: $ac_cv_sys_largefile_source" >&5 +echo "$as_me:29084: 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 @@ -29078,13 +29095,13 @@ # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -echo "$as_me:29081: checking for fseeko" >&5 +echo "$as_me:29098: 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 29087 "configure" +#line 29104 "configure" #include "confdefs.h" #include int @@ -29096,16 +29113,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:29099: \"$ac_link\"") >&5 +if { (eval echo "$as_me:29116: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29102: \$? = $ac_status" >&5 + echo "$as_me:29119: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:29105: \"$ac_try\"") >&5 + { (eval echo "$as_me:29122: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29108: \$? = $ac_status" >&5 + echo "$as_me:29125: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_fseeko=yes else @@ -29115,7 +29132,7 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:29118: result: $ac_cv_func_fseeko" >&5 +echo "$as_me:29135: result: $ac_cv_func_fseeko" >&5 echo "${ECHO_T}$ac_cv_func_fseeko" >&6 if test $ac_cv_func_fseeko = yes; then @@ -29154,14 +29171,14 @@ fi - echo "$as_me:29157: checking whether to use struct dirent64" >&5 + echo "$as_me:29174: 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 29164 "configure" +#line 29181 "configure" #include "confdefs.h" #pragma GCC diagnostic error "-Wincompatible-pointer-types" @@ -29184,16 +29201,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:29187: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:29204: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:29190: \$? = $ac_status" >&5 + echo "$as_me:29207: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:29193: \"$ac_try\"") >&5 + { (eval echo "$as_me:29210: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29196: \$? = $ac_status" >&5 + echo "$as_me:29213: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_struct_dirent64=yes else @@ -29204,7 +29221,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:29207: result: $cf_cv_struct_dirent64" >&5 +echo "$as_me:29224: result: $cf_cv_struct_dirent64" >&5 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6 test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF @@ -29213,7 +29230,7 @@ fi -echo "$as_me:29216: checking if you want to trim unneeded libraries" >&5 +echo "$as_me:29233: checking if you want to trim unneeded libraries" >&5 echo $ECHO_N "checking if you want to trim unneeded libraries... $ECHO_C" >&6 # Check whether --enable-link-prefix or --disable-link-prefix was given. @@ -29230,7 +29247,7 @@ enable_link_prefix=yes fi; -echo "$as_me:29233: result: $enable_link_prefix" >&5 +echo "$as_me:29250: result: $enable_link_prefix" >&5 echo "${ECHO_T}$enable_link_prefix" >&6 if test $enable_link_prefix = yes then @@ -29244,7 +29261,7 @@ if test "$program_transform_name" != "s,x,x," ; then cf_name=`echo "$program_transform_name" | sed -e 's,\\$\\$,$,g'` cf_name=`echo "$TARGET" |sed -e "$cf_name"` -echo "$as_me:29247: checking for symbolic link to create to $cf_name" >&5 +echo "$as_me:29264: checking for symbolic link to create to $cf_name" >&5 echo $ECHO_N "checking for symbolic link to create to $cf_name... $ECHO_C" >&6 # Check whether --with-symlink or --without-symlink was given. @@ -29254,7 +29271,7 @@ else with_symlink=no fi; -echo "$as_me:29257: result: $with_symlink" >&5 +echo "$as_me:29274: result: $with_symlink" >&5 echo "${ECHO_T}$with_symlink" >&6 test "$with_symlink" = yes && with_symlink=$TARGET test -n "$with_symlink" && \ @@ -29291,14 +29308,14 @@ VILE_SYMLINK="$with_symlink" else - { { echo "$as_me:29294: error: No version number found in sources" >&5 + { { echo "$as_me:29311: error: No version number found in sources" >&5 echo "$as_me: error: No version number found in sources" >&2;} { (exit 1); exit 1; }; } fi fi fi -echo "$as_me:29301: checking if you want to change the number of exec-macros" >&5 +echo "$as_me:29318: checking if you want to change the number of exec-macros" >&5 echo $ECHO_N "checking if you want to change the number of exec-macros... $ECHO_C" >&6 # Check whether --with-exec-macros or --without-exec-macros was given. @@ -29308,7 +29325,7 @@ else cf_exec_macros=no fi; -echo "$as_me:29311: result: $cf_exec_macros" >&5 +echo "$as_me:29328: result: $cf_exec_macros" >&5 echo "${ECHO_T}$cf_exec_macros" >&6 test "$cf_exec_macros" != no && cat >>confdefs.h <&5 +echo "$as_me:29338: checking for setlocale()" >&5 echo $ECHO_N "checking for setlocale()... $ECHO_C" >&6 if test "${cf_cv_locale+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 29328 "configure" +#line 29345 "configure" #include "confdefs.h" #include int @@ -29337,16 +29354,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:29340: \"$ac_link\"") >&5 +if { (eval echo "$as_me:29357: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29343: \$? = $ac_status" >&5 + echo "$as_me:29360: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:29346: \"$ac_try\"") >&5 + { (eval echo "$as_me:29363: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29349: \$? = $ac_status" >&5 + echo "$as_me:29366: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_locale=yes else @@ -29358,7 +29375,7 @@ fi -echo "$as_me:29361: result: $cf_cv_locale" >&5 +echo "$as_me:29378: result: $cf_cv_locale" >&5 echo "${ECHO_T}$cf_cv_locale" >&6 test "$cf_cv_locale" = yes && { cat >>confdefs.h <<\EOF @@ -29367,7 +29384,7 @@ } if test $cf_cv_locale = yes ; then -echo "$as_me:29370: checking if you want to use i18n locale support" >&5 +echo "$as_me:29387: checking if you want to use i18n locale support" >&5 echo $ECHO_N "checking if you want to use i18n locale support... $ECHO_C" >&6 # Check whether --with-locale or --without-locale was given. @@ -29377,7 +29394,7 @@ else cf_locale="$cf_extensions" fi; -echo "$as_me:29380: result: $cf_locale" >&5 +echo "$as_me:29397: result: $cf_locale" >&5 echo "${ECHO_T}$cf_locale" >&6 if test "$cf_locale" != no ; then @@ -29386,7 +29403,7 @@ EOF EXTRAOBJS="$EXTRAOBJS charsets\$o eightbit\$o wcwidth\$o" -echo "$as_me:29389: checking if you want to use iconv() for locale support" >&5 +echo "$as_me:29406: checking if you want to use iconv() for locale support" >&5 echo $ECHO_N "checking if you want to use iconv() for locale support... $ECHO_C" >&6 # Check whether --with-iconv or --without-iconv was given. @@ -29396,7 +29413,7 @@ else cf_func_iconv=yes fi; -echo "$as_me:29399: result: $cf_func_iconv" >&5 +echo "$as_me:29416: result: $cf_func_iconv" >&5 echo "${ECHO_T}$cf_func_iconv" >&6 if test "$cf_func_iconv" = yes ; then @@ -29441,7 +29458,7 @@ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 29444 "configure" +#line 29461 "configure" #include "confdefs.h" #include int @@ -29453,16 +29470,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:29456: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:29473: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:29459: \$? = $ac_status" >&5 + echo "$as_me:29476: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:29462: \"$ac_try\"") >&5 + { (eval echo "$as_me:29479: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29465: \$? = $ac_status" >&5 + echo "$as_me:29482: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -29479,7 +29496,7 @@ if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:29482: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:29499: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -29525,7 +29542,7 @@ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 29528 "configure" +#line 29545 "configure" #include "confdefs.h" #include int @@ -29537,16 +29554,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:29540: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:29557: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:29543: \$? = $ac_status" >&5 + echo "$as_me:29560: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:29546: \"$ac_try\"") >&5 + { (eval echo "$as_me:29563: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29549: \$? = $ac_status" >&5 + echo "$as_me:29566: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -29563,7 +29580,7 @@ if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:29566: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:29583: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -29581,7 +29598,7 @@ fi else -{ { echo "$as_me:29584: error: cannot find libiconv under $withval" >&5 +{ { echo "$as_me:29601: error: cannot find libiconv under $withval" >&5 echo "$as_me: error: cannot find libiconv under $withval" >&2;} { (exit 1); exit 1; }; } fi @@ -29606,7 +29623,7 @@ if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:29609: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:29626: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -29635,7 +29652,7 @@ if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:29638: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:29655: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -29644,7 +29661,7 @@ fi else -{ { echo "$as_me:29647: error: cannot find libiconv under $withval" >&5 +{ { echo "$as_me:29664: error: cannot find libiconv under $withval" >&5 echo "$as_me: error: cannot find libiconv under $withval" >&2;} { (exit 1); exit 1; }; } fi @@ -29655,7 +29672,7 @@ fi; - echo "$as_me:29658: checking for iconv" >&5 + echo "$as_me:29675: checking for iconv" >&5 echo $ECHO_N "checking for iconv... $ECHO_C" >&6 if test "${am_cv_func_iconv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -29666,12 +29683,12 @@ cf_cv_header_path_iconv= cf_cv_library_path_iconv= -echo "${as_me:-configure}:29669: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:29686: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_LIBS="$LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 29674 "configure" +#line 29691 "configure" #include "confdefs.h" #include @@ -29690,16 +29707,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:29693: \"$ac_link\"") >&5 +if { (eval echo "$as_me:29710: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29696: \$? = $ac_status" >&5 + echo "$as_me:29713: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:29699: \"$ac_try\"") >&5 + { (eval echo "$as_me:29716: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29702: \$? = $ac_status" >&5 + echo "$as_me:29719: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_iconv=yes @@ -29713,7 +29730,7 @@ LIBS="-liconv $cf_save_LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 29716 "configure" +#line 29733 "configure" #include "confdefs.h" #include @@ -29732,16 +29749,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:29735: \"$ac_link\"") >&5 +if { (eval echo "$as_me:29752: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:29738: \$? = $ac_status" >&5 + echo "$as_me:29755: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:29741: \"$ac_try\"") >&5 + { (eval echo "$as_me:29758: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29744: \$? = $ac_status" >&5 + echo "$as_me:29761: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_find_linkage_iconv=yes @@ -29758,9 +29775,9 @@ test -n "$verbose" && echo " find linkage for iconv library" 1>&6 -echo "${as_me:-configure}:29761: testing find linkage for iconv library ..." 1>&5 +echo "${as_me:-configure}:29778: testing find linkage for iconv library ..." 1>&5 -echo "${as_me:-configure}:29763: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:29780: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" cf_test_CPPFLAGS="$CPPFLAGS" @@ -29851,7 +29868,7 @@ if test -d "$cf_cv_header_path_iconv" ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_iconv" 1>&6 -echo "${as_me:-configure}:29854: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 +echo "${as_me:-configure}:29871: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS" @@ -29859,7 +29876,7 @@ CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_iconv" cat >"conftest.$ac_ext" <<_ACEOF -#line 29862 "configure" +#line 29879 "configure" #include "confdefs.h" #include @@ -29878,21 +29895,21 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:29881: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:29898: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:29884: \$? = $ac_status" >&5 + echo "$as_me:29901: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:29887: \"$ac_try\"") >&5 + { (eval echo "$as_me:29904: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:29890: \$? = $ac_status" >&5 + echo "$as_me:29907: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found iconv headers in $cf_cv_header_path_iconv" 1>&6 -echo "${as_me:-configure}:29895: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 +echo "${as_me:-configure}:29912: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 cf_cv_find_linkage_iconv=maybe cf_test_CPPFLAGS="$CPPFLAGS" @@ -29910,7 +29927,7 @@ if test "$cf_cv_find_linkage_iconv" = maybe ; then -echo "${as_me:-configure}:29913: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:29930: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_LIBS="$LIBS" cf_save_LDFLAGS="$LDFLAGS" @@ -29985,13 +30002,13 @@ if test -d "$cf_cv_library_path_iconv" ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_iconv" 1>&6 -echo "${as_me:-configure}:29988: testing ... testing $cf_cv_library_path_iconv ..." 1>&5 +echo "${as_me:-configure}:30005: testing ... testing $cf_cv_library_path_iconv ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-liconv $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_iconv" cat >"conftest.$ac_ext" <<_ACEOF -#line 29994 "configure" +#line 30011 "configure" #include "confdefs.h" #include @@ -30010,21 +30027,21 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:30013: \"$ac_link\"") >&5 +if { (eval echo "$as_me:30030: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:30016: \$? = $ac_status" >&5 + echo "$as_me:30033: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:30019: \"$ac_try\"") >&5 + { (eval echo "$as_me:30036: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30022: \$? = $ac_status" >&5 + echo "$as_me:30039: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test -n "$verbose" && echo " ... found iconv library in $cf_cv_library_path_iconv" 1>&6 -echo "${as_me:-configure}:30027: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 +echo "${as_me:-configure}:30044: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 cf_cv_find_linkage_iconv=yes cf_cv_library_file_iconv="-liconv" @@ -30064,7 +30081,7 @@ fi fi -echo "$as_me:30067: result: $am_cv_func_iconv" >&5 +echo "$as_me:30084: result: $am_cv_func_iconv" >&5 echo "${ECHO_T}$am_cv_func_iconv" >&6 if test "$am_cv_func_iconv" = yes; then @@ -30073,14 +30090,14 @@ #define HAVE_ICONV 1 EOF - echo "$as_me:30076: checking if the declaration of iconv() needs const." >&5 + echo "$as_me:30093: checking if the declaration of iconv() needs const." >&5 echo $ECHO_N "checking if the declaration of iconv() needs const.... $ECHO_C" >&6 if test "${am_cv_proto_iconv_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 30083 "configure" +#line 30100 "configure" #include "confdefs.h" #include @@ -30105,16 +30122,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:30108: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:30125: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:30111: \$? = $ac_status" >&5 + echo "$as_me:30128: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:30114: \"$ac_try\"") >&5 + { (eval echo "$as_me:30131: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30117: \$? = $ac_status" >&5 + echo "$as_me:30134: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then am_cv_proto_iconv_const=no else @@ -30124,7 +30141,7 @@ fi rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:30127: result: $am_cv_proto_iconv_const" >&5 +echo "$as_me:30144: result: $am_cv_proto_iconv_const" >&5 echo "${ECHO_T}$am_cv_proto_iconv_const" >&6 if test "$am_cv_proto_iconv_const" = yes ; then @@ -30169,7 +30186,7 @@ CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir" cat >"conftest.$ac_ext" <<_ACEOF -#line 30172 "configure" +#line 30189 "configure" #include "confdefs.h" #include int @@ -30181,16 +30198,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:30184: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:30201: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:30187: \$? = $ac_status" >&5 + echo "$as_me:30204: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:30190: \"$ac_try\"") >&5 + { (eval echo "$as_me:30207: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30193: \$? = $ac_status" >&5 + echo "$as_me:30210: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then : else @@ -30207,7 +30224,7 @@ if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:30210: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:30227: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -30246,7 +30263,7 @@ if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:30249: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:30266: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" fi @@ -30265,7 +30282,7 @@ test "$am_cv_func_iconv" != yes && LIBS="$am_cv_func_iconv $LIBS" else - { echo "$as_me:30268: WARNING: skipping iconv since it was not found" >&5 + { echo "$as_me:30285: WARNING: skipping iconv since it was not found" >&5 echo "$as_me: WARNING: skipping iconv since it was not found" >&2;} fi # test $am_cv_func_iconv = yes fi # test $cf_func_iconv" = yes @@ -30274,7 +30291,7 @@ # Extract the first word of "groff", so it can be a program name with args. set dummy groff; ac_word=$2 -echo "$as_me:30277: checking for $ac_word" >&5 +echo "$as_me:30294: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_GROFF_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -30291,7 +30308,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_GROFF_PATH="$ac_dir/$ac_word" - echo "$as_me:30294: found $ac_dir/$ac_word" >&5 + echo "$as_me:30311: found $ac_dir/$ac_word" >&5 break fi done @@ -30303,10 +30320,10 @@ GROFF_PATH=$ac_cv_path_GROFF_PATH if test -n "$GROFF_PATH"; then - echo "$as_me:30306: result: $GROFF_PATH" >&5 + echo "$as_me:30323: result: $GROFF_PATH" >&5 echo "${ECHO_T}$GROFF_PATH" >&6 else - echo "$as_me:30309: result: no" >&5 + echo "$as_me:30326: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -30314,7 +30331,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:30317: checking for $ac_word" >&5 +echo "$as_me:30334: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_NROFF_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -30331,7 +30348,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_NROFF_PATH="$ac_dir/$ac_word" - echo "$as_me:30334: found $ac_dir/$ac_word" >&5 + echo "$as_me:30351: found $ac_dir/$ac_word" >&5 break fi done @@ -30342,10 +30359,10 @@ NROFF_PATH=$ac_cv_path_NROFF_PATH if test -n "$NROFF_PATH"; then - echo "$as_me:30345: result: $NROFF_PATH" >&5 + echo "$as_me:30362: result: $NROFF_PATH" >&5 echo "${ECHO_T}$NROFF_PATH" >&6 else - echo "$as_me:30348: result: no" >&5 + echo "$as_me:30365: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -30355,7 +30372,7 @@ # Extract the first word of "tbl", so it can be a program name with args. set dummy tbl; ac_word=$2 -echo "$as_me:30358: checking for $ac_word" >&5 +echo "$as_me:30375: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TBL_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -30372,7 +30389,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_TBL_PATH="$ac_dir/$ac_word" - echo "$as_me:30375: found $ac_dir/$ac_word" >&5 + echo "$as_me:30392: found $ac_dir/$ac_word" >&5 break fi done @@ -30384,10 +30401,10 @@ TBL_PATH=$ac_cv_path_TBL_PATH if test -n "$TBL_PATH"; then - echo "$as_me:30387: result: $TBL_PATH" >&5 + echo "$as_me:30404: result: $TBL_PATH" >&5 echo "${ECHO_T}$TBL_PATH" >&6 else - echo "$as_me:30390: result: no" >&5 + echo "$as_me:30407: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -30407,7 +30424,7 @@ (x|xyes) # Extract the first word of "man2html", so it can be a program name with args. set dummy man2html; ac_word=$2 -echo "$as_me:30410: checking for $ac_word" >&5 +echo "$as_me:30427: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_cf_man2html+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -30424,7 +30441,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_cf_man2html="$ac_dir/$ac_word" - echo "$as_me:30427: found $ac_dir/$ac_word" >&5 + echo "$as_me:30444: found $ac_dir/$ac_word" >&5 break fi done @@ -30436,16 +30453,16 @@ cf_man2html=$ac_cv_path_cf_man2html if test -n "$cf_man2html"; then - echo "$as_me:30439: result: $cf_man2html" >&5 + echo "$as_me:30456: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 else - echo "$as_me:30442: result: no" >&5 + echo "$as_me:30459: result: no" >&5 echo "${ECHO_T}no" >&6 fi case "x$cf_man2html" in (x/*) - echo "$as_me:30448: checking for the modified Earl Hood script" >&5 + echo "$as_me:30465: checking for the modified Earl Hood script" >&5 echo $ECHO_N "checking for the modified Earl Hood script... $ECHO_C" >&6 if ( $cf_man2html -help 2>&1 | grep 'Make an index of headers at the end' >/dev/null ) then @@ -30454,7 +30471,7 @@ cf_man2html=no cf_man2html_ok=no fi - echo "$as_me:30457: result: $cf_man2html_ok" >&5 + echo "$as_me:30474: result: $cf_man2html_ok" >&5 echo "${ECHO_T}$cf_man2html_ok" >&6 ;; (*) @@ -30463,7 +30480,7 @@ esac esac -echo "$as_me:30466: checking for program to convert manpage to html" >&5 +echo "$as_me:30483: checking for program to convert manpage to html" >&5 echo $ECHO_N "checking for program to convert manpage to html... $ECHO_C" >&6 # Check whether --with-man2html or --without-man2html was given. @@ -30478,11 +30495,11 @@ case $cf_man2html in (yes) - echo "$as_me:30481: result: man2html" >&5 + echo "$as_me:30498: result: man2html" >&5 echo "${ECHO_T}man2html" >&6 # Extract the first word of "man2html", so it can be a program name with args. set dummy man2html; ac_word=$2 -echo "$as_me:30485: checking for $ac_word" >&5 +echo "$as_me:30502: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_cf_man2html+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -30499,7 +30516,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_cf_man2html="$ac_dir/$ac_word" - echo "$as_me:30502: found $ac_dir/$ac_word" >&5 + echo "$as_me:30519: found $ac_dir/$ac_word" >&5 break fi done @@ -30511,10 +30528,10 @@ cf_man2html=$ac_cv_path_cf_man2html if test -n "$cf_man2html"; then - echo "$as_me:30514: result: $cf_man2html" >&5 + echo "$as_me:30531: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 else - echo "$as_me:30517: result: no" >&5 + echo "$as_me:30534: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -30522,11 +30539,11 @@ (no|groff|*/groff*) cf_with_groff=yes cf_man2html=$GROFF_PATH - echo "$as_me:30525: result: $cf_man2html" >&5 + echo "$as_me:30542: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 ;; (*) - echo "$as_me:30529: result: $cf_man2html" >&5 + echo "$as_me:30546: result: $cf_man2html" >&5 echo "${ECHO_T}$cf_man2html" >&6 ;; esac @@ -30567,12 +30584,12 @@ # disable hyphenation if this is groff if test "x$GROFF_PATH" != xno then - echo "$as_me:30570: checking if nroff is really groff" >&5 + echo "$as_me:30587: checking if nroff is really groff" >&5 echo $ECHO_N "checking if nroff is really groff... $ECHO_C" >&6 cf_check_groff="`$NROFF_PATH --version 2>/dev/null | grep groff`" test -n "$cf_check_groff" && cf_check_groff=yes test -n "$cf_check_groff" || cf_check_groff=no - echo "$as_me:30575: result: $cf_check_groff" >&5 + echo "$as_me:30592: result: $cf_check_groff" >&5 echo "${ECHO_T}$cf_check_groff" >&6 test "x$cf_check_groff" = xyes && NROFF_OPTS="-rHY=0" fi @@ -30603,14 +30620,14 @@ cf_man2html=`echo "$cf_man2html" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:30606: error: expected a pathname, not \"$cf_man2html\"" >&5 + { { echo "$as_me:30623: error: expected a pathname, not \"$cf_man2html\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_man2html\"" >&2;} { (exit 1); exit 1; }; } ;; esac MAN2HTML_PATH="$cf_man2html" - echo "$as_me:30613: checking for $cf_man2html top/bottom margins" >&5 + echo "$as_me:30630: checking for $cf_man2html top/bottom margins" >&5 echo $ECHO_N "checking for $cf_man2html top/bottom margins... $ECHO_C" >&6 # for this example, expect 3 lines of content, the remainder is head/foot @@ -30628,10 +30645,10 @@ cf_man2html_bot=`expr "$cf_man2html_bot" - 2 - "$cf_man2html_top"` cf_man2html_top_bot="-topm=$cf_man2html_top -botm=$cf_man2html_bot" - echo "$as_me:30631: result: $cf_man2html_top_bot" >&5 + echo "$as_me:30648: result: $cf_man2html_top_bot" >&5 echo "${ECHO_T}$cf_man2html_top_bot" >&6 - echo "$as_me:30634: checking for pagesize to use" >&5 + echo "$as_me:30651: checking for pagesize to use" >&5 echo $ECHO_N "checking for pagesize to use... $ECHO_C" >&6 for cf_block in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 do @@ -30656,7 +30673,7 @@ test "$cf_man2html_page" -gt 100 && cf_man2html_page=99999 rm -rf conftest* - echo "$as_me:30659: result: $cf_man2html_page" >&5 + echo "$as_me:30676: result: $cf_man2html_page" >&5 echo "${ECHO_T}$cf_man2html_page" >&6 cat >>$MAN2HTML_TEMP <&5 +echo "$as_me:30697: 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. @@ -30699,7 +30716,7 @@ else with_dmalloc= fi; -echo "$as_me:30702: result: ${with_dmalloc:-no}" >&5 +echo "$as_me:30719: result: ${with_dmalloc:-no}" >&5 echo "${ECHO_T}${with_dmalloc:-no}" >&6 case ".$with_cflags" in @@ -30813,23 +30830,23 @@ esac if test "$with_dmalloc" = yes ; then - echo "$as_me:30816: checking for dmalloc.h" >&5 + echo "$as_me:30833: 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 30822 "configure" +#line 30839 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:30826: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:30843: \"$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:30832: \$? = $ac_status" >&5 + echo "$as_me:30849: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -30848,11 +30865,11 @@ fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:30851: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:30868: 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:30855: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:30872: 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 @@ -30860,7 +30877,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 30863 "configure" +#line 30880 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -30879,16 +30896,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:30882: \"$ac_link\"") >&5 +if { (eval echo "$as_me:30899: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:30885: \$? = $ac_status" >&5 + echo "$as_me:30902: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:30888: \"$ac_try\"") >&5 + { (eval echo "$as_me:30905: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:30891: \$? = $ac_status" >&5 + echo "$as_me:30908: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -30899,7 +30916,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:30902: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:30919: 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:30934: 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. @@ -30936,7 +30953,7 @@ else with_dbmalloc= fi; -echo "$as_me:30939: result: ${with_dbmalloc:-no}" >&5 +echo "$as_me:30956: result: ${with_dbmalloc:-no}" >&5 echo "${ECHO_T}${with_dbmalloc:-no}" >&6 case ".$with_cflags" in @@ -31050,23 +31067,23 @@ esac if test "$with_dbmalloc" = yes ; then - echo "$as_me:31053: checking for dbmalloc.h" >&5 + echo "$as_me:31070: 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 31059 "configure" +#line 31076 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:31063: \"$ac_cpp "conftest.$ac_ext"\"") >&5 +if { (eval echo "$as_me:31080: \"$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:31069: \$? = $ac_status" >&5 + echo "$as_me:31086: \$? = $ac_status" >&5 (exit "$ac_status"); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -31085,11 +31102,11 @@ fi rm -f conftest.err "conftest.$ac_ext" fi -echo "$as_me:31088: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:31105: 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:31092: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:31109: 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 @@ -31097,7 +31114,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 31100 "configure" +#line 31117 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -31116,16 +31133,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:31119: \"$ac_link\"") >&5 +if { (eval echo "$as_me:31136: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:31122: \$? = $ac_status" >&5 + echo "$as_me:31139: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:31125: \"$ac_try\"") >&5 + { (eval echo "$as_me:31142: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:31128: \$? = $ac_status" >&5 + echo "$as_me:31145: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -31136,7 +31153,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:31139: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:31156: 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:31171: checking if you want to use purify for testing" >&5 echo $ECHO_N "checking if you want to use purify for testing... $ECHO_C" >&6 # Check whether --with-purify or --without-purify was given. @@ -31173,7 +31190,7 @@ else with_purify= fi; -echo "$as_me:31176: result: ${with_purify:-no}" >&5 +echo "$as_me:31193: result: ${with_purify:-no}" >&5 echo "${ECHO_T}${with_purify:-no}" >&6 case ".$with_cflags" in @@ -31286,7 +31303,7 @@ ;; esac -echo "$as_me:31289: checking if you want to use valgrind for testing" >&5 +echo "$as_me:31306: 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. @@ -31308,7 +31325,7 @@ else with_valgrind= fi; -echo "$as_me:31311: result: ${with_valgrind:-no}" >&5 +echo "$as_me:31328: result: ${with_valgrind:-no}" >&5 echo "${ECHO_T}${with_valgrind:-no}" >&6 case ".$with_cflags" in @@ -31421,7 +31438,7 @@ ;; esac -echo "$as_me:31424: checking if you want to perform memory-leak testing" >&5 +echo "$as_me:31441: 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 --with-no-leaks or --without-no-leaks was given. @@ -31446,7 +31463,7 @@ with_no_leaks=no fi -echo "$as_me:31449: result: $with_no_leaks" >&5 +echo "$as_me:31466: result: $with_no_leaks" >&5 echo "${ECHO_T}$with_no_leaks" >&6 if test "x$enable_leaks" = xno @@ -31500,7 +31517,7 @@ test -z "${with_valgrind}" && EXTRAOBJS="$EXTRAOBJS trace\$o" fi -echo "$as_me:31503: checking if you want to use C11 _Noreturn feature" >&5 +echo "$as_me:31520: checking if you want to use C11 _Noreturn feature" >&5 echo $ECHO_N "checking if you want to use C11 _Noreturn feature... $ECHO_C" >&6 # Check whether --enable-stdnoreturn or --disable-stdnoreturn was given. @@ -31517,17 +31534,17 @@ enable_stdnoreturn=no fi; -echo "$as_me:31520: result: $enable_stdnoreturn" >&5 +echo "$as_me:31537: result: $enable_stdnoreturn" >&5 echo "${ECHO_T}$enable_stdnoreturn" >&6 if test $enable_stdnoreturn = yes; then -echo "$as_me:31524: checking for C11 _Noreturn feature" >&5 +echo "$as_me:31541: checking for C11 _Noreturn feature" >&5 echo $ECHO_N "checking for C11 _Noreturn feature... $ECHO_C" >&6 if test "${cf_cv_c11_noreturn+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 31530 "configure" +#line 31547 "configure" #include "confdefs.h" #include @@ -31544,16 +31561,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:31547: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:31564: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:31550: \$? = $ac_status" >&5 + echo "$as_me:31567: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:31553: \"$ac_try\"") >&5 + { (eval echo "$as_me:31570: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:31556: \$? = $ac_status" >&5 + echo "$as_me:31573: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_c11_noreturn=yes else @@ -31564,7 +31581,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:31567: result: $cf_cv_c11_noreturn" >&5 +echo "$as_me:31584: result: $cf_cv_c11_noreturn" >&5 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6 else cf_cv_c11_noreturn=no, @@ -31592,14 +31609,16 @@ then case $CFLAGS in (*-Werror=*) - test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 - -echo "${as_me:-configure}:31597: testing repairing CFLAGS: $CFLAGS ..." 1>&5 - cf_temp_flags= for cf_temp_scan in $CFLAGS do case "x$cf_temp_scan" in + (x-Werror=format*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; (x-Werror=*) test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " @@ -31614,15 +31633,22 @@ ;; esac done - CFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 + if test "x$CFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing CFLAGS: $CFLAGS" 1>&6 + +echo "${as_me:-configure}:31640: testing repairing CFLAGS: $CFLAGS ..." 1>&5 + + CFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CFLAGS" 1>&6 -echo "${as_me:-configure}:31620: testing ... fixed $CFLAGS ..." 1>&5 +echo "${as_me:-configure}:31645: testing ... fixed $CFLAGS ..." 1>&5 - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:31624: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:31649: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + fi ;; esac fi @@ -31631,14 +31657,16 @@ then case $CPPFLAGS in (*-Werror=*) - test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 - -echo "${as_me:-configure}:31636: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 - cf_temp_flags= for cf_temp_scan in $CPPFLAGS do case "x$cf_temp_scan" in + (x-Werror=format*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; (x-Werror=*) test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " @@ -31653,15 +31681,22 @@ ;; esac done - CPPFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 + if test "x$CPPFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing CPPFLAGS: $CPPFLAGS" 1>&6 + +echo "${as_me:-configure}:31688: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5 + + CPPFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:31659: testing ... fixed $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:31693: testing ... fixed $CPPFLAGS ..." 1>&5 - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 -echo "${as_me:-configure}:31663: testing ... extra $EXTRA_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:31697: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + fi ;; esac fi @@ -31670,14 +31705,16 @@ then case $LDFLAGS in (*-Werror=*) - test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 - -echo "${as_me:-configure}:31675: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 - cf_temp_flags= for cf_temp_scan in $LDFLAGS do case "x$cf_temp_scan" in + (x-Werror=format*) + + test -n "$cf_temp_flags" && cf_temp_flags="$cf_temp_flags " + cf_temp_flags="${cf_temp_flags}$cf_temp_scan" + + ;; (x-Werror=*) test -n "$EXTRA_CFLAGS" && EXTRA_CFLAGS="$EXTRA_CFLAGS " @@ -31692,20 +31729,27 @@ ;; esac done - LDFLAGS="$cf_temp_flags" - test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 + if test "x$LDFLAGS" != "x$cf_temp_flags" + then + test -n "$verbose" && echo " repairing LDFLAGS: $LDFLAGS" 1>&6 + +echo "${as_me:-configure}:31736: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5 -echo "${as_me:-configure}:31698: testing ... fixed $LDFLAGS ..." 1>&5 + LDFLAGS="$cf_temp_flags" + test -n "$verbose" && echo " ... fixed $LDFLAGS" 1>&6 - test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:31741: testing ... fixed $LDFLAGS ..." 1>&5 -echo "${as_me:-configure}:31702: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + test -n "$verbose" && echo " ... extra $EXTRA_CFLAGS" 1>&6 +echo "${as_me:-configure}:31745: testing ... extra $EXTRA_CFLAGS ..." 1>&5 + + fi ;; esac fi -echo "$as_me:31708: checking if you want to turn on gcc warnings" >&5 +echo "$as_me:31752: 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. @@ -31722,7 +31766,7 @@ enable_warnings=no fi; -echo "$as_me:31725: result: $enable_warnings" >&5 +echo "$as_me:31769: result: $enable_warnings" >&5 echo "${ECHO_T}$enable_warnings" >&6 if test "$enable_warnings" = "yes" then @@ -31745,10 +31789,10 @@ EOF if test "$GCC" = yes then - { echo "$as_me:31748: checking for $CC __attribute__ directives..." >&5 + { echo "$as_me:31792: 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:31844: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:31803: \$? = $ac_status" >&5 + echo "$as_me:31847: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:31805: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:31849: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case "$cf_attribute" in @@ -31880,7 +31924,7 @@ done cat >"conftest.$ac_ext" <<_ACEOF -#line 31883 "configure" +#line 31927 "configure" #include "confdefs.h" #include @@ -31895,26 +31939,26 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:31898: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:31942: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:31901: \$? = $ac_status" >&5 + echo "$as_me:31945: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:31904: \"$ac_try\"") >&5 + { (eval echo "$as_me:31948: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:31907: \$? = $ac_status" >&5 + echo "$as_me:31951: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then -echo "$as_me:31910: checking for X11/Xt const-feature" >&5 +echo "$as_me:31954: checking for X11/Xt const-feature" >&5 echo $ECHO_N "checking for X11/Xt const-feature... $ECHO_C" >&6 if test "${cf_cv_const_x_string+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 31917 "configure" +#line 31961 "configure" #include "confdefs.h" #define _CONST_X_STRING /* X11R7.8 (perhaps) */ @@ -31931,16 +31975,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:31934: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:31978: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:31937: \$? = $ac_status" >&5 + echo "$as_me:31981: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:31940: \"$ac_try\"") >&5 + { (eval echo "$as_me:31984: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:31943: \$? = $ac_status" >&5 + echo "$as_me:31987: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_const_x_string=no @@ -31955,7 +31999,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi -echo "$as_me:31958: result: $cf_cv_const_x_string" >&5 +echo "$as_me:32002: result: $cf_cv_const_x_string" >&5 echo "${ECHO_T}$cf_cv_const_x_string" >&6 LIBS="$cf_save_LIBS_CF_CONST_X_STRING" @@ -31984,7 +32028,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" fi cat > "conftest.$ac_ext" <&5 + { echo "$as_me:32047: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall" @@ -32016,12 +32060,12 @@ wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:32019: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:32063: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32022: \$? = $ac_status" >&5 + echo "$as_me:32066: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:32024: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:32068: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -32029,7 +32073,7 @@ CFLAGS="$cf_save_CFLAGS" elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown" then - { echo "$as_me:32032: checking for $CC warning options..." >&5 + { echo "$as_me:32076: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" cf_warn_CONST="" @@ -32052,12 +32096,12 @@ Wundef Wno-inline $cf_gcc_warnings $cf_warn_CONST Wno-unknown-pragmas do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:32055: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:32099: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32058: \$? = $ac_status" >&5 + echo "$as_me:32102: \$? = $ac_status" >&5 (exit "$ac_status"); }; then - test -n "$verbose" && echo "$as_me:32060: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:32104: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case "$cf_opt" in (Winline) @@ -32065,7 +32109,7 @@ ([34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:32068: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:32112: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -32075,7 +32119,7 @@ ([12].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:32078: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:32122: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -32092,7 +32136,7 @@ fi -echo "$as_me:32095: checking if you want to install stripped executables" >&5 +echo "$as_me:32139: checking if you want to install stripped executables" >&5 echo $ECHO_N "checking if you want to install stripped executables... $ECHO_C" >&6 # Check whether --enable-stripping or --disable-stripping was given. @@ -32109,7 +32153,7 @@ enable_stripping=yes fi; -echo "$as_me:32112: result: $enable_stripping" >&5 +echo "$as_me:32156: result: $enable_stripping" >&5 echo "${ECHO_T}$enable_stripping" >&6 if test "$enable_stripping" = yes @@ -32120,7 +32164,7 @@ fi : "${INSTALL:=install}" -echo "$as_me:32123: checking if install accepts -p option" >&5 +echo "$as_me:32167: checking if install accepts -p option" >&5 echo $ECHO_N "checking if install accepts -p option... $ECHO_C" >&6 if test "${cf_cv_install_p+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -32151,10 +32195,10 @@ rm -rf ./conftest* fi -echo "$as_me:32154: result: $cf_cv_install_p" >&5 +echo "$as_me:32198: result: $cf_cv_install_p" >&5 echo "${ECHO_T}$cf_cv_install_p" >&6 -echo "$as_me:32157: checking if install needs to be told about ownership" >&5 +echo "$as_me:32201: checking if install needs to be told about ownership" >&5 echo $ECHO_N "checking if install needs to be told about ownership... $ECHO_C" >&6 case `$ac_config_guess` in (*minix) @@ -32165,7 +32209,7 @@ ;; esac -echo "$as_me:32168: result: $with_install_o" >&5 +echo "$as_me:32212: result: $with_install_o" >&5 echo "${ECHO_T}$with_install_o" >&6 if test "x$with_install_o" = xyes then @@ -32199,7 +32243,7 @@ ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -echo "$as_me:32202: checking for missing \"${ac_func}\" extern" >&5 +echo "$as_me:32246: checking for missing \"${ac_func}\" extern" >&5 echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -32208,7 +32252,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG" cat >"conftest.$ac_ext" <<_ACEOF -#line 32211 "configure" +#line 32255 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -32230,16 +32274,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:32233: \"$ac_link\"") >&5 +if { (eval echo "$as_me:32277: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:32236: \$? = $ac_status" >&5 + echo "$as_me:32280: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:32239: \"$ac_try\"") >&5 + { (eval echo "$as_me:32283: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32242: \$? = $ac_status" >&5 + echo "$as_me:32286: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval 'cf_cv_func_'"${ac_func}"'=yes' else @@ -32253,7 +32297,7 @@ fi eval 'cf_result="$cf_cv_func_'"${ac_func}"\" -echo "$as_me:32256: result: $cf_result" >&5 +echo "$as_me:32300: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test "$cf_result" = yes && cat >>confdefs.h <&5 +echo "$as_me:32308: 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 @@ -32282,7 +32326,7 @@ for cf_header in $cf_header_list do cat >"conftest.$ac_ext" <<_ACEOF -#line 32285 "configure" +#line 32329 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -32296,16 +32340,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:32299: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:32343: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32302: \$? = $ac_status" >&5 + echo "$as_me:32346: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:32305: \"$ac_try\"") >&5 + { (eval echo "$as_me:32349: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32308: \$? = $ac_status" >&5 + echo "$as_me:32352: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header=$cf_header break @@ -32324,7 +32368,7 @@ for cf_header in ncurses/term.h ncursesw/term.h do cat >"conftest.$ac_ext" <<_ACEOF -#line 32327 "configure" +#line 32371 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header:-curses.h}> @@ -32342,16 +32386,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:32345: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:32389: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32348: \$? = $ac_status" >&5 + echo "$as_me:32392: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:32351: \"$ac_try\"") >&5 + { (eval echo "$as_me:32395: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32354: \$? = $ac_status" >&5 + echo "$as_me:32398: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_term_header=$cf_header break @@ -32366,7 +32410,7 @@ esac fi -echo "$as_me:32369: result: $cf_cv_term_header" >&5 +echo "$as_me:32413: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 case "$cf_cv_term_header" in @@ -32399,7 +32443,7 @@ #include " -echo "$as_me:32402: checking if we should include curses.h or termcap.h" >&5 +echo "$as_me:32446: checking if we should include curses.h or termcap.h" >&5 echo $ECHO_N "checking if we should include curses.h or termcap.h... $ECHO_C" >&6 if test "${cf_cv_need_curses_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -32418,7 +32462,7 @@ test -n "$cf_t_opts" && CPPFLAGS="$CPPFLAGS -D$cf_t_opts" cat >"conftest.$ac_ext" <<_ACEOF -#line 32421 "configure" +#line 32465 "configure" #include "confdefs.h" /* $cf_c_opts $cf_t_opts */ $CHECK_DECL_HDRS @@ -32431,16 +32475,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:32434: \"$ac_link\"") >&5 +if { (eval echo "$as_me:32478: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:32437: \$? = $ac_status" >&5 + echo "$as_me:32481: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:32440: \"$ac_try\"") >&5 + { (eval echo "$as_me:32484: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32443: \$? = $ac_status" >&5 + echo "$as_me:32487: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then test "$cf_cv_need_curses_h" = no && { cf_cv_need_curses_h=maybe @@ -32452,7 +32496,7 @@ cat "conftest.$ac_ext" >&5 echo "Recompiling with corrected call (C:$cf_c_opts, T:$cf_t_opts)" >&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 32455 "configure" +#line 32499 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -32465,16 +32509,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:32468: \"$ac_link\"") >&5 +if { (eval echo "$as_me:32512: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:32471: \$? = $ac_status" >&5 + echo "$as_me:32515: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:32474: \"$ac_try\"") >&5 + { (eval echo "$as_me:32518: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32477: \$? = $ac_status" >&5 + echo "$as_me:32521: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_need_curses_h=yes cf_ok_c_opts=$cf_c_opts @@ -32511,7 +32555,7 @@ fi fi -echo "$as_me:32514: result: $cf_cv_need_curses_h" >&5 +echo "$as_me:32558: result: $cf_cv_need_curses_h" >&5 echo "${ECHO_T}$cf_cv_need_curses_h" >&6 case $cf_cv_need_curses_h in @@ -32549,7 +32593,7 @@ ;; esac -echo "$as_me:32552: checking declaration of tputs 3rd param" >&5 +echo "$as_me:32596: checking declaration of tputs 3rd param" >&5 echo $ECHO_N "checking declaration of tputs 3rd param... $ECHO_C" >&6 if test "${cf_cv_type_outchar+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -32565,10 +32609,10 @@ for R in int char; do for S in "" const; do -echo "${as_me:-configure}:32568: testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 +echo "${as_me:-configure}:32612: testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 cat >"conftest.$ac_ext" <<_ACEOF -#line 32571 "configure" +#line 32615 "configure" #include "confdefs.h" $CHECK_DECL_HDRS int @@ -32582,16 +32626,16 @@ } _ACEOF rm -f "conftest.$ac_objext" -if { (eval echo "$as_me:32585: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:32629: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:32588: \$? = $ac_status" >&5 + echo "$as_me:32632: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest.$ac_objext"' - { (eval echo "$as_me:32591: \"$ac_try\"") >&5 + { (eval echo "$as_me:32635: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32594: \$? = $ac_status" >&5 + echo "$as_me:32638: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_cv_type_outchar="$Q OutChar($R)" cf_cv_found=yes @@ -32610,7 +32654,7 @@ done fi -echo "$as_me:32613: result: $cf_cv_type_outchar" >&5 +echo "$as_me:32657: result: $cf_cv_type_outchar" >&5 echo "${ECHO_T}$cf_cv_type_outchar" >&6 case $cf_cv_type_outchar in @@ -32644,7 +32688,7 @@ ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -echo "$as_me:32647: checking for missing \"${ac_func}\" extern" >&5 +echo "$as_me:32691: checking for missing \"${ac_func}\" extern" >&5 echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -32653,7 +32697,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG" cat >"conftest.$ac_ext" <<_ACEOF -#line 32656 "configure" +#line 32700 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -32675,16 +32719,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:32678: \"$ac_link\"") >&5 +if { (eval echo "$as_me:32722: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:32681: \$? = $ac_status" >&5 + echo "$as_me:32725: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:32684: \"$ac_try\"") >&5 + { (eval echo "$as_me:32728: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32687: \$? = $ac_status" >&5 + echo "$as_me:32731: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval 'cf_cv_func_'"${ac_func}"'=yes' else @@ -32698,7 +32742,7 @@ fi eval 'cf_result="$cf_cv_func_'"${ac_func}"\" -echo "$as_me:32701: result: $cf_result" >&5 +echo "$as_me:32745: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test "$cf_result" = yes && cat >>confdefs.h <&5 +echo "$as_me:32822: checking for missing \"${ac_func}\" extern" >&5 echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -32784,7 +32828,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG" cat >"conftest.$ac_ext" <<_ACEOF -#line 32787 "configure" +#line 32831 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -32806,16 +32850,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:32809: \"$ac_link\"") >&5 +if { (eval echo "$as_me:32853: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:32812: \$? = $ac_status" >&5 + echo "$as_me:32856: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:32815: \"$ac_try\"") >&5 + { (eval echo "$as_me:32859: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32818: \$? = $ac_status" >&5 + echo "$as_me:32862: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval 'cf_cv_func_'"${ac_func}"'=yes' else @@ -32829,7 +32873,7 @@ fi eval 'cf_result="$cf_cv_func_'"${ac_func}"\" -echo "$as_me:32832: result: $cf_result" >&5 +echo "$as_me:32876: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test "$cf_result" = yes && cat >>confdefs.h <&5 +echo "$as_me:32896: checking for missing \"${ac_func}\" extern" >&5 echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6 if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -32858,7 +32902,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG" cat >"conftest.$ac_ext" <<_ACEOF -#line 32861 "configure" +#line 32905 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -32880,16 +32924,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:32883: \"$ac_link\"") >&5 +if { (eval echo "$as_me:32927: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:32886: \$? = $ac_status" >&5 + echo "$as_me:32930: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:32889: \"$ac_try\"") >&5 + { (eval echo "$as_me:32933: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:32892: \$? = $ac_status" >&5 + echo "$as_me:32936: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then eval 'cf_cv_func_'"${ac_func}"'=yes' else @@ -32903,7 +32947,7 @@ fi eval 'cf_result="$cf_cv_func_'"${ac_func}"\" -echo "$as_me:32906: result: $cf_result" >&5 +echo "$as_me:32950: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test "$cf_result" = yes && cat >>confdefs.h <&5 +echo "$as_me:33009: checking for dlsym" >&5 echo $ECHO_N "checking for dlsym... $ECHO_C" >&6 if test "${ac_cv_func_dlsym+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >"conftest.$ac_ext" <<_ACEOF -#line 32971 "configure" +#line 33015 "configure" #include "confdefs.h" #define dlsym autoconf_temporary #include /* least-intrusive standard header which defines gcc2 __stub macros */ @@ -32999,16 +33043,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:33002: \"$ac_link\"") >&5 +if { (eval echo "$as_me:33046: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:33005: \$? = $ac_status" >&5 + echo "$as_me:33049: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:33008: \"$ac_try\"") >&5 + { (eval echo "$as_me:33052: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33011: \$? = $ac_status" >&5 + echo "$as_me:33055: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_func_dlsym=yes else @@ -33018,14 +33062,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" fi -echo "$as_me:33021: result: $ac_cv_func_dlsym" >&5 +echo "$as_me:33065: result: $ac_cv_func_dlsym" >&5 echo "${ECHO_T}$ac_cv_func_dlsym" >&6 if test "$ac_cv_func_dlsym" = yes; then cf_have_dlsym=yes else cf_have_libdl=no -echo "$as_me:33028: checking for dlsym in -ldl" >&5 +echo "$as_me:33072: checking for dlsym in -ldl" >&5 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6 if test "${ac_cv_lib_dl_dlsym+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -33033,7 +33077,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >"conftest.$ac_ext" <<_ACEOF -#line 33036 "configure" +#line 33080 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -33052,16 +33096,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:33055: \"$ac_link\"") >&5 +if { (eval echo "$as_me:33099: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:33058: \$? = $ac_status" >&5 + echo "$as_me:33102: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:33061: \"$ac_try\"") >&5 + { (eval echo "$as_me:33105: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33064: \$? = $ac_status" >&5 + echo "$as_me:33108: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then ac_cv_lib_dl_dlsym=yes else @@ -33072,7 +33116,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:33075: result: $ac_cv_lib_dl_dlsym" >&5 +echo "$as_me:33119: result: $ac_cv_lib_dl_dlsym" >&5 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6 if test "$ac_cv_lib_dl_dlsym" = yes; then @@ -33101,10 +33145,10 @@ LIBS="$cf_add_libs" } - echo "$as_me:33104: checking whether able to link to dl*() functions" >&5 + echo "$as_me:33148: checking whether able to link to dl*() functions" >&5 echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6 cat >"conftest.$ac_ext" <<_ACEOF -#line 33107 "configure" +#line 33151 "configure" #include "confdefs.h" #include int @@ -33122,16 +33166,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:33125: \"$ac_link\"") >&5 +if { (eval echo "$as_me:33169: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:33128: \$? = $ac_status" >&5 + echo "$as_me:33172: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:33131: \"$ac_try\"") >&5 + { (eval echo "$as_me:33175: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33134: \$? = $ac_status" >&5 + echo "$as_me:33178: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cat >>confdefs.h <<\EOF @@ -33142,15 +33186,15 @@ echo "$as_me: failed program was:" >&5 cat "conftest.$ac_ext" >&5 - { { echo "$as_me:33145: error: Cannot link test program for libdl" >&5 + { { echo "$as_me:33189: error: Cannot link test program for libdl" >&5 echo "$as_me: error: Cannot link test program for libdl" >&2;} { (exit 1); exit 1; }; } fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" - echo "$as_me:33150: result: ok" >&5 + echo "$as_me:33194: result: ok" >&5 echo "${ECHO_T}ok" >&6 else - { { echo "$as_me:33153: error: Cannot find dlsym function" >&5 + { { echo "$as_me:33197: error: Cannot find dlsym function" >&5 echo "$as_me: error: Cannot find dlsym function" >&2;} { (exit 1); exit 1; }; } fi @@ -33162,11 +33206,11 @@ if test "x$CLANG_COMPILER" = "xyes" then - { echo "$as_me:33165: WARNING: clang may only pretend to honor gcc -rdynamic option" >&5 + { echo "$as_me:33209: WARNING: clang may only pretend to honor gcc -rdynamic option" >&5 echo "$as_me: WARNING: clang may only pretend to honor gcc -rdynamic option" >&2;} else -echo "$as_me:33169: checking if $CC has -rdynamic option" >&5 +echo "$as_me:33213: checking if $CC has -rdynamic option" >&5 echo $ECHO_N "checking if $CC has -rdynamic option... $ECHO_C" >&6 if test "${cf_cv_gcc_opt_rdynamic+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -33177,7 +33221,7 @@ # gcc usually does not return an error for unrecognized options. cat >"conftest.$ac_ext" <<_ACEOF -#line 33180 "configure" +#line 33224 "configure" #include "confdefs.h" #include int @@ -33189,16 +33233,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:33192: \"$ac_link\"") >&5 +if { (eval echo "$as_me:33236: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:33195: \$? = $ac_status" >&5 + echo "$as_me:33239: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:33198: \"$ac_try\"") >&5 + { (eval echo "$as_me:33242: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:33201: \$? = $ac_status" >&5 + echo "$as_me:33245: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then # refine check... @@ -33221,7 +33265,7 @@ CFLAGS="$cf_save_CFLAGS" fi -echo "$as_me:33224: result: $cf_cv_gcc_opt_rdynamic" >&5 +echo "$as_me:33268: result: $cf_cv_gcc_opt_rdynamic" >&5 echo "${ECHO_T}$cf_cv_gcc_opt_rdynamic" >&6 fi @@ -33333,10 +33377,10 @@ then VILE_BUILT_IN_FILTERS="$VILE_LOADABLE_FILTERS" VILE_LOADABLE_FILTERS=none - { echo "$as_me:33336: WARNING: will use built-in filters instead" >&5 + { echo "$as_me:33380: WARNING: will use built-in filters instead" >&5 echo "$as_me: WARNING: will use built-in filters instead" >&2;} else - { { echo "$as_me:33339: error: cannot mix built-in and loadable-filters" >&5 + { { echo "$as_me:33383: error: cannot mix built-in and loadable-filters" >&5 echo "$as_me: error: cannot mix built-in and loadable-filters" >&2;} { (exit 1); exit 1; }; } fi @@ -33355,7 +33399,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:33358: checking for $ac_word" >&5 +echo "$as_me:33402: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_SPELL_PROG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -33370,7 +33414,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_SPELL_PROG="$ac_prog" -echo "$as_me:33373: found $ac_dir/$ac_word" >&5 +echo "$as_me:33417: found $ac_dir/$ac_word" >&5 break done @@ -33378,10 +33422,10 @@ fi SPELL_PROG=$ac_cv_prog_SPELL_PROG if test -n "$SPELL_PROG"; then - echo "$as_me:33381: result: $SPELL_PROG" >&5 + echo "$as_me:33425: result: $SPELL_PROG" >&5 echo "${ECHO_T}$SPELL_PROG" >&6 else - echo "$as_me:33384: result: no" >&5 + echo "$as_me:33428: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -33413,7 +33457,7 @@ echo "Computing location to install filter programs: $filters_bindir" if test "$cf_broken_flex" = yes ; then -{ echo "$as_me:33416: WARNING: You should get a working version of flex, for instance: +{ echo "$as_me:33460: WARNING: You should get a working version of flex, for instance: http://invisible-island.net/reflex " >&5 echo "$as_me: WARNING: You should get a working version of flex, for instance: @@ -33427,7 +33471,7 @@ if test "$TARGET" = xvile; then -echo "$as_me:33430: checking for X applications class" >&5 +echo "$as_me:33474: checking for X applications class" >&5 echo $ECHO_N "checking for X applications class... $ECHO_C" >&6 # Check whether --with-app-class or --without-app-class was given. @@ -33440,23 +33484,23 @@ case x$APP_CLASS in (*[/@,%]*) - { echo "$as_me:33443: WARNING: X applications class cannot contain punctuation" >&5 + { echo "$as_me:33487: WARNING: X applications class cannot contain punctuation" >&5 echo "$as_me: WARNING: X applications class cannot contain punctuation" >&2;} APP_CLASS=XVile ;; (x[A-Z]*) ;; (*) - { echo "$as_me:33450: WARNING: X applications class must start with capital, ignoring $APP_CLASS" >&5 + { echo "$as_me:33494: WARNING: X applications class must start with capital, ignoring $APP_CLASS" >&5 echo "$as_me: WARNING: X applications class must start with capital, ignoring $APP_CLASS" >&2;} APP_CLASS=XVile ;; esac -echo "$as_me:33456: result: $APP_CLASS" >&5 +echo "$as_me:33500: result: $APP_CLASS" >&5 echo "${ECHO_T}$APP_CLASS" >&6 -echo "$as_me:33459: checking for directory to install resource files" >&5 +echo "$as_me:33503: checking for directory to install resource files" >&5 echo $ECHO_N "checking for directory to install resource files... $ECHO_C" >&6 # Check whether --with-app-defaults or --without-app-defaults was given. @@ -33520,7 +33564,7 @@ cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:33523: error: expected a pathname, not \"$cf_path\"" >&5 + { { echo "$as_me:33567: error: expected a pathname, not \"$cf_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -33528,7 +33572,7 @@ fi -echo "$as_me:33531: result: $APPSDIR" >&5 +echo "$as_me:33575: result: $APPSDIR" >&5 echo "${ECHO_T}$APPSDIR" >&6 no_appsdir= @@ -33539,7 +33583,7 @@ EXTRA_INSTALL_DIRS="$EXTRA_INSTALL_DIRS \$(APPSDIR)" fi -echo "$as_me:33542: checking for directory to install pixmaps" >&5 +echo "$as_me:33586: checking for directory to install pixmaps" >&5 echo $ECHO_N "checking for directory to install pixmaps... $ECHO_C" >&6 # Check whether --with-pixmapdir or --without-pixmapdir was given. @@ -33590,14 +33634,14 @@ cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:33593: error: expected a pathname, not \"$cf_path\"" >&5 + { { echo "$as_me:33637: error: expected a pathname, not \"$cf_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} { (exit 1); exit 1; }; } ;; esac fi -echo "$as_me:33600: result: $PIXMAPDIR" >&5 +echo "$as_me:33644: result: $PIXMAPDIR" >&5 echo "${ECHO_T}$PIXMAPDIR" >&6 no_pixmapdir= @@ -33608,7 +33652,7 @@ EXTRA_INSTALL_DIRS="$EXTRA_INSTALL_DIRS \$(PIXMAPDIR)" fi -echo "$as_me:33611: checking for directory to install icons" >&5 +echo "$as_me:33655: checking for directory to install icons" >&5 echo $ECHO_N "checking for directory to install icons... $ECHO_C" >&6 # Check whether --with-icondir or --without-icondir was given. @@ -33659,14 +33703,14 @@ cf_path=`echo "$cf_path" | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:33662: error: expected a pathname, not \"$cf_path\"" >&5 + { { echo "$as_me:33706: error: expected a pathname, not \"$cf_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} { (exit 1); exit 1; }; } ;; esac fi -echo "$as_me:33669: result: $ICONDIR" >&5 +echo "$as_me:33713: result: $ICONDIR" >&5 echo "${ECHO_T}$ICONDIR" >&6 no_icondir= @@ -33677,7 +33721,7 @@ EXTRA_INSTALL_DIRS="$EXTRA_INSTALL_DIRS \$(ICONDIR)" fi -echo "$as_me:33680: checking if icon theme should be used" >&5 +echo "$as_me:33724: checking if icon theme should be used" >&5 echo $ECHO_N "checking if icon theme should be used... $ECHO_C" >&6 # Check whether --with-icon-theme or --without-icon-theme was given. @@ -33695,7 +33739,7 @@ ICON_THEME=hicolor ;; esac -echo "$as_me:33698: result: $ICON_THEME" >&5 +echo "$as_me:33742: result: $ICON_THEME" >&5 echo "${ECHO_T}$ICON_THEME" >&6 if test "x$ICON_THEME" = xno @@ -33704,14 +33748,14 @@ then test -n "$verbose" && echo " ignoring icondir without theme" 1>&6 -echo "${as_me:-configure}:33707: testing ignoring icondir without theme ..." 1>&5 +echo "${as_me:-configure}:33751: testing ignoring icondir without theme ..." 1>&5 no_icondir="#" fi else if test "x$ICONDIR" = xno then - { { echo "$as_me:33714: error: icondir must be set for icon theme" >&5 + { { echo "$as_me:33758: error: icondir must be set for icon theme" >&5 echo "$as_me: error: icondir must be set for icon theme" >&2;} { (exit 1); exit 1; }; } fi @@ -33728,13 +33772,13 @@ cf_icon_list="icons/${ICON_NAME}_48x48" fi -echo "$as_me:33731: checking for icon(s) to install" >&5 +echo "$as_me:33775: checking for icon(s) to install" >&5 echo $ECHO_N "checking for icon(s) to install... $ECHO_C" >&6 for cf_name in $cf_icon_list do test -n "$verbose" && echo " using $ICON_FORMAT" 1>&6 -echo "${as_me:-configure}:33737: testing using $ICON_FORMAT ..." 1>&5 +echo "${as_me:-configure}:33781: testing using $ICON_FORMAT ..." 1>&5 for cf_suffix in $ICON_FORMAT do @@ -33767,7 +33811,7 @@ cf_size=`file "$cf_left"|sed -e 's/^[^:]*://' -e 's/^.*[^0-9]\([0-9][0-9]* x [0-9][0-9]*\)[^0-9].*$/\1/' -e 's/ //g'` if test -z "$cf_size" then - { echo "$as_me:33770: WARNING: cannot determine size of $cf_left" >&5 + { echo "$as_me:33814: WARNING: cannot determine size of $cf_left" >&5 echo "$as_me: WARNING: cannot determine size of $cf_left" >&2;} continue fi @@ -33779,7 +33823,7 @@ (*.xpm) test -n "$verbose" && echo " ignored XPM file in icon theme" 1>&6 -echo "${as_me:-configure}:33782: testing ignored XPM file in icon theme ..." 1>&5 +echo "${as_me:-configure}:33826: testing ignored XPM file in icon theme ..." 1>&5 continue ;; @@ -33791,7 +33835,7 @@ esac test -n "$verbose" && echo " adding $cf_next" 1>&6 -echo "${as_me:-configure}:33794: testing adding $cf_next ..." 1>&5 +echo "${as_me:-configure}:33838: testing adding $cf_next ..." 1>&5 cf_icon="${cf_icon}:${cf_next}" fi @@ -33806,26 +33850,26 @@ if test -n "$verbose" then - echo "$as_me:33809: checking result" >&5 + echo "$as_me:33853: checking result" >&5 echo $ECHO_N "checking result... $ECHO_C" >&6 fi -echo "$as_me:33812: result: $ICON_LIST" >&5 +echo "$as_me:33856: result: $ICON_LIST" >&5 echo "${ECHO_T}$ICON_LIST" >&6 if test -z "$ICON_LIST" then - { { echo "$as_me:33817: error: no icons found" >&5 + { { echo "$as_me:33861: error: no icons found" >&5 echo "$as_me: error: no icons found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:33822: checking for icon name" >&5 +echo "$as_me:33866: checking for icon name" >&5 echo $ECHO_N "checking for icon name... $ECHO_C" >&6 -echo "$as_me:33824: result: $ICON_NAME" >&5 +echo "$as_me:33868: result: $ICON_NAME" >&5 echo "${ECHO_T}$ICON_NAME" >&6 # Comment-out the install-desktop rule if the desktop-utils are not found. - echo "$as_me:33828: checking if you want to install desktop files" >&5 + echo "$as_me:33872: checking if you want to install desktop files" >&5 echo $ECHO_N "checking if you want to install desktop files... $ECHO_C" >&6 # Check whether --enable-desktop or --disable-desktop was given. @@ -33842,14 +33886,14 @@ enable_desktop=$enableval fi; - echo "$as_me:33845: result: $enable_desktop" >&5 + echo "$as_me:33889: result: $enable_desktop" >&5 echo "${ECHO_T}$enable_desktop" >&6 desktop_utils= if test "$enable_desktop" = yes ; then # Extract the first word of "desktop-file-install", so it can be a program name with args. set dummy desktop-file-install; ac_word=$2 -echo "$as_me:33852: checking for $ac_word" >&5 +echo "$as_me:33896: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_desktop_utils+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -33864,7 +33908,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_desktop_utils="yes" -echo "$as_me:33867: found $ac_dir/$ac_word" >&5 +echo "$as_me:33911: found $ac_dir/$ac_word" >&5 break done @@ -33873,10 +33917,10 @@ fi desktop_utils=$ac_cv_prog_desktop_utils if test -n "$desktop_utils"; then - echo "$as_me:33876: result: $desktop_utils" >&5 + echo "$as_me:33920: result: $desktop_utils" >&5 echo "${ECHO_T}$desktop_utils" >&6 else - echo "$as_me:33879: result: no" >&5 + echo "$as_me:33923: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -33911,7 +33955,7 @@ fi fi -echo "$as_me:33914: checking for \".PHONY\" make-support" >&5 +echo "$as_me:33958: checking for \".PHONY\" make-support" >&5 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6 if test "${cf_cv_make_PHONY+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -33966,14 +34010,14 @@ rm -rf conftest* fi -echo "$as_me:33969: result: $cf_cv_make_PHONY" >&5 +echo "$as_me:34013: result: $cf_cv_make_PHONY" >&5 echo "${ECHO_T}$cf_cv_make_PHONY" >&6 MAKE_NO_PHONY="#" MAKE_PHONY="#" test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY= test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY= -echo "$as_me:33976: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:34020: 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 @@ -34000,7 +34044,7 @@ fi fi -echo "$as_me:34003: result: $cf_cv_mixedcase" >&5 +echo "$as_me:34047: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -34011,7 +34055,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:34014: checking for $ac_word" >&5 +echo "$as_me:34058: 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 @@ -34026,7 +34070,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CTAGS="$ac_prog" -echo "$as_me:34029: found $ac_dir/$ac_word" >&5 +echo "$as_me:34073: found $ac_dir/$ac_word" >&5 break done @@ -34034,10 +34078,10 @@ fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:34037: result: $CTAGS" >&5 + echo "$as_me:34081: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:34040: result: no" >&5 + echo "$as_me:34084: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -34048,7 +34092,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:34051: checking for $ac_word" >&5 +echo "$as_me:34095: 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 @@ -34063,7 +34107,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ETAGS="$ac_prog" -echo "$as_me:34066: found $ac_dir/$ac_word" >&5 +echo "$as_me:34110: found $ac_dir/$ac_word" >&5 break done @@ -34071,10 +34115,10 @@ fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:34074: result: $ETAGS" >&5 + echo "$as_me:34118: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:34077: result: no" >&5 + echo "$as_me:34121: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -34083,7 +34127,7 @@ # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. set dummy ${CTAGS:-ctags}; ac_word=$2 -echo "$as_me:34086: checking for $ac_word" >&5 +echo "$as_me:34130: 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 @@ -34098,7 +34142,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_LOWER_TAGS="yes" -echo "$as_me:34101: found $ac_dir/$ac_word" >&5 +echo "$as_me:34145: found $ac_dir/$ac_word" >&5 break done @@ -34107,17 +34151,17 @@ fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:34110: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:34154: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:34113: result: no" >&5 + echo "$as_me:34157: 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:34120: checking for $ac_word" >&5 +echo "$as_me:34164: 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 @@ -34132,7 +34176,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_UPPER_TAGS="yes" -echo "$as_me:34135: found $ac_dir/$ac_word" >&5 +echo "$as_me:34179: found $ac_dir/$ac_word" >&5 break done @@ -34141,10 +34185,10 @@ fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:34144: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:34188: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:34147: result: no" >&5 + echo "$as_me:34191: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -34167,7 +34211,7 @@ LD_RPATH_OPT= if test "x$cf_cv_enable_rpath" != xno then - echo "$as_me:34170: checking for an rpath option" >&5 + echo "$as_me:34214: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case "$cf_cv_system_name" in (irix*) @@ -34198,12 +34242,12 @@ (*) ;; esac - echo "$as_me:34201: result: $LD_RPATH_OPT" >&5 + echo "$as_me:34245: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in (x-R*) - echo "$as_me:34206: checking if we need a space after rpath option" >&5 + echo "$as_me:34250: 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" @@ -34224,7 +34268,7 @@ LIBS="$cf_add_libs" cat >"conftest.$ac_ext" <<_ACEOF -#line 34227 "configure" +#line 34271 "configure" #include "confdefs.h" int @@ -34236,16 +34280,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:34239: \"$ac_link\"") >&5 +if { (eval echo "$as_me:34283: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:34242: \$? = $ac_status" >&5 + echo "$as_me:34286: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:34245: \"$ac_try\"") >&5 + { (eval echo "$as_me:34289: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:34248: \$? = $ac_status" >&5 + echo "$as_me:34292: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_rpath_space=no else @@ -34255,14 +34299,14 @@ fi rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext" LIBS="$cf_save_LIBS" - echo "$as_me:34258: result: $cf_rpath_space" >&5 + echo "$as_me:34302: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; esac fi -echo "$as_me:34265: checking if rpath-hack should be disabled" >&5 +echo "$as_me:34309: 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. @@ -34280,22 +34324,22 @@ fi; if test "x$enable_rpath_hack" = xno; then cf_disable_rpath_hack=yes; else cf_disable_rpath_hack=no; fi -echo "$as_me:34283: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:34327: result: $cf_disable_rpath_hack" >&5 echo "${ECHO_T}$cf_disable_rpath_hack" >&6 if test "$enable_rpath_hack" = yes ; then -echo "$as_me:34288: checking for updated LDFLAGS" >&5 +echo "$as_me:34332: 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:34291: result: maybe" >&5 + echo "$as_me:34335: 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:34298: checking for $ac_word" >&5 +echo "$as_me:34342: 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 @@ -34310,7 +34354,7 @@ 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:34313: found $ac_dir/$ac_word" >&5 +echo "$as_me:34357: found $ac_dir/$ac_word" >&5 break done @@ -34318,10 +34362,10 @@ fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:34321: result: $cf_ldd_prog" >&5 + echo "$as_me:34365: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:34324: result: no" >&5 + echo "$as_me:34368: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -34335,7 +34379,7 @@ cf_rpath_oops= cat >"conftest.$ac_ext" <<_ACEOF -#line 34338 "configure" +#line 34382 "configure" #include "confdefs.h" #include int @@ -34347,16 +34391,16 @@ } _ACEOF rm -f "conftest.$ac_objext" "conftest$ac_exeext" -if { (eval echo "$as_me:34350: \"$ac_link\"") >&5 +if { (eval echo "$as_me:34394: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:34353: \$? = $ac_status" >&5 + echo "$as_me:34397: \$? = $ac_status" >&5 (exit "$ac_status"); } && { ac_try='test -s "conftest$ac_exeext"' - { (eval echo "$as_me:34356: \"$ac_try\"") >&5 + { (eval echo "$as_me:34400: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:34359: \$? = $ac_status" >&5 + echo "$as_me:34403: \$? = $ac_status" >&5 (exit "$ac_status"); }; }; then cf_rpath_oops=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} ' not found' | sed -e 's% =>.*$%%' |sort | uniq` cf_rpath_list=`"$cf_ldd_prog" "conftest$ac_exeext" | ${FGREP-fgrep} / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq` @@ -34384,7 +34428,7 @@ then test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 -echo "${as_me:-configure}:34387: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:34431: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -34396,11 +34440,11 @@ test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:34399: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:34443: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:34403: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:34447: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS @@ -34437,7 +34481,7 @@ then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:34440: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:34484: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -34450,11 +34494,11 @@ test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:34453: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:34497: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:34457: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:34501: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS @@ -34491,7 +34535,7 @@ then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:34494: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:34538: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -34504,14 +34548,14 @@ test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:34507: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:34551: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:34511: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:34555: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 else - echo "$as_me:34514: result: no" >&5 + echo "$as_me:34558: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -34524,11 +34568,11 @@ then test -n "$verbose" && echo " removed loader flags that interfere with loadable filters" 1>&6 -echo "${as_me:-configure}:34527: testing removed loader flags that interfere with loadable filters ..." 1>&5 +echo "${as_me:-configure}:34571: testing removed loader flags that interfere with loadable filters ..." 1>&5 test -n "$verbose" && echo " flags are now $LDFLAGS" 1>&6 -echo "${as_me:-configure}:34531: testing flags are now $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:34575: testing flags are now $LDFLAGS ..." 1>&5 export LDFLAGS fi @@ -34625,7 +34669,7 @@ : "${CONFIG_STATUS=./config.status}" ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:34628: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:34672: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >"$CONFIG_STATUS" <<_ACEOF #! $SHELL @@ -34804,7 +34848,7 @@ echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:34807: error: ambiguous option: $1 + { { echo "$as_me:34851: 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;} @@ -34823,7 +34867,7 @@ ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:34826: error: unrecognized option: $1 + -*) { { echo "$as_me:34870: 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;} @@ -34883,7 +34927,7 @@ "$EXTRA_OUTPUT_FILES" ) CONFIG_FILES="$CONFIG_FILES $EXTRA_OUTPUT_FILES" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config_h.in" ;; - *) { { echo "$as_me:34886: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:34930: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -35029,6 +35073,7 @@ s,@MAKE_LEX@,$MAKE_LEX,;t t s,@LINT@,$LINT,;t t s,@LINT_OPTS@,$LINT_OPTS,;t t +s,@LINT_LIBS@,$LINT_LIBS,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@X_CFLAGS@,$X_CFLAGS,;t t s,@X_LIBS@,$X_LIBS,;t t @@ -35233,7 +35278,7 @@ esac if test x"$ac_file" != x-; then - { echo "$as_me:35236: creating $ac_file" >&5 + { echo "$as_me:35281: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -35251,7 +35296,7 @@ -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:35254: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:35299: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -35264,7 +35309,7 @@ echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:35267: error: cannot find input file: $f" >&5 + { { echo "$as_me:35312: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -35280,7 +35325,7 @@ if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' "$ac_item"` if test -z "$ac_used"; then - { echo "$as_me:35283: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:35328: 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;} @@ -35289,7 +35334,7 @@ fi ac_seen=`grep '${datarootdir}' "$ac_item"` if test -n "$ac_seen"; then - { echo "$as_me:35292: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:35337: 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;} @@ -35326,7 +35371,7 @@ ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:35329: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:35374: 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;} @@ -35337,7 +35382,7 @@ ${EGREP-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:35340: WARNING: Some variables may not be substituted: + { echo "$as_me:35385: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -35386,7 +35431,7 @@ * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:35389: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:35434: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -35397,7 +35442,7 @@ -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:35400: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:35445: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -35410,7 +35455,7 @@ echo "$srcdir/$f" else # /dev/null tree - { { echo "$as_me:35413: error: cannot find input file: $f" >&5 + { { echo "$as_me:35458: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -35468,7 +35513,7 @@ rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then - { echo "$as_me:35471: $ac_file is unchanged" >&5 + { echo "$as_me:35516: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff -Nru vile-9.8v/debian/changelog vile-9.8w/debian/changelog --- vile-9.8v/debian/changelog 2022-08-02 05:15:05.000000000 +0000 +++ vile-9.8w/debian/changelog 2022-08-22 05:16:35.000000000 +0000 @@ -1,3 +1,9 @@ +vile (9.8w-1) unstable; urgency=medium + + * New upstream release. + + -- Brendan O'Dea Mon, 22 Aug 2022 15:16:35 +1000 + vile (9.8v-4) unstable; urgency=medium * Apply multi-arch hint from Debian Janitor: multiple vile-filters diff -Nru vile-9.8v/debian/patches/debian-changes vile-9.8w/debian/patches/debian-changes --- vile-9.8v/debian/patches/debian-changes 2022-08-02 05:15:05.000000000 +0000 +++ vile-9.8w/debian/patches/debian-changes 1970-01-01 00:00:00.000000000 +0000 @@ -1,128 +0,0 @@ -This is an autogenerated patch header for a single-debian-patch file. The -delta against upstream is either kept as a single patch, or maintained -in some VCS, and exported as a single patch instead of more manageable -atomic patches. - ---- vile-9.8v.orig/insert.c -+++ vile-9.8v/insert.c -@@ -446,7 +446,7 @@ replacechar(int f, int n) - if (isbackspace(c)) { /* vi beeps here */ - s = TRUE; /* replaced with nothing */ - } else { -- t = s = lins_chars(n, c, FALSE); -+ t = s = lins_chars(n, c); - } - } - } -@@ -981,11 +981,11 @@ inschar(int c, int *backsp_limit_p) - rc = inspound(); - } else { - autoindented = -1; -- rc = lins_chars(1, c, FALSE); -+ rc = lins_chars(1, c); - } - } else { - autoindented = -1; -- rc = lins_chars(1, c, FALSE); -+ rc = lins_chars(1, c); - } - } - return rc; -@@ -1515,7 +1515,7 @@ quote_next(int f, int n) - s = lnewline(); - } while ((s == TRUE) && (--n != 0)); - } else { -- s = lins_chars(n, c, TRUE); -+ s = lins_chars(n, c); - } - } - return s; ---- vile-9.8v.orig/line.c -+++ vile-9.8v/line.c -@@ -534,7 +534,7 @@ lins_bytes(int n, int c) - * or in insert-mode. - */ - int --lins_chars(int n, int c, int wide) -+lins_chars(int n, int c) - { - int rc = FALSE; - UCHAR target[10]; -@@ -542,7 +542,7 @@ lins_chars(int n, int c, int wide) - int nn; - int mapped; - -- if (wide && (c > 127) && b_is_utfXX(curbp)) { -+ if ((c > 127) && b_is_utfXX(curbp)) { - nbytes = vl_conv_to_utf8(target, (UINT) c, sizeof(target)); - } else if (okCTYPE2(vl_wide_enc) && !vl_mb_is_8bit(c)) { - nbytes = 1; ---- vile-9.8v.orig/macros/UXVile.ad -+++ vile-9.8v/macros/UXVile.ad -@@ -1,5 +1,5 @@ - ! $Id: UXVile.ad,v 1.2 2009/10/07 10:53:26 tom Exp $ - --*font: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1 -- - #include "XVile" -+ -+*font: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1 ---- vile-9.8v.orig/macros/XVile.ad -+++ vile-9.8v/macros/XVile.ad -@@ -3,7 +3,7 @@ - ! "white" on "black" main window - *background: grey5 - *foreground: grey95 --*font: 8x13 -+*font: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-1 - *cursor.background: yellow - *cursor.foreground: grey5 - ---- vile-9.8v.orig/perl.xs -+++ vile-9.8v/perl.xs -@@ -21,7 +21,6 @@ - */ - #ifdef __GNUC__ - #pragma GCC diagnostic ignored "-Wcast-qual" --#pragma GCC diagnostic ignored "-Wcompound-token-split-by-macro" - #pragma GCC diagnostic ignored "-Wconversion" - #pragma GCC diagnostic ignored "-Wnested-externs" - #pragma GCC diagnostic ignored "-Wshadow" -@@ -119,20 +118,20 @@ - - /* for vile */ - #define MARK vile_MARK -+#define regexp vile_regexp - #include "estruct.h" - #include "edef.h" - #include "api.h" - #undef MARK -+#undef regexp - #undef ABORT - - /* for perl */ - #define main perl_main --#define regexp perl_regexp - #include - #include - #include - #undef main --#undef regexp - #undef dofile - - #ifdef __GNUC__ ---- vile-9.8v.orig/proto.h -+++ vile-9.8v/proto.h -@@ -873,10 +873,10 @@ extern int lrepl_regex (REGEXVAL *expr, - - #if OPT_MULTIBYTE - extern int ldel_chars (B_COUNT n, int kflag); --extern int lins_chars (int n, int c, int wide); -+extern int lins_chars (int n, int c); - #else - #define ldel_chars(n, kflag) ldel_bytes(n, kflag) --#define lins_chars(n, c, wide) lins_bytes(n, c) -+#define lins_chars(n, c) lins_bytes(n, c) - #endif - - #if OPT_REGS_CMPL diff -Nru vile-9.8v/debian/patches/series vile-9.8w/debian/patches/series --- vile-9.8v/debian/patches/series 2022-08-02 05:15:05.000000000 +0000 +++ vile-9.8w/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian-changes diff -Nru vile-9.8v/display.c vile-9.8w/display.c --- vile-9.8v/display.c 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/display.c 2022-08-22 05:11:05.000000000 +0000 @@ -4,7 +4,7 @@ * physical display screen the same as the virtual display screen. These * functions use hints that are left in the windows by the commands. * - * $Id: display.c,v 1.580 2021/05/09 21:32:16 Lois.Mansot Exp $ + * $Id: display.c,v 1.581 2022/08/21 16:24:00 tom Exp $ */ #include "estruct.h" @@ -4374,6 +4374,8 @@ #endif #ifdef WMDLINEWRAP WINDOW *wp = row2window(row); + if (wp == 0) + return; if (w_val(wp, WMDLINEWRAP)) { if (colfrom < 0) colfrom = 0; diff -Nru vile-9.8v/doc/vile-hlp.html vile-9.8w/doc/vile-hlp.html --- vile-9.8v/doc/vile-hlp.html 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/doc/vile-hlp.html 2022-08-22 05:11:05.000000000 +0000 @@ -1,5 +1,5 @@ @@ -13226,7 +13226,7 @@

Copyright

-

Copyright © 1995-2020,2021 by Paul Fox, Thomas Dickey, +

Copyright © 1995-2021,2022 by Paul Fox, Thomas Dickey, and Kevin Buettner

diff -Nru vile-9.8v/doc/vile-toc.html vile-9.8w/doc/vile-toc.html --- vile-9.8v/doc/vile-toc.html 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/doc/vile-toc.html 2022-08-22 05:11:05.000000000 +0000 @@ -1,9 +1,9 @@ diff -Nru vile-9.8v/estruct.h vile-9.8w/estruct.h --- vile-9.8v/estruct.h 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/estruct.h 2022-08-22 05:11:05.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - * $Id: estruct.h,v 1.759 2021/03/22 23:19:44 tom Exp $ + * $Id: estruct.h,v 1.760 2022/08/04 21:16:07 tom Exp $ */ #ifndef _estruct_h @@ -1133,6 +1133,8 @@ #define COLS_8BIT 4 /* columns for "\xXX" */ #define COLS_UTF8 6 /* columns for "\uXXXX" */ +#define MAX_UTF8 8 /* enough for any UTF-8 conversion */ + #define CTLA iBIT(MaxCBits+0) /* ^A flag, or'ed in */ #define CTLX iBIT(MaxCBits+1) /* ^X flag, or'ed in */ #define SPEC iBIT(MaxCBits+2) /* special key (function keys) */ diff -Nru vile-9.8v/eval.c vile-9.8w/eval.c --- vile-9.8v/eval.c 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/eval.c 2022-08-22 05:11:05.000000000 +0000 @@ -2,7 +2,7 @@ * eval.c -- function and variable evaluation * original by Daniel Lawrence * - * $Id: eval.c,v 1.469 2021/05/09 21:32:16 Lois.Mansot Exp $ + * $Id: eval.c,v 1.470 2022/08/04 21:19:48 tom Exp $ */ #include @@ -70,7 +70,7 @@ #if OPT_MULTIBYTE int rc; - char temp[10]; + char temp[MAX_UTF8]; int use_locale = same_string(enc->locale, vl_wide_enc.locale); #else (void) enc; diff -Nru vile-9.8v/file.c vile-9.8w/file.c --- vile-9.8v/file.c 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/file.c 2022-08-22 05:11:05.000000000 +0000 @@ -5,7 +5,7 @@ * reading and writing of the disk are * in "fileio.c". * - * $Id: file.c,v 1.463 2018/10/26 01:19:45 tom Exp $ + * $Id: file.c,v 1.465 2022/08/21 15:18:12 tom Exp $ */ #include "estruct.h" @@ -222,7 +222,7 @@ #ifdef MDCHK_MODTIME int -get_modtime(BUFFER *bp, time_t * the_time) +get_modtime(BUFFER *bp, time_t *the_time) { if (isInternalName(bp->b_fname)) *the_time = 0; @@ -315,7 +315,7 @@ */ #if SYS_UNIX && OPT_SHELL static int -slowtime(time_t * refp) +slowtime(time_t *refp) { int status = FALSE; @@ -975,7 +975,9 @@ TRACE((T_CALLED "insfile(%d, %d)\n", f, n)); - if (!calledbefore) { + if (calledbefore) { + (void) vl_strncpy(fname, tb_values(last), sizeof(fname)); + } else { if ((status = mlreply_file("Insert file: ", &last, FILEC_READ | FILEC_PROMPT, fname)) != TRUE) returnCode(status); @@ -1457,7 +1459,7 @@ rc = FIOMEM; } #if OPT_ENCRYPT - else if ((rc = vl_resetkey(bp, (const char *) buffer)) != TRUE) { + else if ((rc = vl_resetkey(bp, bp->b_fname)) != TRUE) { free(buffer); } #endif diff -Nru vile-9.8v/filters/genmake.mak vile-9.8w/filters/genmake.mak --- vile-9.8v/filters/genmake.mak 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/filters/genmake.mak 2022-08-22 05:11:05.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: genmake.mak,v 1.49 2020/05/09 09:27:50 tom Exp $ +# $Id: genmake.mak,v 1.53 2022/01/25 01:29:41 tom Exp $ # This is a list of filter root names and whether .c or .l files define the # filter. Except for vile-crypt and vile-manfilt (which do not correspond to # majormodes), the filter names are constructed as vile-{root}-filt. @@ -7,7 +7,7 @@ key key-filt c m4 m4-filt c perl pl-filt c -perl6 pl6filt c +raku rakufilt c ruby rubyfilt c sed sed-filt c tags tagsfilt c @@ -47,6 +47,7 @@ mailcap mc-filt l make makefilt l mcrl mcrlfilt l +md md-filt l midl midlfilt l mms mms-filt l nmake nmakeflt l diff -Nru vile-9.8v/filters/imakeflt.l vile-9.8w/filters/imakeflt.l --- vile-9.8v/filters/imakeflt.l 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/filters/imakeflt.l 2022-08-22 05:11:05.000000000 +0000 @@ -7,7 +7,7 @@ %{ /* - * $Id: imakeflt.l,v 1.26 2013/12/02 01:32:53 tom Exp $ + * $Id: imakeflt.l,v 1.27 2022/08/20 23:03:03 tom Exp $ * * Filter to add vile "attribution" sequences to selected bits of Imakefile * @@ -59,8 +59,9 @@ {MACRO} { WriteToken(Ident2_attr); } -^{SPACE}\@ { if (yyleng) - flt_puts(yytext, yyleng-1, ""); +^{SPACE}\@ { if (yyleng) { + flt_puts(yytext, yyleng-1, ""); + } flt_puts("@", 1, String_attr); } \\{SPACE}+\n { flt_error("trailing whitespace"); WriteToken(Error_attr); continued = 1; } diff -Nru vile-9.8v/filters/makefilt.l vile-9.8w/filters/makefilt.l --- vile-9.8v/filters/makefilt.l 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/filters/makefilt.l 2022-08-22 05:11:05.000000000 +0000 @@ -7,7 +7,7 @@ %{ /* - * $Id: makefilt.l,v 1.65 2013/12/02 01:32:53 tom Exp $ + * $Id: makefilt.l,v 1.66 2022/08/20 23:03:25 tom Exp $ * * Filter to add vile "attribution" sequences to selected bits of Makefile * @@ -67,8 +67,9 @@ {SUBST} { WriteToken(Preproc_attr); } {MACRO} { WriteToken(Ident2_attr); } -^{SPACE}\@ { if (yyleng) - flt_puts(yytext, yyleng-1, ""); +^{SPACE}\@ { if (yyleng) { + flt_puts(yytext, yyleng-1, ""); + } flt_puts("@", 1, String_attr); } \\{SPACE}+\n { flt_error("trailing whitespace"); WriteToken(Error_attr); continued = 1; } diff -Nru vile-9.8v/filters/manfilt.c vile-9.8w/filters/manfilt.c --- vile-9.8v/filters/manfilt.c 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/filters/manfilt.c 2022-08-22 05:11:05.000000000 +0000 @@ -35,7 +35,7 @@ * * _^HB^HB_^Ho^Ho_^Ht^Ht_^Hh^Hh ^A4IB:Both * - * On many system, bold sequences are actually quite a bit longer. On + * On many systems, bold sequences are actually quite a bit longer. On * some systems, the repeated character is repeated as many as four times. * Thus the letter "B" would be represented as B^HB^HB^HB. * @@ -46,7 +46,7 @@ * vile will choose some appropriate fallback (such as underlining) if * italics are not available. * - * $Id: manfilt.c,v 1.73 2021/09/04 20:25:32 tom Exp $ + * $Id: manfilt.c,v 1.76 2022/08/05 07:37:23 tom Exp $ * */ @@ -137,6 +137,7 @@ static void flush_line(void); +static char *program = "vile-manfilt"; static LINEDATA *all_lines; static LINEDATA *cur_line; static long total_lines; @@ -147,6 +148,11 @@ static void failed(const char *s) { + int save_err = errno; + fflush(stdout); + fclose(stdout); + fprintf(stderr, "%s: ", program); + errno = save_err; perror(s); exit(BADEXIT); } @@ -345,6 +351,7 @@ allocate_line(void) { LINEDATA *p = typecallocn(LINEDATA, 1); + if (p == 0) failed("allocate_line"); @@ -746,21 +753,20 @@ } /* - * Set the current pointer to the previous line, allocating it if necessary + * Set the current pointer to the previous line, if possible. */ static void prev_line(void) { LINEDATA *old_line; - if (cur_line == 0) - cur_line = allocate_line(); + /* + * We can't go back to lines that were already flushed and discarded. + */ + assert(cur_line != 0); + if (cur_line->l_prev == 0) + return; - if (cur_line->l_prev == 0) { - cur_line->l_prev = allocate_line(); - if (cur_line == all_lines) - all_lines = cur_line->l_prev; - } old_line = cur_line; cur_line = cur_line->l_prev; cur_line->l_next = old_line; @@ -834,6 +840,27 @@ return code; } +static void +free_line(LINEDATA * l) +{ + if (l != 0) { + if (l->l_cell != 0) + free(l->l_cell); + if (l->l_prev != 0) { + if (l->l_prev->l_next == l) + l->l_prev->l_next = 0; + l->l_prev = 0; + } + if (l->l_next != 0) { + if (l->l_next->l_prev == l) + l->l_next->l_prev = 0; + l->l_next = 0; + } + free(l); + total_lines--; + } +} + /* * Write the oldest line from memory to standard output and deallocate its * storage. @@ -849,7 +876,7 @@ LINEDATA *l = all_lines; CHARCELL *p; - if (l != 0) { + if (l != 0 && l->l_next != 0) { all_lines = l->l_next; if (cur_line == l) cur_line = all_lines; @@ -886,16 +913,12 @@ while ((p = l->l_cell[col].link) != 0) { l->l_cell[col].link = p->link; - free((char *) p); + free(p); } } my_putc('\n'); - if (l != 0) { - if (l->l_cell != 0) - free((char *) l->l_cell); - free((char *) l); - } + free_line(l); } } @@ -998,8 +1021,12 @@ } } - while (all_lines != 0) + while (all_lines != 0) { + long save = total_lines; flush_line(); + if (save == total_lines) + break; + } total_lines = 0; } @@ -1010,6 +1037,7 @@ int n; FILE *fp; + program = argv[0]; my_getc = ansi_getc; my_putc = ansi_putc; #if OPT_LOCALE @@ -1051,6 +1079,9 @@ } fflush(stdout); fclose(stdout); +#if NO_LEAKS + free_line(cur_line); +#endif exit(GOODEXIT); /* successful exit */ /*NOTREACHED */ } diff -Nru vile-9.8v/filters/md-filt.l vile-9.8w/filters/md-filt.l --- vile-9.8v/filters/md-filt.l 1970-01-01 00:00:00.000000000 +0000 +++ vile-9.8w/filters/md-filt.l 2022-08-22 05:11:05.000000000 +0000 @@ -0,0 +1,616 @@ +%pointer +%s sTEXT sCODE FENCE QUOTES HTML NOTE + +%a 10000 +%o 10000 + +%{ + +/* + * $Id: md-filt.l,v 1.71 2022/08/20 18:24:06 tom Exp $ + * + * Filter to add vile "attribution" sequences to a markdown file. + * + * https://daringfireball.net/projects/markdown/ + * https://www.markdownguide.org/ + * + * TODO use flt_error where appropriate + * TODO markup ">line" + * TODO markup ">paragraph" + */ + +#include +#include + +#define flt_puts(b,n,a) flt_bfr_embed(b,n,a) + +DefineFilter(md); + +typedef struct { + int mark; /* IsMark... */ + int c1st; /* column for mark */ + int c2nd; /* column for marked text */ +} ITEM_STACK; + +static void atx_header(const char *, int); +static void emphasize(const char *, int, int, const char *); +static void fence_start(const char *, int); +static void fence_finish(const char *, int); +static void indent_code(const char *, int); +static void link_link(const char *, int); +static void link_cite(const char *, int); +static void scan_html(const char *, int); +static int reject_links(const char *, int); +static int tone_down(const char *, int, int); +static int valid_indent(const char *, int, int); + +static char *Action_attr; +static char *Comment_attr; +static char *Error_attr; +static char *Ident2_attr; +static char *Number_attr; +static char *Preproc_attr; +static char *String_attr; + +static const char *Code_attr = ""; +static const char *Null_attr = ""; /* ...just for debugging */ + +static int nbl; /* count characters on non-blank line */ +static int pbl; /* previous line's count for "nbl" */ + +static int item_level; /* if >= 0, index in item_stack[] */ +static int item_depth; +static size_t item_limit; +static ITEM_STACK *item_stack; + +static int html_level; + +#define Emphasize(s,l,yl,m,a) { \ + if (reject_links(s, l)) { \ + yyless(1 + yl); \ + } else { \ + int al = tone_down(s, l, m); \ + if (al < (l)) yyless(al +yl); \ + emphasize(s, al, m, a); \ + } \ + } + +/* anchored to ^ */ +#define UnderKeep1(m,a) { Emphasize(yytext, yyleng, 0, m, a); } +#define UnderTrim1(m,a) { yyless(yyleng - 1); UnderKeep1(m, a); } + +/* anchored to character */ +#define UnderKeep2(m,a) { flt_puts(yytext, 1, Null_attr); \ + Emphasize(yytext + 1, yyleng - 1, 1, m, a); } +#define UnderTrim2(m,a) { yyless(yyleng - 1); UnderKeep2(m, a); } + +#define NoItem() { item_depth = 0; item_level = -1; } + +#define isMark(c) ((c) == '*' || (c) == '-' || (c) == '+' || (c) == ':' || isdigit(c)) + +%} + +WS [\t ] +DASH_A ([*]{WS}*)+[*] +DASH_M ([-]{WS}*)+[-] +DASH_U ([_]{WS}*)+[_] +DASHES ({DASH_A}|{DASH_M}|{DASH_U}) +DASHED [=]+ + +ITEM_A ([*]{WS}+[^*]) +ITEM_C ([:]{WS}+[^:]) +ITEM_M ([-]{WS}+[^-]) +ITEM_O ([[:digit:]]+\.{WS}+[[:graph:]]) +ITEM_P ([+]{WS}+[^+]) +ITEM ({ITEM_A}|{ITEM_C}|{ITEM_M}|{ITEM_O}|{ITEM_P}) + +TEXT [[:graph:]] + +N_ [^[:alnum:]_\r\n] +A_ [^*\r\n\t ] +U_ [^_\r\n\t ] +T_ [^\r\n] +Y_ ({U_}|({U_}{T_}*{U_})) +Z_ ({A_}|({A_}{T_}*{A_})) + +CODE1 {WS}|[[:alnum:]]|[~!@#$%^&*()_+={}[\]|\\:"<>?;',./]|[-] +CODE2 {CODE1}|[`] + +SIGN [-+] +DECIMAL [[:digit:]]+ +OCTAL 0[0-7]+ +HEXADECIMAL 0x[[:xdigit:]]+ +REAL ([[:digit:]]*\.[[:digit:]][[:digit:]]*)([eE]{SIGN}?[[:digit:]]+)? +NUMBER {SIGN}?({DECIMAL}|{OCTAL}|{HEXADECIMAL}|{REAL}) + +NAME [[:alnum:]_.#-]+ +ADDRESS ({NAME}|\.)+ +EMAIL {NAME}@{ADDRESS} + +URL [[:alpha:]]+"://"[[:alnum:]#%&+\,.\/?;@_=~-]+ + +%% + +^[\r\n] { pbl = nbl; nbl = 0; + if (cur_state == HTML) { + PopQuote(); + } else { + flt_bfr_append(yytext, yyleng); + } + new_state(sTEXT); + } + +^[<]!-- { PushQuote(NOTE, Comment_attr); + scan_html(yytext, yyleng); + } +--[>] { scan_html(yytext, yyleng); + if (html_level <= 0) { + PopQuote(); + html_level = 0; + } else { + flt_bfr_append(yytext, yyleng); + } + } +[\r\n] | +. { flt_bfr_append(yytext, yyleng); + scan_html(yytext, yyleng); + } + +^\< { + PushQuote(HTML, Preproc_attr); + scan_html(yytext, yyleng); + } +[\r\n] { flt_bfr_append(yytext, yyleng); } +^{WS}*[<] { flt_bfr_append(yytext, yyleng); + scan_html(yytext, yyleng); + } +^{WS}*[^<] { + if (html_level <= 0) { + html_level = 0; + if (yyleng > 0) + yyless(yyleng - 1); + flt_bfr_finish(); + pop_state(); + } else { + flt_bfr_append(yytext, yyleng); + scan_html(yytext, yyleng); + } + } +[^\r\n] { + flt_bfr_append(yytext, yyleng); + scan_html(yytext, yyleng); + } + +^{WS}*```{T_}* { fence_start(yytext, yyleng); } +^{WS}*```{T_}* { fence_finish(yytext, yyleng); } +^{T_}+ { WriteToken(String_attr); } +[\r\n]+ { flt_bfr_append(yytext, yyleng); } + +"["[^]]+"]("[^)]+")" { link_link(yytext, yyleng); } +"["[^]]+"]["[^)]+"]" { link_cite(yytext, yyleng); } + +^"#"{T_}+ { atx_header(yytext, yyleng); NoItem(); } + +^{DASHES}$ | +^{DASHED}+ { WriteToken(Action_attr); NoItem(); } + +^{WS}*{ITEM} { if (valid_indent(yytext, yyleng, 1)) { + WriteToken3(Action_attr, yyleng - 1); + yyless(yyleng - 1); + } else { + WriteToken3(Null_attr, yyleng - 1); + indent_code(yytext, yyleng); + yyless(yyleng - 1); + } + } +^{WS}*{TEXT} { if (valid_indent(yytext, yyleng, 0)) { + WriteToken3(Action_attr, yyleng - 1); + yyless(yyleng - 1); + } else { + if (yyleng < 3 && yytext[0] != '\t') + NoItem(); + WriteToken3(Null_attr, yyleng - 1); + indent_code(yytext, yyleng); + yyless(yyleng - 1); + } + } + +[\\][[:punct:]] { WriteToken(Action_attr); } + +^[_][_][_]{Y_}+[_][_][_]$ { UnderKeep1(3, "IB"); } +^[_][_][_]{Y_}+[_][_][_]{N_} { UnderTrim1(3, "IB"); } +{N_}[_][_][_]{Y_}+[_][_][_]$ { UnderKeep2(3, "IB"); } +{N_}[_][_][_]{Y_}+[_][_][_]{N_} { UnderTrim2(3, "IB"); } + +^[_][_]{Y_}+[_][_]$ { UnderKeep1(2, "B"); } +^[_][_]{Y_}+[_][_]{N_} { UnderTrim1(2, "B"); } +{N_}[_][_]{Y_}+[_][_]$ { UnderKeep2(2, "B"); } +{N_}[_][_]{Y_}+[_][_]{N_} { UnderTrim2(2, "B"); } + +^[_]{Y_}+[_]$ { UnderKeep1(1, "I"); } +^[_]{Y_}+[_]{N_} { UnderTrim1(1, "I"); } +{N_}[_]{Y_}+[_]$ { UnderKeep2(1, "I"); } +{N_}[_]{Y_}+[_]{N_} { UnderTrim2(1, "I"); } + +[*][*][*]{Z_}[*][*][*] { Emphasize(yytext, yyleng, 0, 3, "IB"); } +[*][*]{Z_}[*][*] { Emphasize(yytext, yyleng, 0, 2, "B"); } +[*]{Z_}[*] { Emphasize(yytext, yyleng, 0, 1, "I"); } + +[`][`]{CODE2}+[`][`] { Emphasize(yytext, yyleng, 0, 2, String_attr); } +[`]{CODE1}+[`] { Emphasize(yytext, yyleng, 0, 1, String_attr); } + +{NUMBER} { WriteToken(Number_attr); } +{EMAIL} | +{URL} { WriteToken(Ident2_attr); } + +{T_}+ { WriteToken(Code_attr); } +[\r\n] { flt_bfr_append(yytext, yyleng); new_state(sTEXT); } + +{EMAIL} | +{URL} { flt_bfr_embed(yytext, yyleng, Ident2_attr); } + +\(\"\) | +\'.\' { flt_bfr_append(yytext, yyleng); } + +\`\` { PushQuote(QUOTES, String_attr); } +\'\' { PopQuote(); } +. { flt_bfr_append(yytext, yyleng); } +^[\n] { PopQuote(); } +[\n] { flt_bfr_append(yytext, yyleng); } + +[\r\n] | +. { flt_bfr_append(yytext, yyleng); } + +%% + +#include + +/* + * atx-style headers use 1-6 hash characters at the start of the line, + * corresponding to header levels 1-6. + */ +static void +atx_header(const char *value, int length) +{ + int level = 1; + for (level = 0; level < length; ++level) { + if (value[level] != '#' || (level == 6)) + break; + } + if (level == length || !isspace(value[level])) { + flt_bfr_embed(value, length, Error_attr); + } else { + flt_bfr_embed(value, level, Action_attr); + flt_bfr_embed(value + level, length - level, String_attr); + } +} + +static int +indent_column(const char *value, int length) +{ + int result = 0; + int n; + + for (n = 0; n < length; ++n) { + int ch = value[n]; + if (ch == '\t') + result = 1 + (result | 7); + else if (ch == ' ') + ++result; + else + break; + } + return result; +} + +static int +left_margin(void) +{ + int result = 0; + if (item_depth > 0) + result = item_stack[item_depth - 1].c2nd; + return result; +} + +/* + * Check the indent-level for the current token, updating item_level. + */ +static int +valid_indent(const char *value, int length, int mark) +{ + int result = 0; + int actual = 0; + int marked = 0; + int c1st = -1; + int c2nd = -1; + int n; + + for (n = 0; n < length - 1; ++n) { + int ch = value[n]; + if (ch == '\t') { + actual = 1 + (actual | 7); + } else if (ch == ' ') { + ++actual; + } else if (mark && !marked && isMark(ch)) { + c1st = actual++; + marked = 1; + } else { + ++actual; + } + } + +#define SameMark(tst,ref) (isdigit(ref) ? isdigit(tst) : ((ref) == (tst))) + + if (mark) { + mark = *value; + c2nd = actual; + if (c1st <= 3 + && (item_depth == 0 + || item_stack[item_depth - 1].c1st >= c1st)) { + result = 1; + /* begin/resume top-level */ + item_depth = 0; + item_stack[item_depth].mark = mark; + item_stack[item_depth].c1st = c1st; + item_stack[item_depth].c2nd = c2nd; + item_depth++; + } else if (item_depth > 0) { + if (SameMark(mark, item_stack[item_depth - 1].mark) && + c1st == item_stack[item_depth - 1].c1st && + c2nd == item_stack[item_depth - 1].c2nd) { + /* continue existing level */ + result = 1; + } else if (c1st >= item_stack[item_depth - 1].c2nd && + c1st <= item_stack[item_depth - 1].c2nd + 3) { + result = 1; + /* begin newer level */ + if ((size_t) (item_depth + 1) >= item_limit) { + item_limit += 10; + item_stack = typereallocn(ITEM_STACK, item_stack, item_limit); + } + item_stack[item_depth].mark = mark; + item_stack[item_depth].c1st = c1st; + item_stack[item_depth].c2nd = c2nd; + item_depth++; + } else if (c1st < item_stack[item_depth - 1].c1st) { + /* look for match in older/upper levels */ + for (n = item_depth; n > 0; --n) { + if (c1st == item_stack[n - 1].c1st) { + result = 1; + /* TODO warn if mismatch for mark/c2nd */ + item_depth = n; + break; + } + } + } + } + } else { + c1st = c2nd = actual; + if (item_depth > 0) { + if (c2nd >= item_stack[item_depth - 1].c2nd && + c2nd <= item_stack[item_depth - 1].c2nd + 3) { + result = 1; + } else if (c2nd < item_stack[item_depth - 1].c2nd) { + /* look for match in older/upper levels */ + for (n = item_depth; n > 0; --n) { + if (c2nd == item_stack[n - 1].c2nd) { + result = 1; + item_depth = n; + break; + } + } + } + } + } + if (result == 1) { + item_level = (mark + ? item_stack[item_depth - 1].c1st + : item_stack[item_depth - 1].c2nd); + } + return result; +} + +static void +emphasize(const char *value, int length, int margin, const char *attr) +{ + flt_bfr_embed(value, margin, Action_attr); + flt_bfr_embed(value + margin, length - (2 * margin), attr); + flt_bfr_embed(value, margin, Action_attr); +} + +static void +fence_start(const char *value, int length) +{ + int n; + if ((n = indent_column(value, length)) >= left_margin() + 3) { + indent_code(value, length); + } else { + n += 3; + flt_bfr_embed(value, n, Action_attr); + if (length > n) + flt_bfr_embed(value + n, length - n, String_attr); + new_state(FENCE); + } +} + +static void +fence_finish(const char *value, int length) +{ + int n; + if ((n = indent_column(value, length)) >= left_margin() + 3) { + indent_code(value, length); + } else { + n += 3; + flt_bfr_embed(value, n, Action_attr); + if (length > n) + flt_bfr_embed(value + n, length - n, Error_attr); + new_state(sTEXT); + } +} + +static void +indent_code(const char *value, int length) +{ + if (indent_column(value, length) > left_margin() + 3) + new_state(sCODE); +} + +static void +link_link(const char *value, int length) +{ + int n; + + flt_bfr_embed(value, 1, Action_attr); + for (n = 1; n < length; ++n) { + if (value[n] == R_BLOCK) + break; + } + flt_bfr_embed(value + 1, n - 1, String_attr); + flt_bfr_embed(value + n, 1, Action_attr); + flt_bfr_embed(value + n + 1, 1, Action_attr); + flt_bfr_embed(value + n + 2, length - n - 3, Preproc_attr); + flt_bfr_embed(value + length - 1, 1, Action_attr); +} + +static void +link_cite(const char *value, int length) +{ + int n; + + flt_bfr_embed(value, 1, Action_attr); + for (n = 1; n < length; ++n) { + if (value[n] == R_BLOCK) + break; + } + flt_bfr_embed(value + 1, n - 1, String_attr); + flt_bfr_embed(value + n, 1, Action_attr); + flt_bfr_embed(value + n + 1, 1, Action_attr); + flt_bfr_embed(value + n + 2, length - n - 3, Preproc_attr); + flt_bfr_embed(value + length - 1, 1, Action_attr); +} + +/* + * Delimiters used for emphasis (especially "_") are also valid in link + * descriptions. While the beginning of a link is out of reach, recover from + * this conflict by rejecting the rest of the unintended emphasis. + */ +static int +reject_links(const char *value, int length) +{ + int result = 0; + int blocks = 0; + int parens = 0; + int escape = 0; + int j; + + for (j = 0; j < length; ++j) { + int c1 = value[j]; + if (escape) { + escape = 0; + } else { + switch (c1) { + case '\\': + escape = 1; + break; + case L_PAREN: + parens++; + break; + case R_PAREN: + --parens; + break; + case L_BLOCK: + blocks++; + break; + case R_BLOCK: + --blocks; + break; + } + } + if (value[j] == R_BLOCK && blocks < 0) { + int c2 = (j < length) ? value[j + 1] : 0; + + if (c2 == ' ') + c2 = (j + 1 < length) ? value[j + 2] : 0; + if (c2 == L_BLOCK || c2 == L_PAREN) { + result = 1; + flt_bfr_embed(value, 1, Null_attr); + break; + } + } + } + return result; +} + +static void +scan_html(const char *value, int length) +{ + int n; + for (n = 0; n < length; ++n) { + if (value[n] == L_ANGLE) { + html_level++; + } else if (value[n] == R_ANGLE) { + --html_level; + } + } +} + +/* + * Validate, determine the actual length, in case there is more than one string + * to emphasize on the same line. + */ +static int +tone_down(const char *value, int length, int margin) +{ + int actual = length; + int limit = length - margin; + int n; + + for (n = margin; n < limit - margin; ++n) { + if (!strncmp(value + n, value, (size_t) margin)) { + actual = n + margin; + break; + } + } + return actual; +} + +static void +init_filter(int before GCC_UNUSED) +{ + (void) before; +} + +static void +do_filter(FILE *inputs) +{ + InitLEX(inputs); + + Action_attr = class_attr(NAME_ACTION); + Comment_attr = class_attr(NAME_COMMENT); + Error_attr = class_attr(NAME_ERROR); + Ident2_attr = class_attr(NAME_IDENT2); + Number_attr = class_attr(NAME_NUMBER); + Preproc_attr = class_attr(NAME_PREPROC); + String_attr = class_attr(NAME_LITERAL); + + nbl = pbl = 0; + item_depth = 0; + item_level = -1; + html_level = 0; + if (item_limit == 0) { + item_limit = 10; + item_stack = typecallocn(ITEM_STACK, item_limit); + } + begin_state(sTEXT); + RunLEX(); + flt_bfr_finish(); + end_state(); +} + +#if NO_LEAKS +static void +free_filter(void) +{ + USE_LEXFREE; +} +#endif diff -Nru vile-9.8v/filters/md.key vile-9.8w/filters/md.key --- vile-9.8v/filters/md.key 1970-01-01 00:00:00.000000000 +0000 +++ vile-9.8w/filters/md.key 2022-08-22 05:11:05.000000000 +0000 @@ -0,0 +1 @@ +: $Id: md.key,v 1.1 2022/01/25 00:56:54 tom Exp $ diff -Nru vile-9.8v/filters/perl6.key vile-9.8w/filters/perl6.key --- vile-9.8v/filters/perl6.key 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/filters/perl6.key 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -: $Id: perl6.key,v 1.1 2019/07/21 16:55:17 tom Exp $ -.merge perl diff -Nru vile-9.8v/filters/pl6filt.c vile-9.8w/filters/pl6filt.c --- vile-9.8v/filters/pl6filt.c 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/filters/pl6filt.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,1669 +0,0 @@ -/* - * $Id: pl6filt.c,v 1.1 2019/07/21 17:42:30 tom Exp $ - * - * Filter to add vile "attribution" sequences to perl6 scripts. - * This is a clone of "pl-filt.c", to handle differences from perl5. - */ - -#include - -#ifdef DEBUG -DefineOptFilter(perl6, "d"); -#else -DefineFilter(perl6); -#endif - -/* - * Punctuation that might be quote-delimiters (it is undocumented whether we - * should consider '$' and '&', but reading the parser hints that might work - * too). - */ -#define QUOTE_DELIMS "$+&#:/?|!:%',{}[]()@;=~\"" -/* from Perl's S_scan_str() */ -#define LOOKUP_TERM "([{< )]}> )]}>" - -#define isIdent(c) (isalnum(CharOf(c)) || c == '_') -#define isPattern(c) ((c) == '/' || (c) == '?') - -#define MORE(s) ((s) != the_last) -#define ATLEAST(s,n) (the_last - (s) > (n)) - -#ifdef DEBUG -#define DPRINTF(params) if(FltOptions('d'))printf params -#else -#define DPRINTF(params) /*nothing */ -#endif - -typedef enum { - eBACKTIC - ,eCODE - ,eHERE - ,ePATTERN - ,ePOD - ,eIGNORED -} States; - -typedef struct { - int may_have_pattern; - int has_no_pattern; -} AfterKey; - -static char *put_embedded(char *, int, const char *); - -static char *Action_attr; -static char *Comment_attr; -static char *Error_attr; -static char *Ident_attr; -static char *Ident2_attr; -static char *Keyword_attr; -static char *String_attr; -static char *Preproc_attr; -static char *Number_attr; - -static AfterKey nullKey; - -/* - * The in-memory copy of the input file. - */ -static char *the_file; -static char *the_last; -static size_t the_size; - -#ifdef DEBUG -static char * -stateName(States state) -{ - char *result; - switch (state) { - case eBACKTIC: - result = "BACKTIC"; - break; - case eCODE: - result = "CODE"; - break; - case eHERE: - result = "HERE"; - break; - case ePATTERN: - result = "PATTERN"; - break; - case ePOD: - result = "POD"; - break; - case eIGNORED: - result = "IGNORED"; - break; - default: - result = "?"; - } - return result; -} -#endif - -/* - * Count consecutive blanks at the current position. - */ -static int -count_blanks(char *s) -{ - char *base = s; - - while (MORE(s)) { - if (!isspace(CharOf(*s))) { - break; - } - ++s; - } - return (int) (s - base); -} - -/****************************************************************************** - * Lexical functions that match a particular token type * - ******************************************************************************/ -static int -is_BLANK(char *s) -{ - int found = 0; - while (MORE(s) && isBlank(*s)) { - found++; - s++; - } - return found; -} - -static int -is_INTEGER(char *s) -{ - int found = 0; - while (MORE(s) && isdigit(CharOf(*s))) { - found++; - s++; - } - return found; -} - -/* - * Actually all we are looking for is escaped quotes. perl uses backslashes as - * part of the syntax for referencing variables. Take that back: syntax does - * not really apply to perl... - */ -static int -is_ESCAPED(char *s) -{ - int found = 0; - if (*s == BACKSLASH) { - if (ATLEAST(s, 2) && strchr("'`\\", s[1])) - found = 2; - else - found = 1; - } - return found; -} - -static int -is_STRINGS(char *s, int *err, int delim) -{ - char *base = s; - int found = 0; - int escape = 0; - - *err = 0; - if (*s == delim) { - s++; - for (;;) { - if (!MORE(s)) { - *err = 1; /* unterminated string */ - break; - } - if (!escape && (*s == BACKSLASH)) { - escape = 1; - } else { - if (!escape && (*s == delim)) { - s++; - break; - } - escape = 0; - } - s++; - } - found = (int) (s - base); - } - return found; -} - -static int -is_KEYWORD(const char *s) -{ - const char *base = s; - int ch; - int quote = 0; - - while (MORE(s)) { - ch = CharOf(*s); - if (ch == SQUOTE) { /* leading or embedded - obs */ - /* This works for "&'name" and "name'two" */ - if (s == base) { - if (s == the_file || s[-1] != '&') { - return 0; - } - } else { - if (!ATLEAST(s, 1) - || !isalpha(CharOf(s[1]))) { - return 0; - } - } - s++; - quote++; - } else if (isalpha(CharOf(ch)) - || ch == '_' - || (s != base && (isdigit(CharOf(ch))))) - s++; - else - break; - } - if (quote == (s - base)) - s = base; - return (int) (s - base); -} - -/* - * Test for an identifier or quoted string, which can be used as a - * here-document marker. - */ -static int -is_QIDENT(char *s) -{ - char *base = s; - int ch; - int ok; - int err; - - if ((ok = is_STRINGS(s, &err, SQUOTE)) != 0) { - s += ok; - } else if ((ok = is_STRINGS(s, &err, DQUOTE)) != 0) { - s += ok; - } else { - while (MORE(s)) { - ch = CharOf(*s); - if (isalpha(ch) - || (s != base && isdigit(CharOf(ch))) - || ch == BACKSLASH - || ch == '_' - || ch == SQUOTE - || ch == DQUOTE) - s++; - else - break; - } - } - return (int) (s - base); -} - -/* - * If double-quoted, look for variables after a "&", "$", "%" or "@". - * If not double-quoted, look also for syntax such as $foo'bar - */ -static int -is_NORMALVARS(const char *s, int dquoted) -{ - const char *base = s; - int ch; - int squoted = 0; - int part1 = 0; - int part2 = 0; - - while (MORE(s)) { - ch = CharOf(*s); - if (s == base) { - if (vl_index(dquoted ? "$" : "&$%@", ch) == 0) { - break; - } - } else if (squoted && !dquoted) { - if (isalnum(ch)) { - part2 = 1; - } else { - break; - } - } else { - if (ch == SQUOTE && !dquoted) { - squoted = 1; - } else if (isalnum(ch) || ch == '_') { - part1 = 1; - } else if (ch == ':' && ATLEAST(s, 2) && s[1] == ':') { - part1 = 1; - s += 2; - } else { - break; - } - } - s++; - } - return (part1 && (dquoted || (squoted == part2))) ? (int) (s - base) : 0; -} - -static int -is_OTHERVARS(const char *s) -{ - const char *base = s; - int ch; - int part1 = 0; - int part2 = 0; - - while (MORE(s)) { - ch = CharOf(*s); - if (s == base) { - if (ch != '$') { - break; - } - } else if (s == base + 1) { - if (ch == '^') { - /*EMPTY */ ; - } else if (strchr("-_./,\"\\#%=~|$?&`'+*[];!@<>():", ch) != 0) { - part1 = ch; - } else { - break; - } - } else if (s == base + 2) { - if (part1) { - if (part1 == '#') { /* "$#" is followed by an identifier */ - s += is_KEYWORD(s); - } - break; - } else if (ch >= '@' && ch < '\177') { - part2 = ch; - } - } else { - break; - } - s++; - } - return (part1 || part2) ? (int) (s - base) : 0; -} - -static int -is_NUMBER(char *s, int *err) -{ - char *base = s; - int state = 0; - int value = 0; - int radix = 0; - int dot = 0; - - *err = 0; - while (MORE(s)) { - int ch = CharOf(*s); - - if ((s == base) && (ch == '+' || ch == '-')) { - /* EMPTY */ ; - } else if ((s == base) && (ch == 'v')) { - radix = 11; - } else if (radix == 11) { - if (ch != '_') { - if (isdigit(ch)) { - value = 1; - } else if (ch != '.' || !isdigit(CharOf(s[-1]))) { - break; - } - } - } else if (ch == '.') { - if (ATLEAST(s, 1) - && s[1] == '.') { - break; - } - if (radix == 8) - radix = 10; - if (dot || (radix != 0 && radix != 10) || (state > 1)) { - *err = 1; - } - dot = 1; - radix = 10; - state = 1; - } else if (ch == '_') { - /* EMPTY */ ; - } else if (radix == 0) { - if (ch == '0') { - if (!ATLEAST(s, 1)) { - radix = 10; - } else if (s[1] == 'x') { - radix = 16; - s++; - } else if (s[1] == 'b') { - radix = 2; - s++; - } else { - radix = 8; - } - value = 1; - } else if (isdigit(ch)) { - radix = 10; - value = 1; - } else { - break; - } - } else if (value && (radix != 16) && (ch == 'e' || ch == 'E')) { - if (state >= 2 || !value) { - *err = 1; - } - state = 2; - } else { - if (((state || (radix == 10)) && isdigit(ch)) - || ((radix == 16) && isxdigit(ch)) - || ((radix == 8) && (ch >= '0' && ch < '8')) - || ((radix == 2) && (ch >= '0' && ch < '2'))) { - value = 1; - } else { - if (value) { - while (MORE(s)) { - ch = CharOf(*s); - if (isalnum(ch)) { - *err = 1; - ++s; - } else { - break; - } - } - } - break; - } - } - s++; - } - - return value ? (int) (s - base) : 0; -} - -static char * -put_NUMBER(char *s, int ok, int *err) -{ - if (*err) { - flt_error("illegal number"); - flt_puts(s, ok, Error_attr); - } else { - flt_puts(s, ok, Number_attr); - } - s += ok; - return s; -} - -static int -is_ELLIPSIS(char *s) -{ - int dots; - int ok = 0; - - for (dots = 0; dots < 3; ++dots) { - if (!MORE(s) || (*s++ != '.')) { - break; - } - ok = dots + 1; - } - return (ok > 1) ? ok : 0; -} - -static int -is_IDENT(const char *s, int quoted) -{ - int found; - - if ((found = is_NORMALVARS(s, quoted)) == 0) - found = is_OTHERVARS(s); - return found; -} - -static int -is_NAME(char *s) -{ - int found = 0; - - while (isIdent(s[found])) { - ++found; - } - return found; -} - -/* for compatibility with perlfilt.l, process single-line comments only */ -static int -is_COMMENT(char *s) -{ - char *base = s; - char *t = is_BLANK(s) + s; - - if (*t++ == '#') { - while (MORE(t)) { - if (*t == '\n') { - if (!ATLEAST(t, 1) - || t[1] != '#') - break; - } - t++; - } - s = t; - } - return (int) (s - base); -} - -/* preprocessor stuff: - * - * /^#\s*line\s+(\d+)\s*(?:\s"([^"]+)")?\s*$/ - */ -static int -is_PREPROC(char *s) -{ - char *base = s; - int skip; - int err; - - s += is_BLANK(s); - if (*s++ != '#') - return 0; - s += is_BLANK(s); - if (strncmp(s, "line", (size_t) 4)) - return 0; - if ((skip = is_BLANK(s += 4)) == 0) - return 0; - if ((skip = is_INTEGER(s += skip)) == 0) - return 0; - s += skip; - s += is_BLANK(s); - if (*s == DQUOTE) { - s += is_STRINGS(s, &err, DQUOTE); - if (err) - return 0; - } - s += is_BLANK(s); - return (int) (s - base); -} - -/****************************************************************************** - ******************************************************************************/ - -static int -end_marker(char *s, const char *marker, int only) -{ - size_t len = strlen(marker); - - return (ATLEAST(s, (int) len) - && !strncmp(s, marker, len) - && (!only || (s[len] == '\n'))); -} - -/* - * Check for one or more blank lines followed by a line beginning with an "=" - * and an alpha-character. If found, return the length skipped through the - * "=" (the "=" is painted in a different color). Otherwise return 0. - */ -static int -begin_POD(char *s, int emit) -{ - int result = 0; - char *base; - int skip = 2; - int maybe = 0; - - while (s > the_file) { - if (s[0] != '\n' || - s[-1] != '\n' || - --skip <= 0) { - break; - } - --s; - } - skip = 0; - base = s; - - while (MORE(s)) { - if (*s == '\n') - ++skip; - else - break; - ++s; - } - if ((base != the_file) && (skip == 1)) { - maybe = 1; - ++skip; - } - if (((base == the_file) || (skip >= 2)) - && ATLEAST(s, 2) - && s[0] == '=' - && isalpha(CharOf(s[1]))) { - result = (int) (s + 1 - base); - if (result && maybe) - flt_error("expected a blank line"); - if (emit) { - while (base != s) { - flt_putc(*base++); /* skip the newlines */ - } - } - } - return result; -} - -static int -end_POD(char *s, int skip) -{ - if (skip) { - while (MORE(s)) { - if (*s != '\n') - break; - ++s; - } - } - return end_marker(s, "=cut", 0); -} - -/* - * See discussion of "here-doc" in perldata. - * FIXME: we're only implementing a single here-doc (perldata says they - * can be stacked), and don't check for unbalanced quotes). - */ -static char * -begin_HERE(char *s, int *quoted) -{ - char *base; - int ok; - - if (ATLEAST(s, 2) - && s[0] == '<' - && s[1] == '<') { - s += 2; - s += count_blanks(s); - base = s; - if ((ok = is_QIDENT(s)) != 0) { - size_t temp = 0; - char *marker = do_alloc((char *) 0, (size_t) (ok + 1), &temp); - char *d = marker; - - s += ok; - *quoted = 0; - - if (marker != 0) { - while (base != s) { - if (*base != SQUOTE - && *base != DQUOTE - && *base != BACKSLASH) - *d++ = *base; - else if (*base != DQUOTE) - *quoted = 1; - base++; - } - *d = 0; - } - return marker; - } - } - return 0; -} - -static char * -skip_BLANKS(char *s) -{ - int count = count_blanks(s); - - if (count) { - flt_puts(s, count, ""); - } - return s + count; -} - -/* - * Return the first character, skipping optional blanks - */ -static int -char_after_blanks(char *s) -{ - int result = '\0'; - - while (MORE(s)) { - if (!isspace(CharOf(*s))) { - result = CharOf(*s); - break; - } - ++s; - } - return result; -} - -static int -line_size(char *s) -{ - char *base = s; - - while (MORE(s)) { - if (*s == '\n') - break; - s++; - } - return (int) (s - base); -} - -/* - * The only place that perlfilt.l recognizes a PATTERN is after "!~" or "=~". - * Doing that in other places gets complicated - the reason for moving to C. - */ -static int -begin_PATTERN(char *s) -{ - if (ATLEAST(s, 2) - && (s[0] == '!' || s[0] == '=') - && s[1] == '~') { - return 2 + is_BLANK(s + 2); - } - return 0; -} - -/* - * Check for simple pattern, trying to distinguish '/' from its use for divide, - * and '$' from its use in variable names. - */ -static int -is_PATTERN(char *s) -{ - char *base = s; - int delim = *s++; - int result = 0; - int escaped = 0; - char *content = s; - - while (MORE(s)) { - int ch = *s++; - if (escaped) { - escaped = 0; - } else if (ch == BACKSLASH) { - escaped = 1; - } else if (ch == delim) { - if (((s - 1) - content) != 0) { - /* content is nonempty */ - char *next = 0; - (void) strtol(content, &next, 0); - if (next == 0 || next == content) { - /* content was not a number */ - result = (int) (s - base); - } - } - break; - } else if (isspace(ch)) { - break; - } else if (ch == '$') { - if (*s != delim) - break; - } - } - return result; -} - -/* - * If we're pointing to a quote-like operator, return its length. - * As a side-effect, set the number of delimiters (assuming '/') it needs. - */ -static int -is_QUOTE(char *s, int *delims) -{ - char *base = s; - size_t len; - int result = 0; - - *delims = 0; - while (MORE(s) && isIdent(*s)) { - ++s; - } - if ((len = (size_t) (s - base)) != 0) { - switch (len) { - case 1: - if (*base == 'm' || *base == 'q') { - *delims = 2; - } else if (*base == 's' || *base == 'y') { - *delims = 3; - } - break; - case 2: - if (!strncmp(base, "tr", (size_t) 2)) { - *delims = 3; - } else if (!strncmp(base, "qq", (size_t) 2) || - !strncmp(base, "qx", (size_t) 2) || - !strncmp(base, "qw", (size_t) 2) || - !strncmp(base, "qr", (size_t) 2)) { - *delims = 2; - } - break; - } - } - if (*delims == 0) - s = base; - - if ((result = (int) (s - base)) != 0) { - int test = char_after_blanks(s); - DPRINTF(("is_Quote(%.*s:%c)", result, base, test)); - if (test == '#' && isspace(CharOf(*s))) - test = 0; - if ((test == 0) || (strchr(QUOTE_DELIMS "<>", test) == 0)) { - s = base; - result = 0; - } - DPRINTF(("is_QUOTE(%.*s)\n", - result ? result : 1, - result ? base : "")); - } - return result; -} - -static int -add_to_PATTERN(char *s) -{ - char *base = s; - char *next; - int need; - int skip = is_QUOTE(s, &need); - - if (skip == 0) - need = 2; - - DPRINTF(("\n*add_to_PATTERN(skip=%d, text=%.*s)\n", skip, - line_size(s), s)); - if (ATLEAST(s, need + skip)) { - int delim = 0; - int delim2 = 0; - int ignored = 0; - int escaped = 0; - int comment = 0; - int in_blocks = 0; - int in_curlys = 0; - int in_parens = 0; - - s += skip; - --need; - do { - while (MORE(s) && isspace(CharOf(*s))) { - s++; - } - if (MORE(s)) { - delim = *s++; - } - if ((delim2 = delim) == 0) - return 0; - /* from Perl's S_scan_str() */ - if (delim != 0 && (next = strchr(LOOKUP_TERM, delim)) != 0) - delim2 = next[5]; - - if (delim == L_CURLY) - in_curlys = 1; - - if (delim == L_PAREN) - in_parens = 1; - - DPRINTF(("*start%d %c%c\n->%.*s\n", - need, delim, delim2, - line_size(s), s)); - - next = s; - while (MORE(s)) { - if (comment) { - if (*s == '\n') - comment = 0; - } else if (!escaped && (*s == BACKSLASH)) { - escaped = 1; - } else { - if (!escaped) { - ignored = 0; - - switch (*s) { - case L_BLOCK: - if (in_blocks == 0) - in_blocks = 1; - break; - case R_BLOCK: - if (in_blocks != 0) { - in_blocks = 0; - ignored = 1; - } - break; - case L_CURLY: - ++in_curlys; - break; - case R_CURLY: - if (--in_curlys < 0) - in_curlys = 0; /* oops */ - break; - case L_PAREN: - ++in_parens; - break; - case R_PAREN: - if (--in_parens < 0) - in_parens = 0; /* oops */ - break; - } - - if (*s == '#' && delim == R_CURLY && !in_curlys) - comment = 1; - - if (delim == L_BLOCK && in_blocks) - ignored = 1; - if (delim == L_CURLY && in_curlys) - ignored = 1; - if (delim == L_PAREN && in_parens) - ignored = 1; - - if (!ignored && (*s == delim2)) { - DPRINTF(("*finish%d %c%c\n->%.*s\n", - need, delim, delim2, - line_size(s), s)); - /* - * check for /pattern/.../pattern/ - */ - if (ATLEAST(s, 4) - && need == 1 - && !strncmp(s + 1, "...", (size_t) 3)) - need += 2; - /* - * check for /pattern/ {pattern} - */ - if (delim != delim2 || need == 1) - ++s; - break; - } - } - escaped = 0; - } - s++; - } - } while (--need > 0); - while (MORE(s)) { - if (!isalpha(CharOf(*s)) - || *s == ';') - break; - s++; - } - DPRINTF(("*finally\n->%.*s\n", line_size(s), s)); - return (int) (s - base); - } - return 0; -} - -/* - * FIXME: revisit 9.2e's test-case and determine how to handle /x modifier. - */ -static char * -write_PATTERN(char *s, int len) -{ - int delimiter = 0; - int delims; - int skip = is_QUOTE(s, &delims); - int n; - int first; - int leading = 0; - int comment = 0; - int escaped = 0; - int range = 0; - int interp = 0; - int len_flags = 0; - int e_modifier = 0; - - DPRINTF(("\n*write_PATTERN(%.*s)\n", len, s)); - if (skip) { - flt_puts(s, skip, Keyword_attr); - s += skip; - len -= skip; - } - - skip = (int) (skip_BLANKS(s) - s); - if (skip) { - s += skip; - len -= skip; - } - delimiter = *s; - - for (len_flags = 0; len_flags < (len - 2); ++len_flags) { - int ch = CharOf(s[len - len_flags - 1]); - if (ch == 'e') { - e_modifier = 1; - } else if (!isalpha(ch)) - break; - } - interp = (delimiter == '"'); - - for (n = first = 0; n < len; n++) { - if (!escaped - && !interp - && e_modifier - && (n > 0) - && (s[n] == delimiter)) { - if (comment) { - flt_puts(s + first, (n - first + 1), Comment_attr); - comment = 0; - } else { - flt_puts(s + first, (n - first + 1), String_attr); - } - first = n + 1; - interp = 1; - continue; - } - - if (escaped) { - escaped = 0; - } else if (s[n] == BACKSLASH) { - escaped = 1; - } else if (isBlank(s[n]) && !escaped && !comment && - (leading || char_after_blanks(s + n) == '#')) { - if (interp) { - put_embedded(s + first, (n - first - 0), String_attr); - } else { - flt_puts(s + first, (n - first - 0), String_attr); - } - flt_putc(s[n]); - first = n + 1; - } else if (s[n] == '\n') { - leading = 1; - if (comment) { - flt_puts(s + first, (n - first + 1), Comment_attr); - comment = 0; - first = n + 1; - } - } else { - leading = 0; - if ((s[n] == L_BLOCK) && !comment) { - range = 1; - } else if ((s[n] == R_BLOCK) && range) { - range = 0; - } else if ((s[n] == '#') - && (delimiter == L_CURLY || (n > 0 && isBlank(s[n - 1]))) - && !range) { - if (!comment) { - if (interp) { - put_embedded(s + first, (n - first - 1), String_attr); - } else { - flt_puts(s + first, (n - first - 1), String_attr); - } - comment = 1; - first = n + 0; - } - } - } - } - if (comment) - first += (int) (skip_BLANKS(s) - s); - if (comment) { - flt_puts(s + first, (len - first), Comment_attr); - } else { - if (interp) { - put_embedded(s + first, (len - first - len_flags), String_attr); - } else { - flt_puts(s + first, (len - first - len_flags), String_attr); - } - flt_puts(s + len - len_flags, len_flags, Keyword_attr); - } - s += len; - return s; -} - -static int -is_Option(char *s) -{ - int found = 0; - - if (*s == '-' - && ATLEAST(s, 1) - && isalpha(CharOf(s[1])) - && !isIdent(CharOf(s[2]))) - found = 2; - return found; -} - -static int -is_String(char *s, int *err) -{ - int found = is_STRINGS(s, err, SQUOTE); - if (!found) - found = is_STRINGS(s, err, DQUOTE); - if (!found) - found = is_ESCAPED(s); - return found; -} - -/* - * FIXME: this only handles subscripts that consist of a single identifier, - * with no expressions. - */ -static int -is_Subscript(char *s, int len, char *delimp) -{ - if (delimp != 0) { - int delim = *delimp; - int delim2; - char *next; - - if (delim != 0 && (next = strchr(LOOKUP_TERM, delim)) != 0) { - delim2 = next[5]; - - if (s[len] == delim2) - return 1; - } - } - return 0; -} - -static char * -put_newline(char *s) -{ - if (MORE(s)) - flt_putc(*s++); - return s; -} - -static int -var_embedded(const char *s) -{ - if (*s == '$') { - if (s[1] == L_PAREN - || s[1] == '$') { - if (isIdent(s[2])) - return 0; - } - } - return 1; -} - -static char * -put_embedded(char *s, int len, const char *attr) -{ - int id; - int j, k; - - for (j = k = 0; j < len; j++) { - if ((j == 0 || (s[j - 1] != BACKSLASH)) - && (id = is_IDENT(s + j, 1)) != 0) { - if (var_embedded(s + j)) { - if (j != k) - flt_puts(s + k, j - k, attr); - flt_puts(s + j, id, Ident2_attr); - k = j + id; - j = k - 1; - } else { - j += id - 1; - } - } - } - if (k < len) - flt_puts(s + k, len - k, attr); - return s + len; -} - -/* - * Write the remainder of the line with the given attribute. If not quoted, - * highlight identifiers which are embedded in the line. - */ -static char * -put_remainder(char *s, char *attr, int quoted) -{ - int ok = line_size(s); - - if (quoted) { - flt_puts(s, ok, attr); - s += ok; - } else { - s = put_embedded(s, ok, attr); - } - return put_newline(s); -} - -/* - * Write the line for perldoc (see perlpodspec). - */ -static char * -put_document(char *s) -{ - char *attr = Comment_attr; - int ok = line_size(s); - int j, k; - - j = 0; - if (s[j] == '=') { - flt_puts(s, j, attr); - for (k = j; k < ok; ++k) { - if (isspace(CharOf(s[k]))) - break; - } - flt_puts(s + j, k - j, Preproc_attr); - flt_puts(s + k, ok - k, String_attr); - j = ok; - } - flt_puts(s + j, ok - j, attr); - return put_newline(s + ok); -} - -/* - * Check for special cases of keywords after which we may expect a pattern - * that does not have to be inside parentheses. - */ -static void -check_keyword(char *s, int ok, AfterKey * state) -{ - size_t len = (size_t) ok; - - state->may_have_pattern = 0; - state->has_no_pattern = 0; - - switch (ok) { - case 2: - state->may_have_pattern = (!strncmp(s, "if", len) - || !strncmp(s, "eq", len) - || !strncmp(s, "ge", len) - || !strncmp(s, "gt", len) - || !strncmp(s, "le", len) - || !strncmp(s, "lt", len) - || !strncmp(s, "ne", len) - || !strncmp(s, "or", len)); - break; - case 3: - state->has_no_pattern = !strncmp(s, "sub", len); - state->may_have_pattern = (!strncmp(s, "and", len) - || !strncmp(s, "cmp", len) - || !strncmp(s, "not", len) - || !strncmp(s, "xor", len)); - break; - case 4: - state->may_have_pattern = !strncmp(s, "grep", len); - break; - case 5: - state->may_have_pattern = (!strncmp(s, "split", len) - || !strncmp(s, "until", len) - || !strncmp(s, "while", len)); - break; - case 6: - state->may_have_pattern = !strncmp(s, "unless", len); - break; - } -} - -/* - * Identifier may be a keyword, or a user identifier. - */ -static char * -put_IDENT(char *s, int ok, AfterKey * if_wrd) -{ - const char *attr = 0; - char save = s[ok]; - - s[ok] = '\0'; - attr = get_keyword_attr(s); - s[ok] = save; - flt_puts(s, ok, (attr != 0 && *attr != '\0') ? attr : Ident2_attr); - check_keyword(s, ok, if_wrd); - return s + ok; -} - -/* - * Identifier must be a user identifier. - */ -static char * -put_NOKEYWORD(char *s, int ok, AfterKey * if_wrd) -{ - const char *attr = 0; - char save = s[ok]; - - s[ok] = '\0'; - attr = get_keyword_attr(s); - s[ok] = save; - flt_puts(s, ok, attr); - check_keyword(s, ok, if_wrd); - return s + ok; -} - -/* - * Check for a matching backtic, return the number of characters we'll skip. - */ -static int -end_BACKTIC(char *s) -{ - char *base = s; - int found = 0; - - while (MORE(s)) { - if (*s == BQUOTE) { - found = 1; - break; - } - ++s; - } - return found ? (int) (s - base) : 0; -} - -/* - * Check for a file glob expression delimited by angle-brackets, e.g., - * <*> - * <*.c> - */ -static int -is_GLOB(char *s) -{ - char *base = s; - int wild = 0; - int both = 0; - - if (*s++ == L_ANGLE) { - while (MORE(s)) { - int ch = *s++; - if (ch == '\n' || ch == '=' || ch == L_ANGLE) { - break; - } else if (ch == '*') { - ++wild; - } else if (ch == R_ANGLE) { - both = 1; - break; - } - } - } - return (wild && both) ? (int) (s - base) : 0; -} - -/* - * Check for a "format =" or "format KEYWORD =" line, which begins a special - * type of here-document. - */ -static int -is_FORMAT(char *s, int len) -{ - if (len == 6 && !strncmp(s, "format", (size_t) len)) { - s += len; - s += is_BLANK(s); - s += is_NAME(s); - s += is_BLANK(s); - if (*s == '=' && !ispunct(CharOf(s[1]))) - return 1; - } - return 0; -} - -/****************************************************************************** - ******************************************************************************/ - -static void -init_filter(int before GCC_UNUSED) -{ - (void) before; -} - -#define opRightArrow() (had_op != 0 && old_op == had_op - 1 && *old_op == '-' && *had_op == '>') -#define opBeforePattern() (had_op != 0 && strchr("{(|&=~!", *had_op) != 0) - -#define saveOp(p) { DPRINTF(("\nsaveOp('%c') @%d\n", *p, __LINE__)); old_op = had_op; had_op = p; } -#define clearOp() { DPRINTF(("\nclearOp @%d\n", __LINE__)); old_op = had_op = 0; } - -static void -do_filter(FILE *input GCC_UNUSED) -{ - static size_t used; - static char *line; - - AfterKey if_old; - AfterKey if_wrd; - States state = eCODE; - char *marker = 0; - char *s; - int err; - char *had_op = 0; - char *old_op = 0; - int ignore; - int in_line = -1; - int in_stmt = 0; - int ok; - int parens = 0; - int quoted = 0; - int save; - size_t request = 0; - size_t actual = 0; - size_t mark_len = 0; - - (void) input; - - Action_attr = class_attr(NAME_ACTION); - Comment_attr = class_attr(NAME_COMMENT); - Error_attr = class_attr(NAME_ERROR); - Ident_attr = class_attr(NAME_IDENT); - Ident2_attr = class_attr(NAME_IDENT2); - Keyword_attr = class_attr(NAME_KEYWORD); - Number_attr = class_attr(NAME_NUMBER); - Preproc_attr = class_attr(NAME_PREPROC); - String_attr = class_attr(NAME_LITERAL); - - /* - * Read the whole file into a single string, in-memory. Rather than - * spend time working around the various continuation-line types _and_ - * Perl's "syntax", let's just concentrate on the latter. - */ - the_size = 0; - the_file = 0; - while (flt_gets(&line, &used) != NULL) { - size_t len = strlen(line); /* FIXME: nulls? */ - if (len != 0 && line[len - 1] == '\r') /* FIXME: move this to readline */ - line[--len] = '\0'; - if ((request = the_size + len + 1) > actual) - request = 1024 + (request * 2); - the_file = do_alloc(the_file, request, &actual); - if (the_file == 0) - break; - memcpy(the_file + the_size, line, len + 1); - the_size += len; - } - - if (the_file != 0) { - the_last = the_file + the_size; - - s = the_file; - if_wrd = nullKey; - while (MORE(s)) { - if (*s == '\n' || s == the_file) { - in_line = -1; - } else { - in_line++; - } - if_old = if_wrd; - DPRINTF(("(%s(%c) line:%d.%d(%d) if:%d.%d op:%c%c)%s\n", - stateName(state), *s, in_line, in_stmt, parens, - if_wrd.may_have_pattern, - if_wrd.has_no_pattern, - old_op ? *old_op : ' ', - had_op ? *had_op : ' ', - opRightArrow()? " arrow" : "")); - switch (state) { - case eBACKTIC: - if ((ok = end_BACKTIC(s)) != 0) { - s = put_embedded(s, ok, ""); - } else { - flt_error("missing backtic"); - s = put_remainder(s, Error_attr, 0); - } - if (*s == BQUOTE) { - flt_puts(s, 1, Action_attr); - state = eCODE; - ++s; - } - if_wrd = nullKey; - break; - - case eCODE: - if (*s == '\004' || *s == '\032') { /* ^D or ^Z */ - state = eIGNORED; - flt_puts(s, 1, Preproc_attr); - break; - } else if (!isspace(CharOf(*s))) { - ++in_stmt; - } - - if (*s == BACKSLASH && ATLEAST(s, 2) && s[1] == BQUOTE) { - flt_puts(s, 2, String_attr); - s += 2; - if_wrd = nullKey; - } else if (*s == BQUOTE) { - flt_puts(s, 1, Action_attr); - ++s; - state = eBACKTIC; - if_wrd = nullKey; - } else if ((ok = is_GLOB(s)) != 0) { - s = put_embedded(s, ok, String_attr); - if_wrd = nullKey; - } else if ((marker = begin_HERE(s, "ed)) != 0) { - state = eHERE; - s = put_remainder(s, String_attr, quoted); - if_wrd = nullKey; - } else if ((ok = begin_PATTERN(s)) != 0) { - flt_puts(s, ok, ""); - s += ok; - DPRINTF(("\nePATTERN:%d\n", __LINE__)); - state = ePATTERN; - if_wrd = nullKey; - } else if (in_line <= 0 - && (ok = begin_POD(s, 0))) { - char *base = s; - state = ePOD; - while (*s != '=') - flt_putc(*s++); - s = put_document(s); - if (end_POD(base, 1)) - state = eCODE; - } else if (in_line == 0 - && (ok = is_PREPROC(s)) != 0) { - flt_puts(s, ok, Preproc_attr); - s += ok; - } else if ((ok = is_COMMENT(s)) != 0) { - int skip = (int) (skip_BLANKS(s) - s); - ok -= skip; - s += skip; - flt_puts(s, ok, Comment_attr); - s += ok; - if_wrd = if_old; - } else if ((ok = is_BLANK(s)) != 0) { - flt_puts(s, ok, ""); - s += ok; - if_wrd = if_old; - } else if ((if_old.may_have_pattern - || opBeforePattern() - || (in_stmt == 1)) - && isPattern(*s)) { - DPRINTF(("\nePATTERN:%d\n", __LINE__)); - state = ePATTERN; - } else if (*s == L_CURLY) { - saveOp(s); - flt_putc(*s++); - if_wrd = nullKey; - } else if (*s == L_PAREN) { - parens++; - saveOp(s); - flt_putc(*s++); - if (isPattern(*s)) { - DPRINTF(("\nePATTERN:%d\n", __LINE__)); - state = ePATTERN; - } - if_wrd = nullKey; - } else if (*s == R_PAREN) { - if (--parens < 0) - parens = 0; - flt_putc(*s++); - clearOp(); - if_wrd = nullKey; - } else if ((ok = is_ELLIPSIS(s)) != 0) { - flt_puts(s, ok, ""); - s += ok; - if_wrd = nullKey; - } else if ((ok = is_NUMBER(s, &err)) != 0) { - clearOp(); - s = put_NUMBER(s, ok, &err); - if_wrd = nullKey; - } else if ((ok = is_KEYWORD(s)) != 0) { - if ((s != the_file) - && (s[-1] == '*')) { /* typeglob */ - s = put_IDENT(s, ok, &if_wrd); - clearOp(); - } else if ((s != the_file) - && (if_old.has_no_pattern)) { - s = put_NOKEYWORD(s, ok, &if_wrd); - clearOp(); - } else if (!opRightArrow() - && !is_Subscript(s, ok, had_op) - && is_QUOTE(s, &ignore)) { - DPRINTF(("\nePATTERN:%d\n", __LINE__)); - state = ePATTERN; - } else { - if (is_FORMAT(s, ok)) { - char *try_mark; - quoted = 0; - state = eHERE; - mark_len = 0; - try_mark = do_alloc(0, (size_t) 2, &mark_len); - if (try_mark != 0) - marker = strcpy(try_mark, "."); - } - save = s[ok]; - s[ok] = 0; - if (!strcmp(s, "__END__") || !strcmp(s, "__DATA__")) - state = eIGNORED; - clearOp(); - flt_puts(s, ok, get_keyword_attr(s)); - check_keyword(s, ok, &if_wrd); - s[ok] = (char) save; - s += ok; - } - } else if ((ok = is_Option(s)) != 0) { - clearOp(); - flt_puts(s, ok, Keyword_attr); - check_keyword(s, ok, &if_wrd); - s += ok; - } else if ((ok = is_IDENT(s, 0)) != 0) { - s = put_IDENT(s, ok, &if_wrd); - clearOp(); - } else if ((ok = is_String(s, &err)) != 0) { - clearOp(); - if (*s == DQUOTE) { - if (err) { - flt_error("unexpected quote"); - s = put_embedded(s, ok, Error_attr); - } else { - s = put_embedded(s, ok, String_attr); - } - } else { - if (err) { - flt_error("missing quote"); - flt_puts(s, ok, Error_attr); - } else { - flt_puts(s, ok, String_attr); - } - s += ok; - } - if_wrd = nullKey; - } else if (isPattern(*s) && (ok = is_PATTERN(s))) { - s = write_PATTERN(s, ok); - if_wrd = nullKey; - } else { - if (!isspace(CharOf(*s))) { - if_wrd = nullKey; - } - if (*s == ';') { - in_stmt = 0; - } - if (parens) { - if (strchr("|&=~!->", *s) != 0) { - saveOp(s); - } else if (!isspace(CharOf(*s))) { - clearOp(); - } - } else { - if (strchr("|&=~!->", *s) != 0) { - saveOp(s); - } - } - flt_putc(*s++); - } - break; - - case eHERE: - if (end_marker(s, marker, 1)) { - state = eCODE; - free(marker); - marker = 0; - } - s = put_remainder(s, String_attr, quoted); - if_wrd = nullKey; - break; - - case eIGNORED: - s = put_document(s); - break; - - case ePATTERN: - s = skip_BLANKS(s); - if (MORE(s)) { - if ((ok = is_NAME(s)) != 0 && !is_QUOTE(s, &ignore)) { - s = put_IDENT(s, ok, &if_wrd); - clearOp(); - } else if ((ok = is_IDENT(s, 0)) != 0 && !is_QUOTE(s, &ignore)) { - s = put_IDENT(s, ok, &if_wrd); - clearOp(); - } else if ((ok = add_to_PATTERN(s)) != 0) { - s = write_PATTERN(s, ok); - } else { - flt_putc(*s++); - } - clearOp(); - state = eCODE; - } - if_wrd = nullKey; - break; - - case ePOD: - if (end_POD(s, 0)) - state = eCODE; - s = put_document(s); - if (begin_POD(s - 1, 0)) { - state = ePOD; - } - break; - } - } - free(the_file); - } -} - -#if NO_LEAKS -static void -free_filter(void) -{ -} -#endif diff -Nru vile-9.8v/filters/rakufilt.c vile-9.8w/filters/rakufilt.c --- vile-9.8v/filters/rakufilt.c 1970-01-01 00:00:00.000000000 +0000 +++ vile-9.8w/filters/rakufilt.c 2022-08-22 05:11:05.000000000 +0000 @@ -0,0 +1,1672 @@ +/* + * $Id: rakufilt.c,v 1.3 2022/01/21 00:54:29 bod Exp $ + * + * Filter to add vile "attribution" sequences to raku (formerly perl6) scripts. + * This is a clone of "pl-filt.c", to handle differences from perl5. + */ + +#include + +#ifdef DEBUG +DefineOptFilter(raku, "d"); +#else +DefineFilter(raku); +#endif + +/* + * Punctuation that might be quote-delimiters (it is undocumented whether we + * should consider '$' and '&', but reading the parser hints that might work + * too). + */ +#define QUOTE_DELIMS "$+&#:/?|!:%',{}[]()@;=~\"" +/* from Perl's S_scan_str() */ +#define LOOKUP_TERM "([{< )]}> )]}>" + +#define isIdent(c) (isalnum(CharOf(c)) || c == '_') +#define isPattern(c) ((c) == '/' || (c) == '?') + +#define MORE(s) ((s) != the_last) +#define ATLEAST(s,n) (the_last - (s) > (n)) + +#ifdef DEBUG +#define DPRINTF(params) if(FltOptions('d'))printf params +#else +#define DPRINTF(params) /*nothing */ +#endif + +typedef enum { + eBACKTIC + ,eCODE + ,eHERE + ,ePATTERN + ,ePOD + ,eIGNORED +} States; + +typedef struct { + int may_have_pattern; + int has_no_pattern; +} AfterKey; + +static char *put_embedded(char *, int, const char *); + +static char *Action_attr; +static char *Comment_attr; +static char *Error_attr; +static char *Ident_attr; +static char *Ident2_attr; +static char *Keyword_attr; +static char *String_attr; +static char *Preproc_attr; +static char *Number_attr; + +static AfterKey nullKey; + +/* + * The in-memory copy of the input file. + */ +static char *the_file; +static char *the_last; +static size_t the_size; + +#ifdef DEBUG +static char * +stateName(States state) +{ + char *result; + switch (state) { + case eBACKTIC: + result = "BACKTIC"; + break; + case eCODE: + result = "CODE"; + break; + case eHERE: + result = "HERE"; + break; + case ePATTERN: + result = "PATTERN"; + break; + case ePOD: + result = "POD"; + break; + case eIGNORED: + result = "IGNORED"; + break; + default: + result = "?"; + } + return result; +} +#endif + +/* + * Count consecutive blanks at the current position. + */ +static int +count_blanks(char *s) +{ + char *base = s; + + while (MORE(s)) { + if (!isspace(CharOf(*s))) { + break; + } + ++s; + } + return (int) (s - base); +} + +/****************************************************************************** + * Lexical functions that match a particular token type * + ******************************************************************************/ +static int +is_BLANK(char *s) +{ + int found = 0; + while (MORE(s) && isBlank(*s)) { + found++; + s++; + } + return found; +} + +static int +is_INTEGER(char *s) +{ + int found = 0; + while (MORE(s) && isdigit(CharOf(*s))) { + found++; + s++; + } + return found; +} + +/* + * Actually all we are looking for is escaped quotes. perl uses backslashes as + * part of the syntax for referencing variables. Take that back: syntax does + * not really apply to perl... + */ +static int +is_ESCAPED(char *s) +{ + int found = 0; + if (*s == BACKSLASH) { + if (ATLEAST(s, 2) && strchr("'`\\", s[1])) + found = 2; + else + found = 1; + } + return found; +} + +static int +is_STRINGS(char *s, int *err, int delim) +{ + char *base = s; + int found = 0; + int escape = 0; + + *err = 0; + if (*s == delim) { + s++; + for (;;) { + if (!MORE(s)) { + *err = 1; /* unterminated string */ + break; + } + if (!escape && (*s == BACKSLASH)) { + escape = 1; + } else { + if (!escape && (*s == delim)) { + s++; + break; + } + escape = 0; + } + s++; + } + found = (int) (s - base); + } + return found; +} + +static int +is_KEYWORD(const char *s) +{ + const char *base = s; + int ch; + int quote = 0; + + while (MORE(s)) { + ch = CharOf(*s); + if (ch == SQUOTE) { /* leading or embedded - obs */ + /* This works for "&'name" and "name'two" */ + if (s == base) { + if (s == the_file || s[-1] != '&') { + return 0; + } + } else { + if (!ATLEAST(s, 1) + || !isalpha(CharOf(s[1]))) { + return 0; + } + } + s++; + quote++; + } else if (isalpha(CharOf(ch)) + || ch == '_' + || (s != base && (isdigit(CharOf(ch))))) + s++; + else + break; + } + if (quote == (s - base)) + s = base; + return (int) (s - base); +} + +/* + * Test for an identifier or quoted string, which can be used as a + * here-document marker. + */ +static int +is_QIDENT(char *s) +{ + char *base = s; + int ch; + int ok; + int err; + + if ((ok = is_STRINGS(s, &err, SQUOTE)) != 0) { + s += ok; + } else if ((ok = is_STRINGS(s, &err, DQUOTE)) != 0) { + s += ok; + } else { + while (MORE(s)) { + ch = CharOf(*s); + if (isalpha(ch) + || (s != base && isdigit(CharOf(ch))) + || ch == BACKSLASH + || ch == '_' + || ch == SQUOTE + || ch == DQUOTE) + s++; + else + break; + } + } + return (int) (s - base); +} + +/* + * If double-quoted, look for variables after a "&", "$", "%" or "@". + * If not double-quoted, look also for syntax such as $foo'bar + */ +static int +is_NORMALVARS(const char *s, int dquoted) +{ + const char *base = s; + int ch; + int squoted = 0; + int part1 = 0; + int part2 = 0; + + while (MORE(s)) { + ch = CharOf(*s); + if (s == base) { + if (vl_index(dquoted ? "$" : "&$%@", ch) == 0) { + break; + } + } else if (squoted && !dquoted) { + if (isalnum(ch)) { + part2 = 1; + } else { + break; + } + } else { + if (ch == SQUOTE && !dquoted) { + squoted = 1; + } else if (isalnum(ch) || ch == '_') { + part1 = 1; + } else if (ch == ':' && ATLEAST(s, 2) && s[1] == ':') { + part1 = 1; + s += 2; + } else { + break; + } + } + s++; + } + return (part1 && (dquoted || (squoted == part2))) ? (int) (s - base) : 0; +} + +static int +is_OTHERVARS(const char *s) +{ + const char *base = s; + int ch; + int part1 = 0; + int part2 = 0; + + while (MORE(s)) { + ch = CharOf(*s); + if (s == base) { + if (ch != '$') { + break; + } + } else if (s == base + 1) { + if (ch == '^') { + /*EMPTY */ ; + } else if (strchr("-_./,\"\\#%=~|$?&`'+*[];!@<>():", ch) != 0) { + part1 = ch; + } else { + break; + } + } else if (s == base + 2) { + if (part1) { + if (part1 == '#') { /* "$#" is followed by an identifier */ + s += is_KEYWORD(s); + } + break; + } else if (ch >= '@' && ch < '\177') { + part2 = ch; + } + } else { + break; + } + s++; + } + return (part1 || part2) ? (int) (s - base) : 0; +} + +static int +is_NUMBER(char *s, int *err) +{ + char *base = s; + int state = 0; + int value = 0; + int radix = 0; + int dot = 0; + + *err = 0; + while (MORE(s)) { + int ch = CharOf(*s); + + if ((s == base) && (ch == '+' || ch == '-')) { + /* EMPTY */ ; + } else if ((s == base) && (ch == 'v')) { + radix = 11; + } else if (radix == 11) { + if (ch != '_') { + if (isdigit(ch)) { + value = 1; + } else if (ch != '.' || !isdigit(CharOf(s[-1]))) { + break; + } + } + } else if (ch == '.') { + if (ATLEAST(s, 1) + && s[1] == '.') { + break; + } + if (radix == 8) + radix = 10; + if (dot || (radix != 0 && radix != 10) || (state > 1)) { + *err = 1; + } + dot = 1; + radix = 10; + state = 1; + } else if (ch == '_') { + /* EMPTY */ ; + } else if (radix == 0) { + if (ch == '0') { + if (!ATLEAST(s, 1)) { + radix = 10; + } else if (s[1] == 'x') { + radix = 16; + s++; + } else if (s[1] == 'b') { + radix = 2; + s++; + } else { + radix = 8; + } + value = 1; + } else if (isdigit(ch)) { + radix = 10; + value = 1; + } else { + break; + } + } else if (value && (radix != 16) && (ch == 'e' || ch == 'E')) { + if (state >= 2 || !value) { + *err = 1; + } + state = 2; + } else { + if (((state || (radix == 10)) && isdigit(ch)) + || ((radix == 16) && isxdigit(ch)) + || ((radix == 8) && (ch >= '0' && ch < '8')) + || ((radix == 2) && (ch >= '0' && ch < '2'))) { + value = 1; + } else { + if (value) { + while (MORE(s)) { + ch = CharOf(*s); + if (isalnum(ch)) { + *err = 1; + ++s; + } else { + break; + } + } + } + break; + } + } + s++; + } + + return value ? (int) (s - base) : 0; +} + +static char * +put_NUMBER(char *s, int ok, int *err) +{ + if (*err) { + flt_error("illegal number"); + flt_puts(s, ok, Error_attr); + } else { + flt_puts(s, ok, Number_attr); + } + s += ok; + return s; +} + +static int +is_ELLIPSIS(char *s) +{ + int dots; + int ok = 0; + + for (dots = 0; dots < 3; ++dots) { + if (!MORE(s) || (*s++ != '.')) { + break; + } + ok = dots + 1; + } + return (ok > 1) ? ok : 0; +} + +static int +is_IDENT(const char *s, int quoted) +{ + int found; + + if ((found = is_NORMALVARS(s, quoted)) == 0) + found = is_OTHERVARS(s); + return found; +} + +static int +is_NAME(char *s) +{ + int found = 0; + + while (isIdent(s[found])) { + ++found; + } + return found; +} + +/* for compatibility with perlfilt.l, process single-line comments only */ +static int +is_COMMENT(char *s) +{ + char *base = s; + char *t = is_BLANK(s) + s; + + if (*t++ == '#') { + while (MORE(t)) { + if (*t == '\n') { + if (!ATLEAST(t, 1) + || t[1] != '#') + break; + } + t++; + } + s = t; + } + return (int) (s - base); +} + +/* preprocessor stuff: + * + * /^#\s*line\s+(\d+)\s*(?:\s"([^"]+)")?\s*$/ + */ +static int +is_PREPROC(char *s) +{ + char *base = s; + int skip; + int err; + + s += is_BLANK(s); + if (*s++ != '#') + return 0; + s += is_BLANK(s); + if (strncmp(s, "line", (size_t) 4)) + return 0; + if ((skip = is_BLANK(s += 4)) == 0) + return 0; + if ((skip = is_INTEGER(s += skip)) == 0) + return 0; + s += skip; + s += is_BLANK(s); + if (*s == DQUOTE) { + s += is_STRINGS(s, &err, DQUOTE); + if (err) + return 0; + } + s += is_BLANK(s); + return (int) (s - base); +} + +/****************************************************************************** + ******************************************************************************/ + +static int +end_marker(char *s, const char *marker, int only) +{ + size_t len = strlen(marker); + + return (ATLEAST(s, (int) len) + && !strncmp(s, marker, len) + && (!only || (s[len] == '\n'))); +} + +/* + * Check for one or more blank lines followed by a line beginning with an "=" + * and an alpha-character. If found, return the length skipped through the + * "=" (the "=" is painted in a different color). Otherwise return 0. + */ +static int +begin_POD(char *s, int emit) +{ + int result = 0; + char *base; + int skip = 2; + int maybe = 0; + + while (s > the_file) { + if (s[0] != '\n' || + s[-1] != '\n' || + --skip <= 0) { + break; + } + --s; + } + skip = 0; + base = s; + + while (MORE(s)) { + if (*s == '\n') + ++skip; + else + break; + ++s; + } + if ((base != the_file) && (skip == 1)) { + maybe = 1; + ++skip; + } + if (((base == the_file) || (skip >= 2)) + && ATLEAST(s, 2) + && s[0] == '=' + && isalpha(CharOf(s[1]))) { + result = (int) (s + 1 - base); + if (result && maybe) + flt_error("expected a blank line"); + if (emit) { + while (base != s) { + flt_putc(*base++); /* skip the newlines */ + } + } + } + return result; +} + +static int +end_POD(char *s, int skip) +{ + if (skip) { + while (MORE(s)) { + if (*s != '\n') + break; + ++s; + } + } + return end_marker(s, "=cut", 0); +} + +/* + * See discussion of "here-doc" in perldata. + * FIXME: we're only implementing a single here-doc (perldata says they + * can be stacked), and don't check for unbalanced quotes). + */ +static char * +begin_HERE(char *s, int *quoted) +{ + char *base; + int ok; + + if (ATLEAST(s, 2) + && s[0] == '<' + && s[1] == '<') { + s += 2; + s += count_blanks(s); + base = s; + if ((ok = is_QIDENT(s)) != 0) { + size_t temp = 0; + char *marker = do_alloc((char *) 0, (size_t) (ok + 1), &temp); + char *d = marker; + + s += ok; + *quoted = 0; + + if (marker != 0) { + while (base != s) { + if (*base != SQUOTE + && *base != DQUOTE + && *base != BACKSLASH) + *d++ = *base; + else if (*base != DQUOTE) + *quoted = 1; + base++; + } + *d = 0; + } + return marker; + } + } + return 0; +} + +static char * +skip_BLANKS(char *s) +{ + int count = count_blanks(s); + + if (count) { + flt_puts(s, count, ""); + } + return s + count; +} + +/* + * Return the first character, skipping optional blanks + */ +static int +char_after_blanks(char *s) +{ + int result = '\0'; + + while (MORE(s)) { + if (!isspace(CharOf(*s))) { + result = CharOf(*s); + break; + } + ++s; + } + return result; +} + +static int +line_size(char *s) +{ + char *base = s; + + while (MORE(s)) { + if (*s == '\n') + break; + s++; + } + return (int) (s - base); +} + +/* + * The only place that perlfilt.l recognizes a PATTERN is after "!~" or "=~". + * Doing that in other places gets complicated - the reason for moving to C. + */ +static int +begin_PATTERN(char *s) +{ + if (ATLEAST(s, 2) + && (s[0] == '!' || s[0] == '=') + && s[1] == '~') { + return 2 + is_BLANK(s + 2); + } + return 0; +} + +/* + * Check for simple pattern, trying to distinguish '/' from its use for divide, + * and '$' from its use in variable names. + */ +static int +is_PATTERN(char *s) +{ + char *base = s; + int delim = *s++; + int result = 0; + int escaped = 0; + char *content = s; + + while (MORE(s)) { + int ch = *s++; + if (escaped) { + escaped = 0; + } else if (ch == BACKSLASH) { + escaped = 1; + } else if (ch == delim) { + if (((s - 1) - content) != 0) { + /* content is nonempty */ + char *next = 0; + (void) strtol(content, &next, 0); + if (next == 0 || next == content) { + /* content was not a number */ + result = (int) (s - base); + } + } + break; + } else if (isspace(ch)) { + break; + } else if (ch == '$') { + if (*s != delim) + break; + } + } + return result; +} + +/* + * If we're pointing to a quote-like operator, return its length. + * As a side-effect, set the number of delimiters (assuming '/') it needs. + */ +static int +is_QUOTE(char *s, int *delims) +{ + char *base = s; + size_t len; + int result = 0; + + *delims = 0; + while (MORE(s) && isIdent(*s)) { + ++s; + } + if ((len = (size_t) (s - base)) != 0) { + switch (len) { + case 1: + if (*base == 'm' || *base == 'q') { + *delims = 2; + } else if (*base == 's' || *base == 'y') { + *delims = 3; + } + break; + case 2: + if (!strncmp(base, "tr", (size_t) 2)) { + *delims = 3; + } else if (!strncmp(base, "qq", (size_t) 2) || + !strncmp(base, "qx", (size_t) 2) || + !strncmp(base, "qw", (size_t) 2) || + !strncmp(base, "qr", (size_t) 2)) { + *delims = 2; + } + break; + } + } + if (*delims == 0) + s = base; + + if ((result = (int) (s - base)) != 0) { + int test = char_after_blanks(s); + DPRINTF(("is_Quote(%.*s:%c)", result, base, test)); + if (test == '#' && isspace(CharOf(*s))) + test = 0; + if ((test == 0) || (strchr(QUOTE_DELIMS "<>", test) == 0)) { + s = base; + result = 0; + } + DPRINTF(("is_QUOTE(%.*s)\n", + result ? result : 1, + result ? base : "")); + } + return result; +} + +static int +add_to_PATTERN(char *s) +{ + char *base = s; + char *next; + int need; + int skip = is_QUOTE(s, &need); + + if (skip == 0) + need = 2; + + DPRINTF(("\n*add_to_PATTERN(skip=%d, text=%.*s)\n", skip, + line_size(s), s)); + if (ATLEAST(s, need + skip)) { + int delim = 0; + int delim2 = 0; + int ignored = 0; + int escaped = 0; + int comment = 0; + int in_blocks = 0; + int in_curlys = 0; + int in_parens = 0; + + s += skip; + --need; + do { + while (MORE(s) && isspace(CharOf(*s))) { + s++; + } + if (MORE(s)) { + delim = *s++; + } + if ((delim2 = delim) == 0) + return 0; + /* from Perl's S_scan_str() */ + if (delim != 0 && (next = strchr(LOOKUP_TERM, delim)) != 0) + delim2 = next[5]; + + if (delim == L_CURLY) + in_curlys = 1; + + if (delim == L_PAREN) + in_parens = 1; + + DPRINTF(("*start%d %c%c\n->%.*s\n", + need, delim, delim2, + line_size(s), s)); + + next = s; + while (MORE(s)) { + if (comment) { + if (*s == '\n') + comment = 0; + } else if (!escaped && (*s == BACKSLASH)) { + escaped = 1; + } else { + if (!escaped) { + ignored = 0; + + switch (*s) { + case L_BLOCK: + if (in_blocks == 0) + in_blocks = 1; + break; + case R_BLOCK: + if (in_blocks != 0) { + in_blocks = 0; + ignored = 1; + } + break; + case L_CURLY: + ++in_curlys; + break; + case R_CURLY: + if (--in_curlys < 0) + in_curlys = 0; /* oops */ + break; + case L_PAREN: + ++in_parens; + break; + case R_PAREN: + if (--in_parens < 0) + in_parens = 0; /* oops */ + break; + } + + if (*s == '#' && delim == R_CURLY && !in_curlys) + comment = 1; + + if (delim == L_BLOCK && in_blocks) + ignored = 1; + if (delim == L_CURLY && in_curlys) + ignored = 1; + if (delim == L_PAREN && in_parens) + ignored = 1; + + if (!ignored && (*s == delim2)) { + DPRINTF(("*finish%d %c%c\n->%.*s\n", + need, delim, delim2, + line_size(s), s)); + /* + * check for /pattern/.../pattern/ + */ + if (ATLEAST(s, 4) + && need == 1 + && !strncmp(s + 1, "...", (size_t) 3)) + need += 2; + /* + * check for /pattern/ {pattern} + */ + if (delim != delim2 || need == 1) + ++s; + break; + } + } + escaped = 0; + } + s++; + } + } while (--need > 0); + while (MORE(s)) { + if (!isalpha(CharOf(*s)) + || *s == ';') + break; + s++; + } + DPRINTF(("*finally\n->%.*s\n", line_size(s), s)); + return (int) (s - base); + } + return 0; +} + +/* + * FIXME: revisit 9.2e's test-case and determine how to handle /x modifier. + */ +static char * +write_PATTERN(char *s, int len) +{ + int delimiter = 0; + int delims; + int skip = is_QUOTE(s, &delims); + int n; + int first; + int leading = 0; + int comment = 0; + int escaped = 0; + int range = 0; + int interp = 0; + int len_flags = 0; + int e_modifier = 0; + + DPRINTF(("\n*write_PATTERN(%.*s)\n", len, s)); + if (skip) { + flt_puts(s, skip, Keyword_attr); + s += skip; + len -= skip; + } + + skip = (int) (skip_BLANKS(s) - s); + if (skip) { + s += skip; + len -= skip; + } + delimiter = *s; + + for (len_flags = 0; len_flags < (len - 2); ++len_flags) { + int ch = CharOf(s[len - len_flags - 1]); + if (ch == 'e') { + e_modifier = 1; + } else if (!isalpha(ch)) + break; + } + interp = (delimiter == '"'); + + for (n = first = 0; n < len; n++) { + if (!escaped + && !interp + && e_modifier + && (n > 0) + && (s[n] == delimiter)) { + if (comment) { + flt_puts(s + first, (n - first + 1), Comment_attr); + comment = 0; + } else { + flt_puts(s + first, (n - first + 1), String_attr); + } + first = n + 1; + interp = 1; + continue; + } + + if (escaped) { + escaped = 0; + } else if (s[n] == BACKSLASH) { + escaped = 1; + } else if (isBlank(s[n]) && !escaped && !comment && + (leading || char_after_blanks(s + n) == '#')) { + if (interp) { + put_embedded(s + first, (n - first - 0), String_attr); + } else { + flt_puts(s + first, (n - first - 0), String_attr); + } + flt_putc(s[n]); + first = n + 1; + } else if (s[n] == '\n') { + leading = 1; + if (comment) { + flt_puts(s + first, (n - first + 1), Comment_attr); + comment = 0; + first = n + 1; + } + } else { + leading = 0; + if ((s[n] == L_BLOCK) && !comment) { + range = 1; + } else if ((s[n] == R_BLOCK) && range) { + range = 0; + } else if ((s[n] == '#') + && (delimiter == L_CURLY || (n > 0 && isBlank(s[n - 1]))) + && !range) { + if (!comment) { + if (interp) { + put_embedded(s + first, (n - first - 1), String_attr); + } else { + flt_puts(s + first, (n - first - 1), String_attr); + } + comment = 1; + first = n + 0; + } + } + } + } + if (comment) + first += (int) (skip_BLANKS(s) - s); + if (comment) { + flt_puts(s + first, (len - first), Comment_attr); + } else { + if (interp) { + put_embedded(s + first, (len - first - len_flags), String_attr); + } else { + flt_puts(s + first, (len - first - len_flags), String_attr); + } + flt_puts(s + len - len_flags, len_flags, Keyword_attr); + } + s += len; + return s; +} + +static int +is_Option(char *s) +{ + int found = 0; + + if (*s == '-' + && ATLEAST(s, 1) + && isalpha(CharOf(s[1])) + && !isIdent(CharOf(s[2]))) + found = 2; + return found; +} + +static int +is_String(char *s, int *err) +{ + int found = is_STRINGS(s, err, SQUOTE); + if (!found) + found = is_STRINGS(s, err, DQUOTE); + if (!found) + found = is_ESCAPED(s); + return found; +} + +/* + * FIXME: this only handles subscripts that consist of a single identifier, + * with no expressions. + */ +static int +is_Subscript(char *s, int len, char *delimp) +{ + if (delimp != 0) { + int delim = *delimp; + int delim2; + char *next; + + if (delim != 0 && (next = strchr(LOOKUP_TERM, delim)) != 0) { + delim2 = next[5]; + + if (s[len] == delim2) + return 1; + } + } + return 0; +} + +static char * +put_newline(char *s) +{ + if (MORE(s)) + flt_putc(*s++); + return s; +} + +static int +var_embedded(const char *s) +{ + if (*s == '$') { + if (s[1] == L_PAREN + || s[1] == '$') { + if (isIdent(s[2])) + return 0; + } + } + return 1; +} + +static char * +put_embedded(char *s, int len, const char *attr) +{ + int id; + int j, k; + + for (j = k = 0; j < len; j++) { + if ((j == 0 || (s[j - 1] != BACKSLASH)) + && (id = is_IDENT(s + j, 1)) != 0) { + if (var_embedded(s + j)) { + if (j != k) + flt_puts(s + k, j - k, attr); + flt_puts(s + j, id, Ident2_attr); + k = j + id; + j = k - 1; + } else { + j += id - 1; + } + } + } + if (k < len) + flt_puts(s + k, len - k, attr); + return s + len; +} + +/* + * Write the remainder of the line with the given attribute. If not quoted, + * highlight identifiers which are embedded in the line. + */ +static char * +put_remainder(char *s, char *attr, int quoted) +{ + int ok = line_size(s); + + if (quoted) { + flt_puts(s, ok, attr); + s += ok; + } else { + s = put_embedded(s, ok, attr); + } + return put_newline(s); +} + +/* + * Write the line for perldoc (see perlpodspec). + */ +static char * +put_document(char *s) +{ + char *attr = Comment_attr; + int ok = line_size(s); + int j, k; + + j = 0; + if (s[j] == '=') { + flt_puts(s, j, attr); + for (k = j; k < ok; ++k) { + if (isspace(CharOf(s[k]))) + break; + } + flt_puts(s + j, k - j, Preproc_attr); + flt_puts(s + k, ok - k, String_attr); + j = ok; + } + flt_puts(s + j, ok - j, attr); + return put_newline(s + ok); +} + +/* + * Check for special cases of keywords after which we may expect a pattern + * that does not have to be inside parentheses. + */ +static void +check_keyword(char *s, int ok, AfterKey * state) +{ + size_t len = (size_t) ok; + + state->may_have_pattern = 0; + state->has_no_pattern = 0; + + switch (ok) { + case 2: + state->may_have_pattern = (!strncmp(s, "if", len) + || !strncmp(s, "eq", len) + || !strncmp(s, "ge", len) + || !strncmp(s, "gt", len) + || !strncmp(s, "le", len) + || !strncmp(s, "lt", len) + || !strncmp(s, "ne", len) + || !strncmp(s, "or", len)); + break; + case 3: + state->has_no_pattern = !strncmp(s, "sub", len); + state->may_have_pattern = (!strncmp(s, "and", len) + || !strncmp(s, "cmp", len) + || !strncmp(s, "not", len) + || !strncmp(s, "xor", len)); + break; + case 4: + state->may_have_pattern = !strncmp(s, "grep", len); + break; + case 5: + state->may_have_pattern = (!strncmp(s, "split", len) + || !strncmp(s, "until", len) + || !strncmp(s, "while", len)); + break; + case 6: + state->may_have_pattern = !strncmp(s, "unless", len); + break; + } +} + +/* + * Identifier may be a keyword, or a user identifier. + */ +static char * +put_IDENT(char *s, int ok, AfterKey * if_wrd) +{ + const char *attr = 0; + char save = s[ok]; + + s[ok] = '\0'; + attr = get_keyword_attr(s); + s[ok] = save; + flt_puts(s, ok, (attr != 0 && *attr != '\0') ? attr : Ident2_attr); + check_keyword(s, ok, if_wrd); + return s + ok; +} + +/* + * Identifier must be a user identifier. + */ +static char * +put_NOKEYWORD(char *s, int ok, AfterKey * if_wrd) +{ + const char *attr = 0; + char save = s[ok]; + + s[ok] = '\0'; + attr = get_keyword_attr(s); + s[ok] = save; + flt_puts(s, ok, attr); + check_keyword(s, ok, if_wrd); + return s + ok; +} + +/* + * Check for a matching backtic, return the number of characters we'll skip. + */ +static int +end_BACKTIC(char *s) +{ + char *base = s; + int found = 0; + + while (MORE(s)) { + if (*s == BQUOTE) { + found = 1; + break; + } + ++s; + } + return found ? (int) (s - base) : 0; +} + +/* + * Check for a file glob expression delimited by angle-brackets, e.g., + * <*> + * <*.c> + */ +static int +is_GLOB(char *s) +{ + char *base = s; + int wild = 0; + int both = 0; + + if (*s++ == L_ANGLE) { + while (MORE(s)) { + int ch = *s++; + if (ch == '\n' || ch == '=' || ch == L_ANGLE) { + break; + } else if (ch == '*') { + ++wild; + } else if (ch == R_ANGLE) { + both = 1; + break; + } + } + } + return (wild && both) ? (int) (s - base) : 0; +} + +/* + * Check for a "format =" or "format KEYWORD =" line, which begins a special + * type of here-document. + */ +static int +is_FORMAT(char *s, int len) +{ + if (len == 6 && !strncmp(s, "format", (size_t) len)) { + s += len; + s += is_BLANK(s); + s += is_NAME(s); + s += is_BLANK(s); + if (*s == '=' && !ispunct(CharOf(s[1]))) + return 1; + } + return 0; +} + +/****************************************************************************** + ******************************************************************************/ + +static void +init_filter(int before GCC_UNUSED) +{ + (void) before; +} + +#define opRightArrow() (had_op != 0 && old_op == had_op - 1 && *old_op == '-' && *had_op == '>') +#define opBeforePattern() (had_op != 0 && strchr("{(|&=~!", *had_op) != 0) + +#define saveOp(p) { DPRINTF(("\nsaveOp('%c') @%d\n", *p, __LINE__)); old_op = had_op; had_op = p; } +#define clearOp() { DPRINTF(("\nclearOp @%d\n", __LINE__)); old_op = had_op = 0; } + +static void +do_filter(FILE *input GCC_UNUSED) +{ + static size_t used; + static char *line; + + AfterKey if_old; + AfterKey if_wrd; + States state = eCODE; + char *marker = 0; + char *s; + int err; + char *had_op = 0; + char *old_op = 0; + int ignore; + int in_line = -1; + int in_stmt = 0; + int ok; + int parens = 0; + int quoted = 0; + int save; + size_t request = 0; + size_t actual = 0; + size_t mark_len = 0; + + (void) input; + + Action_attr = class_attr(NAME_ACTION); + Comment_attr = class_attr(NAME_COMMENT); + Error_attr = class_attr(NAME_ERROR); + Ident_attr = class_attr(NAME_IDENT); + Ident2_attr = class_attr(NAME_IDENT2); + Keyword_attr = class_attr(NAME_KEYWORD); + Number_attr = class_attr(NAME_NUMBER); + Preproc_attr = class_attr(NAME_PREPROC); + String_attr = class_attr(NAME_LITERAL); + + /* + * Read the whole file into a single string, in-memory. Rather than + * spend time working around the various continuation-line types _and_ + * Perl's "syntax", let's just concentrate on the latter. + */ + the_size = 0; + the_file = 0; + while (flt_gets(&line, &used) != NULL) { + size_t len = strlen(line); /* FIXME: nulls? */ + if (len != 0 && line[len - 1] == '\r') /* FIXME: move this to readline */ + line[--len] = '\0'; + if ((request = the_size + len + 1) > actual) + request = 1024 + (request * 2); + the_file = do_alloc(the_file, request, &actual); + if (the_file == 0) + break; + memcpy(the_file + the_size, line, len + 1); + the_size += len; + } + + if (the_file != 0) { + the_last = the_file + the_size; + + s = the_file; + if_wrd = nullKey; + while (MORE(s)) { + if (*s == '\n' || s == the_file) { + in_line = -1; + } else { + in_line++; + } + if_old = if_wrd; + DPRINTF(("(%s(%c) line:%d.%d(%d) if:%d.%d op:%c%c)%s\n", + stateName(state), *s, in_line, in_stmt, parens, + if_wrd.may_have_pattern, + if_wrd.has_no_pattern, + old_op ? *old_op : ' ', + had_op ? *had_op : ' ', + opRightArrow()? " arrow" : "")); + switch (state) { + case eBACKTIC: + if ((ok = end_BACKTIC(s)) != 0) { + s = put_embedded(s, ok, ""); + } else { + flt_error("missing backtic"); + s = put_remainder(s, Error_attr, 0); + } + if (*s == BQUOTE) { + flt_puts(s, 1, Action_attr); + state = eCODE; + ++s; + } + if_wrd = nullKey; + break; + + case eCODE: + if (*s == '\004' || *s == '\032') { /* ^D or ^Z */ + state = eIGNORED; + flt_puts(s, 1, Preproc_attr); + break; + } else if (!isspace(CharOf(*s))) { + ++in_stmt; + } + + if (*s == BACKSLASH && ATLEAST(s, 2) && s[1] == BQUOTE) { + flt_puts(s, 2, String_attr); + s += 2; + if_wrd = nullKey; + } else if (*s == BQUOTE) { + flt_puts(s, 1, Action_attr); + ++s; + state = eBACKTIC; + if_wrd = nullKey; + } else if ((ok = is_GLOB(s)) != 0) { + s = put_embedded(s, ok, String_attr); + if_wrd = nullKey; + } else if ((marker = begin_HERE(s, "ed)) != 0) { + state = eHERE; + s = put_remainder(s, String_attr, quoted); + if_wrd = nullKey; + } else if ((ok = begin_PATTERN(s)) != 0) { + flt_puts(s, ok, ""); + s += ok; + DPRINTF(("\nePATTERN:%d\n", __LINE__)); + state = ePATTERN; + if_wrd = nullKey; + } else if (in_line <= 0 + && (ok = begin_POD(s, 0))) { + char *base = s; + state = ePOD; + while (*s != '=') + flt_putc(*s++); + s = put_document(s); + if (end_POD(base, 1)) + state = eCODE; + } else if (in_line == 0 + && (ok = is_PREPROC(s)) != 0) { + flt_puts(s, ok, Preproc_attr); + s += ok; + } else if ((ok = is_COMMENT(s)) != 0) { + int skip = (int) (skip_BLANKS(s) - s); + ok -= skip; + s += skip; + flt_puts(s, ok, Comment_attr); + s += ok; + if_wrd = if_old; + } else if ((ok = is_BLANK(s)) != 0) { + flt_puts(s, ok, ""); + s += ok; + if_wrd = if_old; + } else if ((if_old.may_have_pattern + || opBeforePattern() + || (in_stmt == 1)) + && isPattern(*s)) { + DPRINTF(("\nePATTERN:%d\n", __LINE__)); + state = ePATTERN; + } else if (*s == L_CURLY) { + saveOp(s); + flt_putc(*s++); + if_wrd = nullKey; + } else if (*s == L_PAREN) { + parens++; + saveOp(s); + flt_putc(*s++); + if (isPattern(*s)) { + DPRINTF(("\nePATTERN:%d\n", __LINE__)); + state = ePATTERN; + } + if_wrd = nullKey; + } else if (*s == R_PAREN) { + if (--parens < 0) + parens = 0; + flt_putc(*s++); + clearOp(); + if_wrd = nullKey; + } else if ((ok = is_ELLIPSIS(s)) != 0) { + flt_puts(s, ok, ""); + s += ok; + if_wrd = nullKey; + } else if ((ok = is_NUMBER(s, &err)) != 0) { + clearOp(); + s = put_NUMBER(s, ok, &err); + if_wrd = nullKey; + } else if ((ok = is_KEYWORD(s)) != 0) { + if ((s != the_file) + && (s[-1] == '*')) { /* typeglob */ + s = put_IDENT(s, ok, &if_wrd); + clearOp(); + } else if ((s != the_file) + && (if_old.has_no_pattern)) { + s = put_NOKEYWORD(s, ok, &if_wrd); + clearOp(); + } else if (!opRightArrow() + && !is_Subscript(s, ok, had_op) + && is_QUOTE(s, &ignore)) { + DPRINTF(("\nePATTERN:%d\n", __LINE__)); + state = ePATTERN; + } else { + if (is_FORMAT(s, ok)) { + char *try_mark; + quoted = 0; + state = eHERE; + mark_len = 0; + try_mark = do_alloc(0, (size_t) 2, &mark_len); + if (try_mark != 0) { + free(marker); + marker = strcpy(try_mark, "."); + } + } + save = s[ok]; + s[ok] = 0; + if (!strcmp(s, "__END__") || !strcmp(s, "__DATA__")) + state = eIGNORED; + clearOp(); + flt_puts(s, ok, get_keyword_attr(s)); + check_keyword(s, ok, &if_wrd); + s[ok] = (char) save; + s += ok; + } + } else if ((ok = is_Option(s)) != 0) { + clearOp(); + flt_puts(s, ok, Keyword_attr); + check_keyword(s, ok, &if_wrd); + s += ok; + } else if ((ok = is_IDENT(s, 0)) != 0) { + s = put_IDENT(s, ok, &if_wrd); + clearOp(); + } else if ((ok = is_String(s, &err)) != 0) { + clearOp(); + if (*s == DQUOTE) { + if (err) { + flt_error("unexpected quote"); + s = put_embedded(s, ok, Error_attr); + } else { + s = put_embedded(s, ok, String_attr); + } + } else { + if (err) { + flt_error("missing quote"); + flt_puts(s, ok, Error_attr); + } else { + flt_puts(s, ok, String_attr); + } + s += ok; + } + if_wrd = nullKey; + } else if (isPattern(*s) && (ok = is_PATTERN(s))) { + s = write_PATTERN(s, ok); + if_wrd = nullKey; + } else { + if (!isspace(CharOf(*s))) { + if_wrd = nullKey; + } + if (*s == ';') { + in_stmt = 0; + } + if (parens) { + if (strchr("|&=~!->", *s) != 0) { + saveOp(s); + } else if (!isspace(CharOf(*s))) { + clearOp(); + } + } else { + if (strchr("|&=~!->", *s) != 0) { + saveOp(s); + } + } + flt_putc(*s++); + } + break; + + case eHERE: + if (end_marker(s, marker, 1)) { + state = eCODE; + free(marker); + marker = 0; + } + s = put_remainder(s, String_attr, quoted); + if_wrd = nullKey; + break; + + case eIGNORED: + s = put_document(s); + break; + + case ePATTERN: + s = skip_BLANKS(s); + if (MORE(s)) { + if ((ok = is_NAME(s)) != 0 && !is_QUOTE(s, &ignore)) { + s = put_IDENT(s, ok, &if_wrd); + clearOp(); + } else if ((ok = is_IDENT(s, 0)) != 0 && !is_QUOTE(s, &ignore)) { + s = put_IDENT(s, ok, &if_wrd); + clearOp(); + } else if ((ok = add_to_PATTERN(s)) != 0) { + s = write_PATTERN(s, ok); + } else { + flt_putc(*s++); + } + clearOp(); + state = eCODE; + } + if_wrd = nullKey; + break; + + case ePOD: + if (end_POD(s, 0)) + state = eCODE; + s = put_document(s); + if (begin_POD(s - 1, 0)) { + state = ePOD; + } + break; + } + } + free(the_file); + } + free(marker); +} + +#if NO_LEAKS +static void +free_filter(void) +{ +} +#endif diff -Nru vile-9.8v/filters/raku.key vile-9.8w/filters/raku.key --- vile-9.8v/filters/raku.key 1970-01-01 00:00:00.000000000 +0000 +++ vile-9.8w/filters/raku.key 2022-08-22 05:11:05.000000000 +0000 @@ -0,0 +1,2 @@ +: $Id: raku.key,v 1.1 2019/07/21 16:55:17 bod Exp $ +.merge perl diff -Nru vile-9.8v/filters/sh-filt.l vile-9.8w/filters/sh-filt.l --- vile-9.8v/filters/sh-filt.l 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/filters/sh-filt.l 2022-08-22 05:11:05.000000000 +0000 @@ -10,7 +10,7 @@ %{ /* - * $Id: sh-filt.l,v 1.183 2021/12/12 01:26:53 tom Exp $ + * $Id: sh-filt.l,v 1.184 2022/01/30 20:27:01 tom Exp $ * * Filter to add vile "attribution" sequences to selected bits of Shell script. */ @@ -70,6 +70,7 @@ static void handle_backtic2(const char *text, int length, int test, int which); static void handle_backtic1(const char *text, int length, int test, int which); static void handle_parens(const char *text, int length, int test, int which, int state); +static void resume_state(void); static void save_here(const char *text, int length); static void write_vname(const char *text, int length); @@ -198,8 +199,10 @@ FLEX_PRINTF((stderr, "cannot pop '$((' level %d\n", stk_level)); if (!pop_backtic1(yytext, 1, LEN_BACKTIC1_DOWN)) { FLEX_PRINTF((stderr, "cannot pop '$(' level %d\n", stk_level)); - if (FLTSTACK_OK && stk_state[stk_level-1].state == NORMAL) + if (FLTSTACK_OK && stk_state[stk_level-1].state == NORMAL) { pop_state(); + resume_state(); + } flt_putc(R_PAREN); } unput(R_PAREN); @@ -213,8 +216,10 @@ } {BACKTIC1_UP} { if (!pop_backtic1(yytext, yyleng, LEN_BACKTIC1_DOWN)) { FLEX_PRINTF((stderr, "cannot pop '$(' level %d\n", stk_level)); - if (FLTSTACK_OK && stk_state[stk_level-1].state == NORMAL) + if (FLTSTACK_OK && stk_state[stk_level-1].state == NORMAL) { pop_state(); + resume_state(); + } ECHO; } } @@ -293,6 +298,7 @@ "))" { WriteToken(Action_attr); pop_state(); + resume_state(); } {IDENT1} | {VNAME} { WriteToken(Ident_attr); } @@ -312,6 +318,7 @@ flt_bfr_append("'", 1); flt_bfr_finish(); pop_state(); + resume_state(); } \\[0-7]{1,3} { flt_bfr_embed(yytext, 1, Action_attr); @@ -874,6 +881,7 @@ flt_bfr_append(value + used, length - used); flt_bfr_finish(); pop_state(); + resume_state(); FreeAndNull(here_tag); here_exp = 0; here_next = 0; diff -Nru vile-9.8v/filters/spellflt.l vile-9.8w/filters/spellflt.l --- vile-9.8v/filters/spellflt.l 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/filters/spellflt.l 2022-08-22 05:11:05.000000000 +0000 @@ -3,7 +3,7 @@ %{ /* - * $Id: spellflt.l,v 1.61 2019/06/23 20:28:42 tom Exp $ + * $Id: spellflt.l,v 1.62 2022/08/21 15:42:52 tom Exp $ * * Filter to add vile "attribution" sequences to misspelled words. */ @@ -341,7 +341,14 @@ while (len-- && isspace(CharOf(buffer[len]))) { buffer[len] = 0; } - if (*buffer) { + /* + * Ignore the word if it is all blanks, or if it contains + * wildcards which would make the insertion expand into + * multiple entries. + */ + if (len != 0 + && vl_index(buffer, zero_or_more) == 0 + && vl_index(buffer, zero_or_all) == 0) { /* * If user did not override with an entry in * spell.keywords, add the latest as a misspelled word to diff -Nru vile-9.8v/filters/vilefilt.l vile-9.8w/filters/vilefilt.l --- vile-9.8v/filters/vilefilt.l 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/filters/vilefilt.l 2022-08-22 05:11:05.000000000 +0000 @@ -7,7 +7,7 @@ %{ /* - * $Id: vilefilt.l,v 1.75 2020/03/29 22:28:37 tom Exp $ + * $Id: vilefilt.l,v 1.76 2022/08/21 14:48:45 tom Exp $ * * Filter to add vile "attribution" sequences to selected bits of vile macros * - T.Dickey @@ -17,7 +17,7 @@ #define FLTSTACK_EXTRA int with_state; int with_active; #define FltStack_WITH_STATE FLTSTACK_THIS.with_state -#define FltStack_WITH_ACTIVE FLTSTACK_THIS.with_state +#define FltStack_WITH_ACTIVE FLTSTACK_THIS.with_active #include #if defined(_estruct_h) && !SMALLER diff -Nru vile-9.8v/history.c vile-9.8w/history.c --- vile-9.8v/history.c 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/history.c 2022-08-22 05:11:05.000000000 +0000 @@ -55,7 +55,7 @@ * not (yet) correspond to :-commands. Before implementing, probably will * have to make TESTC a settable mode. * - * $Id: history.c,v 1.92 2015/03/13 08:52:40 tom Exp $ + * $Id: history.c,v 1.94 2022/08/21 16:46:05 tom Exp $ * */ @@ -391,8 +391,8 @@ TRACE(("hst_remove(%s)\n", cmd)); while (*cmd++) tb_unput(MyText); - kbd_kill_response(temp, &len, killc); - tb_free(&temp); + if ((temp = kbd_kill_response(temp, &len, killc)) != 0) + tb_free(&temp); } } @@ -661,7 +661,6 @@ HST param; BUFFER *bp; LINE *lp1, *lp2; - int escaped = FALSE; int c = *given; if (!isSpecial(c)) { @@ -713,20 +712,19 @@ *given = c; return FALSE; - } else if ((h_direction != 0) && (escaped || !isGraph(c))) { + } else if ((h_direction != 0) && !isGraph(c)) { if ((lp2 = hst_scroll(lp1, ¶m)) != 0) lp1 = lp2; else /* cannot scroll */ kbd_alarm(); - } else if (!escaped) { + } else { *given = c; if (h_was_edited) unkeystroke(c); return h_was_edited; - } else - kbd_alarm(); + } c = keystroke(); } diff -Nru vile-9.8v/input.c vile-9.8w/input.c --- vile-9.8v/input.c 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/input.c 2022-08-22 05:11:05.000000000 +0000 @@ -44,7 +44,7 @@ * tgetc_avail() true if a key is avail from tgetc() or below. * keystroke_avail() true if a key is avail from keystroke() or below. * - * $Id: input.c,v 1.372 2020/12/01 22:47:44 tom Exp $ + * $Id: input.c,v 1.374 2022/08/21 16:20:10 tom Exp $ */ #include "estruct.h" @@ -1366,7 +1366,7 @@ /* * Erases the response from the screen for 'kbd_string()' */ -void +TBUFF * kbd_kill_response(TBUFF *buffer, size_t *position, int c) { char *buf = tb_values(buffer); @@ -1399,6 +1399,7 @@ } tb_free(&tmp); } + return buffer; } /* @@ -1685,7 +1686,7 @@ if (!recur && ((char2int(c) >= (int) iBIT(MinCBits)) || (char2int(c) >= 128 && b_is_utfXX(bminip)))) { - UCHAR temp[10]; + UCHAR temp[MAX_UTF8]; int used = vl_conv_to_utf8(temp, (UINT) c, sizeof(temp)); int n; diff -Nru vile-9.8v/insert.c vile-9.8w/insert.c --- vile-9.8v/insert.c 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/insert.c 2022-08-22 05:11:05.000000000 +0000 @@ -4,7 +4,7 @@ * Most code probably by Dan Lawrence or Dave Conroy for MicroEMACS * Extensions for vile by Paul Fox * - * $Id: insert.c,v 1.187 2020/12/02 00:52:02 tom Exp $ + * $Id: insert.c,v 1.192 2022/08/21 23:10:57 tom Exp $ */ #include "estruct.h" @@ -22,6 +22,27 @@ ? DOT.o\ : w_left_margin(curwp) +/* Use this to convert from UTF-8 in cases where a character is needed rather + * than a series of bytes. + */ +#if OPT_MULTIBYTE +#define DecodeUTF8(target, source) \ + B_COUNT limit; \ + UINT utf8; \ + int test; \ + \ + if ((vl_encoding >= enc_UTF8) \ + && b_is_utfXX(curbp) \ + && (limit = (B_COUNT) strlen(source)) > 1 \ + && (test = vl_check_utf8(source, limit)) > 1 \ + && vl_conv_to_utf32(&utf8, source, (B_COUNT) test) == test) { \ + target = (int) utf8; \ + source += test; \ + } else +#else +#define DecodeUTF8(target, source) /* nothing */ +#endif + static int backspace(void); static int doindent(int ind); static int indented_newline(void); @@ -411,9 +432,13 @@ if (clexec || isnamedcmd) { int status; static char cbuf[NLINE]; - if ((status = mlreply("Replace with: ", cbuf, 2)) != TRUE) + char *tp = cbuf; + if ((status = mlreply("Replace with: ", cbuf, sizeof(cbuf))) != TRUE) return status; - c = cbuf[0]; + { + DecodeUTF8(c, tp) + c = *tp; + } } else { set_insertmode(INSMODE_RPL); /* need to fool SPEC prefix code */ if (dotcmdactive != PLAY) @@ -446,7 +471,7 @@ if (isbackspace(c)) { /* vi beeps here */ s = TRUE; /* replaced with nothing */ } else { - t = s = lins_chars(n, c, FALSE); + t = s = lins_chars(n, c); } } } @@ -838,6 +863,7 @@ int rc = FALSE; CmdFunc execfunc; /* ptr to function to execute */ + TRACE((T_CALLED "inschar U+%04X\n", c)); execfunc = NULL; if (c == quotec) { execfunc = quote_next; @@ -859,7 +885,7 @@ int status = wrapword(wm_flag, is_space); *backsp_limit_p = w_left_margin(curwp); if (wm_flag && is_space) { - return status; + returnCode(status); } } else if (wm_flag && !blanks_on_line() @@ -981,14 +1007,14 @@ rc = inspound(); } else { autoindented = -1; - rc = lins_chars(1, c, FALSE); + rc = lins_chars(1, c); } } else { autoindented = -1; - rc = lins_chars(1, c, FALSE); + rc = lins_chars(1, c); } } - return rc; + returnCode(rc); } #if ! SMALLER @@ -1036,10 +1062,13 @@ backsp_limit = BackspaceLimit(); /* insert it */ - while (n--) { + while (n-- > 0) { tp = tstring; while (*tp) { - if ((status = inschar(CharOf(*tp++), &backsp_limit)) != TRUE) { + int c; + DecodeUTF8(c, tp) + c = CharOf(*tp++); + if ((status = inschar(c, &backsp_limit)) != TRUE) { n = 0; break; } @@ -1515,7 +1544,7 @@ s = lnewline(); } while ((s == TRUE) && (--n != 0)); } else { - s = lins_chars(n, c, TRUE); + s = lins_chars(n, c); } } return s; diff -Nru vile-9.8v/line.c vile-9.8w/line.c --- vile-9.8v/line.c 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/line.c 2022-08-22 05:11:05.000000000 +0000 @@ -10,7 +10,7 @@ * editing must be being displayed, which means that "b_nwnd" is non zero, * which means that the dot and mark values in the buffer headers are nonsense. * - * $Id: line.c,v 1.238 2020/12/01 23:27:32 tom Exp $ + * $Id: line.c,v 1.240 2022/08/04 23:51:57 tom Exp $ */ /* #define POISON */ @@ -534,15 +534,19 @@ * or in insert-mode. */ int -lins_chars(int n, int c, int wide) +lins_chars(int n, int c) { int rc = FALSE; - UCHAR target[10]; + UCHAR target[MAX_UTF8]; int nbytes; int nn; int mapped; - if (wide && (c > 127) && b_is_utfXX(curbp)) { + TRACE((T_CALLED "lins_chars global %d, buffer %d U+%04X\n", + global_is_utfXX(), + b_is_utfXX(curbp), c)); + + if ((c > 127) && b_is_utfXX(curbp)) { nbytes = vl_conv_to_utf8(target, (UINT) c, sizeof(target)); } else if (okCTYPE2(vl_wide_enc) && !vl_mb_is_8bit(c)) { nbytes = 1; @@ -567,7 +571,7 @@ } else { rc = lins_bytes(n, c); } - return rc; + returnCode(rc); } #endif diff -Nru vile-9.8v/macros/manpage.rc vile-9.8w/macros/manpage.rc --- vile-9.8v/macros/manpage.rc 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/macros/manpage.rc 2022-08-22 05:11:05.000000000 +0000 @@ -3,7 +3,7 @@ ;; ;; Author: Kevin Buettner ;; -;; $Id: manpage.rc,v 1.27 2014/03/30 20:10:29 tom Exp $ +;; $Id: manpage.rc,v 1.29 2022/01/25 11:24:32 tom Exp $ ;; store-procedure ShowManpage "Prompt for, and display a manual-page" @@ -89,6 +89,17 @@ &cat " " \ &cat &pquote $cfilname \ &cat " | " %filter + ~elseif &seq $majormode "md" + " fick + kill-buffer '[Trace]' + ~trace on + edit-file \ + &cat "!markdown " \ + &cat &pquote $cfilname \ + &cat "|lynx -nolist -stdin -force_html -with_backspaces -dump -width=" \ + &cat $pagewid \ + &cat "|" %filter + ~trace off ~elseif &seq $majormode "perl" ~if &seq %table '' edit-file &cat "!pod2text " \ diff -Nru vile-9.8v/macros/modes.rc vile-9.8w/macros/modes.rc --- vile-9.8v/macros/modes.rc 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/macros/modes.rc 2022-08-22 05:11:05.000000000 +0000 @@ -1,4 +1,4 @@ -; $Id: modes.rc,v 1.149 2020/05/10 20:30:36 tom Exp $ +; $Id: modes.rc,v 1.153 2022/08/20 16:15:44 tom Exp $ ; majormodes in this file are ordered alphabetically for convenience - the ; precedence used by vile is strictly alphabetic, counting case. Use the ; before and after qualifiers to override the precedence. @@ -410,6 +410,14 @@ fence-end '-->' ~endwith +" markdown +define-mode md +~with define-submode md + suffixes '\.\(md\)$' + tabstop=8 + shiftwidth=4 +~endwith + define-mode midl ~with define-submode midl suffixes '\.\(idl\|odl\)$' @@ -706,11 +714,11 @@ ; fence-fi '^\s*}' ~endwith -define-mode perl6 -~with define-submode perl6 - preamble '^\(#!\s*\(\/[^\\]*\)\?\\)\|\(\s*use\s\+v6\s*;\)' - suffixes '\.\(pl6\|rakudo\)$' - mode-pathname '^.*perl6.*\.t$' +define-mode raku +~with define-submode raku + preamble '^\(#!\s*\(\/[^\\]*\)\?\<\(perl6\|rakudo\)\>\)\|\(\s*use\s\+v6\s*;\)' + suffixes '\.\(pl\?6\|pm6\|raku\(\|mod\|test\)\)$' + mode-pathname '^.*rakudo.*\.t$' after "perl" cindent cindent-chars &cat ':' $fences @@ -1268,7 +1276,6 @@ remove-submode yaml cindent ~with define-submode yaml before conf - preamble '^---' suffixes '\.\(yaml\|yml\)$' notabinsert tabstop=2 diff -Nru vile-9.8v/macros/UXVile.ad vile-9.8w/macros/UXVile.ad --- vile-9.8v/macros/UXVile.ad 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/macros/UXVile.ad 2022-08-22 05:11:05.000000000 +0000 @@ -1,5 +1,5 @@ -! $Id: UXVile.ad,v 1.2 2009/10/07 10:53:26 tom Exp $ - -*font: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1 +! $Id: UXVile.ad,v 1.3 2022/08/02 03:58:11 bod Exp $ #include "XVile" + +*font: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1 diff -Nru vile-9.8v/macros/XVile.ad vile-9.8w/macros/XVile.ad --- vile-9.8v/macros/XVile.ad 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/macros/XVile.ad 2022-08-22 05:11:05.000000000 +0000 @@ -1,9 +1,9 @@ -! $Id: XVile.ad,v 1.9 2010/09/05 14:37:12 tom Exp $ +! $Id: XVile.ad,v 1.10 2022/08/02 03:58:11 bod Exp $ ! "white" on "black" main window *background: grey5 *foreground: grey95 -*font: 8x13 +*font: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-1 *cursor.background: yellow *cursor.foreground: grey5 diff -Nru vile-9.8v/main.c vile-9.8w/main.c --- vile-9.8v/main.c 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/main.c 2022-08-22 05:11:05.000000000 +0000 @@ -17,11 +17,11 @@ * distributable status. This version of vile is distributed under the * terms of the GNU Public License (see COPYING). * - * Copyright (c) 1992-2018,2020 by Paul Fox and Thomas Dickey + * Copyright (c) 1992-2020,2022 by Paul Fox and Thomas Dickey */ /* - * $Id: main.c,v 1.742 2020/08/30 23:41:27 tom Exp $ + * $Id: main.c,v 1.745 2022/08/20 22:38:01 tom Exp $ */ #define realdef /* Make global definitions not external */ diff -Nru vile-9.8v/makefile.in vile-9.8w/makefile.in --- vile-9.8v/makefile.in 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/makefile.in 2022-08-22 05:11:05.000000000 +0000 @@ -20,7 +20,7 @@ # # gnu autoconf support by kevin buettner, 5/94 # -# $Id: makefile.in,v 1.296 2021/12/09 08:46:15 tom Exp $ +# $Id: makefile.in,v 1.297 2022/08/20 18:59:42 tom Exp $ SHELL = @SHELL@ @@ -47,6 +47,7 @@ LINT = @LINT@ LINT_OPTS = @LINT_OPTS@ +LINT_LIBS = # @LINT_LIBS@ CTAGS = @CTAGS@ ETAGS = @ETAGS@ @@ -756,7 +757,7 @@ - $(RM) tags TAGS vile-perl-api.* pod2html* lint: $(BUILTHDRS) - $(LINT) $(LINT_OPTS) $(CPPFLAGS) $(SRC) $(LIBS) + $(LINT) $(LINT_OPTS) $(CPPFLAGS) $(SRC) $(LINT_LIBS) $(LINT) $(LINT_OPTS) $(CPPFLAGS) mktbls.c TAG_SRC = $(SRC) $(HDRS) $(BUILTSRC) $(BUILTHDRS) diff -Nru vile-9.8v/MANIFEST vile-9.8w/MANIFEST --- vile-9.8v/MANIFEST 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/MANIFEST 2022-08-22 05:11:05.000000000 +0000 @@ -1,4 +1,4 @@ -MANIFEST for vile, version v9_8v +MANIFEST for vile, version v9_8w -------------------------------------------------------------------------------- MANIFEST this file AUTHORS list of authors, with nicknames in CHANGES @@ -303,6 +303,8 @@ filters/mc-filt.l mailcap syntax filter filters/mcrl.key filters for mCRL/mCRL2 filters/mcrlfilt.l filters for mCRL/mCRL2 +filters/md-filt.l syntax filter for markdown files +filters/md.key keywords for markdown files filters/midl.key keywords for MIDL filters/midlfilt.l syntax filter for MIDL filters/mk-0th.awk construct builtflt.h @@ -325,11 +327,9 @@ filters/pas.key keywords for pascal highlighting filter filters/pc.key keywords for printcap syntax highlighting filters/perl.key keywords for perl syntax filter -filters/perl6.key keywords for perl6 syntax filter filters/php-filt.l syntax filter for php filters/php.key keywords for phpmode filters/pl-filt.c syntax highlighter for perl -filters/pl6filt.c syntax highlighter for perl6 filters/pot-filt.l syntax filter for gettext ".po" files filters/pot.key keywords for pot (gettext) mode filters/prolog.key keywords for prolog @@ -339,6 +339,8 @@ filters/ps1.key keywords for powershell mode filters/py-filt.l syntax filter for Python filters/py.key keywords for Python syntax filter +filters/raku.key syntax keywords for raku (originally perl6) +filters/rakufilt.c syntax filter for raku (originally perl6) filters/rb.key keywords for Ruby syntax filter filters/rc-filt.l syntax filter for Windows ".rc" files filters/rc.key keywords for Windows ".rc" files diff -Nru vile-9.8v/map.c vile-9.8w/map.c --- vile-9.8v/map.c 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/map.c 2022-08-22 05:11:05.000000000 +0000 @@ -3,7 +3,7 @@ * Original interface by Otto Lind, 6/3/93 * Additional map and map! support by Kevin Buettner, 9/17/94 * - * $Id: map.c,v 1.126 2018/10/21 21:00:20 tom Exp $ + * $Id: map.c,v 1.130 2022/08/21 23:10:09 tom Exp $ */ #include "estruct.h" @@ -249,7 +249,7 @@ } *mpp = mp; mp->dlink = mp->flink = NULL; - TRACE2(("...adding %#x\n", CharOf(*ks))); + TRACE2(("...adding 0x%X\n", CharOf(*ks))); mp->ch = CharOf(*ks++); mp->srv = NULL; mp->flags = flags; @@ -378,7 +378,7 @@ TRACE2(("maplookup unmatched:%s\n", itb_visible(unmatched))); matchedcnt = 0; while (mp != 0) { - TRACE2(("... c=%#x, mp->ch=%#x\n", c, mp->ch)); + TRACE2(("... c=0x%X, mp->ch=0x%X\n", c, mp->ch)); if (c == mp->ch) { if (mp->irv != -1 || mp->srv != NULL) { rmp = mp; @@ -462,7 +462,7 @@ /* unget the unmatched suffix */ while (suffix && (count > 0)) { (void) itb_append(out_ptr, itb_values(unmatched)[--count]); - TRACE2(("...1 ungetting %#x\n", itb_values(unmatched)[count])); + TRACE2(("...1 ungetting 0x%X\n", itb_values(unmatched)[count])); } /* unget the mapping and elide correct number of recorded chars */ if (rmp->srv) { @@ -476,16 +476,16 @@ remapflag = 0; while (cp > rmp->srv) { (void) itb_append(out_ptr, CharOf(*--cp) | (int) remapflag); - TRACE2(("...2 ungetting %#x|%#x\n", CharOf(*cp), remapflag)); + TRACE2(("...2 ungetting 0x%X|0x%X\n", CharOf(*cp), remapflag)); } } else { (void) itb_append(out_ptr, rmp->irv); - TRACE2(("...3 ungetting %#x\n", rmp->irv)); + TRACE2(("...3 ungetting 0x%X\n", rmp->irv)); } } else { /* didn't find a match */ while (count > 0) { (void) itb_append(out_ptr, itb_values(unmatched)[--count]); - TRACE2(("...4 ungetting %#x\n", itb_values(unmatched)[count])); + TRACE2(("...4 ungetting 0x%X\n", itb_values(unmatched)[count])); } matchedcnt = 0; } @@ -726,7 +726,7 @@ normal_getc(void) { int c = term.getch(); - TRACE(("normal/getc:%c (%#x)\n", c, c)); + TRACE(("normal/getc:%c (0x%X)\n", c, c)); save_keystroke(c); return c; } @@ -755,7 +755,7 @@ if ((c = term.getch()) == -1) return c; /* see comment in ttgetc */ - TRACE(("mapped/getc:%c (%#x)\n", c, c)); + TRACE(("mapped/getc:%c (0x%X)\n", c, c)); save_keystroke(c); @@ -785,7 +785,7 @@ void mapungetc(int c) { - TRACE2(("mapungetc %#x\n", c)); + TRACE2(("mapungetc 0x%X\n", c)); if (tgetc_avail()) { tungetc(c); } else { @@ -800,6 +800,7 @@ static int mapgetc(void) { + int result; UINT remapflag; if (global_g_val(GMDREMAP)) remapflag = 0; @@ -815,13 +816,16 @@ mlforce("[Infinite loop detected in %s sequence]", (insertmode) ? "map!" : "map"); catnap(1000, FALSE); /* FIXME: be sure message gets out */ - return esc_c | (int) NOREMAP; + result = esc_c | (int) NOREMAP; + } else { + mapgetc_ungotcnt--; + result = itb_last(mapgetc_ungottenchars) | (int) remapflag; } - mapgetc_ungotcnt--; - return itb_last(mapgetc_ungottenchars) | (int) remapflag; + } else { + infloopcount = 0; + result = tgetc(mapgetc_raw_flag); } - infloopcount = 0; - return tgetc(mapgetc_raw_flag); + return result; } int @@ -917,6 +921,25 @@ } c = mapgetc(); +#if OPT_MULTIBYTE + if (vl_encoding >= enc_UTF8 && b_is_utfXX(curbp)) { + char save[MAX_UTF8]; + int have = 0; + int need = 9; + UINT utf8; + do { + save[have++] = (char) c; + need = vl_check_utf8(save, (B_COUNT) have); + if (need <= have) + break; + c = mapgetc(); + } while (c > 127); + if ((have > 1) && + vl_conv_to_utf32(&utf8, save, (B_COUNT) have) == have) { + c = (int) utf8; + } + } +#endif if (!global_g_val(GMDREMAPFIRST)) matched = FALSE; @@ -992,8 +1015,9 @@ } DOT.o -= matched; ldel_bytes((B_COUNT) matched, FALSE); - while (status && itb_more(abbr_chars)) + while (status && itb_more(abbr_chars)) { status = inschar(itb_last(abbr_chars), backsp_limit_p); + } } itb_free(&abbr_chars); return; diff -Nru vile-9.8v/mktbls.c vile-9.8w/mktbls.c --- vile-9.8v/mktbls.c 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/mktbls.c 2022-08-22 05:11:05.000000000 +0000 @@ -5,7 +5,7 @@ * included in main.c * * Copyright (c) 1990 by Paul Fox - * Copyright (c) 1995-2021 by Paul Fox and Thomas Dickey + * Copyright (c) 1995-2022 by Paul Fox and Thomas Dickey * * See the file "cmdtbl" for input data formats, and "estruct.h" for * the output structures. @@ -15,7 +15,7 @@ * by Tom Dickey, 1993. -pgf * * - * $Id: mktbls.c,v 1.200 2021/03/22 23:21:55 tom Exp $ + * $Id: mktbls.c,v 1.204 2022/08/21 14:51:39 tom Exp $ * */ @@ -2478,11 +2478,11 @@ case SECT_VARS: if (r != 1 - || (!strcmp(vec[1], "bool") - && !strcmp(vec[1], "enum") - && !strcmp(vec[1], "int") - && !strcmp(vec[1], "string") - && !strcmp(vec[1], "regex"))) + || (strcmp(vec[1], "bool") + && strcmp(vec[1], "enum") + && strcmp(vec[1], "int") + && strcmp(vec[1], "string") + && strcmp(vec[1], "regex"))) badfmt("looking for mode datatype"); (void) my_strncpy(modetype, vec[1], sizeof(modetype)); break; diff -Nru vile-9.8v/ntwinio.c vile-9.8w/ntwinio.c --- vile-9.8v/ntwinio.c 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/ntwinio.c 2022-08-22 05:11:05.000000000 +0000 @@ -1,7 +1,7 @@ /* * Uses the Win32 screen API. * - * $Id: ntwinio.c,v 1.223 2021/01/01 10:17:51 tom Exp $ + * $Id: ntwinio.c,v 1.224 2022/01/20 22:50:26 tom Exp $ * Written by T.E.Dickey for vile (october 1997). * -- improvements by Clark Morgan (see w32cbrd.c, w32pipe.c). */ @@ -2423,7 +2423,7 @@ /* talk about copyright */ hwnd = GetDlgItem(hDlg, IDM_ABOUT_COPYRIGHT); sprintf(buf, - "\nCopyright \xA9 Thomas Dickey 1997-2020,2021\n\n" + "\nCopyright \xA9 Thomas Dickey 1997-2021,2022\n\n" "%s is free software, distributed under the terms of the GNU " "Public License, Version 2 (see COPYING).", prognam); diff -Nru vile-9.8v/package/convile.nsi vile-9.8w/package/convile.nsi --- vile-9.8v/package/convile.nsi 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/package/convile.nsi 2022-08-22 05:11:05.000000000 +0000 @@ -1,4 +1,4 @@ -; $Id: convile.nsi,v 1.29 2021/01/01 10:18:16 tom Exp $ +; $Id: convile.nsi,v 1.31 2022/01/20 22:50:48 tom Exp $ ; vile:fk=8bit ; Script originally generated with the Venis Install Wizard, but customized. ; The Inno Setup script is preferred; but this can be built via cross-compiling. @@ -9,8 +9,8 @@ !define VERSION_MAJOR "9" !define VERSION_MINOR "8" -!define VERSION_LEVEL "22" -!define VERSION_PATCH "v" +!define VERSION_LEVEL "23" +!define VERSION_PATCH "w" !define VERSION_BUILT "0" !define SUBKEY "VI like Emacs" @@ -29,7 +29,7 @@ VIAddVersionKey ProductName "${SUBKEY}" VIAddVersionKey CompanyName "Thomas E. Dickey" -VIAddVersionKey LegalCopyright "© 1997-2020,2021, Thomas E. Dickey" +VIAddVersionKey LegalCopyright "© 1997-2021,2022, Thomas E. Dickey" VIAddVersionKey FileDescription "ConVile Installer (MinGW)" VIAddVersionKey FileVersion "${VERSION}" VIAddVersionKey ProductVersion "${VERSION}" diff -Nru vile-9.8v/package/debian/changelog vile-9.8w/package/debian/changelog --- vile-9.8v/package/debian/changelog 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/package/debian/changelog 2022-08-22 05:11:05.000000000 +0000 @@ -1,3 +1,9 @@ +vile (9.8w) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey Sat, 18 Dec 2021 06:50:27 -0500 + vile (9.8v) unstable; urgency=low * maintenance updates diff -Nru vile-9.8v/package/freebsd/vile/distinfo vile-9.8w/package/freebsd/vile/distinfo --- vile-9.8v/package/freebsd/vile/distinfo 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/package/freebsd/vile/distinfo 2022-08-22 05:11:05.000000000 +0000 @@ -1,3 +1,3 @@ -TIMESTAMP = 1639097144 -SHA256 (vile-9.8v.tgz) = 180ea24df191540a74bc1d70052f5042ae9dc70cf6452a1bb73f0e81b5186b83 -SIZE (vile-9.8v.tgz) = 2401921 +TIMESTAMP = 1639846551 +SHA256 (vile-9.8v.tgz) = 240edec7bbf3d9df48b3042754bf9854d9a233d371d50bba236ec0edd708eed5 +SIZE (vile-9.8v.tgz) = 2405398 diff -Nru vile-9.8v/package/freebsd/vile/Makefile vile-9.8w/package/freebsd/vile/Makefile --- vile-9.8v/package/freebsd/vile/Makefile 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/package/freebsd/vile/Makefile 2022-08-22 05:11:05.000000000 +0000 @@ -1,5 +1,4 @@ # Created by: pgf -# $FreeBSD$ PORTNAME= vile PORTVERSION= 9.8v @@ -14,6 +13,7 @@ COMMENT= VI Like Emacs -- console version LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= reflex:textproc/reflex diff -Nru vile-9.8v/package/freebsd/xvile/distinfo vile-9.8w/package/freebsd/xvile/distinfo --- vile-9.8v/package/freebsd/xvile/distinfo 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/package/freebsd/xvile/distinfo 2022-08-22 05:11:05.000000000 +0000 @@ -1,3 +1,3 @@ -TIMESTAMP = 1639097516 -SHA256 (vile-9.8v.tgz) = 180ea24df191540a74bc1d70052f5042ae9dc70cf6452a1bb73f0e81b5186b83 -SIZE (vile-9.8v.tgz) = 2401921 +TIMESTAMP = 1639846563 +SHA256 (vile-9.8v.tgz) = 240edec7bbf3d9df48b3042754bf9854d9a233d371d50bba236ec0edd708eed5 +SIZE (vile-9.8v.tgz) = 2405398 diff -Nru vile-9.8v/package/freebsd/xvile/Makefile vile-9.8w/package/freebsd/xvile/Makefile --- vile-9.8v/package/freebsd/xvile/Makefile 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/package/freebsd/xvile/Makefile 2022-08-22 05:11:05.000000000 +0000 @@ -1,5 +1,4 @@ # Created by: pgf -# $FreeBSD: head/editors/xvile/Makefile 516802 2019-11-05 15:48:40Z zeising $ PORTNAME= vile PORTVERSION= 9.8v diff -Nru vile-9.8v/package/minvile.nsi vile-9.8w/package/minvile.nsi --- vile-9.8v/package/minvile.nsi 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/package/minvile.nsi 2022-08-22 05:11:05.000000000 +0000 @@ -1,4 +1,4 @@ -; $Id: minvile.nsi,v 1.36 2021/01/01 10:18:24 tom Exp $ +; $Id: minvile.nsi,v 1.38 2022/01/20 22:50:58 tom Exp $ ; vile:fk=8bit ; Script originally generated with the Venis Install Wizard, but customized. ; The Inno Setup script is preferred; but this can be built via cross-compiling. @@ -9,8 +9,8 @@ !define VERSION_MAJOR "9" !define VERSION_MINOR "8" -!define VERSION_LEVEL "22" -!define VERSION_PATCH "v" +!define VERSION_LEVEL "23" +!define VERSION_PATCH "w" !define VERSION_BUILT "0" !define SUBKEY "VI like Emacs" @@ -29,7 +29,7 @@ VIAddVersionKey ProductName "${SUBKEY}" VIAddVersionKey CompanyName "Thomas E. Dickey" -VIAddVersionKey LegalCopyright "© 1997-2020,2021, Thomas E. Dickey" +VIAddVersionKey LegalCopyright "© 1997-2021,2022, Thomas E. Dickey" VIAddVersionKey FileDescription "WinVile Installer (MinGW)" VIAddVersionKey FileVersion "${VERSION}" VIAddVersionKey ProductVersion "${VERSION}" diff -Nru vile-9.8v/package/vile.spec vile-9.8w/package/vile.spec --- vile-9.8v/package/vile.spec 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/package/vile.spec 2022-08-22 05:11:05.000000000 +0000 @@ -1,8 +1,8 @@ Summary: VI Like Emacs editor -# $Id: vile.spec,v 1.63 2021/12/10 00:38:28 tom Exp $ +# $Id: vile.spec,v 1.65 2022/01/20 22:55:03 tom Exp $ Name: vile %define AppVersion 9.8 -Version: %{AppVersion}v +Version: %{AppVersion}w # each patch should update the version Release: dev License: GPLv2 @@ -31,12 +31,14 @@ Patch20: vile-9.8t.patch.gz Patch21: vile-9.8u.patch.gz Patch22: vile-9.8v.patch.gz +Patch23: vile-9.8w.patch.gz # each patch should add itself to this list Vendor: Thomas E. Dickey Packager: Thomas E. Dickey BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-common = %{version}-%{release} +# Fedora34 requires perl-DB_File, perl-English %prep @@ -94,6 +96,7 @@ %patch20 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 # each patch should add itself to this list rpm --version @@ -261,6 +264,9 @@ %changelog # each patch should add its ChangeLog entries here +* Sat Dec 18 2021 Thomas E. Dickey +- added patch for 9.8w + * Tue May 19 2020 Thomas E. Dickey - added patch for 9.8v diff -Nru vile-9.8v/package/winvile.iss vile-9.8w/package/winvile.iss --- vile-9.8v/package/winvile.iss 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/package/winvile.iss 2022-08-22 05:11:05.000000000 +0000 @@ -1,4 +1,4 @@ -; $Id: winvile.iss,v 1.31 2021/01/01 10:18:33 tom Exp $ +; $Id: winvile.iss,v 1.32 2022/01/20 22:51:08 tom Exp $ ; vile:ts=2 sw=2 fk=8bit ; ; This installs winvile as "winvile-ole.exe", since that is the name I use when building the OLE flavor @@ -60,7 +60,7 @@ #emit 'AppVersion=' + myVer #emit 'AppVerName=' + myAppVer AppPublisher=Thomas E. Dickey -AppCopyright=© 1997-2020,2021, Thomas E. Dickey +AppCopyright=© 1997-2021,2022, Thomas E. Dickey AppPublisherURL=https://invisible-island.net/vile/ AppSupportURL=https://invisible-island.net/vile/ AppUpdatesURL=https://invisible-island.net/vile/ diff -Nru vile-9.8v/package/winvile.nsi vile-9.8w/package/winvile.nsi --- vile-9.8v/package/winvile.nsi 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/package/winvile.nsi 2022-08-22 05:11:05.000000000 +0000 @@ -1,4 +1,4 @@ -; $Id: winvile.nsi,v 1.17 2020/05/19 23:22:34 tom Exp $ +; $Id: winvile.nsi,v 1.18 2021/12/18 11:50:27 tom Exp $ ; Script generated with the Venis Install Wizard ; Define your application name @@ -6,8 +6,8 @@ !define VERSION_MAJOR "9" !define VERSION_MINOR "8" -!define VERSION_LEVEL "22" -!define VERSION_PATCH "v" +!define VERSION_LEVEL "23" +!define VERSION_PATCH "w" !define VERSION_BUILT "0" !define APPNAMEANDVERSION "${APPNAME} ${VERSION_MAJOR}.${VERSION_MINOR}" diff -Nru vile-9.8v/patchlev.h vile-9.8w/patchlev.h --- vile-9.8v/patchlev.h 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/patchlev.h 2022-08-22 05:11:05.000000000 +0000 @@ -1,4 +1,4 @@ #define VILE_RELEASE "9" #define VILE_VERSION "8" -#define VILE_PATCHLEVEL "v" -#define VILE_PATCHVALUE 22 +#define VILE_PATCHLEVEL "w" +#define VILE_PATCHVALUE 23 diff -Nru vile-9.8v/perl.xs vile-9.8w/perl.xs --- vile-9.8v/perl.xs 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/perl.xs 2022-08-22 05:11:05.000000000 +0000 @@ -13,7 +13,7 @@ * vile. The file api.c (sometimes) provides a middle layer between * this interface and the rest of vile. * - * $Id: perl.xs,v 1.143 2021/12/07 01:40:25 tom Exp $ + * $Id: perl.xs,v 1.144 2022/07/03 18:02:36 tom Exp $ */ /* @@ -21,7 +21,6 @@ */ #ifdef __GNUC__ #pragma GCC diagnostic ignored "-Wcast-qual" -#pragma GCC diagnostic ignored "-Wcompound-token-split-by-macro" #pragma GCC diagnostic ignored "-Wconversion" #pragma GCC diagnostic ignored "-Wnested-externs" #pragma GCC diagnostic ignored "-Wshadow" @@ -119,20 +118,20 @@ /* for vile */ #define MARK vile_MARK +#define regexp vile_regexp #include "estruct.h" #include "edef.h" #include "api.h" +#undef regexp #undef MARK #undef ABORT /* for perl */ #define main perl_main -#define regexp perl_regexp #include #include #include #undef main -#undef regexp #undef dofile #ifdef __GNUC__ diff -Nru vile-9.8v/plink.sh vile-9.8w/plink.sh --- vile-9.8v/plink.sh 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/plink.sh 2022-08-22 05:11:05.000000000 +0000 @@ -1,9 +1,9 @@ #!/bin/sh -# $XTermId: plink.sh,v 1.15 2021/12/12 18:11:32 tom Exp $ +# $XTermId: plink.sh,v 1.17 2022/03/13 18:27:29 Ryan.Schmidt Exp $ # ----------------------------------------------------------------------------- # this file is part of xterm # -# Copyright 2001-2013,2021 by Thomas E. Dickey +# Copyright 2001-2021,2022 by Thomas E. Dickey # # All Rights Reserved # @@ -44,14 +44,17 @@ ;; esac +: "${TMPDIR=/tmp}" + while [ $# != 0 ] do if [ $ASNEED = no ] && [ -n "$LINKIT" ] then ASNEED=yes OPT=-Wl,-as-needed - warned=`mktemp` - trap "rm -f $warned" EXIT INT QUIT TERM HUP + warned=`mktemp "$TMPDIR/xterm.XXXXXXXX"` + trap "rm -f $warned; exit 1" 1 2 3 15 + trap "rm -f $warned" 0 if ( eval $LINKIT $OPT $NO_LTO "$@" >"$warned" 2>&1 ) then WARNED=`cat "$warned"` diff -Nru vile-9.8v/proto.h vile-9.8w/proto.h --- vile-9.8v/proto.h 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/proto.h 2022-08-22 05:11:05.000000000 +0000 @@ -4,7 +4,7 @@ * * Created: Thu May 14 15:44:40 1992 * - * $Id: proto.h,v 1.753 2021/03/22 23:18:23 tom Exp $ + * $Id: proto.h,v 1.755 2022/08/21 16:20:48 tom Exp $ */ #ifndef VILE_PROTO_H @@ -776,7 +776,7 @@ extern void dotcmdstop (void); extern void get_kbd_macro (TBUFF **rp); extern void incr_dot_kregnum (void); -extern void kbd_kill_response (TBUFF *buf, size_t *position, int c); +extern TBUFF * kbd_kill_response (TBUFF *buf, size_t *position, int c); extern void kbd_mac_check (void); extern void kbd_pushback (TBUFF *buf, int skip); extern void set_end_string (int c); @@ -873,10 +873,10 @@ #if OPT_MULTIBYTE extern int ldel_chars (B_COUNT n, int kflag); -extern int lins_chars (int n, int c, int wide); +extern int lins_chars (int n, int c); #else #define ldel_chars(n, kflag) ldel_bytes(n, kflag) -#define lins_chars(n, c, wide) lins_bytes(n, c) +#define lins_chars(n, c) lins_bytes(n, c) #endif #if OPT_REGS_CMPL diff -Nru vile-9.8v/random.c vile-9.8w/random.c --- vile-9.8v/random.c 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/random.c 2022-08-22 05:11:05.000000000 +0000 @@ -2,7 +2,7 @@ * This file contains the command processing functions for a number of random * commands. There is no functional grouping here, for sure. * - * $Id: random.c,v 1.359 2018/10/23 22:34:15 tom Exp $ + * $Id: random.c,v 1.360 2022/08/04 21:23:10 tom Exp $ */ #ifdef __BEOS__ @@ -463,7 +463,7 @@ { #if OPT_MULTIBYTE if (b_is_utfXX(curbp)) { - UCHAR buffer[10]; + UCHAR buffer[MAX_UTF8]; int old_len = bytes_at(lp, offset); int new_len = vl_conv_to_utf8(buffer, (UINT) ch, sizeof(buffer)); int n; diff -Nru vile-9.8v/regexp.c vile-9.8w/regexp.c --- vile-9.8v/regexp.c 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/regexp.c 2022-08-22 05:11:05.000000000 +0000 @@ -1,7 +1,7 @@ /* - * $Id: regexp.c,v 1.221 2020/03/29 23:30:13 tom Exp $ + * $Id: regexp.c,v 1.227 2022/08/09 22:38:31 tom Exp $ * - * Copyright 2005-2019,2020 Thomas E. Dickey and Paul G. Fox + * Copyright 2005-2020,2022 Thomas E. Dickey and Paul G. Fox * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the @@ -118,6 +118,9 @@ #include #include +#define vl_index (strchr) +#define strmalloc(s) strdup(s) + #endif /* OPT_MULTIBYTE */ #else @@ -428,7 +431,7 @@ #else #define sys_CTYPE_SIZE ((unsigned) 0xff) -#define is_CLASS(name,ptr) is_ ## name(*ptr) +#define is_CLASS(name,ptr) is_ ## name(*(ptr)) #endif /* @@ -645,7 +648,7 @@ static void put_reg_char(int ch) { - UCHAR target[10]; + UCHAR target[MAX_UTF8]; int len = vl_conv_to_utf8(target, (UINT) ch, sizeof(target)); int n; @@ -2136,7 +2139,7 @@ returnReg(0); break; case ENDWORD: - /* Match if previous char isident + /* Match if previous char is ident * and current char EOL or !ident */ if ((reginput != regnomore && is_CLASS(IDENT, reginput)) || reginput == regbol @@ -3096,6 +3099,7 @@ * > Comments begin with '#'. * > Use an uppercase p/q/r to suppress backslash interpretation of the line, * e.g., to simplify typing patterns. + * > Use I/i to switch ignorecase on/off in the call to regexec(). * > Use M/m to switch magic on/off in the call to regcomp(). * > Use N to disable regmassage (used for vile), so expressions are POSIX. * > Lines beginning with '?' are error messages. @@ -3110,6 +3114,7 @@ test_regexp(FILE *fp) { char *s; + int ic = FALSE; int magic = TRUE; int linenum = 0; int literal; @@ -3122,6 +3127,14 @@ literal = 0; REGTRACE(("-------------->%s\n", s)); switch (*s) { + case 'i': + ic = FALSE; + put_string(s, length, TRUE); + break; + case 'I': + ic = TRUE; + put_string(s, length, TRUE); + break; case 'N': magic = -1; put_string(s, length, TRUE); @@ -3154,8 +3167,7 @@ ++s, --length; if (pattern != 0) { for (offset = 0; offset <= length; ++offset) { - if (regexec(pattern, s, s + length, offset, length, - (offset == 0))) { + if (regexec(pattern, s, s + length, offset, length, ic)) { for (subexp = 0; subexp < NSUBEXP; ++subexp) { if (pattern->startp[subexp] != 0 && pattern->endp[subexp] != 0 @@ -3165,11 +3177,11 @@ pattern->endp[subexp] - pattern->startp[subexp]; if (mlen <= 1) { - printf("r%d [%d:%d] -> [%d]", + printf("r%d [%d:%d] -> [%ld]", subexp, offset, length - mlen, pattern->startp[subexp] - s); } else { - printf("r%d [%d:%d] -> [%d:%d]", + printf("r%d [%d:%d] -> [%ld:%ld]", subexp, offset, length - 1, pattern->startp[subexp] - s, pattern->endp[subexp] - s - 1); @@ -3177,7 +3189,7 @@ put_string(pattern->startp[subexp], mlen, FALSE); } else if (pattern->startp[subexp] != 0 && pattern->endp[subexp] != 0) { - printf("? mlen = %d\n", + printf("? mlen = %ld\n", pattern->endp[subexp] - pattern->startp[subexp]); } else if (pattern->startp[subexp] != 0) { diff -Nru vile-9.8v/region.c vile-9.8w/region.c --- vile-9.8v/region.c 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/region.c 2022-08-22 05:11:05.000000000 +0000 @@ -3,7 +3,7 @@ * and mark. Some functions are commands. Some functions are just for * internal use. * - * $Id: region.c,v 1.170 2018/10/25 23:30:18 tom Exp $ + * $Id: region.c,v 1.171 2022/08/04 21:17:54 tom Exp $ */ #include "estruct.h" @@ -724,7 +724,7 @@ { #if OPT_MULTIBYTE if (b_is_utfXX(curbp)) { - UCHAR buffer[10]; + UCHAR buffer[MAX_UTF8]; int len = vl_conv_to_utf8(buffer, (UINT) ch, sizeof(buffer)); int n; for (n = 0; n < len; ++n) diff -Nru vile-9.8v/revlist vile-9.8w/revlist --- vile-9.8v/revlist 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/revlist 2022-08-22 05:11:05.000000000 +0000 @@ -1,11 +1,11 @@ -revlist for vile, version v9_8v +revlist for vile, version v9_8w -------------------------------------------------------------------------------- -aclocal.m4 1.351 +aclocal.m4 1.353 ansi.c 1.54 api.c 1.54 api.h 1.16 AUTHORS 1.5 -basic.c 1.178 +basic.c 1.179 bind.c 1.378 blist.c 1.17 blist.h 1.4 @@ -15,7 +15,7 @@ buffer.c 1.372 buglist 1.419 builtflt.c 1.101 -CHANGES 1.2011 +CHANGES 1.2028 CHANGES.R3 1.2 CHANGES.R4 1.2 CHANGES.R5 1.2 @@ -28,7 +28,7 @@ config.guess 1.53 config_h.in 1.3 config.sub 1.54 -configure 1.169 +configure 1.170 configure.in 1.344 COPYING 1.5 csrch.c 1.35 @@ -36,18 +36,18 @@ descrip.mms 1.51 df-install.in 1.3 dirstuff.h 1.33 -display.c 1.580 +display.c 1.581 djhandl.c 1.8 dumbterm.c 1.27 edef.h 1.376 eightbit.c 1.110 encrypt.c 1.12 -estruct.h 1.759 -eval.c 1.469 +estruct.h 1.760 +eval.c 1.470 exec.c 1.367 externs.c 1.13 fences.c 1.97 -file.c 1.463 +file.c 1.465 filec.c 1.136 fileio.c 1.209 finderr.c 1.153 @@ -55,64 +55,64 @@ glob.c 1.104 gnreight.h 1.25 gppconio.c 1.5 -history.c 1.92 -input.c 1.372 -insert.c 1.187 +history.c 1.94 +input.c 1.374 +insert.c 1.192 INSTALL 1.7 install-sh 1.1 isearch.c 1.71 itbuff.c 1.29 lckfiles.c 1.13 -line.c 1.238 -main.c 1.742 +line.c 1.240 +main.c 1.745 makeargv.c 1.8 makeargv.h 1.5 makefile.blc 1.25 makefile.djg 1.42 makefile.icc 1.20 -makefile.in 1.296 +makefile.in 1.297 makefile.wnt 1.114 makeflag.wnt 1.4 MANIFEST none -map.c 1.126 +map.c 1.130 menu.c 1.81 mkprlenv.wnt 1.12 -mktbls.c 1.200 +mktbls.c 1.204 modes.c 1.458 modetbl 1.327 msgs.c 1.31 npopen.c 1.102 ntconio.c 1.106 -ntwinio.c 1.223 +ntwinio.c 1.224 nullterm.c 1.12 oneliner.c 1.127 opers.c 1.105 os2keys.h 1.3 os2pipe.c 1.7 os2vio.c 1.40 -patchlev.h 1.432 +patchlev.h 1.433 path.c 1.184 -perl.xs 1.143 -plink.sh 1.15 +perl.xs 1.144 +plink.sh 1.17 plugin.c 1.2 plugin.h 1.1 -proto.h 1.753 +proto.h 1.755 pscreen.h 1.4 ptypemap 1.8 -random.c 1.359 +random.c 1.360 README 1.107 README.PC 1.35 README.VMS 1.5 -regexp.c 1.221 -region.c 1.170 -revlist v9_8v +regexp.c 1.227 +region.c 1.171 +revlist v9_8w search.c 1.158 select.c 1.195 spawn.c 1.218 statevar.c 1.167 tags.c 1.155 tbuff.c 1.80 -tcap.c 1.190 +tcap.c 1.191 tcap.h 1.20 termio.c 1.225 test_io.c 1.3 @@ -123,7 +123,7 @@ version.c 1.79 version.sh 1.2 vile.1 1.47 -vile.hlp 1.764 +vile.hlp 1.765 vile.wmconfig 1.1 vl_alloc.h 1.9 vl_crypt.h 1.6 @@ -135,11 +135,11 @@ vmsbuild.com 1.52 vmspipe.c 1.16 vmsvt.c 1.69 -w32cbrd.c 1.44 +w32cbrd.c 1.45 w32cmd.c 1.61 -w32info.rc 1.18 +w32info.rc 1.20 w32misc.c 1.65 -w32ole.cpp 1.36 +w32ole.cpp 1.37 w32ole.h 1.11 w32ole.rc 1.3 w32oo.cpp 1.21 @@ -156,14 +156,14 @@ winvile.rc 1.12 word.c 1.109 wordmov.c 1.26 -wvwrap.cpp 1.23 +wvwrap.cpp 1.24 x11.c 1.433 x11menu.c 1.23 x11plain.c 1.18 x11vile.h 1.27 xftplain.c 1.57 xshell.sh 1.5 -xterm.c 1.10 +xterm.c 1.11 xtermkeys.h 1.19 xvile.wmconfig 1.1 doc/config.doc 1.39 @@ -187,12 +187,12 @@ doc/oleauto.html 1.14 doc/perl.doc 1.11 doc/perl.html 1.9 -doc/vile-hlp.html 1.121 +doc/vile-hlp.html 1.122 doc/vile-man.html 1.24 doc/vile-man.sed 1.11 doc/Vileserv.doc 1.10 doc/Vileserv.html 1.9 -doc/vile-toc.html 1.127 +doc/vile-toc.html 1.128 doc/visvile.doc 1.21 doc/visvile.html 1.12 filters/ada-filt.l 1.22 @@ -255,14 +255,14 @@ filters/flt_defs.h 1.21 filters/fltstack.h 1.19 filters/genmake.c 1.5 -filters/genmake.mak 1.49 +filters/genmake.mak 1.53 filters/genmake.sh 1.12 filters/go.key 1.2 filters/hs-filt.l 1.29 filters/hs.key 1.2 filters/htmlfilt.l 1.125 filters/html.key 1.20 -filters/imakeflt.l 1.26 +filters/imakeflt.l 1.27 filters/imake.key 1.5 filters/infofilt.l 1.14 filters/ini-filt.l 1.19 @@ -294,13 +294,15 @@ filters/makefile.icc 1.4 filters/makefile.in 1.92 filters/makefile.wnt 1.41 -filters/makefilt.l 1.65 +filters/makefilt.l 1.66 filters/make.key 1.8 filters/makelist.sh 1.6 -filters/manfilt.c 1.73 +filters/manfilt.c 1.76 filters/mc-filt.l 1.13 filters/mcrlfilt.l 1.8 filters/mcrl.key 1.1 +filters/md-filt.l 1.71 +filters/md.key 1.1 filters/midlfilt.l 1.11 filters/midl.key 1.3 filters/mk-0th.awk 1.11 @@ -322,11 +324,9 @@ filters/pas-filt.l 1.13 filters/pas.key 1.5 filters/pc.key 1.1 -filters/perl6.key 1.1 filters/perl.key 1.8 filters/php-filt.l 1.27 filters/php.key 1.3 -filters/pl6filt.c 1.1 filters/pl-filt.c 1.127 filters/pot-filt.l 1.14 filters/pot.key 1.1 @@ -337,6 +337,8 @@ filters/ps.key 1.3 filters/py-filt.l 1.20 filters/py.key 1.3 +filters/rakufilt.c 1.3 +filters/raku.key 1.1 filters/rb.key 1.5 filters/rc-filt.l 1.18 filters/rc.key 1.2 @@ -357,11 +359,11 @@ filters/scheme.key 1.3 filters/scm-filt.l 1.10 filters/sed-filt.c 1.29 -filters/sh-filt.l 1.183 +filters/sh-filt.l 1.184 filters/sh.key 1.6 filters/sml-filt.l 1.15 filters/sml.key 1.1 -filters/spellflt.l 1.61 +filters/spellflt.l 1.62 filters/spell.rc 1.8 filters/sql-filt.l 1.51 filters/sql.key 1.13 @@ -390,7 +392,7 @@ filters/vbs.key 1.4 filters/vcproj.key 1.4 filters/vcxproj.key 1.2 -filters/vilefilt.l 1.75 +filters/vilefilt.l 1.76 filters/vile.key 1.9 filters/vim.key 1.3 filters/vl-filt.l 1.23 @@ -445,15 +447,15 @@ macros/lxvile 1.2 macros/lxvile.desktop 1.1 macros/lxvile-fonts 1.2 -macros/manpage.rc 1.27 -macros/modes.rc 1.149 +macros/manpage.rc 1.29 +macros/modes.rc 1.153 macros/palettes.rc 1.9 macros/pictmode.rc 1.5 macros/search.rc 1.4 macros/shifts.rc 1.4 macros/showeach.rc 1.5 macros/uxvile 1.1 -macros/UXVile.ad 1.2 +macros/UXVile.ad 1.3 macros/uxvile.desktop 1.4 macros/vileinit.rc 1.42 macros/vile-libdir-path 1.3 @@ -462,10 +464,10 @@ macros/vileperl.rc 1.8 macros/vile-to-html 1.1 macros/which.rc 1.20 -macros/XVile.ad 1.9 +macros/XVile.ad 1.10 macros/xvile.desktop 1.4 -package/convile.nsi 1.29 -package/debian/changelog 1.29 +package/convile.nsi 1.31 +package/debian/changelog 1.30 package/debian/compat 1.3 package/debian/control 1.3 package/debian/copyright 1.1 @@ -488,15 +490,15 @@ package/debian/xvile.files 1.3 package/debian/xvile.links 1.2 package/debian/xvile.menu 1.2 -package/freebsd/vile/distinfo 1.7 -package/freebsd/vile/Makefile 1.8 +package/freebsd/vile/distinfo 1.8 +package/freebsd/vile/Makefile 1.9 package/freebsd/vile/pkg-descr 1.2 package/freebsd/vile/pkg-plist 1.3 -package/freebsd/xvile/distinfo 1.8 -package/freebsd/xvile/Makefile 1.12 +package/freebsd/xvile/distinfo 1.9 +package/freebsd/xvile/Makefile 1.13 package/freebsd/xvile/pkg-descr 1.2 package/freebsd/xvile/pkg-plist 1.5 -package/minvile.nsi 1.36 +package/minvile.nsi 1.38 package/pkgsrc/vile/ALTERNATIVES 1.1 package/pkgsrc/vile/DESCR 1.1 package/pkgsrc/vile/distinfo 1.4 @@ -506,11 +508,11 @@ package/pkgsrc/xvile/DESCR 1.1 package/pkgsrc/xvile/Makefile 1.8 package/pkgsrc/xvile/PLIST 1.3 -package/vile.spec 1.63 +package/vile.spec 1.65 package/winvile64.iss 1.1 package/winvile64-wide.iss 1.1 -package/winvile.iss 1.31 -package/winvile.nsi 1.17 +package/winvile.iss 1.32 +package/winvile.nsi 1.18 package/winvile-wide.iss 1.2 perl/Breadcrumbs.pm 1.7 perl/CaptHook.pm 1.6 diff -Nru vile-9.8v/revlist.bak vile-9.8w/revlist.bak --- vile-9.8v/revlist.bak 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/revlist.bak 1970-01-01 00:00:00.000000000 +0000 @@ -1,555 +0,0 @@ -revlist for vile, version v9_8u --------------------------------------------------------------------------------- -aclocal.m4 1.310 -ansi.c 1.53 -api.c 1.54 -api.h 1.15 -AUTHORS 1.5 -basic.c 1.176 -bind.c 1.378 -blist.c 1.17 -blist.h 1.4 -borland.c 1.42 -btree.c 1.54 -btree.h 1.6 -buffer.c 1.371 -buglist 1.418 -builtflt.c 1.101 -CHANGES 1.1960 -CHANGES.R3 1.2 -CHANGES.R4 1.2 -CHANGES.R5 1.2 -CHANGES.R6 1.2 -CHANGES.R7 1.3 -CHANGES.R8 1.2 -charsets.c 1.80 -chgdfunc.h 1.23 -cmdtbl 1.272 -config.guess 1.26 -config_h.in 1.2 -config.sub 1.27 -configure 1.147 -configure.in 1.327 -COPYING 1.5 -csrch.c 1.34 -curses.c 1.49 -descrip.mms 1.50 -df-install.in 1.3 -dirstuff.h 1.32 -display.c 1.579 -djhandl.c 1.7 -dumbterm.c 1.26 -edef.h 1.375 -eightbit.c 1.109 -encrypt.c 1.11 -estruct.h 1.756 -eval.c 1.468 -exec.c 1.367 -externs.c 1.12 -fences.c 1.97 -file.c 1.463 -filec.c 1.136 -fileio.c 1.209 -finderr.c 1.152 -globals.c 1.51 -glob.c 1.103 -gnreight.h 1.25 -gppconio.c 1.4 -history.c 1.91 -input.c 1.370 -insert.c 1.184 -INSTALL 1.6 -install-sh 1.1 -isearch.c 1.71 -itbuff.c 1.29 -lckfiles.c 1.12 -line.c 1.235 -main.c 1.741 -makeargv.c 1.7 -makeargv.h 1.4 -makefile.blc 1.24 -makefile.djg 1.41 -makefile.icc 1.19 -makefile.in 1.287 -makefile.wnt 1.114 -makeflag.wnt 1.4 -MANIFEST none -map.c 1.126 -menu.c 1.80 -mkprlenv.wnt 1.11 -mktbls.c 1.198 -modes.c 1.457 -modetbl 1.325 -msgs.c 1.30 -npopen.c 1.101 -ntconio.c 1.106 -ntwinio.c 1.222 -nullterm.c 1.11 -oneliner.c 1.126 -opers.c 1.104 -os2keys.h 1.2 -os2pipe.c 1.6 -os2vio.c 1.39 -patchlev.h 1.431 -path.c 1.184 -perl.xs 1.141 -plink.sh 1.8 -plugin.c 1.1 -plugin.h 1.1 -proto.h 1.750 -pscreen.h 1.4 -ptypemap 1.8 -random.c 1.359 -README 1.106 -README.PC 1.34 -README.VMS 1.5 -regexp.c 1.221 -region.c 1.170 -revlist v9_8u -search.c 1.157 -select.c 1.195 -sinstall.sh 1.1 -spawn.c 1.218 -statevar.c 1.164 -tags.c 1.155 -tbuff.c 1.80 -tcap.c 1.189 -tcap.h 1.19 -termio.c 1.225 -test_io.c 1.2 -trace.c 1.121 -trace.h 1.39 -ucrypt.c 1.25 -undo.c 1.102 -version.c 1.78 -version.sh 1.1 -vile.1 1.47 -vile.hlp 1.760 -vile.wmconfig 1.1 -vl_alloc.h 1.9 -vl_crypt.h 1.6 -vl_ctype.c 1.20 -vl_ctype.h 1.39 -vl_regex.h 1.9 -vl_stdio.h 1.4 -vms2unix.c 1.42 -vmsbuild.com 1.51 -vmspipe.c 1.15 -vmsvt.c 1.68 -w32cbrd.c 1.44 -w32cmd.c 1.61 -w32info.rc 1.16 -w32misc.c 1.65 -w32ole.cpp 1.35 -w32ole.h 1.10 -w32ole.rc 1.3 -w32oo.cpp 1.21 -w32pipe.c 1.41 -w32reg.c 1.17 -w32reg.h 1.1 -w32vile.h 1.9 -watch.c 1.7 -wcwidth.c 1.30 -wcwidth.h 1.1 -window.c 1.132 -winvile.h 1.11 -winvile.odl 1.8 -winvile.rc 1.12 -word.c 1.109 -wordmov.c 1.25 -wvwrap.cpp 1.22 -x11.c 1.395 -x11menu.c 1.18 -x11plain.c 1.6 -x11vile.h 1.3 -xshell.sh 1.4 -xterm.c 1.9 -xtermkeys.h 1.18 -xvile.wmconfig 1.1 -doc/config.doc 1.38 -doc/config.html 1.22 -doc/dir.doc 1.16 -doc/dir.html 1.12 -doc/filters.doc 1.66 -doc/filters.html 1.22 -doc/macros.doc 1.144 -doc/macros.html 1.34 -doc/makefile 1.21 -doc/make-hlp.pl 1.17 -doc/make-hlp.sh 1.1 -doc/make-toc.pl 1.8 -doc/make-toc.sh 1.3 -doc/menus.doc 1.18 -doc/menus.html 1.15 -doc/modes.doc 1.29 -doc/modes.html 1.12 -doc/oleauto.doc 1.19 -doc/oleauto.html 1.14 -doc/perl.doc 1.11 -doc/perl.html 1.9 -doc/vile-hlp.html 1.117 -doc/vile-man.html 1.24 -doc/vile-man.sed 1.10 -doc/Vileserv.doc 1.10 -doc/Vileserv.html 1.9 -doc/vile-toc.html 1.123 -doc/visvile.doc 1.21 -doc/visvile.html 1.12 -filters/ada-filt.l 1.21 -filters/ada.key 1.2 -filters/ant.key 1.95 -filters/as386.key 1.2 -filters/as-filt.l 1.15 -filters/as.key 1.3 -filters/asm-filt.l 1.14 -filters/asm.key 1.1 -filters/atr2ansi.c 1.4 -filters/atr2html.c 1.12 -filters/atr2text.c 1.4 -filters/au3-filt.l 1.15 -filters/au3.key 1.4 -filters/awk-filt.l 1.33 -filters/awk.key 1.2 -filters/bas-filt.l 1.28 -filters/bash.key 1.2 -filters/basic.key 1.5 -filters/bat-filt.l 1.37 -filters/bat.key 1.5 -filters/bnf-filt.l 1.15 -filters/bnf.key 1.1 -filters/cfg-filt.l 1.19 -filters/c-filt.c 1.92 -filters/c-filt.flx 1.1 -filters/c.key 1.12 -filters/conffilt.l 1.19 -filters/cpp.key 1.10 -filters/csh.key 1.1 -filters/cs.key 1.2 -filters/css-filt.l 1.29 -filters/css.key 1.6 -filters/cwebfilt.l 1.23 -filters/cweb.key 1.3 -filters/dcl-filt.l 1.26 -filters/dcl.key 1.5 -filters/def-filt.l 1.15 -filters/def.key 1.1 -filters/delphi.key 1.2 -filters/difffilt.l 1.12 -filters/diff.key 1.1 -filters/docbook.key 1.5 -filters/ecl-filt.l 1.29 -filters/ecl.key 1.2 -filters/ecrypt.c 1.27 -filters/erl-filt.l 1.6 -filters/erl.key 1.1 -filters/esqlfilt.l 1.26 -filters/esql.key 1.3 -filters/est-filt.l 1.12 -filters/est.key 1.1 -filters/fdl-filt.l 1.20 -filters/fdl.key 1.4 -filters/filterio.c 1.69 -filters/filters.c 1.164 -filters/filters.h 1.145 -filters/filters.rc 1.256 -filters/flt_defs.h 1.20 -filters/fltstack.h 1.19 -filters/genmake.c 1.4 -filters/genmake.mak 1.49 -filters/genmake.sh 1.12 -filters/go.key 1.2 -filters/hs-filt.l 1.29 -filters/hs.key 1.2 -filters/htmlfilt.l 1.124 -filters/html.key 1.20 -filters/imakeflt.l 1.25 -filters/imake.key 1.5 -filters/infofilt.l 1.13 -filters/ini-filt.l 1.18 -filters/ini.key 1.1 -filters/iss-filt.l 1.21 -filters/iss.key 1.14 -filters/java.key 1.3 -filters/js.key 1.5 -filters/jsonfilt.l 1.12 -filters/json.key 1.1 -filters/key-filt.c 1.51 -filters/ksh.key 1.2 -filters/latexflt.l 1.55 -filters/latex.key 1.2 -filters/lex-filt.l 1.87 -filters/lex.key 1.10 -filters/lispfilt.l 1.27 -filters/lisp.key 1.2 -filters/lua-filt.l 1.14 -filters/lua.key 1.2 -filters/m4-filt.c 1.43 -filters/m4.key 1.5 -filters/mailcap.key 1.3 -filters/mailfilt.l 1.30 -filters/mail.key 1.3 -filters/makefile.2nd 1.29 -filters/makefile.djg 1.5 -filters/makefile.emx 1.4 -filters/makefile.icc 1.3 -filters/makefile.in 1.88 -filters/makefile.wnt 1.41 -filters/makefilt.l 1.64 -filters/make.key 1.8 -filters/makelist.sh 1.5 -filters/manfilt.c 1.71 -filters/mc-filt.l 1.12 -filters/mcrlfilt.l 1.7 -filters/mcrl.key 1.1 -filters/midlfilt.l 1.10 -filters/midl.key 1.3 -filters/mk-0th.awk 1.10 -filters/mk-0th.bat 1.6 -filters/mk-1st.awk 1.15 -filters/mk-1st.bat 1.6 -filters/mk-2nd.awk 1.22 -filters/mk-2nd.bat 1.9 -filters/mk-key.awk 1.3 -filters/mms-filt.l 1.20 -filters/mvn.key 1.5 -filters/nmakeflt.l 1.12 -filters/nmake.key 1.3 -filters/noclass.sh 1.7 -filters/nr-filt.l 1.35 -filters/nr.key 1.1 -filters/nsis.key 1.5 -filters/objc.key 1.4 -filters/pas-filt.l 1.13 -filters/pas.key 1.5 -filters/pc.key 1.1 -filters/perl6.key 1.1 -filters/perl.key 1.8 -filters/php-filt.l 1.27 -filters/php.key 1.3 -filters/pl6filt.c 1.1 -filters/pl-filt.c 1.127 -filters/pot-filt.l 1.14 -filters/pot.key 1.1 -filters/prolog.key 1.2 -filters/ps1-filt.l 1.14 -filters/ps1.key 1.1 -filters/ps-filt.l 1.19 -filters/ps.key 1.3 -filters/py-filt.l 1.20 -filters/py.key 1.3 -filters/rb.key 1.5 -filters/rc-filt.l 1.18 -filters/rc.key 1.2 -filters/rcs-filt.l 1.24 -filters/rcs.key 1.1 -filters/rexxfilt.l 1.15 -filters/rexx.key 1.1 -filters/rpm-filt.l 1.41 -filters/rpm.key 1.10 -filters/rtf-filt.l 1.10 -filters/rtf.key 1.4 -filters/rubyfilt.c 1.85 -filters/ruby.key 1.1 -filters/rustfilt.l 1.11 -filters/rust.key 1.3 -filters/sccsfilt.l 1.22 -filters/sccs.key 1.1 -filters/scheme.key 1.3 -filters/scm-filt.l 1.10 -filters/sed-filt.c 1.28 -filters/sh-filt.l 1.181 -filters/sh.key 1.6 -filters/sml-filt.l 1.14 -filters/sml.key 1.1 -filters/spellflt.l 1.60 -filters/spell.rc 1.8 -filters/sql-filt.l 1.50 -filters/sql.key 1.13 -filters/syntax.key 1.1 -filters/tagsfilt.c 1.12 -filters/tags.key 1.1 -filters/tbl-filt.l 1.17 -filters/tbl.key 1.2 -filters/tc-filt.l 1.40 -filters/tc.key 1.3 -filters/tcl-filt.l 1.65 -filters/tcl.key 1.27 -filters/texifilt.l 1.14 -filters/texi.key 1.1 -filters/tex.key 1.4 -filters/ti-filt.l 1.30 -filters/ti.key 1.2 -filters/tpu-filt.l 1.3 -filters/tpu.key 1.5 -filters/ts.key 1.1 -filters/txt-filt.l 1.42 -filters/unfilter.c 1.12 -filters/unfilter.h 1.1 -filters/vb6.key 1.5 -filters/vb.key 1.16 -filters/vbs.key 1.4 -filters/vcproj.key 1.4 -filters/vcxproj.key 1.2 -filters/vilefilt.l 1.75 -filters/vile.key 1.9 -filters/vim.key 1.3 -filters/vl-filt.l 1.22 -filters/vlog.key 1.10 -filters/wbt-filt.l 1.13 -filters/wbt.key 1.3 -filters/xml-filt.l 1.53 -filters/xml.key 1.4 -filters/xq-filt.l 1.20 -filters/xq.key 1.12 -filters/xresfilt.l 1.30 -filters/xres.key 1.3 -filters/xs-filt.l 1.21 -filters/xs.key 1.1 -filters/xsl.key 1.13 -filters/yaccfilt.l 1.45 -filters/yacc.key 1.10 -filters/yamlfilt.l 1.48 -filters/yaml.key 1.3 -filters/zsh.key 1.2 -icons/pumpkin_48x48.png 1.2 -icons/pumpkin_48x48.svg 1.3 -icons/pumpkin_48x48.xcf 1.2 -icons/pumpkin.ico 1.3 -icons/pumpkin.xbm 1.2 -icons/pumpkin.xcf 1.1 -icons/pumpkin.xpm 1.2 -icons/sink_48x48.png 1.2 -icons/sink_48x48.svg 1.3 -icons/sink_48x48.xcf 1.1 -icons/sink.ico 1.2 -icons/sink.xbm 1.2 -icons/sink.xcf 1.1 -icons/sink.xpm 1.2 -icons/vile_48x48.png 1.3 -icons/vile_48x48.svg 1.8 -icons/vile_48x48.xcf 1.3 -icons/vile.ico 1.3 -icons/vile-mini_16x16.xpm 1.1 -icons/vile-mini_32x32.xpm 1.1 -icons/vile-mini_48x48.xpm 1.1 -icons/vile-mini.svg 1.2 -icons/vile.xbm 1.1 -icons/vile.xcf 1.1 -icons/vile.xpm 1.1 -macros/color-ls.rc 1.3 -macros/complete.rc 1.1 -macros/dates.rc 1.2 -macros/digraphs.rc 1.4 -macros/gnugpg.rc 1.3 -macros/loaderrs.rc 1.2 -macros/lxvile 1.1 -macros/lxvile.desktop 1.1 -macros/lxvile-fonts 1.1 -macros/manpage.rc 1.26 -macros/modes.rc 1.149 -macros/palettes.rc 1.8 -macros/pictmode.rc 1.4 -macros/search.rc 1.3 -macros/shifts.rc 1.4 -macros/showeach.rc 1.5 -macros/uxvile 1.1 -macros/UXVile.ad 1.1 -macros/uxvile.desktop 1.4 -macros/vileinit.rc 1.41 -macros/vile-libdir-path 1.3 -macros/vilemenu.rc 1.6 -macros/vile-pager 1.6 -macros/vileperl.rc 1.8 -macros/vile-to-html 1.1 -macros/which.rc 1.19 -macros/XVile.ad 1.8 -macros/xvile.desktop 1.4 -package/convile.nsi 1.27 -package/debian/changelog 1.28 -package/debian/compat 1.2 -package/debian/control 1.3 -package/debian/copyright 1.1 -package/debian/overrides/vile 1.1 -package/debian/README.Debian 1.1 -package/debian/rules 1.22 -package/debian/source/format 1.1 -package/debian/vile-common.docs 1.2 -package/debian/vile-common.examples 1.2 -package/debian/vile-common.files 1.1 -package/debian/vile-common.manpages 1.1 -package/debian/vile.files 1.3 -package/debian/vile-filters.files 1.1 -package/debian/vile-filters.links 1.1 -package/debian/vile.links 1.2 -package/debian/vile.menu 1.1 -package/debian/vile.mini.xpm 1.2 -package/debian/vile.postinst 1.1 -package/debian/vile.prerm 1.1 -package/debian/xvile.files 1.3 -package/debian/xvile.links 1.2 -package/debian/xvile.menu 1.2 -package/freebsd/vile/distinfo 1.2 -package/freebsd/vile/Makefile 1.2 -package/freebsd/vile/pkg-descr 1.2 -package/freebsd/vile/pkg-plist 1.2 -package/freebsd/xvile/distinfo 1.2 -package/freebsd/xvile/files/patch-x11menu.c 1.1 -package/freebsd/xvile/files/patch-x11vile.h 1.1 -package/freebsd/xvile/Makefile 1.2 -package/freebsd/xvile/pkg-descr 1.2 -package/freebsd/xvile/pkg-plist 1.2 -package/minvile.nsi 1.34 -package/vile.spec 1.58 -package/winvile64.iss 1.1 -package/winvile64-wide.iss 1.1 -package/winvile.iss 1.30 -package/winvile.nsi 1.16 -package/winvile-wide.iss 1.1 -perl/Breadcrumbs.pm 1.7 -perl/CaptHook.pm 1.6 -perl/capture.pm 1.3 -perl/dict.pm 1.5 -perl/directory.pm 1.11 -perl/dirlist.pm 1.6 -perl/gdb.pm 1.4 -perl/Glob2re.pm 1.3 -perl/Help.pm 1.7 -perl/hgrep.pm 1.7 -perl/lock.pm 1.3 -perl/man.pm 1.5 -perl/mime.pl 1.10 -perl/plugins.pl 1.7 -perl/search.pm 1.5 -perl/shell.pm 1.10 -perl/spell.pm 1.9 -perl/Vile/Exporter.pm 1.3 -perl/vileget 1.10 -perl/Vile/Manual.pm 1.6 -perl/Vile.pm 1.4 -perl/Vileserv.pm 1.13 -perl/Visit.pm 1.4 -perl/winops.pm 1.4 -plugins/Makefile 1.1 -plugins/test.c 1.1 -plugins/test.rc 1.1 -visvile/commands.cpp 1.4 -visvile/commands.h 1.1 -visvile/dsaddin.cpp 1.2 -visvile/dsaddin.h 1.1 -visvile/oleauto.cpp 1.6 -visvile/oleauto.h 1.4 -visvile/readme.txt 1.6 -visvile/resource.h 1.3 -visvile/stdafx.cpp 1.1 -visvile/stdafx.h 1.1 -visvile/tbarlrge.bmp 1.1 -visvile/tbarmedm.bmp 1.1 -visvile/visvile.cpp 1.1 -visvile/visvile.def 1.1 -visvile/visvile.dsm 1.2 -visvile/visvile.dsp 1.2 -visvile/visvile.dsw 1.2 -visvile/visvile.h 1.1 -visvile/visvile.odl 1.1 -visvile/visvile.rc 1.4 -visvile/visvile.rc2 1.1 diff -Nru vile-9.8v/tcap.c vile-9.8w/tcap.c --- vile-9.8v/tcap.c 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/tcap.c 2022-08-22 05:11:05.000000000 +0000 @@ -1,7 +1,7 @@ /* tcap: Unix V5, V7 and BS4.2 Termcap video driver * for MicroEMACS * - * $Id: tcap.c,v 1.190 2014/01/25 00:31:52 tom Exp $ + * $Id: tcap.c,v 1.191 2022/08/20 22:42:11 tom Exp $ * */ @@ -397,6 +397,8 @@ tcap_close(void) { TRACE((T_CALLED "tcap_close()\n")); + if (i_was_closed) + returnVoid(); #if OPT_VIDEO_ATTRS if (tc_SE) putpad(tc_SE); @@ -422,6 +424,10 @@ #if OPT_LOCALE vl_close_mbterm(); #endif +#if NO_LEAKS && USE_TERMINFO + del_curterm(cur_term); + cur_term = 0; +#endif i_was_closed = TRUE; returnVoid(); } diff -Nru vile-9.8v/vile.hlp vile-9.8w/vile.hlp --- vile-9.8v/vile.hlp 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/vile.hlp 2022-08-22 05:11:05.000000000 +0000 @@ -7541,8 +7541,8 @@ Copyright --------- - Copyright (c) 1995-2020,2021 by Paul Fox, Thomas Dickey, and Kevin Buettner + Copyright (c) 1995-2021,2022 by Paul Fox, Thomas Dickey, and Kevin Buettner --- (generated by make-hlp.pl from vile-hlp.html(1.121)) +-- (generated by make-hlp.pl from vile-hlp.html(1.122)) -- vile:txtmode fillcol=78 --- $Id: vile.hlp,v 1.764 2021/11/30 09:04:05 tom Exp $ +-- $Id: vile.hlp,v 1.765 2022/01/20 22:51:49 tom Exp $ diff -Nru vile-9.8v/w32cbrd.c vile-9.8w/w32cbrd.c --- vile-9.8v/w32cbrd.c 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/w32cbrd.c 2022-08-22 05:11:05.000000000 +0000 @@ -11,7 +11,7 @@ * Subsequent copies do not show this cursor. On an NT host, this * phenomenon does not occur. * - * $Id: w32cbrd.c,v 1.44 2020/01/17 22:29:27 tom Exp $ + * $Id: w32cbrd.c,v 1.45 2022/08/04 21:16:11 tom Exp $ */ #include "estruct.h" @@ -554,8 +554,6 @@ return (rc); } -#define MAX_UTF8 8 /* buffer-size big enough for any UTF-8 conversion */ - /* * Paste contents of windows clipboard (if TEXT) to current buffer. * Bound to Shift+Insert. diff -Nru vile-9.8v/w32info.rc vile-9.8w/w32info.rc --- vile-9.8v/w32info.rc 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/w32info.rc 2022-08-22 05:11:05.000000000 +0000 @@ -1,11 +1,11 @@ -// $Id: w32info.rc,v 1.18 2021/01/01 10:18:02 tom Exp $ +// $Id: w32info.rc,v 1.20 2022/01/20 22:50:36 tom Exp $ // vile:rcmode fk=8bit #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 9,8,22,0 -PRODUCTVERSION 9,8,22,0 +FILEVERSION 9,8,23,0 +PRODUCTVERSION 9,8,23,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -18,12 +18,12 @@ BEGIN VALUE "CompanyName", "http://invisible-island.net/vile/" VALUE "FileDescription", "vile - Vi LIke Emacs" - VALUE "FileVersion", "9.8.22.0" + VALUE "FileVersion", "9.8.23.0" VALUE "InternalName", "WinVile" - VALUE "LegalCopyright", "©1997-2020,2021 Thomas E. Dickey" + VALUE "LegalCopyright", "©1997-2021,2022 Thomas E. Dickey" VALUE "OriginalFilename", "winvile.exe" VALUE "ProductName", "vile - VI Like Emacs" - VALUE "ProductVersion", "9.8.22.0" + VALUE "ProductVersion", "9.8.23.0" END END BLOCK "VarFileInfo" diff -Nru vile-9.8v/w32ole.cpp vile-9.8w/w32ole.cpp --- vile-9.8v/w32ole.cpp 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/w32ole.cpp 2022-08-22 05:11:05.000000000 +0000 @@ -17,7 +17,7 @@ * "FAILED" may not be used to test an OLE return code. Use SUCCEEDED * instead. * - * $Id: w32ole.cpp,v 1.36 2020/01/17 23:12:35 tom Exp $ + * $Id: w32ole.cpp,v 1.37 2022/08/21 23:37:31 tom Exp $ */ #include "w32vile.h" @@ -1587,8 +1587,8 @@ ntwinio_redirect_hwnd(FALSE); sprintf(msg, - "Keyboard redirection to window hwnd %#0x failed, redirection disabled", - redirect_hwnd); + "Keyboard redirection to window hwnd %#0lx failed, redirection disabled", + (unsigned long) redirect_hwnd); /* Killed keyboard redirection, so make sure user sees error */ w32_message_box((HWND) winvile_hwnd(), msg, MB_OK|MB_ICONSTOP); diff -Nru vile-9.8v/wvwrap.cpp vile-9.8w/wvwrap.cpp --- vile-9.8v/wvwrap.cpp 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/wvwrap.cpp 2022-08-22 05:11:05.000000000 +0000 @@ -12,7 +12,7 @@ * Note: A great deal of the code included in this file is copied * (almost verbatim) from other vile modules. * - * $Id: wvwrap.cpp,v 1.23 2016/07/27 09:28:11 tom Exp $ + * $Id: wvwrap.cpp,v 1.24 2022/08/21 23:38:55 tom Exp $ */ #include "w32vile.h" @@ -91,7 +91,7 @@ NULL); } #else - unsigned len = strlen(source) + 1; + size_t len = strlen(source) + 1; target = typecallocn(char, len + 1); if (target != 0) memcpy(target, source, len); @@ -124,7 +124,7 @@ len); } #else - unsigned len = strlen(source) + 1; + size_t len = strlen(source) + 1; target = typecallocn(TCHAR, len + 1); if (target != 0) memcpy(target, source, len); diff -Nru vile-9.8v/xterm.c vile-9.8w/xterm.c --- vile-9.8v/xterm.c 2021-12-13 06:30:57.000000000 +0000 +++ vile-9.8w/xterm.c 2022-08-22 05:11:05.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: xterm.c,v 1.10 2010/02/09 21:32:14 tom Exp $ + * $Id: xterm.c,v 1.11 2022/08/04 21:24:31 tom Exp $ * * xterm-specific code for vi-like-emacs. */ @@ -293,7 +293,7 @@ #if OPT_MULTIBYTE int check; UINT ch; - UCHAR temp[10]; + UCHAR temp[MAX_UTF8]; ENC_CHOICES want_encoding = title_encoding; #endif TRACE(("xterm_settitle(%s)\n", string));