# vile 9.4g - patch 2004/6/17 - T.Dickey # ------------------------------------------------------------------------------ # CHANGES | 87 # MANIFEST | 10 # aclocal.m4 | 233 - # ansi.c | 480 +- # api.c | 4 # basic.c | 4 # buffer.c | 6 # builtflt.c | 4 # cmdtbl | 5 # configure | 9114 +++++++++++++++++++++---------------------- # configure.in | 124 # display.c | 111 # doc/macros.doc | 9 # dumbterm.c | 166 # edef.h | 3 # estruct.h | 14 # eval.c | 162 # exec.c | 35 # externs.c | 3 # filec.c | 6 # filters/c-filt.c | 97 # filters/dcl-filt.l | 120 # filters/dcl.key | 12 # filters/filters.rc | 16 # filters/js.key | 81 # filters/latexflt.l | 4 # filters/pl-filt.c | 174 # finderr.c | 30 # history.c | 31 # input.c | 52 # isearch.c | 4 # line.c | 6 # macros/color-ls.rc | 6 # macros/manpage.rc | 6 # macros/vileinit.rc | 10 # main.c | 4 # mktbls.c | 8 # modes.c | 4 # modetbl | 3 # npopen.c | 12 # patchlev.h | 2 # proto.h | 10 # region.c | 4 # revlist | 115 # search.c | 4 # select.c | 14 # spawn.c | 4 # statevar.c | 249 - # tbuff.c | 145 # termio.c | 6 # trace.c | 12 # vile-9.4.spec | 9 # vile-9.4g/doc/ncu-indent | 91 # vile-9.4g/plugin.c | 58 # vile-9.4g/plugin.h | 13 # vile-9.4g/plugins/Makefile | 15 # vile-9.4g/plugins/test.c | 17 # vile-9.4g/plugins/test.rc | 2 # vile.hlp | 87 # word.c | 4 # x11.c | 6 # 61 files changed, 6480 insertions(+), 5647 deletions(-) # ------------------------------------------------------------------------------ # Please remove the following file before applying this patch. # (You can feed this patch to 'sh' to do so.) rm -f doc/indent.pro exit Index: CHANGES --- vile-9.4f+/CHANGES 2004-04-12 00:13:30.000000000 +0000 +++ vile-9.4g/CHANGES 2004-06-17 23:56:32.000000000 +0000 @@ -1,5 +1,92 @@ Changes for vile 9.5 (released ??? ??? ?? ????) + 20040617 (g) + > Clark Morgan: + + modify manpage.rc and color-ls.rc to avoid showing their guts if + aborted. + + vile.hlp changes: + + add discussion of mode-pathname and mode-filename to the section + on Majormodes. + + add notes about optimizing suffixes for C versus C++ editing. + > Fabien Coutant: + + add experimental plugin support and example. + > Tom Dickey: + + indent'd ansi.c + + configure-script fixes: + + change prerequisite to autoconf 2.13.20030927 patch, mainly for + OS/2 EMX. Other systems use the 2.52-generated configure script. + + modify --with-Xaw3d, --with-neXtaw and --with-XawPlus options to + avoid being confused by options such as --without-Xaw3d. + + several fixes to accommodate quoted string definitions introduced + in some imake configurations, which did not work with the + CF_ADD_CFLAGS macro's parsing. + + modify CF_X_TOOLKIT to remove the checks for clix (obsolete) and + move the call to AC_PATH_XTRA to the beginning - which it + essentially was anyway. Now it simply calls AC_PATH_XTRA and + ensures that I can get -lXt and -lX11. Reading the code, it seems + that the IRIX6/IRIX5 issue was taken care of in autoconf 2.13. + + modify CF_NCURSES_LIBS to only look for -lmytinfo when building + with ncurses. This works around FreeBSD's broken linker semantics + when configuring for ncursesw. + + add $error-tabstop variable, to allow changing the tabstop value + used when interpreting %C results in the error finder. Most programs + assume 8, and that does not work well when editing buffers with other + tabstops such as 4. + + correct perl highlighting of subscripts which happen to be the same + as quote-operator names, e.g., + $foo{y} + (report by Daniel L Ashbrook). + + correct perl highlighting of variables within double quotes, ignoring + single-quotes which may happen to follow, e.g., + "foo = '$foo'" + (report by Daniel L Ashbrook). + + correct logic in vl_lookup_func(), which did not allow match on + ">", since that appeared to conflict with ">seq" (report by + Clark Morgan). + + change TPRINTF() macro so that if debugging trace is turned on, the + same text that would be written to [Trace] is also written to the + Trace.out file. + + modify dofmt() to handle "%*.*s" and "%.*s" formats, removed "%*S" + format. + + replace doc/indent.pro with ncu-indent, a script which allows preview + of the indent changes. Note that preview relies on bug-fixes which + are not in "official" indent. See the indent section in + http://invisible-island.net/gnu-patches/gnu-patches.html + + modify needQuotes() to return true only if both conditions apply + (the token needs quoting and it is not the first token) rather than either. + This makes [History] show things like + set tags=foo + set tags="foo bar" + rather than + set "tags"="foo" + set "tags"="foo bar" + + revise quoting of strings returned by run_func(), using new + functions tb_enquote() and tb_dequote(). This fixes case such as + set tags='' + write-message &cat "tags: " $tags + which lost one of the single-quotes when the "set" command was + interactive (report by Clark Morgan). + + modify cppmode's suffixes to look for .C, .H and .CC only on systems + where filenames are case-sensitive. + + call attrib_matches() at the end of attribute_directly() to restore + highlighting due to visual-matches. This fixes a bug where autocolor + might wipe that highlighting away (report by Clark Morgan). + + modify pattern for logmode to allow filenames such as gmake.out + + modify latexflt.l to not color "|" in TEXT state. + + add map's for newer XFree86 xterm shifted cursor-keys (see + + improve label-expression in dcl-filt.l + + modify dcl-filt.l to recognize $DECK / $EOD literal lines. + + modify c-filt.c to recognize Java double suffix, e.g., 1.0e1d + + revise/extend js.key based on ECMA-262 and other online information. + + add a mode-pathname setting for cppmode, so files under (for example) + /usr/include/g++ will be treated as C++. Newer C++ headers have + no suffixes. + + add ".hpp" to suffixes for cppmode. + + add ".el" to suffixes for lispmode. + + add an "-s" option to c-filt.c, for JavaScript (to support jsmode). + Use this to control whether to allow regular expressions in certain + cases. + 20040411 (f) > Clark Morgan: + modify vilemode, adding "sections" expression. Index: MANIFEST --- vile-9.4f+/MANIFEST 2004-04-12 00:45:53.000000000 +0000 +++ vile-9.4g/MANIFEST 2004-06-18 00:56:07.000000000 +0000 @@ -1,4 +1,4 @@ -MANIFEST for vile, version v9_4f +MANIFEST for vile, version v9_4g -------------------------------------------------------------------------------- MANIFEST this file CHANGES Change-log for VILE @@ -90,6 +90,8 @@ patchlev.h patch-level path.c functions that manipulate pathnames perl.xs Perl/C interface wrapper +plugin.c command interface to plugins +plugin.h interface of plugin.c proto.h function prototypes pscreen.h interface for PSCREEN struct ptypemap perl-interface type map @@ -148,10 +150,10 @@ doc/config.doc configuration-instructions for VILE doc/dir.doc description of perl directory-browser doc/filters.doc overview of syntax filter programs -doc/indent.pro sample 'indent' profile for vile doc/macros.doc documentation for VILE macros doc/menus.doc description of xvile (Xm and Xaw) menus doc/modes.doc overview of modes/majormodes +doc/ncu-indent copy of ncu-indent doc/oleauto.doc document Winvile OLE doc/perl.doc notes about perl interface to vile doc/visvile.doc document visvile.dll @@ -359,6 +361,10 @@ perl/spell.pm Perl: interactive spelling checker/corrector perl/vileget pass file-edit request to xvile session running Vileserv perl/winops.pm window-operations for testing the Perl5 interface +plugins subdirectory +plugins/Makefile makefile for plugin samples +plugins/test.c example of a plugin +plugins/test.rc script to exercise plugin sample visvile subdirectory visvile/commands.cpp implement commands for visvile.dll visvile/commands.h implement commands for visvile.dll Index: aclocal.m4 Prereq: 1.129 --- vile-9.4f+/aclocal.m4 2004-03-19 22:37:07.000000000 +0000 +++ vile-9.4g/aclocal.m4 2004-06-17 00:53:21.000000000 +0000 @@ -1,6 +1,6 @@ dnl vile's local definitions for autoconf. dnl -dnl $Header: /usr/build/vile/vile/RCS/aclocal.m4,v 1.129 2004/03/19 22:37:07 tom Exp $ +dnl $Header: /usr/build/vile/vile/RCS/aclocal.m4,v 1.131 2004/06/17 00:53:21 tom Exp $ dnl dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- @@ -14,18 +14,44 @@ AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), [$1], [$2], [$3])])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_CFLAGS version: 5 updated: 2002/12/01 00:12:15 +dnl CF_ADD_CFLAGS version: 7 updated: 2004/04/25 17:48:30 dnl ------------- dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS dnl The second parameter if given makes this macro verbose. +dnl +dnl Put any preprocessor definitions that use quoted strings in $EXTRA_CPPFLAGS, +dnl to simplify use of $CPPFLAGS in compiler checks, etc., that are easily +dnl confused by the quotes (which require backslashes to keep them usable). AC_DEFUN([CF_ADD_CFLAGS], [ +cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= +cf_new_extra_cppflags= + for cf_add_cflags in $1 do +case $cf_fix_cppflags in +no) case $cf_add_cflags in #(vi -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac case "$CPPFLAGS" in *$cf_add_cflags) #(vi ;; @@ -38,6 +64,17 @@ cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac done if test -n "$cf_new_cflags" ; then @@ -50,6 +87,13 @@ CPPFLAGS="$cf_new_cppflags $CPPFLAGS" fi +if test -n "$cf_new_extra_cppflags" ; then + ifelse($2,,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags)]) + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi + +AC_SUBST(EXTRA_CPPFLAGS) + ])dnl dnl --------------------------------------------------------------------------- dnl CF_ADD_INCDIR version: 4 updated: 2002/12/21 14:25:52 @@ -191,6 +235,12 @@ AC_DEFUN([CF_ARG_DISABLE], [CF_ARG_OPTION($1,[$2],[$3],[$4],yes)])dnl dnl --------------------------------------------------------------------------- +dnl CF_ARG_ENABLE version: 3 updated: 1999/03/30 17:24:31 +dnl ------------- +dnl Allow user to enable a normally-off option. +AC_DEFUN([CF_ARG_ENABLE], +[CF_ARG_OPTION($1,[$2],[$3],[$4],no)])dnl +dnl --------------------------------------------------------------------------- dnl CF_ARG_OPTION version: 3 updated: 1997/10/18 14:42:41 dnl ------------- dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus @@ -247,7 +297,7 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_CACHE version: 9 updated: 2004/01/30 15:59:13 +dnl CF_CHECK_CACHE version: 10 updated: 2004/05/23 13:03:31 dnl -------------- dnl Check if we're accidentally using a cache from a different machine. dnl Derive the system name, as a check for reusing the autoconf cache. @@ -261,7 +311,7 @@ dnl autoconf 2.5x broke compatibility with autoconf 2.13 AC_DEFUN([CF_CHECK_CACHE], [ -if test -f $srcdir/config.guess ; then +if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then ifelse([$1],,[AC_CANONICAL_HOST],[$1]) system_name="$host_os" else @@ -841,6 +891,41 @@ ])dnl dnl --------------------------------------------------------------------------- +dnl CF_FUNC_DLSYM version: 1 updated: 2004/06/16 20:52:45 +dnl ------------- +dnl Test for dlsym() and related functions, as well as libdl. +dnl +dnl Sets +dnl $cf_have_dlsym +dnl $cf_have_libdl +AC_DEFUN([CF_FUNC_DLSYM],[ +cf_have_dlsym=no +AC_CHECK_FUNC(dlsym,cf_have_dlsym=yes,[ + +cf_have_libdl=no +AC_CHECK_LIB(dl,dlsym,[ + cf_have_dlsym=yes + cf_have_libdl=yes])]) + +if test "$cf_have_dlsym" = yes ; then + test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS" + + AC_MSG_CHECKING(whether able to link to dl*() functions) + AC_TRY_LINK([#include ],[ + void *obj; + if ((obj = dlopen("filename", 0)) != 0) { + if (dlsym(obj, "symbolname") == 0) { + dlclose(obj); + } + }],[ + AC_DEFINE(HAVE_LIBDL)],[ + AC_MSG_ERROR(Cannot link test program for libdl)]) + AC_MSG_RESULT(ok) +else + AC_MSG_ERROR(Cannot find dlsym function) +fi +]) +dnl --------------------------------------------------------------------------- dnl CF_GCC_ATTRIBUTES version: 9 updated: 2002/12/21 19:25:52 dnl ----------------- dnl Test for availability of useful gcc __attribute__ directives to quiet @@ -1071,7 +1156,7 @@ test $cf_cv_select_with_time = yes && AC_DEFINE(SELECT_WITH_TIME) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_IMAKE_CFLAGS version: 15 updated: 2003/10/11 12:01:23 +dnl CF_IMAKE_CFLAGS version: 22 updated: 2004/04/25 20:55:33 dnl --------------- dnl Use imake to obtain compiler flags. We could, in principle, write tests to dnl get these, but if imake is properly configured there is no point in doing @@ -1087,6 +1172,10 @@ */imake) cf_imake_opts="-DUseInstalled=YES" # (vi ;; +*/util/xmkmf) + # A single parameter tells xmkmf where the config-files are: + cf_imake_opts="`echo $IMAKE|sed -e s,/config/util/xmkmf,,`" # (vi + ;; *) cf_imake_opts= ;; @@ -1096,19 +1185,35 @@ # config directory. if test -n "$IMAKE" ; then if mkdir conftestdir; then - cf_makefile=`cd $srcdir;pwd`/Imakefile CDPATH=; export CDPATH + cf_makefile=`cd $srcdir;pwd`/Imakefile cd conftestdir + + cat >fix_cflags.sed <<'CF_EOF' +s/\\//g +s/"//g +s/\(-D[[a-zA-Z0-9_]][[a-zA-Z0-9_]]*\)=\([[^\\"0-9 ]][[^ ]]*\([[ ]][[ ]]*[[^- ]][[^ ]]*\)*\)/\1='\\"\2\\"'/g +s/^IMAKE[[ ]]*/IMAKE_CFLAGS="/ +s/$/"/ +CF_EOF + + cat >fix_lflags.sed <<'CF_EOF' +s/^IMAKE[[ ]]*/IMAKE_LOADFLAGS="/ +s/$/"/ +CF_EOF + echo >./Imakefile test -f $cf_makefile && cat $cf_makefile >>./Imakefile + cat >> ./Imakefile <<'CF_EOF' findstddefs: - @echo 'IMAKE_CFLAGS="${ALLDEFINES} ifelse($1,,,$1)"' - @echo 'IMAKE_LOADFLAGS="${EXTRA_LOAD_FLAGS} ifelse($2,,,$2)"' + @echo IMAKE $(ALLDEFINES)ifelse($1,,,[ $1]) | sed -f fix_cflags.sed + @echo IMAKE $(EXTRA_LOAD_FLAGS)ifelse($2,,,[ $2]) | sed -f fix_lflags.sed CF_EOF + if ( $IMAKE $cf_imake_opts 1>/dev/null 2>&AC_FD_CC && test -f Makefile) then - CF_VERBOSE(Using $IMAKE) + CF_VERBOSE(Using $IMAKE $cf_imake_opts) else # sometimes imake doesn't have the config path compiled in. Find it. cf_config= @@ -1180,6 +1285,10 @@ fi fi fi + +CF_VERBOSE(IMAKE_CFLAGS $IMAKE_CFLAGS) +CF_VERBOSE(IMAKE_LOADFLAGS $IMAKE_LOADFLAGS) + AC_SUBST(IMAKE_CFLAGS) AC_SUBST(IMAKE_LOADFLAGS) ])dnl @@ -1578,7 +1687,7 @@ CF_NCURSES_VERSION ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_LIBS version: 11 updated: 2002/12/22 14:22:25 +dnl CF_NCURSES_LIBS version: 12 updated: 2004/04/27 16:26:05 dnl --------------- dnl Look for the ncurses library. This is a little complicated on Linux, dnl because it may be linked with the gpm (general purpose mouse) library. @@ -1608,7 +1717,9 @@ freebsd*) # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). - AC_CHECK_LIB(mytinfo,tgoto,[cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"]) + if test "$cf_nculib_root" = ncurses ; then + AC_CHECK_LIB(mytinfo,tgoto,[cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"]) + fi ;; esac @@ -2425,25 +2536,47 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_X_ATHENA version: 11 updated: 2002/12/26 20:56:10 +dnl CF_X_ATHENA version: 12 updated: 2004/06/15 21:14:41 dnl ----------- dnl Check for Xaw (Athena) libraries dnl +dnl Sets $cf_x_athena according to the flavor of Xaw which is used. AC_DEFUN([CF_X_ATHENA], [AC_REQUIRE([CF_X_TOOLKIT]) cf_x_athena=${cf_x_athena-Xaw} +AC_MSG_CHECKING(if you want to link with Xaw 3d library) +withval= AC_ARG_WITH(Xaw3d, - [ --with-Xaw3d link with Xaw 3d library], - [cf_x_athena=Xaw3d]) + [ --with-Xaw3d link with Xaw 3d library]) +if test "$withval" = yes ; then + cf_x_athena=Xaw3d + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) +fi +AC_MSG_CHECKING(if you want to link with neXT Athena library) +withval= AC_ARG_WITH(neXtaw, - [ --with-neXtaw link with neXT Athena library], - [cf_x_athena=neXtaw]) + [ --with-neXtaw link with neXT Athena library]) +if test "$withval" = yes ; then + cf_x_athena=neXtaw + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) +fi +AC_MSG_CHECKING(if you want to link with Athena-Plus library) +withval= AC_ARG_WITH(XawPlus, - [ --with-XawPlus link with Athena-Plus library], - [cf_x_athena=XawPlus]) + [ --with-XawPlus link with Athena-Plus library]) +if test "$withval" = yes ; then + cf_x_athena=XawPlus + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) +fi AC_CHECK_LIB(Xext,XextCreateExtension, [LIBS="-lXext $LIBS"]) @@ -2594,59 +2727,33 @@ [Unable to successfully link OpenLook library (-lXol) with test program])) dnl ])dnl dnl --------------------------------------------------------------------------- -dnl CF_X_TOOLKIT version: 9 updated: 2001/12/30 19:09:58 +dnl CF_X_TOOLKIT version: 10 updated: 2004/04/25 15:37:17 dnl ------------ dnl Check for X Toolkit libraries dnl AC_DEFUN([CF_X_TOOLKIT], [ +AC_REQUIRE([AC_PATH_XTRA]) AC_REQUIRE([CF_CHECK_CACHE]) -# We need to check for -lsocket and -lnsl here in order to work around an -# autoconf bug. autoconf-2.12 is not checking for these prior to checking for -# the X11R6 -lSM and -lICE libraries. The resultant failures cascade... -# (tested on Solaris 2.5 w/ X11R6) -SYSTEM_NAME=`echo "$cf_cv_system_name"|tr ' ' -` + +# SYSTEM_NAME=`echo "$cf_cv_system_name"|tr ' ' -` + cf_have_X_LIBS=no -case $SYSTEM_NAME in -irix[[56]]*) ;; -clix*) - # FIXME: modify the library lookup in autoconf to - # allow _s.a suffix ahead of .a - AC_CHECK_LIB(c_s,open, - [LIBS="-lc_s $LIBS" - AC_CHECK_LIB(bsd,gethostname, - [LIBS="-lbsd $LIBS" - AC_CHECK_LIB(nsl_s,gethostname, - [LIBS="-lnsl_s $LIBS" - AC_CHECK_LIB(X11_s,XOpenDisplay, - [LIBS="-lX11_s $LIBS" - AC_CHECK_LIB(Xt_s,XtAppInitialize, - [LIBS="-lXt_s $LIBS" - cf_have_X_LIBS=Xt - ]) ]) ]) ]) ]) - ;; -*) - AC_CHECK_LIB(socket,socket) - AC_CHECK_LIB(nsl,gethostname) - ;; -esac -if test $cf_have_X_LIBS = no ; then - AC_PATH_XTRA - LDFLAGS="$LDFLAGS $X_LIBS" - CF_CHECK_CFLAGS($X_CFLAGS) - AC_CHECK_LIB(X11,XOpenDisplay, - [LIBS="-lX11 $LIBS"],, - [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS]) - AC_CHECK_LIB(Xt, XtAppInitialize, - [AC_DEFINE(HAVE_LIBXT) - cf_have_X_LIBS=Xt - LIBS="-lXt $X_PRE_LIBS $LIBS"],, - [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS]) -else - LDFLAGS="$LDFLAGS $X_LIBS" - CF_CHECK_CFLAGS($X_CFLAGS) -fi +LDFLAGS="$X_LIBS $LDFLAGS" +CF_CHECK_CFLAGS($X_CFLAGS) + +AC_CHECK_FUNC(XOpenDisplay,,[ +AC_CHECK_LIB(X11,XOpenDisplay, + [LIBS="-lX11 $LIBS"],, + [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])]) + +AC_CHECK_FUNC(XtAppInitialize,,[ +AC_CHECK_LIB(Xt, XtAppInitialize, + [AC_DEFINE(HAVE_LIBXT) + cf_have_X_LIBS=Xt + LIBS="-lXt $X_PRE_LIBS $LIBS"],, + [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])]) if test $cf_have_X_LIBS = no ; then AC_WARN( Index: ansi.c Prereq: 1.44 --- vile-9.4f+/ansi.c 2003-05-27 00:21:58.000000000 +0000 +++ vile-9.4g/ansi.c 2004-06-07 21:57:41.000000000 +0000 @@ -4,23 +4,22 @@ * "termio.c". It compiles into nothing if not an ANSI device. * * - * $Header: /usr/build/vile/vile/RCS/ansi.c,v 1.44 2003/05/27 00:21:58 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/ansi.c,v 1.45 2004/06/07 21:57:41 tom Exp $ */ #include "estruct.h" #include "edef.h" -#if DISP_ANSI +#if DISP_ANSI #define SCROLL_REG 1 - -#if SYS_MSDOS +#if SYS_MSDOS #define NROW 25 #define NCOL 80 #define MAXNROW 60 #define MAXNCOL 132 -#undef SCROLL_REG /* ANSI.SYS can't do scrolling */ +#undef SCROLL_REG /* ANSI.SYS can't do scrolling */ #define SCROLL_REG 0 #endif @@ -30,158 +29,121 @@ #endif #if !defined NROW && defined(linux) -#define NROW 25 /* Screen size. */ -#define NCOL 80 /* Edit if you want to. */ +#define NROW 25 /* Screen size. */ +#define NCOL 80 /* Edit if you want to. */ #endif #ifndef NROW -#define NROW 24 /* Screen size. */ -#define NCOL 80 /* Edit if you want to. */ +#define NROW 24 /* Screen size. */ +#define NCOL 80 /* Edit if you want to. */ #endif #ifndef MAXNROW #define MAXNROW NROW #define MAXNCOL NCOL #endif -#define NPAUSE 100 /* # times thru update to pause */ - -static void ansimove (int row, int col); -static void ansieeol (void); -static void ansieeop (void); -static void ansibeep (void); -static void ansiopen (void); -static void ansirev (UINT state); -static void ansiclose (void); -static void ansiscroll (int from, int to, int n); - -#if OPT_COLOR -static void ansifcol (int color); -static void ansibcol (int color); - -static int cfcolor = -1; /* current forground color */ -static int cbcolor = -1; /* current background color */ +#define NPAUSE 100 /* # times thru update to pause */ -#endif +#if OPT_COLOR -/* - * Standard terminal interface dispatch table. Most of the fields point into - * "termio" code. - */ -TERM term = { - MAXNROW, /* max */ - NROW, /* current */ - MAXNCOL, /* max */ - NCOL, /* current */ - NPAUSE, - ansiopen, - nullterm_kopen, - nullterm_kclose, - ansiclose, - ttgetc, - ttputc, - tttypahead, - ttflush, - ansimove, - ansieeol, - ansieeop, - ansibeep, - ansirev, - nullterm_setdescrip, -#if OPT_COLOR - ansifcol, - ansibcol, -#else - nullterm_setfore, - nullterm_setback, -#endif - nullterm_setpal, /* no palette */ - nullterm_setccol, - ansiscroll, - nullterm_pflush, - nullterm_icursor, - nullterm_settitle, - nullterm_watchfd, - nullterm_unwatchfd, - nullterm_cursorvis, -}; +static int cfcolor = -1; /* current forground color */ +static int cbcolor = -1; /* current background color */ -static void ansiparm (int n); -#if SCROLL_REG -static void ansiscrollregion (int top, int bot); #endif static void -csi (void) +csi(void) { - ttputc(ESC); - ttputc('['); + ttputc(ESC); + ttputc('['); } -#if OPT_COLOR static void -ansifcol(int color) /* set the current output color */ +ansiparm(register int n) { - if (color < 0) - color = C_WHITE; - if (color == cfcolor) - return; - csi(); - ansiparm(color+30); - ttputc('m'); - cfcolor = color; + register int q, r; + +#ifdef optimize_works /* i don't think it does, although it should, to be ANSI */ + if (n == 1) + return; +#endif + + q = n / 10; + if (q != 0) { + r = q / 10; + if (r != 0) { + ttputc((r % 10) + '0'); + } + ttputc((q % 10) + '0'); + } + ttputc((n % 10) + '0'); } +#if OPT_COLOR static void -ansibcol(int color) /* set the current background color */ +ansifcol(int color) /* set the current output color */ { - if (color < 0) - color = C_BLACK; - if (color == cbcolor) - return; - csi(); - ansiparm(color+40); - ttputc('m'); - cbcolor = color; + if (color < 0) + color = C_WHITE; + if (color == cfcolor) + return; + csi(); + ansiparm(color + 30); + ttputc('m'); + cfcolor = color; +} + +static void +ansibcol(int color) /* set the current background color */ +{ + if (color < 0) + color = C_BLACK; + if (color == cbcolor) + return; + csi(); + ansiparm(color + 40); + ttputc('m'); + cbcolor = color; } #endif static void ansimove(int row, int col) { - csi(); - ansiparm(row+1); - ttputc(';'); - ansiparm(col+1); - ttputc('H'); + csi(); + ansiparm(row + 1); + ttputc(';'); + ansiparm(col + 1); + ttputc('H'); } static void ansieeol(void) { - csi(); - ttputc('K'); + csi(); + ttputc('K'); } static void ansieeop(void) { -#if OPT_COLOR - ansifcol(gfcolor); - ansibcol(gbcolor); +#if OPT_COLOR + ansifcol(gfcolor); + ansibcol(gbcolor); #endif - csi(); - ttputc('2'); - ttputc('J'); + csi(); + ttputc('2'); + ttputc('J'); } #if OPT_COLOR static void force_colors(int fc, int bc) { - cfcolor = + cfcolor = cbcolor = -1; - ansifcol(fc); - ansibcol(bc); + ansifcol(fc); + ansibcol(bc); } #endif @@ -192,72 +154,85 @@ use an "after-market" ansi driver -- nnansi593.zip, from oak.oakland.edu, or any simtel mirror. */ static void -ansirev( /* change reverse video state */ -UINT state) /* TRUE = reverse, FALSE = normal */ +ansirev( /* change reverse video state */ + UINT state) /* TRUE = reverse, FALSE = normal */ { -#if !OPT_COLOR - static UINT revstate = SORTOFTRUE; - if (state == revstate) - return; - revstate = state; +#if !OPT_COLOR + static UINT revstate = SORTOFTRUE; + if (state == revstate) + return; + revstate = state; #endif - csi(); + csi(); #if OPT_COLOR && SYS_MSDOS - ttputc('1'); /* bold-on */ + ttputc('1'); /* bold-on */ #else - if (state) ttputc('7'); /* reverse-video on */ + if (state) + ttputc('7'); /* reverse-video on */ #endif - ttputc('m'); + ttputc('m'); -#if OPT_COLOR -#if SYS_MSDOS - /* - * Setting reverse-video with ANSI.SYS seems to reset the colors to - * monochrome. Using the colors directly to simulate reverse video - * works better. Bold-face makes the foreground colors "look" right. - */ - if (state) - force_colors(cbcolor, cfcolor); - else - force_colors(cfcolor, cbcolor); -#else /* normal ANSI-reverse */ - if (state == FALSE) { - force_colors(cfcolor, cbcolor); - } -#endif /* MSDOS vs ANSI-reverse */ -#endif /* OPT_COLOR */ +#if OPT_COLOR +#if SYS_MSDOS + /* + * Setting reverse-video with ANSI.SYS seems to reset the colors to + * monochrome. Using the colors directly to simulate reverse video + * works better. Bold-face makes the foreground colors "look" right. + */ + if (state) + force_colors(cbcolor, cfcolor); + else + force_colors(cfcolor, cbcolor); +#else /* normal ANSI-reverse */ + if (state == FALSE) { + force_colors(cfcolor, cbcolor); + } +#endif /* MSDOS vs ANSI-reverse */ +#endif /* OPT_COLOR */ } #else static void -ansirev( /* change reverse video state */ -UINT state) /* TRUE = reverse, FALSE = normal */ +ansirev( /* change reverse video state */ + UINT state) /* TRUE = reverse, FALSE = normal */ { - static UINT revstate = SORTOFTRUE; - if (state == revstate) - return; - revstate = state; - - csi(); - if (state) ttputc('7'); /* reverse-video on */ - ttputc('m'); + static UINT revstate = SORTOFTRUE; + if (state == revstate) + return; + revstate = state; + + csi(); + if (state) + ttputc('7'); /* reverse-video on */ + ttputc('m'); #if OPT_COLOR - force_colors(cfcolor, cbcolor); + force_colors(cfcolor, cbcolor); #endif } #endif - static void ansibeep(void) { - ttputc(BEL); - ttflush(); + ttputc(BEL); + ttflush(); } +#if SCROLL_REG +static void +ansiscrollregion(int top, int bot) +{ + csi(); + ansiparm(top + 1); + ttputc(';'); + if (bot != term.rows - 1) + ansiparm(bot + 1); + ttputc('r'); +} +#endif /* if your ansi terminal can scroll regions, like the vt100, then define SCROLL_REG. If not, you can use delete/insert line code, which @@ -269,122 +244,133 @@ static void ansiscroll(int from, int to, int n) { - int i; - if (to == from) return; + int i; + if (to == from) + return; #if SCROLL_REG - if (to < from) { - ansiscrollregion(to, from + n - 1); - ansimove(from + n - 1,0); - for (i = from - to; i > 0; i--) - ttputc('\n'); - } else { /* from < to */ - ansiscrollregion(from, to + n - 1); - ansimove(from,0); - for (i = to - from; i > 0; i--) { - ttputc(ESC); - ttputc('M'); - } + if (to < from) { + ansiscrollregion(to, from + n - 1); + ansimove(from + n - 1, 0); + for (i = from - to; i > 0; i--) + ttputc('\n'); + } else { /* from < to */ + ansiscrollregion(from, to + n - 1); + ansimove(from, 0); + for (i = to - from; i > 0; i--) { + ttputc(ESC); + ttputc('M'); } - ansiscrollregion(0, term.maxrows-1); + } + ansiscrollregion(0, term.maxrows - 1); #else /* use insert and delete line */ #if OPT_PRETTIER_SCROLL - if (absol(from-to) > 1) { - ansiscroll(from, (from 1) { + ansiscroll(from, (from < to) ? to - 1 : to + 1, n); + if (from < to) + from = to - 1; + else + from = to + 1; + } #endif -} - -#if SCROLL_REG -static void -ansiscrollregion(int top, int bot) -{ + if (to < from) { + ansimove(to, 0); csi(); - ansiparm(top + 1); - ttputc(';'); - if (bot != term.rows-1) ansiparm(bot + 1); - ttputc('r'); -} -#endif - - -static void -ansiparm(register int n) -{ - register int q,r; - -#ifdef optimize_works /* i don't think it does, although it should, to be ANSI */ - if (n == 1) return; + ansiparm(from - to); + ttputc('M'); /* delete */ + ansimove(to + n, 0); + csi(); + ansiparm(from - to); + ttputc('L'); /* insert */ + } else { + ansimove(from + n, 0); + csi(); + ansiparm(to - from); + ttputc('M'); /* delete */ + ansimove(from, 0); + csi(); + ansiparm(to - from); + ttputc('L'); /* insert */ + } #endif - - q = n/10; - if (q != 0) { - r = q/10; - if (r != 0) { - ttputc((r%10)+'0'); - } - ttputc((q%10) + '0'); - } - ttputc((n%10) + '0'); } static void ansiopen(void) { - static int already_open = FALSE; - if (!already_open) { - already_open = TRUE; - strcpy(screen_desc, "NORMAL"); - revexist = TRUE; + static int already_open = FALSE; + if (!already_open) { + already_open = TRUE; + strcpy(screen_desc, "NORMAL"); + revexist = TRUE; #if ! SYS_MSDOS - /* Get screen size from system */ - getscreensize(&term.cols, &term.rows); - if (term.rows <= 1) - term.rows = 24; - - if (term.cols <= 1) - term.cols = 80; - /* we won't resize, but need the measured size */ - term.maxrows = term.rows; - term.maxcols = term.cols; + /* Get screen size from system */ + getscreensize(&term.cols, &term.rows); + if (term.rows <= 1) + term.rows = 24; + + if (term.cols <= 1) + term.cols = 80; + /* we won't resize, but need the measured size */ + term.maxrows = term.rows; + term.maxcols = term.cols; #endif - ttopen(); - } + ttopen(); + } } static void ansiclose(void) { - term.curmove(term.rows-1, 0); /* cf: dumbterm.c */ - ansieeol(); -#if OPT_COLOR - ansifcol(C_WHITE); - ansibcol(C_BLACK); + term.curmove(term.rows - 1, 0); /* cf: dumbterm.c */ + ansieeol(); +#if OPT_COLOR + ansifcol(C_WHITE); + ansibcol(C_BLACK); #endif } -#endif /* DISP_ANSI */ +/* + * Standard terminal interface dispatch table. Most of the fields point into + * "termio" code. + */ +TERM term = +{ + MAXNROW, /* max */ + NROW, /* current */ + MAXNCOL, /* max */ + NCOL, /* current */ + NPAUSE, + ansiopen, + nullterm_kopen, + nullterm_kclose, + ansiclose, + ttgetc, + ttputc, + tttypahead, + ttflush, + ansimove, + ansieeol, + ansieeop, + ansibeep, + ansirev, + nullterm_setdescrip, +#if OPT_COLOR + ansifcol, + ansibcol, +#else + nullterm_setfore, + nullterm_setback, +#endif + nullterm_setpal, /* no palette */ + nullterm_setccol, + ansiscroll, + nullterm_pflush, + nullterm_icursor, + nullterm_settitle, + nullterm_watchfd, + nullterm_unwatchfd, + nullterm_cursorvis, +}; + +#endif /* DISP_ANSI */ Index: api.c --- vile-9.4f+/api.c 2002-10-19 14:37:48.000000000 +0000 +++ vile-9.4g/api.c 2004-06-17 00:43:20.000000000 +0000 @@ -18,7 +18,7 @@ #include "estruct.h" -#if OPT_PERL +#if OPT_PERL || OPT_PLUGIN #include "edef.h" #include "api.h" @@ -783,7 +783,9 @@ MK = DOT; /* make sure MK is in same buffer as DOT */ +#if OPT_PERL perl_free_deferred(); +#endif } void Index: basic.c Prereq: 1.119 --- vile-9.4f+/basic.c 2003-07-27 19:01:43.000000000 +0000 +++ vile-9.4g/basic.c 2004-05-29 14:28:28.000000000 +0000 @@ -5,7 +5,7 @@ * functions that adjust the top line in the window and invalidate the * framing, are hard. * - * $Header: /usr/build/vile/vile/RCS/basic.c,v 1.119 2003/07/27 19:01:43 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/basic.c,v 1.120 2004/05/29 14:28:28 tom Exp $ * */ @@ -1084,7 +1084,7 @@ line_no(bp, mark.l), mk_to_vcol(mark, FALSE, bp, 0, 0) + 1); if (llength(mark.l) > 0) { - bprintf("%*P%*S", + bprintf("%*P%.*s", stop - DOT.o, ' ', llength(mark.l), mark.l->l_text); Index: buffer.c Prereq: 1.264 --- vile-9.4f+/buffer.c 2003-11-12 01:21:25.000000000 +0000 +++ vile-9.4g/buffer.c 2004-06-17 00:55:53.000000000 +0000 @@ -5,7 +5,7 @@ * keys. Like everyone else, they set hints * for the display system. * - * $Header: /usr/build/vile/vile/RCS/buffer.c,v 1.264 2003/11/12 01:21:25 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/buffer.c,v 1.266 2004/06/17 00:55:53 tom Exp $ * */ @@ -323,7 +323,7 @@ #if OPT_HILITEMATCH clobber_save_curbp(bp); #endif -#if OPT_PERL || OPT_TCL +#if OPT_PERL || OPT_TCL || OPT_PLUGIN api_free_private(bp->b_api_private); #endif free((char *) bp); /* Release buffer block */ @@ -1740,7 +1740,7 @@ bprintf(" %2d%c ", nbuf++, this_or_that); (void) bsizes(bp); - bprintf("%7ld %*S ", bp->b_bytecount, NBUFN - 1, bp->b_bname); + bprintf("%7ld %.*s ", bp->b_bytecount, NBUFN - 1, bp->b_bname); { char *p; Index: builtflt.c Prereq: 1.37 --- vile-9.4f+/builtflt.c 2004-03-18 01:16:08.000000000 +0000 +++ vile-9.4g/builtflt.c 2004-06-09 01:03:34.000000000 +0000 @@ -1,7 +1,7 @@ /* * Main program and I/O for external vile syntax/highlighter programs * - * $Header: /usr/build/vile/vile/RCS/builtflt.c,v 1.37 2004/03/18 01:16:08 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/builtflt.c,v 1.38 2004/06/09 01:03:34 tom Exp $ * */ @@ -446,7 +446,7 @@ static TBUFF *filter_list; int -var_FILTER_LIST(TBUFF ** rp, const char *vp) +var_FILTER_LIST(TBUFF **rp, const char *vp) { int n; Index: cmdtbl Prereq: 1.228 --- vile-9.4f+/cmdtbl 2003-02-17 11:44:28.000000000 +0000 +++ vile-9.4g/cmdtbl 2004-06-17 00:43:42.000000000 +0000 @@ -97,7 +97,7 @@ # in '!' listed, then the flag does nothing, and should be # viewed simply as documentation. # -# $Header: /usr/build/vile/vile/RCS/cmdtbl,v 1.228 2003/02/17 11:44:28 cmorgan Exp $ +# $Header: /usr/build/vile/vile/RCS/cmdtbl,v 1.229 2004/06/17 00:43:42 tom Exp $ # # @@ -945,6 +945,9 @@ loadkreg NONE "load-register" +loadplugin NONE OPT_PLUGIN + "load-plugin" + showkreg NONE OPT_SHOW_REGS "show-registers" "showregisters" !FEWNAMES Index: configure --- vile-9.4f+/configure 2004-03-19 22:37:15.000000000 +0000 +++ vile-9.4g/configure 2004-06-17 23:59:57.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.204 . +# From configure.in Revision: 1.207 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20030208. # @@ -680,8 +680,9 @@ --disable-echo display "compiling" commands --disable-extensions test: build only core functions --disable-shell test: disable shell/external commands - --with-CFLAGS=value set default for \$CFLAGS + --with-CFLAGS=value set default for $CFLAGS --with-cflags=value (same as --with-CFLAGS) + --enable-plugins compile-in plugin support --disable-filters do not build syntax filters --with-builtin-filters=XX specify filters to compile built-in vs external. Give an option value to specify only certain filters, @@ -912,7 +913,7 @@ fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:915: loading site script $ac_site_file" >&5 + { echo "$as_me:916: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} cat "$ac_site_file" >&5 . "$ac_site_file" @@ -923,7 +924,7 @@ # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:926: loading cache $cache_file" >&5 + { echo "$as_me:927: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -931,7 +932,7 @@ esac fi else - { echo "$as_me:934: creating cache $cache_file" >&5 + { echo "$as_me:935: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -947,21 +948,21 @@ eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:950: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:951: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:954: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:955: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:960: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:961: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:962: former value: $ac_old_val" >&5 + { echo "$as_me:963: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:964: current value: $ac_new_val" >&5 + { echo "$as_me:965: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -980,9 +981,9 @@ fi done if $ac_cache_corrupted; then - { echo "$as_me:983: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:984: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:985: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:986: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1002,10 +1003,10 @@ echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1005: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1006: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1008: \$? = $ac_status" >&5 + echo "$as_me:1009: \$? = $ac_status" >&5 (exit $ac_status); }; then ac_path_separator=';' else @@ -1033,7 +1034,7 @@ fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1036: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1037: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1043,11 +1044,11 @@ # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:1046: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1047: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1050: checking build system type" >&5 +echo "$as_me:1051: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1056,24 +1057,24 @@ test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1059: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1060: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:1063: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1064: error: $ac_config_sub $ac_cv_build_alias failed." >&5 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1068: result: $ac_cv_build" >&5 +echo "$as_me:1069: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -if test -f $srcdir/config.guess ; then - echo "$as_me:1076: checking host system type" >&5 +if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then + echo "$as_me:1077: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1082,12 +1083,12 @@ test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:1085: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1086: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1090: result: $ac_cv_host" >&5 +echo "$as_me:1091: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` @@ -1112,55 +1113,18 @@ fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1115: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1116: result: Configuring for $cf_cv_system_name" >&5 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6 if test ".$system_name" != ".$cf_cv_system_name" ; then - echo "$as_me:1119: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1120: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6 - { { echo "$as_me:1121: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1122: error: \"Please remove config.cache and try again.\"" >&5 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;} { (exit 1); exit 1; }; } fi -### checks for alternative programs - -echo "$as_me:1128: checking for makeflags variable" >&5 -echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 -if test "${cf_cv_makeflags+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cf_cv_makeflags='' - for cf_option in '-$(MAKEFLAGS)' '$(MFLAGS)' - do - cat >cf_makeflags.tmp </dev/null` - case "$cf_result" in - .*k) - cf_result=`${MAKE-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` - case "$cf_result" in - .*CC=*) cf_cv_makeflags= - ;; - *) cf_cv_makeflags=$cf_option - ;; - esac - break - ;; - *) echo no match "$cf_result" - ;; - esac - done - rm -f cf_makeflags.tmp - -fi -echo "$as_me:1161: result: $cf_cv_makeflags" >&5 -echo "${ECHO_T}$cf_cv_makeflags" >&6 - +### checks for compiler ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -1169,7 +1133,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1172: checking for $ac_word" >&5 +echo "$as_me:1136: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1184,7 +1148,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1187: found $ac_dir/$ac_word" >&5 +echo "$as_me:1151: found $ac_dir/$ac_word" >&5 break done @@ -1192,10 +1156,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1195: result: $CC" >&5 + echo "$as_me:1159: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1198: result: no" >&5 + echo "$as_me:1162: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1204,7 +1168,7 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1207: checking for $ac_word" >&5 +echo "$as_me:1171: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1219,7 +1183,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1222: found $ac_dir/$ac_word" >&5 +echo "$as_me:1186: found $ac_dir/$ac_word" >&5 break done @@ -1227,10 +1191,10 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1230: result: $ac_ct_CC" >&5 + echo "$as_me:1194: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1233: result: no" >&5 + echo "$as_me:1197: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1243,7 +1207,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1246: checking for $ac_word" >&5 +echo "$as_me:1210: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1258,7 +1222,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1261: found $ac_dir/$ac_word" >&5 +echo "$as_me:1225: found $ac_dir/$ac_word" >&5 break done @@ -1266,10 +1230,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1269: result: $CC" >&5 + echo "$as_me:1233: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1272: result: no" >&5 + echo "$as_me:1236: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1278,7 +1242,7 @@ ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1281: checking for $ac_word" >&5 +echo "$as_me:1245: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1293,7 +1257,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1296: found $ac_dir/$ac_word" >&5 +echo "$as_me:1260: found $ac_dir/$ac_word" >&5 break done @@ -1301,10 +1265,10 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1304: result: $ac_ct_CC" >&5 + echo "$as_me:1268: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1307: result: no" >&5 + echo "$as_me:1271: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1317,7 +1281,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1320: checking for $ac_word" >&5 +echo "$as_me:1284: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1337,7 +1301,7 @@ continue fi ac_cv_prog_CC="cc" -echo "$as_me:1340: found $ac_dir/$ac_word" >&5 +echo "$as_me:1304: found $ac_dir/$ac_word" >&5 break done @@ -1359,10 +1323,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1362: result: $CC" >&5 + echo "$as_me:1326: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1365: result: no" >&5 + echo "$as_me:1329: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1373,7 +1337,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:1376: checking for $ac_word" >&5 +echo "$as_me:1340: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1388,7 +1352,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1391: found $ac_dir/$ac_word" >&5 +echo "$as_me:1355: found $ac_dir/$ac_word" >&5 break done @@ -1396,10 +1360,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1399: result: $CC" >&5 + echo "$as_me:1363: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1402: result: no" >&5 + echo "$as_me:1366: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1412,7 +1376,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:1415: checking for $ac_word" >&5 +echo "$as_me:1379: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1427,7 +1391,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1430: found $ac_dir/$ac_word" >&5 +echo "$as_me:1394: found $ac_dir/$ac_word" >&5 break done @@ -1435,10 +1399,10 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1438: result: $ac_ct_CC" >&5 + echo "$as_me:1402: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1441: result: no" >&5 + echo "$as_me:1405: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1450,32 +1414,32 @@ fi -test -z "$CC" && { { echo "$as_me:1453: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1417: error: no acceptable cc found in \$PATH" >&5 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1458:" \ +echo "$as_me:1422:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1461: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:1425: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1464: \$? = $ac_status" >&5 + echo "$as_me:1428: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1466: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:1430: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1469: \$? = $ac_status" >&5 + echo "$as_me:1433: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1471: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:1435: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1474: \$? = $ac_status" >&5 + echo "$as_me:1438: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1478 "configure" +#line 1442 "configure" #include "confdefs.h" int @@ -1491,13 +1455,13 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1494: checking for C compiler default output" >&5 +echo "$as_me:1458: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1497: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1461: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1500: \$? = $ac_status" >&5 + echo "$as_me:1464: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last @@ -1520,34 +1484,34 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1523: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1487: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1529: result: $ac_file" >&5 +echo "$as_me:1493: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1534: checking whether the C compiler works" >&5 +echo "$as_me:1498: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1540: \"$ac_try\"") >&5 + { (eval echo "$as_me:1504: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1543: \$? = $ac_status" >&5 + echo "$as_me:1507: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1550: error: cannot run C compiled programs. + { { echo "$as_me:1514: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -1555,24 +1519,24 @@ fi fi fi -echo "$as_me:1558: result: yes" >&5 +echo "$as_me:1522: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe conftest$ac_cv_exeext ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1565: checking whether we are cross compiling" >&5 +echo "$as_me:1529: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1567: result: $cross_compiling" >&5 +echo "$as_me:1531: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1570: checking for executable suffix" >&5 +echo "$as_me:1534: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1572: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1536: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1575: \$? = $ac_status" >&5 + echo "$as_me:1539: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -1588,25 +1552,25 @@ esac done else - { { echo "$as_me:1591: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1555: error: cannot compute EXEEXT: cannot compile and link" >&5 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1597: result: $ac_cv_exeext" >&5 +echo "$as_me:1561: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1603: checking for object suffix" >&5 +echo "$as_me:1567: checking for object suffix" >&5 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1609 "configure" +#line 1573 "configure" #include "confdefs.h" int @@ -1618,10 +1582,10 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1621: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1585: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1624: \$? = $ac_status" >&5 + echo "$as_me:1588: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in @@ -1633,24 +1597,24 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1636: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1600: error: cannot compute OBJEXT: cannot compile" >&5 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1643: result: $ac_cv_objext" >&5 +echo "$as_me:1607: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1647: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1611: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1653 "configure" +#line 1617 "configure" #include "confdefs.h" int @@ -1665,16 +1629,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1668: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1632: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1671: \$? = $ac_status" >&5 + echo "$as_me:1635: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1674: \"$ac_try\"") >&5 + { (eval echo "$as_me:1638: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1677: \$? = $ac_status" >&5 + echo "$as_me:1641: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1686,19 +1650,19 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1689: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1653: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1695: checking whether $CC accepts -g" >&5 +echo "$as_me:1659: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1701 "configure" +#line 1665 "configure" #include "confdefs.h" int @@ -1710,16 +1674,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1713: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1677: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1716: \$? = $ac_status" >&5 + echo "$as_me:1680: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1719: \"$ac_try\"") >&5 + { (eval echo "$as_me:1683: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1722: \$? = $ac_status" >&5 + echo "$as_me:1686: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1729,7 +1693,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1732: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1696: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1756,16 +1720,16 @@ #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1759: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1723: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1762: \$? = $ac_status" >&5 + echo "$as_me:1726: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1765: \"$ac_try\"") >&5 + { (eval echo "$as_me:1729: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1768: \$? = $ac_status" >&5 + echo "$as_me:1732: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1777,7 +1741,7 @@ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1780 "configure" +#line 1744 "configure" #include "confdefs.h" #include $ac_declaration @@ -1790,16 +1754,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1793: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1757: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1796: \$? = $ac_status" >&5 + echo "$as_me:1760: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1799: \"$ac_try\"") >&5 + { (eval echo "$as_me:1763: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1802: \$? = $ac_status" >&5 + echo "$as_me:1766: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -1809,7 +1773,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1812 "configure" +#line 1776 "configure" #include "confdefs.h" $ac_declaration int @@ -1821,16 +1785,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1824: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1788: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1827: \$? = $ac_status" >&5 + echo "$as_me:1791: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1830: \"$ac_try\"") >&5 + { (eval echo "$as_me:1794: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1833: \$? = $ac_status" >&5 + echo "$as_me:1797: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -1862,7 +1826,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:1865: checking how to run the C preprocessor" >&5 +echo "$as_me:1829: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -1883,18 +1847,18 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 1886 "configure" +#line 1850 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:1891: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:1855: \"$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:1897: \$? = $ac_status" >&5 + echo "$as_me:1861: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -1917,17 +1881,17 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 1920 "configure" +#line 1884 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:1924: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:1888: \"$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:1930: \$? = $ac_status" >&5 + echo "$as_me:1894: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -1964,7 +1928,7 @@ else ac_cv_prog_CPP=$CPP fi -echo "$as_me:1967: result: $CPP" >&5 +echo "$as_me:1931: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -1974,18 +1938,18 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 1977 "configure" +#line 1941 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:1982: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:1946: \"$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:1988: \$? = $ac_status" >&5 + echo "$as_me:1952: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2008,17 +1972,17 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 2011 "configure" +#line 1975 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2015: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:1979: \"$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:2021: \$? = $ac_status" >&5 + echo "$as_me:1985: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2046,7 +2010,7 @@ if $ac_preproc_ok; then : else - { { echo "$as_me:2049: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2013: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2058,14 +2022,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:2061: checking whether $CC needs -traditional" >&5 + echo "$as_me:2025: checking whether $CC needs -traditional" >&5 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 if test "${ac_cv_prog_gcc_traditional+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_pattern="Autoconf.*'x'" cat >conftest.$ac_ext <<_ACEOF -#line 2068 "configure" +#line 2032 "configure" #include "confdefs.h" #include int Autoconf = TIOCGETP; @@ -2080,7 +2044,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat >conftest.$ac_ext <<_ACEOF -#line 2083 "configure" +#line 2047 "configure" #include "confdefs.h" #include int Autoconf = TCGETA; @@ -2093,1148 +2057,1282 @@ fi fi -echo "$as_me:2096: result: $ac_cv_prog_gcc_traditional" >&5 +echo "$as_me:2060: result: $ac_cv_prog_gcc_traditional" >&5 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" fi fi -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:2115: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_save_IFS=$IFS; IFS=$ac_path_separator - for ac_dir in $PATH; do - IFS=$ac_save_IFS - # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ - | /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if $as_executable_p "$ac_dir/$ac_prog"; then - if test $ac_prog = install && - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi - done - ;; - esac - done - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL=$ac_install_sh - fi -fi -echo "$as_me:2164: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' +### checks for UNIX variants that set C preprocessor variables -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +echo "$as_me:2069: checking for AIX" >&5 +echo $ECHO_N "checking for AIX... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +#line 2072 "configure" +#include "confdefs.h" +#ifdef _AIX + yes +#endif -echo "$as_me:2175: checking whether ${MAKE-make} sets \${MAKE}" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.make <<\EOF -all: - @echo 'ac_maketemp="${MAKE}"' +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "yes" >/dev/null 2>&1; then + echo "$as_me:2081: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +cat >>confdefs.h <<\EOF +#define _ALL_SOURCE 1 EOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes + else - eval ac_cv_prog_make_${ac_make}_set=no -fi -rm -f conftest.make + echo "$as_me:2088: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:2195: result: yes" >&5 +rm -f conftest* + +echo "$as_me:2093: checking for POSIXized ISC" >&5 +echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6 +if test -d /etc/conf/kconfig.d && + grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 +then + echo "$as_me:2098: result: yes" >&5 echo "${ECHO_T}yes" >&6 - SET_MAKE= + ISC=yes # If later tests want to check for ISC. + +cat >>confdefs.h <<\EOF +#define _POSIX_SOURCE 1 +EOF + + if test "$GCC" = yes; then + CC="$CC -posix" + else + CC="$CC -Xp" + fi else - echo "$as_me:2199: result: no" >&5 + echo "$as_me:2112: result: no" >&5 echo "${ECHO_T}no" >&6 - SET_MAKE="MAKE=${MAKE-make}" + ISC= fi -for ac_prog in mawk gawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:2208: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_AWK+set}" = set; then +echo "$as_me:2117: checking for minix/config.h" >&5 +echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6 +if test "${ac_cv_header_minix_config_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. + cat >conftest.$ac_ext <<_ACEOF +#line 2123 "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:2127: \"$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:2133: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_AWK="$ac_prog" -echo "$as_me:2223: found $ac_dir/$ac_word" >&5 -break -done - + ac_cpp_err=yes fi +if test -z "$ac_cpp_err"; then + ac_cv_header_minix_config_h=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_header_minix_config_h=no fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - echo "$as_me:2231: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:2152: result: $ac_cv_header_minix_config_h" >&5 +echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6 +if test $ac_cv_header_minix_config_h = yes; then + MINIX=yes else - echo "$as_me:2234: result: no" >&5 -echo "${ECHO_T}no" >&6 + MINIX= fi - test -n "$AWK" && break -done +if test "$MINIX" = yes; then -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:2244: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:2259: found $ac_dir/$ac_word" >&5 -break -done +cat >>confdefs.h <<\EOF +#define _POSIX_SOURCE 1 +EOF -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - echo "$as_me:2267: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 -else - echo "$as_me:2270: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi +cat >>confdefs.h <<\EOF +#define _POSIX_1_SOURCE 2 +EOF + +cat >>confdefs.h <<\EOF +#define _MINIX 1 +EOF fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo "$as_me:2279: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:2294: found $ac_dir/$ac_word" >&5 -break -done - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - echo "$as_me:2303: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 -else - echo "$as_me:2306: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi +### checks for compiler characteristics - RANLIB=$ac_ct_RANLIB -else - RANLIB="$ac_cv_prog_RANLIB" -fi +case $cf_cv_system_name in +os2*) + CFLAGS="$CFLAGS -Zmt" + CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__" + CXXFLAGS="$CXXFLAGS -Zmt" + # autoconf's macro sets -Zexe and suffix both, which conflict:w + LDFLAGS="$LDFLAGS -Zmt -Zcrtdll" + ac_cv_exeext=.exe + ;; +esac -case $host_os in hpux*) CPPFLAGS="-DYYCHAR_ARRAY $CPPFLAGS";; esac; for ac_prog in flex lex -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:2319: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_LEX+set}" = set; then +PROG_EXT="$EXEEXT" + +test -n "$PROG_EXT" && cat >>confdefs.h <&5 +echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6 +if test "${cf_cv_ansi_cc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$LEX"; then - ac_cv_prog_LEX="$LEX" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_LEX="$ac_prog" -echo "$as_me:2334: found $ac_dir/$ac_word" >&5 -break -done -fi -fi -LEX=$ac_cv_prog_LEX -if test -n "$LEX"; then - echo "$as_me:2342: result: $LEX" >&5 -echo "${ECHO_T}$LEX" >&6 -else - echo "$as_me:2345: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi +cf_cv_ansi_cc=no +cf_save_CFLAGS="$CFLAGS" +cf_save_CPPFLAGS="$CPPFLAGS" +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX -Aa -D_HPUX_SOURCE +# SVR4 -Xc +# UnixWare 1.2 (cannot use -Xc, since ANSI/POSIX clashes) +for cf_arg in "-DCC_HAS_PROTOS" \ + "" \ + -qlanglvl=ansi \ + -std1 \ + -Ae \ + "-Aa -D_HPUX_SOURCE" \ + -Xc +do - test -n "$LEX" && break +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_arg +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac done -test -n "$LEX" || LEX=":" -if test -z "$LEXLIB" -then - echo "$as_me:2355: checking for yywrap in -lfl" >&5 -echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6 -if test "${ac_cv_lib_fl_yywrap+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lfl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 2363 "configure" -#include "confdefs.h" +if test -n "$cf_new_cflags" ; then -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char yywrap (); -int -main () -{ -yywrap (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2382: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2385: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2388: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2391: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_fl_yywrap=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_fl_yywrap=no + CFLAGS="$CFLAGS $cf_new_cflags" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$cf_new_cppflags $CPPFLAGS" fi -echo "$as_me:2402: result: $ac_cv_lib_fl_yywrap" >&5 -echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6 -if test $ac_cv_lib_fl_yywrap = yes; then - LEXLIB="-lfl" -else - echo "$as_me:2407: checking for yywrap in -ll" >&5 -echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6 -if test "${ac_cv_lib_l_yywrap+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ll $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 2415 "configure" + +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi + + cat >conftest.$ac_ext <<_ACEOF +#line 2289 "configure" #include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" +#ifndef CC_HAS_PROTOS +#if !defined(__STDC__) || (__STDC__ != 1) +choke me #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char yywrap (); +#endif + int main () { -yywrap (); + + int test (int i, double x); + struct s1 {int (*f) (int a);}; + struct s2 {int (*f) (double a);}; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2434: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2310: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2437: \$? = $ac_status" >&5 + echo "$as_me:2313: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2440: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2316: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2443: \$? = $ac_status" >&5 + echo "$as_me:2319: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_l_yywrap=yes + cf_cv_ansi_cc="$cf_arg"; break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_l_yywrap=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.$ac_objext conftest.$ac_ext +done +CFLAGS="$cf_save_CFLAGS" +CPPFLAGS="$cf_save_CPPFLAGS" + fi -echo "$as_me:2454: result: $ac_cv_lib_l_yywrap" >&5 -echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6 -if test $ac_cv_lib_l_yywrap = yes; then - LEXLIB="-ll" +echo "$as_me:2332: result: $cf_cv_ansi_cc" >&5 +echo "${ECHO_T}$cf_cv_ansi_cc" >&6 + +if test "$cf_cv_ansi_cc" != "no"; then +if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_cv_ansi_cc +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" fi +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$cf_new_cppflags $CPPFLAGS" fi +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi -if test "x$LEX" != "x:"; then - echo "$as_me:2465: checking lex output file root" >&5 -echo $ECHO_N "checking lex output file root... $ECHO_C" >&6 -if test "${ac_cv_prog_lex_root+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # The minimal lex program is just a single line: %%. But some broken lexes -# (Solaris, I think it was) want two %% lines, so accommodate them. -echo '%% -%%' | $LEX -if test -f lex.yy.c; then - ac_cv_prog_lex_root=lex.yy -elif test -f lexyy.c; then - ac_cv_prog_lex_root=lexyy else - { { echo "$as_me:2479: error: cannot find output from $LEX; giving up" >&5 -echo "$as_me: error: cannot find output from $LEX; giving up" >&2;} - { (exit 1); exit 1; }; } + cat >>confdefs.h <<\EOF +#define CC_HAS_PROTOS 1 +EOF + fi fi -echo "$as_me:2484: result: $ac_cv_prog_lex_root" >&5 -echo "${ECHO_T}$ac_cv_prog_lex_root" >&6 -LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root -echo "$as_me:2488: checking whether yytext is a pointer" >&5 -echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6 -if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then +if test "$cf_cv_ansi_cc" = "no"; then + { { echo "$as_me:2415: error: Your compiler does not appear to recognize prototypes. +You have the following choices: + a. adjust your compiler options + b. get an up-to-date compiler + c. use a wrapper such as unproto" >&5 +echo "$as_me: error: Your compiler does not appear to recognize prototypes. +You have the following choices: + a. adjust your compiler options + b. get an up-to-date compiler + c. use a wrapper such as unproto" >&2;} + { (exit 1); exit 1; }; } +fi + +echo "$as_me:2428: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - # POSIX says lex can declare yytext either as a pointer or an array; the -# default is implementation-dependent. Figure out which it is, since -# not all implementations provide the %pointer and %array declarations. -ac_cv_prog_lex_yytext_pointer=no -echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c -ac_save_LIBS=$LIBS -LIBS="$LIBS $LEXLIB" + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -`cat $LEX_OUTPUT_ROOT.c` +#line 2436 "configure" +#include "confdefs.h" +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2504: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:2485: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2507: \$? = $ac_status" >&5 + echo "$as_me:2488: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2510: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2491: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2513: \$? = $ac_status" >&5 + echo "$as_me:2494: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_prog_lex_yytext_pointer=yes + ac_cv_prog_cc_stdc=$ac_arg +break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_save_LIBS -rm -f "${LEX_OUTPUT_ROOT}.c" - -fi -echo "$as_me:2525: result: $ac_cv_prog_lex_yytext_pointer" >&5 -echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6 -if test $ac_cv_prog_lex_yytext_pointer = yes; then - -cat >>confdefs.h <<\EOF -#define YYTEXT_POINTER 1 -EOF +rm -f conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC fi -fi +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:2511: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:2514: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac -if test "${cf_cv_subst_AR+set}" = set; then +echo "$as_me:2519: checking for an ANSI C-conforming const" >&5 +echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 +if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +#line 2525 "configure" +#include "confdefs.h" -echo "$as_me:2541: checking for archiver (symbol AR)" >&5 -echo $ECHO_N "checking for archiver (symbol AR)... $ECHO_C" >&6 -test -z "$AR" && AR=ar -echo "$as_me:2544: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6 +int +main () +{ +/* FIXME: Include the comments suggested by Paul. */ +#ifndef __cplusplus + /* Ultrix mips cc rejects this. */ + typedef int charset[2]; + const charset x; + /* SunOS 4.1.1 cc rejects this. */ + char const *const *ccp; + char **p; + /* NEC SVR4.0.2 mips cc rejects this. */ + struct point {int x, y;}; + static struct point const zero = {0,0}; + /* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in + an arm of an if-expression whose if-part is not a constant + expression */ + const char *g = "string"; + ccp = &g + (g ? g-g : 0); + /* HPUX 7.0 cc rejects these. */ + ++ccp; + p = (char**) ccp; + ccp = (char const *const *) p; + { /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; -cf_cv_subst_AR=$AR + *t++ = 0; + } + { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; + } + { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; + } + { /* AIX XL C 1.02.0.0 rejects this saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; }; + struct s *b; b->j = 5; + } + { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; + } +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2583: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2586: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2589: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2592: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_c_const=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_c_const=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext fi +echo "$as_me:2602: result: $ac_cv_c_const" >&5 +echo "${ECHO_T}$ac_cv_c_const" >&6 +if test $ac_cv_c_const = no; then -AR=${cf_cv_subst_AR} +cat >>confdefs.h <<\EOF +#define const +EOF -if test "${cf_cv_subst_AR_OPTS+set}" = set; then +fi + +echo "$as_me:2612: checking if we can initialize unions" >&5 +echo $ECHO_N "checking if we can initialize unions... $ECHO_C" >&6 +if test "${cf_cv_init_unions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "$as_me:2556: checking for archiver options (symbol AR_OPTS)" >&5 -echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6 -test -z "$AR_OPTS" && AR_OPTS=rv -echo "$as_me:2559: result: $AR_OPTS" >&5 -echo "${ECHO_T}$AR_OPTS" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 2619 "configure" +#include "confdefs.h" -cf_cv_subst_AR_OPTS=$AR_OPTS +int +main () +{ +static struct foo {int x; union {double a; int b; } bar; } c = {0,{1.0}} + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:2631: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:2634: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:2637: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:2640: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_init_unions=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_init_unions=no fi +rm -f conftest.$ac_objext conftest.$ac_ext -AR_OPTS=${cf_cv_subst_AR_OPTS} - -echo "$as_me:2567: checking if you want to see long compiling messages" >&5 -echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 - -# Check whether --enable-echo or --disable-echo was given. -if test "${enable_echo+set}" = set; then - enableval="$enable_echo" - test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then +fi +echo "$as_me:2651: result: $cf_cv_init_unions" >&5 +echo "${ECHO_T}$cf_cv_init_unions" >&6 +test $cf_cv_init_unions = no && cat >>confdefs.h <<\EOF +#define CC_CANNOT_INIT_UNIONS 1 +EOF - ECHO_LT='--silent' - ECHO_LD='@echo linking $@;' - RULE_CC=' @echo compiling $<' - SHOW_CC=' @echo compiling $@' - ECHO_CC='@' - - else - - ECHO_LT='' - ECHO_LD='' - RULE_CC='# compiling' - SHOW_CC='# compiling' - ECHO_CC='' - - fi -else - enableval=yes - - ECHO_LT='' - ECHO_LD='' - RULE_CC='# compiling' - SHOW_CC='# compiling' - ECHO_CC='' - -fi; -echo "$as_me:2601: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 - - case $cf_cv_system_name in - os2*) PATHSEP=';' ;; - *) PATHSEP=':' ;; - esac - -case $cf_cv_system_name in -os2*) - CFLAGS="$CFLAGS -Zmt" - CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__" - CXXFLAGS="$CXXFLAGS -Zmt" - # autoconf's macro sets -Zexe and suffix both, which conflict:w - LDFLAGS="$LDFLAGS -Zmt -Zcrtdll" - ac_cv_exeext=.exe - ;; -esac - -PROG_EXT="$EXEEXT" - -test -n "$PROG_EXT" && cat >>confdefs.h <&5 -echo $ECHO_N "checking for AIX... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -#line 2637 "configure" -#include "confdefs.h" -#ifdef _AIX - yes -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "yes" >/dev/null 2>&1; then - echo "$as_me:2646: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -cat >>confdefs.h <<\EOF -#define _ALL_SOURCE 1 -EOF - -else - echo "$as_me:2653: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -rm -f conftest* - -echo "$as_me:2658: checking for POSIXized ISC" >&5 -echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6 -if test -d /etc/conf/kconfig.d && - grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 -then - echo "$as_me:2663: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - ISC=yes # If later tests want to check for ISC. - -cat >>confdefs.h <<\EOF -#define _POSIX_SOURCE 1 -EOF - - if test "$GCC" = yes; then - CC="$CC -posix" - else - CC="$CC -Xp" - fi -else - echo "$as_me:2677: result: no" >&5 -echo "${ECHO_T}no" >&6 - ISC= -fi - -echo "$as_me:2682: checking for minix/config.h" >&5 -echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6 -if test "${ac_cv_header_minix_config_h+set}" = set; then +case $host_os in hpux*) CPPFLAGS="-DYYCHAR_ARRAY $CPPFLAGS";; esac; for ac_prog in flex lex +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:2661: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_LEX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 2688 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:2692: \"$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:2698: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_minix_config_h=yes + if test -n "$LEX"; then + ac_cv_prog_LEX="$LEX" # Let the user override the test. else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_minix_config_h=no + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_LEX="$ac_prog" +echo "$as_me:2676: found $ac_dir/$ac_word" >&5 +break +done + fi -rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:2717: result: $ac_cv_header_minix_config_h" >&5 -echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6 -if test $ac_cv_header_minix_config_h = yes; then - MINIX=yes +LEX=$ac_cv_prog_LEX +if test -n "$LEX"; then + echo "$as_me:2684: result: $LEX" >&5 +echo "${ECHO_T}$LEX" >&6 else - MINIX= -fi - -if test "$MINIX" = yes; then - -cat >>confdefs.h <<\EOF -#define _POSIX_SOURCE 1 -EOF - -cat >>confdefs.h <<\EOF -#define _POSIX_1_SOURCE 2 -EOF - -cat >>confdefs.h <<\EOF -#define _MINIX 1 -EOF - + echo "$as_me:2687: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -### checks for compiler characteristics + test -n "$LEX" && break +done +test -n "$LEX" || LEX=":" -echo "$as_me:2743: checking for ${CC-cc} option to accept ANSI C" >&5 -echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6 -if test "${cf_cv_ansi_cc+set}" = set; then +if test -z "$LEXLIB" +then + echo "$as_me:2697: checking for yywrap in -lfl" >&5 +echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6 +if test "${ac_cv_lib_fl_yywrap+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cf_cv_ansi_cc=no -cf_save_CFLAGS="$CFLAGS" -cf_save_CPPFLAGS="$CPPFLAGS" -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX -Aa -D_HPUX_SOURCE -# SVR4 -Xc -# UnixWare 1.2 (cannot use -Xc, since ANSI/POSIX clashes) -for cf_arg in "-DCC_HAS_PROTOS" \ - "" \ - -qlanglvl=ansi \ - -std1 \ - -Ae \ - "-Aa -D_HPUX_SOURCE" \ - -Xc -do - -cf_new_cflags= -cf_new_cppflags= -for cf_add_cflags in $cf_arg -do - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi - case "$CPPFLAGS" in - *$cf_add_cflags) #(vi - ;; - *) #(vi - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" - ;; - esac - ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" - ;; - esac -done - -if test -n "$cf_new_cflags" ; then - - CFLAGS="$CFLAGS $cf_new_cflags" -fi - -if test -n "$cf_new_cppflags" ; then - - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" -fi - - cat >conftest.$ac_ext <<_ACEOF -#line 2799 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-lfl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 2705 "configure" #include "confdefs.h" -#ifndef CC_HAS_PROTOS -#if !defined(__STDC__) || (__STDC__ != 1) -choke me -#endif +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" #endif - +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char yywrap (); int main () { - - int test (int i, double x); - struct s1 {int (*f) (int a);}; - struct s2 {int (*f) (double a);}; +yywrap (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2820: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:2724: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2823: \$? = $ac_status" >&5 + echo "$as_me:2727: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2826: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:2730: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2829: \$? = $ac_status" >&5 + echo "$as_me:2733: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_ansi_cc="$cf_arg"; break + ac_cv_lib_fl_yywrap=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +ac_cv_lib_fl_yywrap=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -CFLAGS="$cf_save_CFLAGS" -CPPFLAGS="$cf_save_CPPFLAGS" - -fi -echo "$as_me:2842: result: $cf_cv_ansi_cc" >&5 -echo "${ECHO_T}$cf_cv_ansi_cc" >&6 - -if test "$cf_cv_ansi_cc" != "no"; then -if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then - -cf_new_cflags= -cf_new_cppflags= -for cf_add_cflags in $cf_cv_ansi_cc -do - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi - case "$CPPFLAGS" in - *$cf_add_cflags) #(vi - ;; - *) #(vi - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" - ;; - esac - ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" - ;; - esac -done - -if test -n "$cf_new_cflags" ; then - - CFLAGS="$CFLAGS $cf_new_cflags" -fi - -if test -n "$cf_new_cppflags" ; then - - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi - +echo "$as_me:2744: result: $ac_cv_lib_fl_yywrap" >&5 +echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6 +if test $ac_cv_lib_fl_yywrap = yes; then + LEXLIB="-lfl" else - cat >>confdefs.h <<\EOF -#define CC_HAS_PROTOS 1 -EOF - -fi -fi - -if test "$cf_cv_ansi_cc" = "no"; then - { { echo "$as_me:2887: error: Your compiler does not appear to recognize prototypes. -You have the following choices: - a. adjust your compiler options - b. get an up-to-date compiler - c. use a wrapper such as unproto" >&5 -echo "$as_me: error: Your compiler does not appear to recognize prototypes. -You have the following choices: - a. adjust your compiler options - b. get an up-to-date compiler - c. use a wrapper such as unproto" >&2;} - { (exit 1); exit 1; }; } -fi - -echo "$as_me:2900: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo "$as_me:2749: checking for yywrap in -ll" >&5 +echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6 +if test "${ac_cv_lib_l_yywrap+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_cc_stdc=no -ac_save_CC=$CC + ac_check_lib_save_LIBS=$LIBS +LIBS="-ll $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 2908 "configure" +#line 2757 "configure" #include "confdefs.h" -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char yywrap (); int main () { -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; +yywrap (); ; return 0; } _ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:2957: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:2776: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2960: \$? = $ac_status" >&5 + echo "$as_me:2779: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2963: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:2782: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2966: \$? = $ac_status" >&5 + echo "$as_me:2785: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break + ac_cv_lib_l_yywrap=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +ac_cv_lib_l_yywrap=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:2796: result: $ac_cv_lib_l_yywrap" >&5 +echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6 +if test $ac_cv_lib_l_yywrap = yes; then + LEXLIB="-ll" fi -rm -f conftest.$ac_objext -done -rm -f conftest.$ac_ext conftest.$ac_objext -CC=$ac_save_CC fi -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:2983: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; - *) - echo "$as_me:2986: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; -esac +fi -echo "$as_me:2991: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 -if test "${ac_cv_c_const+set}" = set; then +if test "x$LEX" != "x:"; then + echo "$as_me:2807: checking lex output file root" >&5 +echo $ECHO_N "checking lex output file root... $ECHO_C" >&6 +if test "${ac_cv_prog_lex_root+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 2997 "configure" -#include "confdefs.h" - -int -main () -{ -/* FIXME: Include the comments suggested by Paul. */ -#ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; - const charset x; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *ccp; - char **p; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; - ccp = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++ccp; - p = (char**) ccp; - ccp = (char const *const *) p; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; - } - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; - } - { /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - } -#endif + # The minimal lex program is just a single line: %%. But some broken lexes +# (Solaris, I think it was) want two %% lines, so accommodate them. +echo '%% +%%' | $LEX +if test -f lex.yy.c; then + ac_cv_prog_lex_root=lex.yy +elif test -f lexyy.c; then + ac_cv_prog_lex_root=lexyy +else + { { echo "$as_me:2821: error: cannot find output from $LEX; giving up" >&5 +echo "$as_me: error: cannot find output from $LEX; giving up" >&2;} + { (exit 1); exit 1; }; } +fi +fi +echo "$as_me:2826: result: $ac_cv_prog_lex_root" >&5 +echo "${ECHO_T}$ac_cv_prog_lex_root" >&6 +LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root - ; - return 0; -} +echo "$as_me:2830: checking whether yytext is a pointer" >&5 +echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6 +if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # POSIX says lex can declare yytext either as a pointer or an array; the +# default is implementation-dependent. Figure out which it is, since +# not all implementations provide the %pointer and %array declarations. +ac_cv_prog_lex_yytext_pointer=no +echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c +ac_save_LIBS=$LIBS +LIBS="$LIBS $LEXLIB" +cat >conftest.$ac_ext <<_ACEOF +`cat $LEX_OUTPUT_ROOT.c` _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3055: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:2846: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3058: \$? = $ac_status" >&5 + echo "$as_me:2849: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3061: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:2852: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3064: \$? = $ac_status" >&5 + echo "$as_me:2855: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_c_const=yes + ac_cv_prog_lex_yytext_pointer=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_c_const=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_save_LIBS +rm -f "${LEX_OUTPUT_ROOT}.c" + fi -echo "$as_me:3074: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6 -if test $ac_cv_c_const = no; then +echo "$as_me:2867: result: $ac_cv_prog_lex_yytext_pointer" >&5 +echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6 +if test $ac_cv_prog_lex_yytext_pointer = yes; then cat >>confdefs.h <<\EOF -#define const +#define YYTEXT_POINTER 1 EOF fi -echo "$as_me:3084: checking if we can initialize unions" >&5 -echo $ECHO_N "checking if we can initialize unions... $ECHO_C" >&6 -if test "${cf_cv_init_unions+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +fi - cat >conftest.$ac_ext <<_ACEOF -#line 3091 "configure" -#include "confdefs.h" +### checks for alternative programs -int -main () -{ -static struct foo {int x; union {double a; int b; } bar; } c = {0,{1.0}} - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:3103: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:3106: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3109: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3112: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cf_cv_init_unions=yes +echo "$as_me:2881: checking for makeflags variable" >&5 +echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6 +if test "${cf_cv_makeflags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cf_cv_init_unions=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext + + cf_cv_makeflags='' + for cf_option in '-$(MAKEFLAGS)' '$(MFLAGS)' + do + cat >cf_makeflags.tmp </dev/null` + case "$cf_result" in + .*k) + cf_result=`${MAKE-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` + case "$cf_result" in + .*CC=*) cf_cv_makeflags= + ;; + *) cf_cv_makeflags=$cf_option + ;; + esac + break + ;; + *) echo no match "$cf_result" + ;; + esac + done + rm -f cf_makeflags.tmp fi -echo "$as_me:3123: result: $cf_cv_init_unions" >&5 -echo "${ECHO_T}$cf_cv_init_unions" >&6 -test $cf_cv_init_unions = no && cat >>confdefs.h <<\EOF -#define CC_CANNOT_INIT_UNIONS 1 -EOF +echo "$as_me:2914: result: $cf_cv_makeflags" >&5 +echo "${ECHO_T}$cf_cv_makeflags" >&6 -### options to control how much we build -echo "$as_me:3130: checking if you wish to build only core functions" >&5 -echo $ECHO_N "checking if you wish to build only core functions... $ECHO_C" >&6 +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# ./install, which can be erroneously created by make from ./install.sh. +echo "$as_me:2929: checking for a BSD compatible install" >&5 +echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +if test -z "$INSTALL"; then +if test "${ac_cv_path_install+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_save_IFS=$IFS; IFS=$ac_path_separator + for ac_dir in $PATH; do + IFS=$ac_save_IFS + # Account for people who put trailing slashes in PATH elements. + case $ac_dir/ in + / | ./ | .// | /cC/* \ + | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ + | /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + if $as_executable_p "$ac_dir/$ac_prog"; then + if test $ac_prog = install && + grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + ac_cv_path_install="$ac_dir/$ac_prog -c" + break 2 + fi + fi + done + ;; + esac + done -# Check whether --enable-extensions or --disable-extensions was given. -if test "${enable_extensions+set}" = set; then - enableval="$enable_extensions" - test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then - DISABLE_EXTS=yes +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install else - DISABLE_EXTS=no + # As a last resort, use the slow shell script. We don't cache a + # path for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the path is relative. + INSTALL=$ac_install_sh fi -else - enableval=yes - DISABLE_EXTS=no - -fi; -echo "$as_me:3147: result: $DISABLE_EXTS" >&5 -echo "${ECHO_T}$DISABLE_EXTS" >&6 -if test "$DISABLE_EXTS" = yes ; then - cat >>confdefs.h <<\EOF -#define SMALLER 1 -EOF +fi +echo "$as_me:2978: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6 - cat >>confdefs.h <<\EOF -#define FEWNAMES 1 -EOF +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - cf_extensions=no -else - EXTRAOBJS="$EXTRAOBJS api.o btree.o history.o isearch.o select.o statevar.o ucrypt.o" - cf_extensions=yes -fi +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -echo "$as_me:3164: checking if you wish to disable shell/external commands" >&5 -echo $ECHO_N "checking if you wish to disable shell/external commands... $ECHO_C" >&6 +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Check whether --enable-shell or --disable-shell was given. -if test "${enable_shell+set}" = set; then - enableval="$enable_shell" - test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then - DISABLE_SHELL=yes - else - DISABLE_SHELL=no - fi +echo "$as_me:2989: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - enableval=yes - DISABLE_SHELL=no - -fi; -echo "$as_me:3181: result: $DISABLE_SHELL" >&5 -echo "${ECHO_T}$DISABLE_SHELL" >&6 -if test "$DISABLE_SHELL" = yes ; then - cat >>confdefs.h <<\EOF -#define OPT_SHELL 0 + cat >conftest.make <<\EOF +all: + @echo 'ac_maketemp="${MAKE}"' EOF - +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` +if test -n "$ac_maketemp"; then + eval ac_cv_prog_make_${ac_make}_set=yes else - EXTRAOBJS="$EXTRAOBJS npopen.o spawn.o" + eval ac_cv_prog_make_${ac_make}_set=no +fi +rm -f conftest.make +fi +if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then + echo "$as_me:3009: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + SET_MAKE= +else + echo "$as_me:3013: result: no" >&5 +echo "${ECHO_T}no" >&6 + SET_MAKE="MAKE=${MAKE-make}" fi -### use option --with-cflags to set default CFLAGS -echo "$as_me:3193: checking for CFLAGS options" >&5 -echo $ECHO_N "checking for CFLAGS options... $ECHO_C" >&6 - -# Check whether --with-CFLAGS or --without-CFLAGS was given. -if test "${with_CFLAGS+set}" = set; then - withval="$with_CFLAGS" - cflags="$withval" -fi; -if test -z "$cflags"; then +for ac_prog in mawk gawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:3022: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_AWK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_AWK="$ac_prog" +echo "$as_me:3037: found $ac_dir/$ac_word" >&5 +break +done -# Check whether --with-cflags or --without-cflags was given. -if test "${with_cflags+set}" = set; then - withval="$with_cflags" - cflags="$withval" -fi; fi - -# if the user specified nothing else, set -O. user can override -# with --with-cflags=" " -if test -n "$cflags"; then - CFLAGS="$cflags" -elif test -z "$CFLAGS" ; then - CFLAGS="-O" fi -echo "$as_me:3217: result: $cflags" >&5 -echo "${ECHO_T}$cflags" >&6 +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + echo "$as_me:3045: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6 +else + echo "$as_me:3048: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi -echo "$as_me:3220: checking if you want to build syntax filters" >&5 -echo $ECHO_N "checking if you want to build syntax filters... $ECHO_C" >&6 + test -n "$AWK" && break +done -# Check whether --enable-filters or --disable-filters was given. -if test "${enable_filters+set}" = set; then - enableval="$enable_filters" - test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then - with_filters=no - else - with_filters=yes - fi +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +echo "$as_me:3058: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +echo "$as_me:3073: found $ac_dir/$ac_word" >&5 +break +done + +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + echo "$as_me:3081: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6 +else + echo "$as_me:3084: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +echo "$as_me:3093: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_RANLIB="ranlib" +echo "$as_me:3108: found $ac_dir/$ac_word" >&5 +break +done + + test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + echo "$as_me:3117: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6 +else + echo "$as_me:3120: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + RANLIB=$ac_ct_RANLIB +else + RANLIB="$ac_cv_prog_RANLIB" +fi + +if test "${cf_cv_subst_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +echo "$as_me:3133: checking for archiver (symbol AR)" >&5 +echo $ECHO_N "checking for archiver (symbol AR)... $ECHO_C" >&6 +test -z "$AR" && AR=ar +echo "$as_me:3136: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6 + +cf_cv_subst_AR=$AR +fi + +AR=${cf_cv_subst_AR} + +if test "${cf_cv_subst_AR_OPTS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +echo "$as_me:3148: checking for archiver options (symbol AR_OPTS)" >&5 +echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6 +test -z "$AR_OPTS" && AR_OPTS=rv +echo "$as_me:3151: result: $AR_OPTS" >&5 +echo "${ECHO_T}$AR_OPTS" >&6 + +cf_cv_subst_AR_OPTS=$AR_OPTS +fi + +AR_OPTS=${cf_cv_subst_AR_OPTS} + +echo "$as_me:3159: checking if you want to see long compiling messages" >&5 +echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 + +# Check whether --enable-echo or --disable-echo was given. +if test "${enable_echo+set}" = set; then + enableval="$enable_echo" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + + ECHO_LT='--silent' + ECHO_LD='@echo linking $@;' + RULE_CC=' @echo compiling $<' + SHOW_CC=' @echo compiling $@' + ECHO_CC='@' + + else + + ECHO_LT='' + ECHO_LD='' + RULE_CC='# compiling' + SHOW_CC='# compiling' + ECHO_CC='' + + fi +else + enableval=yes + + ECHO_LT='' + ECHO_LD='' + RULE_CC='# compiling' + SHOW_CC='# compiling' + ECHO_CC='' + +fi; +echo "$as_me:3193: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 + + case $cf_cv_system_name in + os2*) PATHSEP=';' ;; + *) PATHSEP=':' ;; + esac + + case $cf_cv_system_name in + OS/2*) LIB_PREFIX='' ;; + os2*) LIB_PREFIX='' ;; + *) LIB_PREFIX='lib' ;; + esac + +### options to control how much we build +echo "$as_me:3208: checking if you wish to build only core functions" >&5 +echo $ECHO_N "checking if you wish to build only core functions... $ECHO_C" >&6 + +# Check whether --enable-extensions or --disable-extensions was given. +if test "${enable_extensions+set}" = set; then + enableval="$enable_extensions" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + DISABLE_EXTS=yes + else + DISABLE_EXTS=no + fi +else + enableval=yes + DISABLE_EXTS=no + +fi; +echo "$as_me:3225: result: $DISABLE_EXTS" >&5 +echo "${ECHO_T}$DISABLE_EXTS" >&6 +if test "$DISABLE_EXTS" = yes ; then + cat >>confdefs.h <<\EOF +#define SMALLER 1 +EOF + + cat >>confdefs.h <<\EOF +#define FEWNAMES 1 +EOF + + cf_extensions=no +else + EXTRAOBJS="$EXTRAOBJS api.o btree.o history.o isearch.o select.o statevar.o ucrypt.o" + cf_extensions=yes +fi + +echo "$as_me:3242: checking if you wish to disable shell/external commands" >&5 +echo $ECHO_N "checking if you wish to disable shell/external commands... $ECHO_C" >&6 + +# Check whether --enable-shell or --disable-shell was given. +if test "${enable_shell+set}" = set; then + enableval="$enable_shell" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + DISABLE_SHELL=yes + else + DISABLE_SHELL=no + fi +else + enableval=yes + DISABLE_SHELL=no + +fi; +echo "$as_me:3259: result: $DISABLE_SHELL" >&5 +echo "${ECHO_T}$DISABLE_SHELL" >&6 +if test "$DISABLE_SHELL" = yes ; then + cat >>confdefs.h <<\EOF +#define OPT_SHELL 0 +EOF + +else + EXTRAOBJS="$EXTRAOBJS npopen.o spawn.o" +fi + +### use option --with-cflags to set default CFLAGS +echo "$as_me:3271: checking for CFLAGS options" >&5 +echo $ECHO_N "checking for CFLAGS options... $ECHO_C" >&6 + +# Check whether --with-CFLAGS or --without-CFLAGS was given. +if test "${with_CFLAGS+set}" = set; then + withval="$with_CFLAGS" + cflags="$withval" +fi; +if test -z "$cflags"; then + +# Check whether --with-cflags or --without-cflags was given. +if test "${with_cflags+set}" = set; then + withval="$with_cflags" + cflags="$withval" +fi; +fi + +# if the user specified nothing else, set -O. user can override +# with --with-cflags=" " +if test -n "$cflags"; then + CFLAGS="$cflags" +elif test -z "$CFLAGS" ; then + CFLAGS="-O" +fi +echo "$as_me:3295: result: $cflags" >&5 +echo "${ECHO_T}$cflags" >&6 + +echo "$as_me:3298: 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. +if test "${enable_plugins+set}" = set; then + enableval="$enable_plugins" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + with_plugins=yes + else + with_plugins=no + fi +else + enableval=no + with_plugins=no + +fi; +echo "$as_me:3315: result: $with_plugins" >&5 +echo "${ECHO_T}$with_plugins" >&6 + +echo "$as_me:3318: checking if you want to build syntax filters" >&5 +echo $ECHO_N "checking if you want to build syntax filters... $ECHO_C" >&6 + +# Check whether --enable-filters or --disable-filters was given. +if test "${enable_filters+set}" = set; then + enableval="$enable_filters" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + with_filters=no + else + with_filters=yes + fi else enableval=yes with_filters=yes fi; -echo "$as_me:3237: result: $with_filters" >&5 +echo "$as_me:3335: result: $with_filters" >&5 echo "${ECHO_T}$with_filters" >&6 MAKE_FILTERS= @@ -3246,7 +3344,7 @@ : ${VILE_LOADABLE_FILTERS=none} : ${VILE_EXTERNAL_FILTERS=all} -echo "$as_me:3249: checking if you want built-in syntax filters" >&5 +echo "$as_me:3347: checking if you want built-in syntax filters" >&5 echo $ECHO_N "checking if you want built-in syntax filters... $ECHO_C" >&6 # Check whether --with-builtin-filters or --without-builtin-filters was given. @@ -3257,10 +3355,10 @@ VILE_BUILT_IN_FILTERS=none fi; test "$VILE_BUILT_IN_FILTERS" = no && VILE_BUILT_IN_FILTERS=none -echo "$as_me:3260: result: $VILE_BUILT_IN_FILTERS" >&5 +echo "$as_me:3358: result: $VILE_BUILT_IN_FILTERS" >&5 echo "${ECHO_T}$VILE_BUILT_IN_FILTERS" >&6 -echo "$as_me:3263: checking if you want loadable syntax filters" >&5 +echo "$as_me:3361: checking if you want loadable syntax filters" >&5 echo $ECHO_N "checking if you want loadable syntax filters... $ECHO_C" >&6 # Check whether --with-loadable-filters or --without-loadable-filters was given. @@ -3271,7 +3369,7 @@ VILE_LOADABLE_FILTERS=none fi; test "$VILE_LOADABLE_FILTERS" = no && VILE_LOADABLE_FILTERS=none -echo "$as_me:3274: result: $VILE_LOADABLE_FILTERS" >&5 +echo "$as_me:3372: result: $VILE_LOADABLE_FILTERS" >&5 echo "${ECHO_T}$VILE_LOADABLE_FILTERS" >&6 # If both "--with-builtin-filters" and "--with-loadable-filters" were given, @@ -3289,7 +3387,7 @@ do if test "$cf_b" = "$cf_l" then - { { echo "$as_me:3292: error: Cannot overlap built-in and loadable filter lists" >&5 + { { echo "$as_me:3390: error: Cannot overlap built-in and loadable filter lists" >&5 echo "$as_me: error: Cannot overlap built-in and loadable filter lists" >&2;} { (exit 1); exit 1; }; } fi @@ -3332,7 +3430,7 @@ test -z "$VILE_EXTERNAL_FILTERS" && VILE_EXTERNAL_FILTERS=none fi -echo "$as_me:3335: checking if any filters require flex" >&5 +echo "$as_me:3433: checking if any filters require flex" >&5 echo $ECHO_N "checking if any filters require flex... $ECHO_C" >&6 builtins=`sh $srcdir/filters/makelist.sh $srcdir/filters/genmake.mak l "$VILE_BUILT_IN_FILTERS"` @@ -3345,48 +3443,48 @@ else cf_needflex=no fi -echo "$as_me:3348: result: $cf_needflex" >&5 +echo "$as_me:3446: result: $cf_needflex" >&5 echo "${ECHO_T}$cf_needflex" >&6 if test "$cf_needflex" = yes ; then test -z "$LEX" && LEX=lex -echo "$as_me:3354: checking if $LEX is really flex" >&5 +echo "$as_me:3452: checking if $LEX is really flex" >&5 echo $ECHO_N "checking if $LEX is really flex... $ECHO_C" >&6 if ( $LEX '-?' 2>&1 |fgrep flex >/dev/null ) then - echo "$as_me:3358: result: yes" >&5 + echo "$as_me:3456: result: yes" >&5 echo "${ECHO_T}yes" >&6 - echo "$as_me:3360: checking version of $LEX" >&5 + echo "$as_me:3458: checking version of $LEX" >&5 echo $ECHO_N "checking version of $LEX... $ECHO_C" >&6 LEX_VERSION=`$LEX --version 2>&1 | sed -e 's/^.* //;s/^[^0-9]*//'` - echo "$as_me:3363: result: $LEX_VERSION" >&5 + echo "$as_me:3461: result: $LEX_VERSION" >&5 echo "${ECHO_T}$LEX_VERSION" >&6 else - echo "$as_me:3366: result: no" >&5 + echo "$as_me:3464: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test -z "$LEX_VERSION" then - { { echo "$as_me:3372: error: You need flex to compile builtin filters" >&5 + { { echo "$as_me:3470: error: You need flex to compile builtin filters" >&5 echo "$as_me: error: You need flex to compile builtin filters" >&2;} { (exit 1); exit 1; }; } elif ( expr $LEX_VERSION \< 2.5 >/dev/null ) then - { { echo "$as_me:3377: error: Sorry - your version of flex is too old: $LEX_VERSION" >&5 + { { echo "$as_me:3475: error: Sorry - your version of flex is too old: $LEX_VERSION" >&5 echo "$as_me: error: Sorry - your version of flex is too old: $LEX_VERSION" >&2;} { (exit 1); exit 1; }; } elif ( expr $LEX_VERSION \>= 2.6 >/dev/null ) then - { { echo "$as_me:3382: error: Sorry - your version of flex is too unstable: $LEX_VERSION" >&5 + { { echo "$as_me:3480: error: Sorry - your version of flex is too unstable: $LEX_VERSION" >&5 echo "$as_me: error: Sorry - your version of flex is too unstable: $LEX_VERSION" >&2;} { (exit 1); exit 1; }; } else LEX_SUBVERSION=`echo "$LEX_VERSION" | sed -e 's/^2.5.//'` if test -z "$LEX_SUBVERSION" then - { { echo "$as_me:3389: error: This version of flex cannot compile builtin filters" >&5 + { { echo "$as_me:3487: error: This version of flex cannot compile builtin filters" >&5 echo "$as_me: error: This version of flex cannot compile builtin filters" >&2;} { (exit 1); exit 1; }; } elif test $LEX_SUBVERSION = 4a @@ -3395,7 +3493,7 @@ elif ( expr $LEX_SUBVERSION \> 4 >/dev/null ) then - { { echo "$as_me:3398: error: This version of flex cannot compile builtin filters" >&5 + { { echo "$as_me:3496: error: This version of flex cannot compile builtin filters" >&5 echo "$as_me: error: This version of flex cannot compile builtin filters" >&2;} { (exit 1); exit 1; }; } fi @@ -3410,7 +3508,7 @@ MAKE_FILTERS="#" fi -echo "$as_me:3413: checking for library path" >&5 +echo "$as_me:3511: checking for library path" >&5 echo $ECHO_N "checking for library path... $ECHO_C" >&6 # Check whether --with-libdir-path or --without-libdir-path was given. @@ -3444,7 +3542,7 @@ cf_src_path=`echo $cf_src_path | sed -e s%NONE%$ac_default_prefix%` ;; *) - { { echo "$as_me:3447: error: expected a pathname, not \"$cf_src_path\"" >&5 + { { echo "$as_me:3545: error: expected a pathname, not \"$cf_src_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -3466,10 +3564,10 @@ eval 'VILE_LIBDIR_PATH="$cf_dst_path"' -echo "$as_me:3469: result: $VILE_LIBDIR_PATH" >&5 +echo "$as_me:3567: result: $VILE_LIBDIR_PATH" >&5 echo "${ECHO_T}$VILE_LIBDIR_PATH" >&6 -echo "$as_me:3472: checking for startup path" >&5 +echo "$as_me:3570: checking for startup path" >&5 echo $ECHO_N "checking for startup path... $ECHO_C" >&6 # Check whether --with-startup-path or --without-startup-path was given. @@ -3503,7 +3601,7 @@ cf_src_path=`echo $cf_src_path | sed -e s%NONE%$ac_default_prefix%` ;; *) - { { echo "$as_me:3506: error: expected a pathname, not \"$cf_src_path\"" >&5 + { { echo "$as_me:3604: error: expected a pathname, not \"$cf_src_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -3525,10 +3623,10 @@ eval 'VILE_STARTUP_PATH="$cf_dst_path"' -echo "$as_me:3528: result: $VILE_STARTUP_PATH" >&5 +echo "$as_me:3626: result: $VILE_STARTUP_PATH" >&5 echo "${ECHO_T}$VILE_STARTUP_PATH" >&6 -echo "$as_me:3531: checking if $LEX supports states" >&5 +echo "$as_me:3629: checking if $LEX supports states" >&5 echo $ECHO_N "checking if $LEX supports states... $ECHO_C" >&6 cat >conftest.l <&5 +if { (eval echo "$as_me:3639: \"$cf_lex_states\"") >&5 (eval $cf_lex_states) 2>&5 ac_status=$? - echo "$as_me:3544: \$? = $ac_status" >&5 + echo "$as_me:3642: \$? = $ac_status" >&5 (exit $ac_status); }; then cf_lex_states=yes else cf_lex_states=no fi -echo "$as_me:3550: result: $cf_lex_states" >&5 +echo "$as_me:3648: result: $cf_lex_states" >&5 echo "${ECHO_T}$cf_lex_states" >&6 rm -f conftest.* $LEX_OUTPUT_ROOT.c MAKE_LEX= if test "$cf_lex_states" != yes ; then - { echo "$as_me:3555: WARNING: Your $LEX program does not support states. Get flex." >&5 + { echo "$as_me:3653: WARNING: Your $LEX program does not support states. Get flex." >&5 echo "$as_me: WARNING: Your $LEX program does not support states. Get flex." >&2;} MAKE_LEX="#" fi -echo "$as_me:3560: checking if you want to use perl as an extension language" >&5 +echo "$as_me:3658: checking if you want to use perl as an extension language" >&5 echo $ECHO_N "checking if you want to use perl as an extension language... $ECHO_C" >&6 # Check whether --with-perl or --without-perl was given. @@ -3567,3436 +3665,3074 @@ else with_perl=no fi; -echo "$as_me:3570: result: $with_perl" >&5 +echo "$as_me:3668: result: $with_perl" >&5 echo "${ECHO_T}$with_perl" >&6 if test "$with_perl" = yes ; then # find perl binary -echo "$as_me:3574: checking for perl-5.004" >&5 +echo "$as_me:3672: checking for perl-5.004" >&5 echo $ECHO_N "checking for perl-5.004... $ECHO_C" >&6 if test "${cf_cv_prog_PERL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "configure:3579: ...version 5.004 required" >&5 + echo "configure:3677: ...version 5.004 required" >&5 # allow user to override if test -n "$PERL"; then cf_try="$PERL" else cf_try="perl perl5" fi - - cf_version=`echo '[]'|sed -e 's/^./$/'` - for cf_prog in $cf_try; do - echo "configure:3589: trying $cf_prog" >&5 - if ($cf_prog -e 'printf "found version %g\n",'$cf_version';exit('$cf_version'<5.004)') 1>&5 2>&1; then - cf_cv_prog_PERL=$cf_prog - break - fi - done -fi -PERL="$cf_cv_prog_PERL" -if test -n "$PERL"; then - echo "$as_me:3598: result: $PERL" >&5 -echo "${ECHO_T}$PERL" >&6 -else - echo "$as_me:3601: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - if test "$PERL" = no; then - { { echo "$as_me:3606: error: perl not found" >&5 -echo "$as_me: error: perl not found" >&2;} - { (exit 1); exit 1; }; } - fi - perl_lib_path=`$PERL -MConfig -e 'print $Config{privlib}'` - cat >>confdefs.h <<\EOF -#define OPT_PERL 1 -EOF - - EXTRAOBJS="$EXTRAOBJS perl.o" - LINK_PREFIX=`$PERL -MConfig -e 'print $Config{shrpenv}'` - ac_link="$LINK_PREFIX $ac_link" - -test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 - -cf_check_cflags="$CFLAGS" -cf_check_cppflags="$CPPFLAGS" - -cf_new_cflags= -cf_new_cppflags= -for cf_add_cflags in `$PERL -MExtUtils::Embed -e ccopts` -do - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi - case "$CPPFLAGS" in - *$cf_add_cflags) #(vi - ;; - *) #(vi - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" - ;; - esac - ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" - ;; - esac -done - -if test -n "$cf_new_cflags" ; then - test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 - - CFLAGS="$CFLAGS $cf_new_cflags" -fi - -if test -n "$cf_new_cppflags" ; then - test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 - - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" -fi - -if test "$cf_check_cflags" != "$CFLAGS" ; then -cat >conftest.$ac_ext <<_ACEOF -#line 3658 "configure" -#include "confdefs.h" -#include -int -main () -{ -printf("Hello world"); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3670: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3673: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3676: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3679: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 - - if test "$cf_check_cppflags" != "$CPPFLAGS" ; then - test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 - - fi - CFLAGS="$cf_check_flags" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi - - LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`" - EXTRA_INSTALL_DIRS="$EXTRA_INSTALL_DIRS \$(INSTALL_PERL_DIRS)" - EXTRA_INSTALL_FILES="$EXTRA_INSTALL_FILES \$(INSTALL_PERL_FILES)" -fi - -# X11 checks will sometimes add to CFLAGS. We want the state of CFLAGS -# prior to these checks - -echo "$as_me:3704: checking for getpwnam" >&5 -echo $ECHO_N "checking for getpwnam... $ECHO_C" >&6 -if test "${ac_cv_func_getpwnam+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 3710 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getpwnam (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char getpwnam (); -char (*f) (); - -int -main () -{ -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getpwnam) || defined (__stub___getpwnam) -choke me -#else -f = getpwnam; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3741: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3744: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3747: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3750: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_getpwnam=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_getpwnam=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:3760: result: $ac_cv_func_getpwnam" >&5 -echo "${ECHO_T}$ac_cv_func_getpwnam" >&6 -if test $ac_cv_func_getpwnam = yes; then - : -else - -echo "$as_me:3766: checking for getpwnam in -lsun" >&5 -echo $ECHO_N "checking for getpwnam in -lsun... $ECHO_C" >&6 -if test "${ac_cv_lib_sun_getpwnam+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsun $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 3774 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char getpwnam (); -int -main () -{ -getpwnam (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3793: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3796: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3799: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3802: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_sun_getpwnam=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_sun_getpwnam=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:3813: result: $ac_cv_lib_sun_getpwnam" >&5 -echo "${ECHO_T}$ac_cv_lib_sun_getpwnam" >&6 -if test $ac_cv_lib_sun_getpwnam = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_LINT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$LINT"; then - ac_cv_prog_LINT="$LINT" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_LINT="$ac_prog" -echo "$as_me:3846: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -LINT=$ac_cv_prog_LINT -if test -n "$LINT"; then - echo "$as_me:3854: result: $LINT" >&5 -echo "${ECHO_T}$LINT" >&6 -else - echo "$as_me:3857: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$LINT" && break -done - -if test -n "$LINT" -then - cat >>confdefs.h <<\EOF -#define SYSTEM_HAS_LINT_PROG 1 -EOF - -fi - -### checks for header files -echo "$as_me:3873: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 3879 "configure" -#include "confdefs.h" -#include -#include -#include -#include - -_ACEOF -if { (eval echo "$as_me:3887: \"$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:3893: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_stdc=no -fi -rm -f conftest.err conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -#line 3915 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -#line 3933 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -#line 3954 "configure" -#include "confdefs.h" -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:3980: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3983: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3985: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3988: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_header_stdc=no -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi + + cf_version=`echo '[]'|sed -e 's/^./$/'` + for cf_prog in $cf_try; do + echo "configure:3687: trying $cf_prog" >&5 + if ($cf_prog -e 'printf "found version %g\n",'$cf_version';exit('$cf_version'<5.004)') 1>&5 2>&1; then + cf_cv_prog_PERL=$cf_prog + break + fi + done fi +PERL="$cf_cv_prog_PERL" +if test -n "$PERL"; then + echo "$as_me:3696: result: $PERL" >&5 +echo "${ECHO_T}$PERL" >&6 +else + echo "$as_me:3699: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -echo "$as_me:4001: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 -if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\EOF -#define STDC_HEADERS 1 + if test "$PERL" = no; then + { { echo "$as_me:3704: error: perl not found" >&5 +echo "$as_me: error: perl not found" >&2;} + { (exit 1); exit 1; }; } + fi + perl_lib_path=`$PERL -MConfig -e 'print $Config{privlib}'` + cat >>confdefs.h <<\EOF +#define OPT_PERL 1 EOF -fi + EXTRAOBJS="$EXTRAOBJS perl.o" + LINK_PREFIX=`$PERL -MConfig -e 'print $Config{shrpenv}'` + ac_link="$LINK_PREFIX $ac_link" -ac_header_dirent=no -for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:4014: checking for $ac_hdr that defines DIR" >&5 -echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 4020 "configure" -#include "confdefs.h" -#include -#include <$ac_hdr> +test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -int -main () -{ -if ((DIR *) 0) -return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4035: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:4038: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4041: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4044: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_Header=no" +cf_check_cflags="$CFLAGS" +cf_check_cppflags="$CPPFLAGS" + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in `$PERL -MExtUtils::Embed -e ccopts` +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + + CFLAGS="$CFLAGS $cf_new_cflags" fi -rm -f conftest.$ac_objext conftest.$ac_ext + +if test -n "$cf_new_cppflags" ; then + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + + CPPFLAGS="$cf_new_cppflags $CPPFLAGS" fi -echo "$as_me:4054: 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 <&6 + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi -done -# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. -if test $ac_header_dirent = dirent.h; then - echo "$as_me:4067: checking for opendir in -ldir" >&5 -echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 -if test "${ac_cv_lib_dir_opendir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldir $LIBS" +if test "$cf_check_cflags" != "$CFLAGS" ; then cat >conftest.$ac_ext <<_ACEOF -#line 4075 "configure" +#line 3795 "configure" #include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char opendir (); +#include int main () { -opendir (); +printf("Hello world"); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4094: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3807: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4097: \$? = $ac_status" >&5 + echo "$as_me:3810: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4100: \"$ac_try\"") >&5 + { (eval echo "$as_me:3813: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4103: \$? = $ac_status" >&5 + echo "$as_me:3816: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_dir_opendir=yes + : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_dir_opendir=no +test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 + + if test "$cf_check_cppflags" != "$CPPFLAGS" ; then + test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 + + fi + CFLAGS="$cf_check_flags" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4114: result: $ac_cv_lib_dir_opendir" >&5 -echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 -if test $ac_cv_lib_dir_opendir = yes; then - LIBS="$LIBS -ldir" + + LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`" + EXTRA_INSTALL_DIRS="$EXTRA_INSTALL_DIRS \$(INSTALL_PERL_DIRS)" + EXTRA_INSTALL_FILES="$EXTRA_INSTALL_FILES \$(INSTALL_PERL_FILES)" fi -else - echo "$as_me:4121: checking for opendir in -lx" >&5 -echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 -if test "${ac_cv_lib_x_opendir+set}" = set; then +# X11 checks will sometimes add to CFLAGS. We want the state of CFLAGS +# prior to these checks + +echo "$as_me:3841: checking for getpwnam" >&5 +echo $ECHO_N "checking for getpwnam... $ECHO_C" >&6 +if test "${ac_cv_func_getpwnam+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lx $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 4129 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 3847 "configure" #include "confdefs.h" - +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char getpwnam (); below. */ +#include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char opendir (); +char getpwnam (); +char (*f) (); + int main () { -opendir (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getpwnam) || defined (__stub___getpwnam) +choke me +#else +f = getpwnam; +#endif + ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4148: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3878: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4151: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4154: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4157: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_x_opendir=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_x_opendir=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:4168: result: $ac_cv_lib_x_opendir" >&5 -echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 -if test $ac_cv_lib_x_opendir = yes; then - LIBS="$LIBS -lx" -fi - -fi - -for ac_header in \ -fcntl.h \ -ioctl.h \ -memory.h \ -poll.h \ -pwd.h \ -select.h \ -setjmp.h \ -sgtty.h \ -signal.h \ -stdarg.h \ -stddef.h \ -stdlib.h \ -string.h \ -sys/filio.h \ -sys/ioctl.h \ -sys/itimer.h \ -sys/param.h \ -sys/resource.h \ -sys/select.h \ -sys/socket.h \ -sys/time.h \ -sys/wait.h \ -termio.h \ -termios.h \ -unistd.h \ -utime.h \ -varargs.h \ - -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4207: 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 4213 "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:4217: \"$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:4223: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + echo "$as_me:3881: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3884: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:3887: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_getpwnam=yes else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_ext +cat conftest.$ac_ext >&5 +ac_cv_func_getpwnam=no fi -echo "$as_me:4242: 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 "${ECHO_T}$ac_cv_func_getpwnam" >&6 +if test $ac_cv_func_getpwnam = yes; then + : +else -### checks for typedefs -echo "$as_me:4253: checking return type of signal handlers" >&5 -echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 -if test "${ac_cv_type_signal+set}" = set; then +echo "$as_me:3903: checking for getpwnam in -lsun" >&5 +echo $ECHO_N "checking for getpwnam in -lsun... $ECHO_C" >&6 +if test "${ac_cv_lib_sun_getpwnam+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 4259 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsun $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 3911 "configure" #include "confdefs.h" -#include -#include -#ifdef signal -# undef signal -#endif + +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus -extern "C" void (*signal (int, void (*)(int)))(int); -#else -void (*signal ()) (); +extern "C" #endif - +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char getpwnam (); int main () { -int i; +getpwnam (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4281: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:3930: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4284: \$? = $ac_status" >&5 + echo "$as_me:3933: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4287: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:3936: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4290: \$? = $ac_status" >&5 + echo "$as_me:3939: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_signal=void + ac_cv_lib_sun_getpwnam=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_type_signal=int +ac_cv_lib_sun_getpwnam=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4300: result: $ac_cv_type_signal" >&5 -echo "${ECHO_T}$ac_cv_type_signal" >&6 - -cat >>confdefs.h <>confdefs.h <<\EOF -#define SIGT RETSIGTYPE -EOF - -if test $ac_cv_type_signal = void; then - cat >>confdefs.h <<\EOF -#define SIGRET /*do nothing*/ +echo "$as_me:3950: result: $ac_cv_lib_sun_getpwnam" >&5 +echo "${ECHO_T}$ac_cv_lib_sun_getpwnam" >&6 +if test $ac_cv_lib_sun_getpwnam = yes; then + cat >>confdefs.h <>confdefs.h <<\EOF -#define SIGRET return 0 -EOF + LIBS="-lsun $LIBS" fi -# On IRIX 5.3, sys/types and inttypes.h are conflicting. +fi -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h +# check for a lint program. +for ac_prog in lint alint splint lclint do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4329: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then + # 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:3968: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_LINT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 4335 "configure" -#include "confdefs.h" -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4341: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:4344: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4347: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4350: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" + if test -n "$LINT"; then + ac_cv_prog_LINT="$LINT" # Let the user override the test. else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_LINT="$ac_prog" +echo "$as_me:3983: found $ac_dir/$ac_word" >&5 +break +done + fi -rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4360: 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 "${ECHO_T}$LINT" >&6 +else + echo "$as_me:3994: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$LINT" && break +done + +if test -n "$LINT" +then + cat >>confdefs.h <<\EOF +#define SYSTEM_HAS_LINT_PROG 1 EOF fi -done -echo "$as_me:4370: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 -if test "${ac_cv_type_size_t+set}" = set; then +### checks for header files +echo "$as_me:4010: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4376 "configure" +#line 4016 "configure" #include "confdefs.h" -$ac_includes_default -int -main () -{ -if ((size_t *) 0) - return 0; -if (sizeof (size_t)) - return 0; - ; - return 0; -} +#include +#include +#include +#include + _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4391: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:4394: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4397: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (eval echo "$as_me:4024: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - echo "$as_me:4400: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_size_t=yes + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:4030: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_size_t=no + ac_cpp_err=yes fi -rm -f conftest.$ac_objext conftest.$ac_ext +if test -z "$ac_cpp_err"; then + ac_cv_header_stdc=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_header_stdc=no fi -echo "$as_me:4410: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 -if test $ac_cv_type_size_t = yes; then +rm -f conftest.err conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +#line 4052 "configure" +#include "confdefs.h" +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "memchr" >/dev/null 2>&1; then : else + ac_cv_header_stdc=no +fi +rm -f conftest* -cat >>confdefs.h <conftest.$ac_ext <<_ACEOF +#line 4070 "configure" +#include "confdefs.h" +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* fi -echo "$as_me:4422: checking for uid_t in sys/types.h" >&5 -echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 -if test "${ac_cv_type_uid_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : else cat >conftest.$ac_ext <<_ACEOF -#line 4428 "configure" +#line 4091 "configure" #include "confdefs.h" -#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + exit(2); + exit (0); +} _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "uid_t" >/dev/null 2>&1; then - ac_cv_type_uid_t=yes +rm -f conftest$ac_exeext +if { (eval echo "$as_me:4117: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:4120: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:4122: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4125: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : else - ac_cv_type_uid_t=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_header_stdc=no fi -rm -f conftest* - +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4442: result: $ac_cv_type_uid_t" >&5 -echo "${ECHO_T}$ac_cv_type_uid_t" >&6 -if test $ac_cv_type_uid_t = no; then - -cat >>confdefs.h <<\EOF -#define uid_t int -EOF +fi +fi +echo "$as_me:4138: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 +if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\EOF -#define gid_t int +#define STDC_HEADERS 1 EOF fi -echo "$as_me:4456: checking for pid_t" >&5 -echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 -if test "${ac_cv_type_pid_t+set}" = set; then +ac_header_dirent=no +for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +echo "$as_me:4151: checking for $ac_hdr that defines DIR" >&5 +echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4462 "configure" +#line 4157 "configure" #include "confdefs.h" -$ac_includes_default +#include +#include <$ac_hdr> + int main () { -if ((pid_t *) 0) - return 0; -if (sizeof (pid_t)) - return 0; +if ((DIR *) 0) +return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4477: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4172: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4480: \$? = $ac_status" >&5 + echo "$as_me:4175: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4483: \"$ac_try\"") >&5 + { (eval echo "$as_me:4178: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4486: \$? = $ac_status" >&5 + echo "$as_me:4181: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_pid_t=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_type_pid_t=no +eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4496: result: $ac_cv_type_pid_t" >&5 -echo "${ECHO_T}$ac_cv_type_pid_t" >&6 -if test $ac_cv_type_pid_t = yes; then - : -else - -cat >>confdefs.h <&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 -echo $ECHO_N "checking for time_t... $ECHO_C" >&6 -if test "${ac_cv_type_time_t+set}" = set; then +done +# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. +if test $ac_header_dirent = dirent.h; then + echo "$as_me:4204: checking for opendir in -ldir" >&5 +echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 +if test "${ac_cv_lib_dir_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 4514 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldir $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 4212 "configure" #include "confdefs.h" -$ac_includes_default + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char opendir (); int main () { -if ((time_t *) 0) - return 0; -if (sizeof (time_t)) - return 0; +opendir (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4529: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4231: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4532: \$? = $ac_status" >&5 + echo "$as_me:4234: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4535: \"$ac_try\"") >&5 + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4237: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4538: \$? = $ac_status" >&5 + echo "$as_me:4240: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_type_time_t=yes + ac_cv_lib_dir_opendir=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_type_time_t=no +ac_cv_lib_dir_opendir=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:4548: result: $ac_cv_type_time_t" >&5 -echo "${ECHO_T}$ac_cv_type_time_t" >&6 -if test $ac_cv_type_time_t = yes; then - : -else - -cat >>confdefs.h <&5 +echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 +if test $ac_cv_lib_dir_opendir = yes; then + LIBS="$LIBS -ldir" fi -### checks for library functions -if test "$cross_compiling" = no; then - echo "$as_me:4562: checking whether setvbuf arguments are reversed" >&5 -echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 -if test "${ac_cv_func_setvbuf_reversed+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$cross_compiling" = yes; then - { { echo "$as_me:4568: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + echo "$as_me:4258: checking for opendir in -lx" >&5 +echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 +if test "${ac_cv_lib_x_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 4573 "configure" + ac_check_lib_save_LIBS=$LIBS +LIBS="-lx $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 4266 "configure" #include "confdefs.h" -#include -/* If setvbuf has the reversed format, exit 0. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char opendir (); int main () { - /* This call has the arguments reversed. - A reversed system may check and see that the address of main - is not _IOLBF, _IONBF, or _IOFBF, and return nonzero. */ - if (setvbuf(stdout, _IOLBF, (char *) main, BUFSIZ) != 0) - exit(1); - putc('\r', stdout); - exit(0); /* Non-reversed systems segv here. */ +opendir (); + ; + return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:4590: \"$ac_link\"") >&5 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:4285: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4593: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4595: \"$ac_try\"") >&5 + echo "$as_me:4288: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:4291: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4598: \$? = $ac_status" >&5 + echo "$as_me:4294: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_setvbuf_reversed=yes + ac_cv_lib_x_opendir=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_setvbuf_reversed=no -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -rm -f core core.* *.core -fi -echo "$as_me:4611: result: $ac_cv_func_setvbuf_reversed" >&5 -echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 -if test $ac_cv_func_setvbuf_reversed = yes; then - -cat >>confdefs.h <<\EOF -#define SETVBUF_REVERSED 1 -EOF - +ac_cv_lib_x_opendir=no fi - +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi - -### checks for structures -echo "$as_me:4624: checking whether stat file-mode macros are broken" >&5 -echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6 -if test "${ac_cv_header_stat_broken+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 4630 "configure" -#include "confdefs.h" -#include -#include - -#if defined(S_ISBLK) && defined(S_IFDIR) -# if S_ISBLK (S_IFDIR) -You lose. -# endif -#endif - -#if defined(S_ISBLK) && defined(S_IFCHR) -# if S_ISBLK (S_IFCHR) -You lose. -# endif -#endif - -#if defined(S_ISLNK) && defined(S_IFREG) -# if S_ISLNK (S_IFREG) -You lose. -# endif -#endif - -#if defined(S_ISSOCK) && defined(S_IFREG) -# if S_ISSOCK (S_IFREG) -You lose. -# endif -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "You lose" >/dev/null 2>&1; then - ac_cv_header_stat_broken=yes -else - ac_cv_header_stat_broken=no +echo "$as_me:4305: result: $ac_cv_lib_x_opendir" >&5 +echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 +if test $ac_cv_lib_x_opendir = yes; then + LIBS="$LIBS -lx" fi -rm -f conftest* fi -echo "$as_me:4669: result: $ac_cv_header_stat_broken" >&5 -echo "${ECHO_T}$ac_cv_header_stat_broken" >&6 -if test $ac_cv_header_stat_broken = yes; then - -cat >>confdefs.h <<\EOF -#define STAT_MACROS_BROKEN 1 -EOF -fi +for ac_header in \ +fcntl.h \ +ioctl.h \ +memory.h \ +poll.h \ +pwd.h \ +select.h \ +setjmp.h \ +sgtty.h \ +signal.h \ +stdarg.h \ +stddef.h \ +stdlib.h \ +string.h \ +sys/filio.h \ +sys/ioctl.h \ +sys/itimer.h \ +sys/param.h \ +sys/resource.h \ +sys/select.h \ +sys/socket.h \ +sys/time.h \ +sys/wait.h \ +termio.h \ +termios.h \ +unistd.h \ +utime.h \ +varargs.h \ -echo "$as_me:4679: checking for struct stat.st_blksize" >&5 -echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6 -if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:4344: 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 4685 "configure" +#line 4350 "configure" #include "confdefs.h" -$ac_includes_default -int -main () -{ -static struct stat ac_aggr; -if (ac_aggr.st_blksize) -return 0; - ; - return 0; -} +#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4699: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:4702: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4705: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (eval echo "$as_me:4354: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - echo "$as_me:4708: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_member_struct_stat_st_blksize=yes + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:4360: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_member_struct_stat_st_blksize=no + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4718: result: $ac_cv_member_struct_stat_st_blksize" >&5 -echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6 -if test $ac_cv_member_struct_stat_st_blksize = yes; then - -cat >>confdefs.h <>confdefs.h <<\EOF -#define HAVE_ST_BLKSIZE 1 +echo "$as_me:4379: 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 $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6 -if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then +### checks for typedefs +echo "$as_me:4390: checking return type of signal handlers" >&5 +echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 +if test "${ac_cv_type_signal+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4738 "configure" +#line 4396 "configure" #include "confdefs.h" -$ac_includes_default +#include +#include +#ifdef signal +# undef signal +#endif +#ifdef __cplusplus +extern "C" void (*signal (int, void (*)(int)))(int); +#else +void (*signal ()) (); +#endif + int main () { -static struct stat ac_aggr; -if (ac_aggr.st_blocks) -return 0; +int i; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4752: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4418: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4755: \$? = $ac_status" >&5 + echo "$as_me:4421: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4758: \"$ac_try\"") >&5 + { (eval echo "$as_me:4424: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4761: \$? = $ac_status" >&5 + echo "$as_me:4427: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_member_struct_stat_st_blocks=yes + ac_cv_type_signal=void else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_member_struct_stat_st_blocks=no +ac_cv_type_signal=int fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4771: result: $ac_cv_member_struct_stat_st_blocks" >&5 -echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6 -if test $ac_cv_member_struct_stat_st_blocks = yes; then +echo "$as_me:4437: result: $ac_cv_type_signal" >&5 +echo "${ECHO_T}$ac_cv_type_signal" >&6 cat >>confdefs.h <>confdefs.h <<\EOF -#define HAVE_ST_BLOCKS 1 +#define SIGT RETSIGTYPE +EOF + +if test $ac_cv_type_signal = void; then + cat >>confdefs.h <<\EOF +#define SIGRET /*do nothing*/ EOF else - LIBOBJS="$LIBOBJS fileblocks.$ac_objext" + cat >>confdefs.h <<\EOF +#define SIGRET return 0 +EOF + fi -echo "$as_me:4787: checking for struct stat.st_rdev" >&5 -echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6 -if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:4466: 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 4793 "configure" +#line 4472 "configure" #include "confdefs.h" $ac_includes_default -int -main () -{ -static struct stat ac_aggr; -if (ac_aggr.st_rdev) -return 0; - ; - return 0; -} +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4807: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4478: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4810: \$? = $ac_status" >&5 + echo "$as_me:4481: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4813: \"$ac_try\"") >&5 + { (eval echo "$as_me:4484: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4816: \$? = $ac_status" >&5 + echo "$as_me:4487: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_member_struct_stat_st_rdev=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_member_struct_stat_st_rdev=no +eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4826: result: $ac_cv_member_struct_stat_st_rdev" >&5 -echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6 -if test $ac_cv_member_struct_stat_st_rdev = yes; then - -cat >>confdefs.h <>confdefs.h <<\EOF -#define HAVE_ST_RDEV 1 +echo "$as_me:4497: 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 $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6 -if test "${ac_cv_struct_tm+set}" = set; then +echo "$as_me:4507: checking for size_t" >&5 +echo $ECHO_N "checking for size_t... $ECHO_C" >&6 +if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4846 "configure" +#line 4513 "configure" #include "confdefs.h" -#include -#include - +$ac_includes_default int main () { -struct tm *tp; tp->tm_sec; +if ((size_t *) 0) + return 0; +if (sizeof (size_t)) + return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4860: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4528: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4863: \$? = $ac_status" >&5 + echo "$as_me:4531: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4866: \"$ac_try\"") >&5 + { (eval echo "$as_me:4534: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4869: \$? = $ac_status" >&5 + echo "$as_me:4537: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_struct_tm=time.h + ac_cv_type_size_t=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_struct_tm=sys/time.h +ac_cv_type_size_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4879: result: $ac_cv_struct_tm" >&5 -echo "${ECHO_T}$ac_cv_struct_tm" >&6 -if test $ac_cv_struct_tm = sys/time.h; then +echo "$as_me:4547: result: $ac_cv_type_size_t" >&5 +echo "${ECHO_T}$ac_cv_type_size_t" >&6 +if test $ac_cv_type_size_t = yes; then + : +else -cat >>confdefs.h <<\EOF -#define TM_IN_SYS_TIME 1 +cat >>confdefs.h <&5 -echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 -if test "${ac_cv_header_time+set}" = set; then +echo "$as_me:4559: checking for uid_t in sys/types.h" >&5 +echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 +if test "${ac_cv_type_uid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4895 "configure" +#line 4565 "configure" #include "confdefs.h" #include -#include -#include -int -main () -{ -if ((struct tm *) 0) -return 0; - ; - return 0; -} _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:4911: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:4914: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4917: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:4920: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_header_time=yes +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "uid_t" >/dev/null 2>&1; then + ac_cv_type_uid_t=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_header_time=no + ac_cv_type_uid_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* + fi -echo "$as_me:4930: result: $ac_cv_header_time" >&5 -echo "${ECHO_T}$ac_cv_header_time" >&6 -if test $ac_cv_header_time = yes; then +echo "$as_me:4579: result: $ac_cv_type_uid_t" >&5 +echo "${ECHO_T}$ac_cv_type_uid_t" >&6 +if test $ac_cv_type_uid_t = no; then cat >>confdefs.h <<\EOF -#define TIME_WITH_SYS_TIME 1 +#define uid_t int +EOF + +cat >>confdefs.h <<\EOF +#define gid_t int EOF fi -echo "$as_me:4940: checking if we can include select.h with time.h" >&5 -echo $ECHO_N "checking if we can include select.h with time.h... $ECHO_C" >&6 -if test "${cf_cv_select_with_time+set}" = set; then +echo "$as_me:4593: checking for pid_t" >&5 +echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 +if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cat >conftest.$ac_ext <<_ACEOF -#line 4947 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 4599 "configure" #include "confdefs.h" - -#include -#ifdef HAVE_SYS_TIME_H -#include -#ifdef TIME_WITH_SYS_TIME -# include -#endif -#else -#include -#endif -#ifdef HAVE_SELECT -# ifdef HAVE_SELECT_H -# include -# endif -# ifdef HAVE_SYS_SELECT_H -# include -# endif -#endif - +$ac_includes_default int main () { - +if ((pid_t *) 0) + return 0; +if (sizeof (pid_t)) + return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4977: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4614: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4980: \$? = $ac_status" >&5 + echo "$as_me:4617: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4983: \"$ac_try\"") >&5 + { (eval echo "$as_me:4620: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4986: \$? = $ac_status" >&5 + echo "$as_me:4623: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_select_with_time=yes + ac_cv_type_pid_t=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_select_with_time=no +ac_cv_type_pid_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:4633: result: $ac_cv_type_pid_t" >&5 +echo "${ECHO_T}$ac_cv_type_pid_t" >&6 +if test $ac_cv_type_pid_t = yes; then + : +else -fi -echo "$as_me:4997: result: $cf_cv_select_with_time" >&5 -echo "${ECHO_T}$cf_cv_select_with_time" >&6 -test $cf_cv_select_with_time = yes && cat >>confdefs.h <<\EOF -#define SELECT_WITH_TIME 1 +cat >>confdefs.h <&5 -echo $ECHO_N "checking if we may include sys/resource.h with sys/wait.h... $ECHO_C" >&6 -if test "${cf_cv_resource_with_wait+set}" = set; then +fi + +echo "$as_me:4645: checking for time_t" >&5 +echo $ECHO_N "checking for time_t... $ECHO_C" >&6 +if test "${ac_cv_type_time_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cat >conftest.$ac_ext <<_ACEOF -#line 5010 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 4651 "configure" #include "confdefs.h" - -#if defined(HAVE_SYS_TIME_H) && (defined(SELECT_WITH_TIME) || !(defined(HAVE_SELECT_H || defined(HAVE_SYS_SELECT_H)))) -#include -#ifdef TIME_WITH_SYS_TIME -# include -#endif -#else -#include -#endif -#include -#include -#include - +$ac_includes_default int main () { - +if ((time_t *) 0) + return 0; +if (sizeof (time_t)) + return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5034: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4666: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5037: \$? = $ac_status" >&5 + echo "$as_me:4669: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5040: \"$ac_try\"") >&5 + { (eval echo "$as_me:4672: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5043: \$? = $ac_status" >&5 + echo "$as_me:4675: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_resource_with_wait=yes + ac_cv_type_time_t=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_resource_with_wait=no +ac_cv_type_time_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext - fi -echo "$as_me:5054: result: $cf_cv_resource_with_wait" >&5 -echo "${ECHO_T}$cf_cv_resource_with_wait" >&6 -test $cf_cv_resource_with_wait = yes && cat >>confdefs.h <<\EOF -#define RESOURCE_WITH_WAIT 1 +echo "$as_me:4685: result: $ac_cv_type_time_t" >&5 +echo "${ECHO_T}$ac_cv_type_time_t" >&6 +if test $ac_cv_type_time_t = yes; then + : +else + +cat >>confdefs.h <&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +### checks for library functions +if test "$cross_compiling" = no; then + echo "$as_me:4699: checking whether setvbuf arguments are reversed" >&5 +echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6 +if test "${ac_cv_func_setvbuf_reversed+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + if test "$cross_compiling" = yes; then + { { echo "$as_me:4705: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } +else cat >conftest.$ac_ext <<_ACEOF -#line 5073 "configure" +#line 4710 "configure" #include "confdefs.h" -#include <$ac_header> +#include +/* If setvbuf has the reversed format, exit 0. */ +int +main () +{ + /* This call has the arguments reversed. + A reversed system may check and see that the address of main + is not _IOLBF, _IONBF, or _IOFBF, and return nonzero. */ + if (setvbuf(stdout, _IOLBF, (char *) main, BUFSIZ) != 0) + exit(1); + putc('\r', stdout); + exit(0); /* Non-reversed systems segv here. */ +} _ACEOF -if { (eval echo "$as_me:5077: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:4727: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:5083: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi + echo "$as_me:4730: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:4732: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:4735: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_setvbuf_reversed=yes else - ac_cpp_err=yes + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_setvbuf_reversed=no fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_ext +rm -f core core.* *.core fi -echo "$as_me:5102: 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 "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6 +if test $ac_cv_func_setvbuf_reversed = yes; then + +cat >>confdefs.h <<\EOF +#define SETVBUF_REVERSED 1 EOF fi -done -if test "$ISC" = yes ; then +fi -for ac_header in sys/termio.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5117: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +### checks for structures +echo "$as_me:4761: checking whether stat file-mode macros are broken" >&5 +echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6 +if test "${ac_cv_header_stat_broken+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5123 "configure" +#line 4767 "configure" #include "confdefs.h" -#include <$ac_header> +#include +#include + +#if defined(S_ISBLK) && defined(S_IFDIR) +# if S_ISBLK (S_IFDIR) +You lose. +# endif +#endif + +#if defined(S_ISBLK) && defined(S_IFCHR) +# if S_ISBLK (S_IFCHR) +You lose. +# endif +#endif + +#if defined(S_ISLNK) && defined(S_IFREG) +# if S_ISLNK (S_IFREG) +You lose. +# endif +#endif + +#if defined(S_ISSOCK) && defined(S_IFREG) +# if S_ISSOCK (S_IFREG) +You lose. +# endif +#endif + _ACEOF -if { (eval echo "$as_me:5127: \"$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:5133: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "You lose" >/dev/null 2>&1; then + ac_cv_header_stat_broken=yes else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" + ac_cv_header_stat_broken=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* + fi -echo "$as_me:5152: 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 "${ECHO_T}$ac_cv_header_stat_broken" >&6 +if test $ac_cv_header_stat_broken = yes; then + +cat >>confdefs.h <<\EOF +#define STAT_MACROS_BROKEN 1 EOF fi -done -fi -if test "$ac_cv_header_termios_h" = yes ; then - case "$CFLAGS $CPPFLAGS" in - *-D_POSIX_SOURCE*) - termios_bad=dunno ;; - *) termios_bad=maybe ;; - esac - if test "$termios_bad" = maybe ; then - echo "$as_me:5170: checking whether termios.h needs _POSIX_SOURCE" >&5 -echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 5173 "configure" -#include "confdefs.h" -#include -int -main () -{ -struct termios foo; int x = foo.c_iflag - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:5185: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:5188: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5191: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:5194: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - termios_bad=no +echo "$as_me:4816: checking for struct stat.st_blksize" >&5 +echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6 +if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -#line 5202 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 4822 "configure" #include "confdefs.h" - -#define _POSIX_SOURCE -#include +$ac_includes_default int main () { -struct termios foo; int x = foo.c_iflag +static struct stat ac_aggr; +if (ac_aggr.st_blksize) +return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5216: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4836: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5219: \$? = $ac_status" >&5 + echo "$as_me:4839: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5222: \"$ac_try\"") >&5 + { (eval echo "$as_me:4842: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5225: \$? = $ac_status" >&5 + echo "$as_me:4845: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - termios_bad=unknown + ac_cv_member_struct_stat_st_blksize=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -termios_bad=yes cat >>confdefs.h <<\EOF -#define SVR4_TERMIO 1 -EOF - +ac_cv_member_struct_stat_st_blksize=no fi rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:4855: result: $ac_cv_member_struct_stat_st_blksize" >&5 +echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6 +if test $ac_cv_member_struct_stat_st_blksize = yes; then + +cat >>confdefs.h <>confdefs.h <<\EOF +#define HAVE_ST_BLKSIZE 1 +EOF fi -rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:5240: result: $termios_bad" >&5 -echo "${ECHO_T}$termios_bad" >&6 - fi -fi -echo "$as_me:5245: checking declaration of size-change" >&5 -echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 -if test "${cf_cv_sizechange+set}" = set; then +echo "$as_me:4869: checking for struct stat.st_blocks" >&5 +echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6 +if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cf_cv_sizechange=unknown - cf_save_CPPFLAGS="$CPPFLAGS" - -for cf_opts in "" "NEED_PTEM_H" -do - - CPPFLAGS="$cf_save_CPPFLAGS" - test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" - cat >conftest.$ac_ext <<_ACEOF -#line 5260 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 4875 "configure" #include "confdefs.h" -#include -#ifdef HAVE_TERMIOS_H -#include -#else -#ifdef HAVE_TERMIO_H -#include -#endif -#endif -#ifdef NEED_PTEM_H -/* This is a workaround for SCO: they neglected to define struct winsize in - * termios.h -- it's only in termio.h and ptem.h - */ -#include -#include -#endif -#if !defined(sun) || !defined(HAVE_TERMIOS_H) -#include -#endif - +$ac_includes_default int main () { - -#ifdef TIOCGSIZE - struct ttysize win; /* FIXME: what system is this? */ - int y = win.ts_lines; - int x = win.ts_cols; -#else -#ifdef TIOCGWINSZ - struct winsize win; - int y = win.ws_row; - int x = win.ws_col; -#else - no TIOCGSIZE or TIOCGWINSZ -#endif /* TIOCGWINSZ */ -#endif /* TIOCGSIZE */ - +static struct stat ac_aggr; +if (ac_aggr.st_blocks) +return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5304: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4889: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5307: \$? = $ac_status" >&5 + echo "$as_me:4892: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5310: \"$ac_try\"") >&5 + { (eval echo "$as_me:4895: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5313: \$? = $ac_status" >&5 + echo "$as_me:4898: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_sizechange=yes + ac_cv_member_struct_stat_st_blocks=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_sizechange=no +ac_cv_member_struct_stat_st_blocks=no fi rm -f conftest.$ac_objext conftest.$ac_ext - - CPPFLAGS="$cf_save_CPPFLAGS" - if test "$cf_cv_sizechange" = yes ; then - echo "size-change succeeded ($cf_opts)" >&5 - test -n "$cf_opts" && cf_cv_sizechange="$cf_opts" - break - fi -done - fi -echo "$as_me:5332: result: $cf_cv_sizechange" >&5 -echo "${ECHO_T}$cf_cv_sizechange" >&6 -if test "$cf_cv_sizechange" != no ; then - cat >>confdefs.h <<\EOF -#define HAVE_SIZECHANGE 1 +echo "$as_me:4908: result: $ac_cv_member_struct_stat_st_blocks" >&5 +echo "${ECHO_T}$ac_cv_member_struct_stat_st_blocks" >&6 +if test $ac_cv_member_struct_stat_st_blocks = yes; then + +cat >>confdefs.h <>confdefs.h <>confdefs.h <<\EOF +#define HAVE_ST_BLOCKS 1 EOF - ;; - esac +else + LIBOBJS="$LIBOBJS fileblocks.$ac_objext" fi -echo "$as_me:5349: checking for file-pointer ready definition" >&5 -echo $ECHO_N "checking for file-pointer ready definition... $ECHO_C" >&6 -if test "${cf_cv_fp_isready+set}" = set; then +echo "$as_me:4924: checking for struct stat.st_rdev" >&5 +echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6 +if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cf_cv_fp_isready=none -while true -do - read definition - test -z "$definition" && break - echo "test-compile $definition" 1>&5 - - cat >conftest.$ac_ext <<_ACEOF -#line 5363 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 4930 "configure" #include "confdefs.h" - -#include -#define isready_c(p) $definition - +$ac_includes_default int main () { -int x = isready_c(stdin) +static struct stat ac_aggr; +if (ac_aggr.st_rdev) +return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5378: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4944: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5381: \$? = $ac_status" >&5 + echo "$as_me:4947: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5384: \"$ac_try\"") >&5 + { (eval echo "$as_me:4950: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5387: \$? = $ac_status" >&5 + echo "$as_me:4953: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$definition" >conftest.env - break + ac_cv_member_struct_stat_st_rdev=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +ac_cv_member_struct_stat_st_rdev=no fi rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:4963: result: $ac_cv_member_struct_stat_st_rdev" >&5 +echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6 +if test $ac_cv_member_struct_stat_st_rdev = yes; then -done <<'CF_EOF' -( (p)->_IO_read_ptr < (p)->_IO_read_end) -( (p)->__cnt > 0) -( (p)->__rptr < (p)->__rend) -( (p)->_cnt > 0) -( (p)->_gptr < (p)->_egptr) -( (p)->_r > 0) -( (p)->_rcount > 0) -( (p)->endr < (p)->endb) -CF_EOF +cat >>confdefs.h <>confdefs.h <<\EOF +#define HAVE_ST_RDEV 1 +EOF fi -echo "$as_me:5411: result: $cf_cv_fp_isready" >&5 -echo "${ECHO_T}$cf_cv_fp_isready" >&6 - -test "$cf_cv_fp_isready" != none && cat >>confdefs.h < and functions" >&5 -echo $ECHO_N "checking for and functions... $ECHO_C" >&6 -if test "${cf_cv_have_wctype+set}" = set; then +echo "$as_me:4977: checking whether struct tm is in sys/time.h or time.h" >&5 +echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6 +if test "${ac_cv_struct_tm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - -cat >conftest.$ac_ext <<_ACEOF -#line 5425 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 4983 "configure" #include "confdefs.h" +#include +#include -#include int main () { - - wint_t temp = 101; - int test = (wctype("alnum") != 0) - || iswalnum(temp) - || iswalpha(temp) - || iswblank(temp) - || iswcntrl(temp) - || iswdigit(temp) - || iswgraph(temp) - || iswlower(temp) - || iswprint(temp) - || iswpunct(temp) - || iswspace(temp) - || iswupper(temp) - || iswxdigit(temp); +struct tm *tp; tp->tm_sec; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5452: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4997: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5455: \$? = $ac_status" >&5 + echo "$as_me:5000: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5458: \"$ac_try\"") >&5 + { (eval echo "$as_me:5003: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5461: \$? = $ac_status" >&5 + echo "$as_me:5006: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_have_wctype=yes + ac_cv_struct_tm=time.h else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_have_wctype=no +ac_cv_struct_tm=sys/time.h fi rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:5016: result: $ac_cv_struct_tm" >&5 +echo "${ECHO_T}$ac_cv_struct_tm" >&6 +if test $ac_cv_struct_tm = sys/time.h; then + +cat >>confdefs.h <<\EOF +#define TM_IN_SYS_TIME 1 +EOF fi -echo "$as_me:5472: result: $cf_cv_have_wctype" >&5 -echo "${ECHO_T}$cf_cv_have_wctype" >&6 -if test "$cf_cv_have_wctype" = yes ; then - echo "$as_me:5475: checking for library containing wctype" >&5 -echo $ECHO_N "checking for library containing wctype... $ECHO_C" >&6 -if test "${ac_cv_search_wctype+set}" = set; then + +echo "$as_me:5026: checking whether time.h and sys/time.h may both be included" >&5 +echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 +if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_func_search_save_LIBS=$LIBS -ac_cv_search_wctype=no -cat >conftest.$ac_ext <<_ACEOF -#line 5483 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 5032 "configure" #include "confdefs.h" +#include +#include +#include -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char wctype (); int main () { -wctype (); +if ((struct tm *) 0) +return 0; ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5502: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:5048: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5505: \$? = $ac_status" >&5 + echo "$as_me:5051: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5508: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:5054: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5511: \$? = $ac_status" >&5 + echo "$as_me:5057: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_search_wctype="none required" + ac_cv_header_time=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +ac_cv_header_time=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -if test "$ac_cv_search_wctype" = no; then - for ac_lib in w; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 5523 "configure" +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:5067: result: $ac_cv_header_time" >&5 +echo "${ECHO_T}$ac_cv_header_time" >&6 +if test $ac_cv_header_time = yes; then + +cat >>confdefs.h <<\EOF +#define TIME_WITH_SYS_TIME 1 +EOF + +fi + +echo "$as_me:5077: checking if we can include select.h with time.h" >&5 +echo $ECHO_N "checking if we can include select.h with time.h... $ECHO_C" >&6 +if test "${cf_cv_select_with_time+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +cat >conftest.$ac_ext <<_ACEOF +#line 5084 "configure" #include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" +#include +#ifdef HAVE_SYS_TIME_H +#include +#ifdef TIME_WITH_SYS_TIME +# include #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char wctype (); +#else +#include +#endif +#ifdef HAVE_SELECT +# ifdef HAVE_SELECT_H +# include +# endif +# ifdef HAVE_SYS_SELECT_H +# include +# endif +#endif + int main () { -wctype (); + ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5542: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:5114: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5545: \$? = $ac_status" >&5 + echo "$as_me:5117: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5548: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:5120: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5551: \$? = $ac_status" >&5 + echo "$as_me:5123: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_search_wctype="-l$ac_lib" -break + cf_cv_select_with_time=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 +cf_cv_select_with_time=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - done -fi -LIBS=$ac_func_search_save_LIBS -fi -echo "$as_me:5564: result: $ac_cv_search_wctype" >&5 -echo "${ECHO_T}$ac_cv_search_wctype" >&6 -if test "$ac_cv_search_wctype" != no; then - test "$ac_cv_search_wctype" = "none required" || LIBS="$ac_cv_search_wctype $LIBS" - cat >>confdefs.h <<\EOF -#define HAVE_WCTYPE 1 -EOF - -fi - -fi +rm -f conftest.$ac_objext conftest.$ac_ext -### checks for system services and user specified options -echo "$as_me:5577: checking for long file names" >&5 -echo $ECHO_N "checking for long file names... $ECHO_C" >&6 -if test "${ac_cv_sys_long_file_names+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_sys_long_file_names=yes -# Test for long file names in all the places we know might matter: -# . the current directory, where building will happen -# $prefix/lib where we will be installing things -# $exec_prefix/lib likewise -# eval it to expand exec_prefix. -# $TMPDIR if set, where it might want to write temporary files -# if $TMPDIR is not set: -# /tmp where it might want to write temporary files -# /var/tmp likewise -# /usr/tmp likewise -if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then - ac_tmpdirs=$TMPDIR -else - ac_tmpdirs='/tmp /var/tmp /usr/tmp' -fi -for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do - test -d $ac_dir || continue - test -w $ac_dir || continue # It is less confusing to not echo anything here. - ac_xdir=$ac_dir/cf$$ - (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue - ac_tf1=$ac_xdir/conftest9012345 - ac_tf2=$ac_xdir/conftest9012346 - (echo 1 >$ac_tf1) 2>/dev/null - (echo 2 >$ac_tf2) 2>/dev/null - ac_val=`cat $ac_tf1 2>/dev/null` - if test ! -f $ac_tf1 || test "$ac_val" != 1; then - ac_cv_sys_long_file_names=no - rm -rf $ac_xdir 2>/dev/null - break - fi - rm -rf $ac_xdir 2>/dev/null -done fi -echo "$as_me:5616: result: $ac_cv_sys_long_file_names" >&5 -echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 -if test $ac_cv_sys_long_file_names = yes; then - -cat >>confdefs.h <<\EOF -#define HAVE_LONG_FILE_NAMES 1 +echo "$as_me:5134: result: $cf_cv_select_with_time" >&5 +echo "${ECHO_T}$cf_cv_select_with_time" >&6 +test $cf_cv_select_with_time = yes && cat >>confdefs.h <<\EOF +#define SELECT_WITH_TIME 1 EOF -fi - -echo "$as_me:5626: checking for restartable reads on pipes" >&5 -echo $ECHO_N "checking for restartable reads on pipes... $ECHO_C" >&6 -if test "${cf_cv_can_restart_read+set}" = set; then +echo "$as_me:5140: checking if we may include sys/resource.h with sys/wait.h" >&5 +echo $ECHO_N "checking if we may include sys/resource.h with sys/wait.h... $ECHO_C" >&6 +if test "${cf_cv_resource_with_wait+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -if test "$cross_compiling" = yes; then - cf_cv_can_restart_read=unknown -else - cat >conftest.$ac_ext <<_ACEOF -#line 5636 "configure" +cat >conftest.$ac_ext <<_ACEOF +#line 5147 "configure" #include "confdefs.h" -/* Exit 0 (true) if wait returns something other than -1, - i.e. the pid of the child, which means that wait was restarted - after getting the signal. */ -#include -#include -#ifdef SA_RESTART -sigwrapper(sig, disp) -int sig; -void (*disp)(); -{ - struct sigaction act, oact; - - act.sa_handler = disp; - sigemptyset(&act.sa_mask); - act.sa_flags = SA_RESTART; - - (void)sigaction(sig, &act, &oact); -} +#if defined(HAVE_SYS_TIME_H) && (defined(SELECT_WITH_TIME) || !(defined(HAVE_SELECT_H || defined(HAVE_SYS_SELECT_H)))) +#include +#ifdef TIME_WITH_SYS_TIME +# include +#endif #else -# define sigwrapper signal +#include #endif -ucatch (isig) { } -main () { - int i, status; - int fd[2]; - char buff[2]; - pipe(fd); - i = fork(); - if (i == 0) { - sleep (2); - kill (getppid (), SIGINT); - sleep (2); - write(fd[1],"done",4); - close(fd[1]); - exit (0); - } - sigwrapper (SIGINT, ucatch); - status = read(fd[0], buff, sizeof(buff)); - wait (&i); - exit (status == -1); -} +#include +#include +#include +int +main () +{ + + ; + return 0; +} _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:5683: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:5171: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5686: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5688: \"$ac_try\"") >&5 + echo "$as_me:5174: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:5177: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5691: \$? = $ac_status" >&5 + echo "$as_me:5180: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_can_restart_read=yes + cf_cv_resource_with_wait=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_can_restart_read=no -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +cf_cv_resource_with_wait=no fi +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5704: result: $cf_cv_can_restart_read" >&5 -echo "${ECHO_T}$cf_cv_can_restart_read" >&6 - -test $cf_cv_can_restart_read = yes && cat >>confdefs.h <<\EOF -#define HAVE_RESTARTABLE_PIPEREAD 1 +echo "$as_me:5191: result: $cf_cv_resource_with_wait" >&5 +echo "${ECHO_T}$cf_cv_resource_with_wait" >&6 +test $cf_cv_resource_with_wait = yes && cat >>confdefs.h <<\EOF +#define RESOURCE_WITH_WAIT 1 EOF - # is a read() of a pipe restartable? +for ac_header in \ +termio.h \ +termios.h \ +unistd.h \ -echo "$as_me:5713: checking whether setpgrp takes no argument" >&5 -echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6 -if test "${ac_cv_func_setpgrp_void+set}" = set; then +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:5204: 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 - if test "$cross_compiling" = yes; then - { { echo "$as_me:5719: error: cannot check setpgrp if cross compiling" >&5 -echo "$as_me: error: cannot check setpgrp if cross compiling" >&2;} - { (exit 1); exit 1; }; } -else cat >conftest.$ac_ext <<_ACEOF -#line 5724 "configure" +#line 5210 "configure" #include "confdefs.h" -#if HAVE_UNISTD_H -# include -#endif - -int -main () -{ -/* If this system has a BSD-style setpgrp, which takes arguments, exit - successfully. */ - exit (setpgrp (1,1) == -1); - ; - return 0; -} +#include <$ac_header> _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:5741: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (eval echo "$as_me:5214: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - echo "$as_me:5744: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5746: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:5220: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:5239: 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 $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 5260 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:5264: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - echo "$as_me:5749: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_setpgrp_void=no + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:5270: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_setpgrp_void=yes + ac_cpp_err=yes fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" fi +rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5761: result: $ac_cv_func_setpgrp_void" >&5 -echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6 -if test $ac_cv_func_setpgrp_void = yes; then - -cat >>confdefs.h <<\EOF -#define SETPGRP_VOID 1 +echo "$as_me:5289: 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 $ECHO_N "checking whether getpgrp takes no argument... $ECHO_C" >&6 -if test "${ac_cv_func_getpgrp_void+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Use it with a single arg. -cat >conftest.$ac_ext <<_ACEOF -#line 5778 "configure" +fi +if test "$ac_cv_header_termios_h" = yes ; then + case "$CFLAGS $CPPFLAGS" in + *-D_POSIX_SOURCE*) + termios_bad=dunno ;; + *) termios_bad=maybe ;; + esac + if test "$termios_bad" = maybe ; then + echo "$as_me:5307: checking whether termios.h needs _POSIX_SOURCE" >&5 +echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line 5310 "configure" #include "confdefs.h" -$ac_includes_default +#include int main () { -getpgrp (0); +struct termios foo; int x = foo.c_iflag ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5790: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5322: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5793: \$? = $ac_status" >&5 + echo "$as_me:5325: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5796: \"$ac_try\"") >&5 + { (eval echo "$as_me:5328: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5799: \$? = $ac_status" >&5 + echo "$as_me:5331: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_func_getpgrp_1=yes + termios_bad=no else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_func_getpgrp_1=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -# Use it with no arg. -cat >conftest.$ac_ext <<_ACEOF -#line 5810 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 5339 "configure" #include "confdefs.h" -$ac_includes_default + +#define _POSIX_SOURCE +#include int main () { -getpgrp (); +struct termios foo; int x = foo.c_iflag ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5822: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5353: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5825: \$? = $ac_status" >&5 + echo "$as_me:5356: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5828: \"$ac_try\"") >&5 + { (eval echo "$as_me:5359: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5831: \$? = $ac_status" >&5 + echo "$as_me:5362: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_func_getpgrp_0=yes + termios_bad=unknown else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_func_getpgrp_0=no +termios_bad=yes cat >>confdefs.h <<\EOF +#define SVR4_TERMIO 1 +EOF + fi rm -f conftest.$ac_objext conftest.$ac_ext -# If both static checks agree, we are done. -case $ac_func_getpgrp_0:$ac_func_getpgrp_1 in - yes:no) ac_cv_func_getpgrp_void=yes;; - no:yes) ac_cv_func_getpgrp_void=false;; - *) if test "$cross_compiling" = yes; then - { { echo "$as_me:5845: error: cannot check getpgrp if cross compiling" >&5 -echo "$as_me: error: cannot check getpgrp if cross compiling" >&2;} - { (exit 1); exit 1; }; } + +fi +rm -f conftest.$ac_objext conftest.$ac_ext + echo "$as_me:5377: result: $termios_bad" >&5 +echo "${ECHO_T}$termios_bad" >&6 + fi +fi + +echo "$as_me:5382: checking declaration of size-change" >&5 +echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6 +if test "${cf_cv_sizechange+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 5850 "configure" -#include "confdefs.h" -$ac_includes_default -/* - * If this system has a BSD-style getpgrp(), - * which takes a pid argument, exit unsuccessfully. - * - * Snarfed from Chet Ramey's bash pgrp.c test program - */ + cf_cv_sizechange=unknown + cf_save_CPPFLAGS="$CPPFLAGS" -int pid; -int pg1, pg2, pg3, pg4; -int ng, np, s, child; +for cf_opts in "" "NEED_PTEM_H" +do + + CPPFLAGS="$cf_save_CPPFLAGS" + test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" + cat >conftest.$ac_ext <<_ACEOF +#line 5397 "configure" +#include "confdefs.h" +#include +#ifdef HAVE_TERMIOS_H +#include +#else +#ifdef HAVE_TERMIO_H +#include +#endif +#endif +#ifdef NEED_PTEM_H +/* This is a workaround for SCO: they neglected to define struct winsize in + * termios.h -- it's only in termio.h and ptem.h + */ +#include +#include +#endif +#if !defined(sun) || !defined(HAVE_TERMIOS_H) +#include +#endif int main () { - pid = getpid (); - pg1 = getpgrp (0); - pg2 = getpgrp (); - pg3 = getpgrp (pid); - pg4 = getpgrp (1); - /* If all of these values are the same, it's pretty sure that we're - on a system that ignores getpgrp's first argument. */ - if (pg2 == pg4 && pg1 == pg3 && pg2 == pg3) - exit (0); +#ifdef TIOCGSIZE + struct ttysize win; /* FIXME: what system is this? */ + int y = win.ts_lines; + int x = win.ts_cols; +#else +#ifdef TIOCGWINSZ + struct winsize win; + int y = win.ws_row; + int x = win.ws_col; +#else + no TIOCGSIZE or TIOCGWINSZ +#endif /* TIOCGWINSZ */ +#endif /* TIOCGSIZE */ - child = fork (); - if (child < 0) - exit(1); - else if (child == 0) - { - np = getpid (); - /* If this is Sys V, this will not work; pgrp will be set to np - because setpgrp just changes a pgrp to be the same as the - pid. */ - setpgrp (np, pg1); - ng = getpgrp (0); /* Same result for Sys V and BSD */ - if (ng == pg1) - exit (1); - else - exit (0); - } - else - { - wait (&s); - exit (s>>8); - } + ; + return 0; } - _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:5904: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:5441: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5907: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5909: \"$ac_try\"") >&5 + echo "$as_me:5444: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:5447: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5912: \$? = $ac_status" >&5 + echo "$as_me:5450: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_func_getpgrp_void=yes + cf_cv_sizechange=yes else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_func_getpgrp_void=no +cf_cv_sizechange=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi;; -esac # $ac_func_getpgrp_0:$ac_func_getpgrp_1 +rm -f conftest.$ac_objext conftest.$ac_ext + + CPPFLAGS="$cf_save_CPPFLAGS" + if test "$cf_cv_sizechange" = yes ; then + echo "size-change succeeded ($cf_opts)" >&5 + test -n "$cf_opts" && cf_cv_sizechange="$cf_opts" + break + fi +done fi -echo "$as_me:5926: result: $ac_cv_func_getpgrp_void" >&5 -echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6 -if test $ac_cv_func_getpgrp_void = yes; then +echo "$as_me:5469: result: $cf_cv_sizechange" >&5 +echo "${ECHO_T}$cf_cv_sizechange" >&6 +if test "$cf_cv_sizechange" != no ; then + cat >>confdefs.h <<\EOF +#define HAVE_SIZECHANGE 1 +EOF -cat >>confdefs.h <<\EOF -#define GETPGRP_VOID 1 + case $cf_cv_sizechange in #(vi + NEED*) + cat >>confdefs.h <&5 -echo $ECHO_N "checking if killpg is needed... $ECHO_C" >&6 -if test "${cf_cv_need_killpg+set}" = set; then +echo "$as_me:5486: checking for file-pointer ready definition" >&5 +echo $ECHO_N "checking for file-pointer ready definition... $ECHO_C" >&6 +if test "${cf_cv_fp_isready+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -if test "$cross_compiling" = yes; then - cf_cv_need_killpg=unknown -else - cat >conftest.$ac_ext <<_ACEOF -#line 5946 "configure" +cf_cv_fp_isready=none +while true +do + read definition + test -z "$definition" && break + echo "test-compile $definition" 1>&5 + + cat >conftest.$ac_ext <<_ACEOF +#line 5500 "configure" #include "confdefs.h" -#include -#include -RETSIGTYPE -handler(s) - int s; -{ - exit(0); -} +#include +#define isready_c(p) $definition -main() +int +main () { -#ifdef SETPGRP_VOID - (void) setpgrp(); -#else - (void) setpgrp(0,0); -#endif - (void) signal(SIGINT, handler); - (void) kill(-getpid(), SIGINT); - exit(1); +int x = isready_c(stdin) + ; + return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:5971: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:5515: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5974: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5976: \"$ac_try\"") >&5 + echo "$as_me:5518: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:5521: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5979: \$? = $ac_status" >&5 + echo "$as_me:5524: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_need_killpg=no + echo "$definition" >conftest.env + break else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_need_killpg=yes -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi +rm -f conftest.$ac_objext conftest.$ac_ext + +done <<'CF_EOF' +( (p)->_IO_read_ptr < (p)->_IO_read_end) +( (p)->__cnt > 0) +( (p)->__rptr < (p)->__rend) +( (p)->_cnt > 0) +( (p)->_gptr < (p)->_egptr) +( (p)->_r > 0) +( (p)->_rcount > 0) +( (p)->endr < (p)->endb) +CF_EOF + +test -f conftest.env && cf_cv_fp_isready=`cat conftest.env` fi -echo "$as_me:5992: result: $cf_cv_need_killpg" >&5 -echo "${ECHO_T}$cf_cv_need_killpg" >&6 +echo "$as_me:5548: result: $cf_cv_fp_isready" >&5 +echo "${ECHO_T}$cf_cv_fp_isready" >&6 -test $cf_cv_need_killpg = yes && cat >>confdefs.h <<\EOF -#define HAVE_KILLPG 1 +test "$cf_cv_fp_isready" != none && cat >>confdefs.h <&5 -echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 -if test "${cf_cv_dcl_errno+set}" = set; then +echo "$as_me:5555: checking for and functions" >&5 +echo $ECHO_N "checking for and functions... $ECHO_C" >&6 +if test "${cf_cv_have_wctype+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 6006 "configure" +cat >conftest.$ac_ext <<_ACEOF +#line 5562 "configure" #include "confdefs.h" -#ifdef HAVE_STDLIB_H -#include -#endif -#include -#include -#include +#include int main () { -long x = (long) errno + + wint_t temp = 101; + int test = (wctype("alnum") != 0) + || iswalnum(temp) + || iswalpha(temp) + || iswblank(temp) + || iswcntrl(temp) + || iswdigit(temp) + || iswgraph(temp) + || iswlower(temp) + || iswprint(temp) + || iswpunct(temp) + || iswspace(temp) + || iswupper(temp) + || iswxdigit(temp); ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6024: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5589: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6027: \$? = $ac_status" >&5 + echo "$as_me:5592: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6030: \"$ac_try\"") >&5 + { (eval echo "$as_me:5595: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6033: \$? = $ac_status" >&5 + echo "$as_me:5598: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_dcl_errno=yes + cf_cv_have_wctype=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_dcl_errno=no +cf_cv_have_wctype=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6044: result: $cf_cv_dcl_errno" >&5 -echo "${ECHO_T}$cf_cv_dcl_errno" >&6 - -if test "$cf_cv_dcl_errno" = no ; then - -cf_result=`echo "decl_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - - cat >>confdefs.h <&5 -echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 -if test "${cf_cv_have_errno+set}" = set; then +echo "$as_me:5609: result: $cf_cv_have_wctype" >&5 +echo "${ECHO_T}$cf_cv_have_wctype" >&6 +if test "$cf_cv_have_wctype" = yes ; then + echo "$as_me:5612: checking for library containing wctype" >&5 +echo $ECHO_N "checking for library containing wctype... $ECHO_C" >&6 +if test "${ac_cv_search_wctype+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else + ac_func_search_save_LIBS=$LIBS +ac_cv_search_wctype=no +cat >conftest.$ac_ext <<_ACEOF +#line 5620 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char wctype (); +int +main () +{ +wctype (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:5639: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:5642: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:5645: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:5648: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_wctype="none required" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +if test "$ac_cv_search_wctype" = no; then + for ac_lib in w; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6066 "configure" +#line 5660 "configure" #include "confdefs.h" -#undef errno -extern int errno; - +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char wctype (); int main () { -errno = 2 +wctype (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6081: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5679: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6084: \$? = $ac_status" >&5 + echo "$as_me:5682: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6087: \"$ac_try\"") >&5 + { (eval echo "$as_me:5685: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6090: \$? = $ac_status" >&5 + echo "$as_me:5688: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_have_errno=yes + ac_cv_search_wctype="-l$ac_lib" +break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_have_errno=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + done +fi +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:5701: result: $ac_cv_search_wctype" >&5 +echo "${ECHO_T}$ac_cv_search_wctype" >&6 +if test "$ac_cv_search_wctype" != no; then + test "$ac_cv_search_wctype" = "none required" || LIBS="$ac_cv_search_wctype $LIBS" + cat >>confdefs.h <<\EOF +#define HAVE_WCTYPE 1 +EOF fi -echo "$as_me:6101: result: $cf_cv_have_errno" >&5 -echo "${ECHO_T}$cf_cv_have_errno" >&6 -if test "$cf_cv_have_errno" = yes ; then +fi -cf_result=`echo "have_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +### checks for system services and user specified options +echo "$as_me:5714: checking for long file names" >&5 +echo $ECHO_N "checking for long file names... $ECHO_C" >&6 +if test "${ac_cv_sys_long_file_names+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_sys_long_file_names=yes +# Test for long file names in all the places we know might matter: +# . the current directory, where building will happen +# $prefix/lib where we will be installing things +# $exec_prefix/lib likewise +# eval it to expand exec_prefix. +# $TMPDIR if set, where it might want to write temporary files +# if $TMPDIR is not set: +# /tmp where it might want to write temporary files +# /var/tmp likewise +# /usr/tmp likewise +if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then + ac_tmpdirs=$TMPDIR +else + ac_tmpdirs='/tmp /var/tmp /usr/tmp' +fi +for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do + test -d $ac_dir || continue + test -w $ac_dir || continue # It is less confusing to not echo anything here. + ac_xdir=$ac_dir/cf$$ + (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue + ac_tf1=$ac_xdir/conftest9012345 + ac_tf2=$ac_xdir/conftest9012346 + (echo 1 >$ac_tf1) 2>/dev/null + (echo 2 >$ac_tf2) 2>/dev/null + ac_val=`cat $ac_tf1 2>/dev/null` + if test ! -f $ac_tf1 || test "$ac_val" != 1; then + ac_cv_sys_long_file_names=no + rm -rf $ac_xdir 2>/dev/null + break + fi + rm -rf $ac_xdir 2>/dev/null +done +fi +echo "$as_me:5753: result: $ac_cv_sys_long_file_names" >&5 +echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 +if test $ac_cv_sys_long_file_names = yes; then - cat >>confdefs.h <>confdefs.h <<\EOF +#define HAVE_LONG_FILE_NAMES 1 EOF fi -echo "$as_me:6114: checking if external sys_nerr is declared" >&5 -echo $ECHO_N "checking if external sys_nerr is declared... $ECHO_C" >&6 -if test "${cf_cv_dcl_sys_nerr+set}" = set; then +echo "$as_me:5763: checking for restartable reads on pipes" >&5 +echo $ECHO_N "checking for restartable reads on pipes... $ECHO_C" >&6 +if test "${cf_cv_can_restart_read+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 6121 "configure" +if test "$cross_compiling" = yes; then + cf_cv_can_restart_read=unknown +else + cat >conftest.$ac_ext <<_ACEOF +#line 5773 "configure" #include "confdefs.h" - -#ifdef HAVE_STDLIB_H -#include -#endif -#include +/* Exit 0 (true) if wait returns something other than -1, + i.e. the pid of the child, which means that wait was restarted + after getting the signal. */ #include -#include -int -main () +#include +#ifdef SA_RESTART +sigwrapper(sig, disp) +int sig; +void (*disp)(); { -long x = (long) sys_nerr - ; - return 0; + struct sigaction act, oact; + + act.sa_handler = disp; + sigemptyset(&act.sa_mask); + act.sa_flags = SA_RESTART; + + (void)sigaction(sig, &act, &oact); + +} +#else +# define sigwrapper signal +#endif +ucatch (isig) { } +main () { + int i, status; + int fd[2]; + char buff[2]; + pipe(fd); + i = fork(); + if (i == 0) { + sleep (2); + kill (getppid (), SIGINT); + sleep (2); + write(fd[1],"done",4); + close(fd[1]); + exit (0); + } + sigwrapper (SIGINT, ucatch); + status = read(fd[0], buff, sizeof(buff)); + wait (&i); + exit (status == -1); } + _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:6139: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:5820: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6142: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6145: \"$ac_try\"") >&5 + echo "$as_me:5823: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:5825: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6148: \$? = $ac_status" >&5 + echo "$as_me:5828: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_dcl_sys_nerr=yes + cf_cv_can_restart_read=yes else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_dcl_sys_nerr=no +cf_cv_can_restart_read=no fi -rm -f conftest.$ac_objext conftest.$ac_ext - +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6159: result: $cf_cv_dcl_sys_nerr" >&5 -echo "${ECHO_T}$cf_cv_dcl_sys_nerr" >&6 - -if test "$cf_cv_dcl_sys_nerr" = no ; then -cf_result=`echo "decl_sys_nerr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +fi +echo "$as_me:5841: result: $cf_cv_can_restart_read" >&5 +echo "${ECHO_T}$cf_cv_can_restart_read" >&6 - cat >>confdefs.h <>confdefs.h <<\EOF +#define HAVE_RESTARTABLE_PIPEREAD 1 EOF -fi - -# It's possible (for near-UNIX clones) that the data doesn't exist + # is a read() of a pipe restartable? -echo "$as_me:6174: checking if external sys_nerr exists" >&5 -echo $ECHO_N "checking if external sys_nerr exists... $ECHO_C" >&6 -if test "${cf_cv_have_sys_nerr+set}" = set; then +echo "$as_me:5850: checking whether setpgrp takes no argument" >&5 +echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6 +if test "${ac_cv_func_setpgrp_void+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat >conftest.$ac_ext <<_ACEOF -#line 6181 "configure" + if test "$cross_compiling" = yes; then + { { echo "$as_me:5856: error: cannot check setpgrp if cross compiling" >&5 +echo "$as_me: error: cannot check setpgrp if cross compiling" >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +#line 5861 "configure" #include "confdefs.h" - -#undef sys_nerr -extern int sys_nerr; +#if HAVE_UNISTD_H +# include +#endif int main () { -sys_nerr = 2 +/* If this system has a BSD-style setpgrp, which takes arguments, exit + successfully. */ + exit (setpgrp (1,1) == -1); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6196: \"$ac_link\"") >&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:5878: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6199: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6202: \"$ac_try\"") >&5 + echo "$as_me:5881: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:5883: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6205: \$? = $ac_status" >&5 + echo "$as_me:5886: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_have_sys_nerr=yes + ac_cv_func_setpgrp_void=no else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_have_sys_nerr=no +ac_cv_func_setpgrp_void=yes fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6216: result: $cf_cv_have_sys_nerr" >&5 -echo "${ECHO_T}$cf_cv_have_sys_nerr" >&6 - -if test "$cf_cv_have_sys_nerr" = yes ; then - -cf_result=`echo "have_sys_nerr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` +fi +echo "$as_me:5898: result: $ac_cv_func_setpgrp_void" >&5 +echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6 +if test $ac_cv_func_setpgrp_void = yes; then - cat >>confdefs.h <>confdefs.h <<\EOF +#define SETPGRP_VOID 1 EOF fi -echo "$as_me:6229: checking if external sys_errlist is declared" >&5 -echo $ECHO_N "checking if external sys_errlist is declared... $ECHO_C" >&6 -if test "${cf_cv_dcl_sys_errlist+set}" = set; then +echo "$as_me:5908: checking whether getpgrp takes no argument" >&5 +echo $ECHO_N "checking whether getpgrp takes no argument... $ECHO_C" >&6 +if test "${ac_cv_func_getpgrp_void+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - cat >conftest.$ac_ext <<_ACEOF -#line 6236 "configure" + # Use it with a single arg. +cat >conftest.$ac_ext <<_ACEOF +#line 5915 "configure" #include "confdefs.h" - -#ifdef HAVE_STDLIB_H -#include -#endif -#include -#include -#include +$ac_includes_default int main () { -long x = (long) sys_errlist +getpgrp (0); ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6254: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5927: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6257: \$? = $ac_status" >&5 + echo "$as_me:5930: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6260: \"$ac_try\"") >&5 + { (eval echo "$as_me:5933: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6263: \$? = $ac_status" >&5 + echo "$as_me:5936: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_dcl_sys_errlist=yes + ac_func_getpgrp_1=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_dcl_sys_errlist=no +ac_func_getpgrp_1=no fi rm -f conftest.$ac_objext conftest.$ac_ext - -fi -echo "$as_me:6274: result: $cf_cv_dcl_sys_errlist" >&5 -echo "${ECHO_T}$cf_cv_dcl_sys_errlist" >&6 - -if test "$cf_cv_dcl_sys_errlist" = no ; then - -cf_result=`echo "decl_sys_errlist" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - - cat >>confdefs.h <&5 -echo $ECHO_N "checking if external sys_errlist exists... $ECHO_C" >&6 -if test "${cf_cv_have_sys_errlist+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF -#line 6296 "configure" +# Use it with no arg. +cat >conftest.$ac_ext <<_ACEOF +#line 5947 "configure" #include "confdefs.h" - -#undef sys_errlist -extern int sys_errlist; - +$ac_includes_default int main () { -sys_errlist = 2 +getpgrp (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6311: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:5959: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6314: \$? = $ac_status" >&5 + echo "$as_me:5962: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6317: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:5965: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6320: \$? = $ac_status" >&5 + echo "$as_me:5968: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_cv_have_sys_errlist=yes + ac_func_getpgrp_0=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_cv_have_sys_errlist=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - -fi -echo "$as_me:6331: result: $cf_cv_have_sys_errlist" >&5 -echo "${ECHO_T}$cf_cv_have_sys_errlist" >&6 - -if test "$cf_cv_have_sys_errlist" = yes ; then - -cf_result=`echo "have_sys_errlist" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - - cat >>confdefs.h <>confdefs.h <<\EOF -#define SYS_UNIX 1 -EOF - -cat >>confdefs.h <<\EOF -#define scrn_chosen 1 -EOF - -# Try to eventually eliminate the following -cat >>confdefs.h <<\EOF -#define os_chosen 1 -EOF - -echo "$as_me:6357: checking for screen type" >&5 -echo $ECHO_N "checking for screen type... $ECHO_C" >&6 - -# Check whether --with-screen or --without-screen was given. -if test "${with_screen+set}" = set; then - withval="$with_screen" - screen=$withval -fi; - -if test -z "$screen"; then - -# Check whether --with-scr or --without-scr was given. -if test "${with_scr+set}" = set; then - withval="$with_scr" - screen=$withval -fi; -fi -test -z "$screen" && test "$with_x" = yes && screen=x11 -if test -z "$screen"; then - screen=termcap; +ac_func_getpgrp_0=no fi -echo "$as_me:6378: result: $screen" >&5 -echo "${ECHO_T}$screen" >&6 - -: See if this is any type of xvile configuration: -case "$screen" in - [Oo]pen[Ll]ook | [Mm]otif* | [xX] | [Aa]thena | [xX][atTmMoO]* | [xX]11 | neXtaw | XawPlus ) - EXTRA_INSTALL_FILES="$EXTRA_INSTALL_FILES \$(INSTALL_X_FILES)" - echo "$as_me:6385: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6 - -# Check whether --with-x or --without-x was given. -if test "${with_x+set}" = set; then - withval="$with_x" - -fi; -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled -else - if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then - # Both variables are already set. - have_x=yes - else - if test "${ac_cv_have_x+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +rm -f conftest.$ac_objext conftest.$ac_ext +# If both static checks agree, we are done. +case $ac_func_getpgrp_0:$ac_func_getpgrp_1 in + yes:no) ac_cv_func_getpgrp_void=yes;; + no:yes) ac_cv_func_getpgrp_void=false;; + *) if test "$cross_compiling" = yes; then + { { echo "$as_me:5982: error: cannot check getpgrp if cross compiling" >&5 +echo "$as_me: error: cannot check getpgrp if cross compiling" >&2;} + { (exit 1); exit 1; }; } else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -fr conftest.dir -if mkdir conftest.dir; then - cd conftest.dir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat >Imakefile <<'EOF' -acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' -EOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in - /usr/include) ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in - /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. - rm -fr conftest.dir -fi + cat >conftest.$ac_ext <<_ACEOF +#line 5987 "configure" +#include "confdefs.h" +$ac_includes_default -# Standard set of common directories for X headers. -# Check X11 before X11Rn because it is often a symlink to the current release. -ac_x_header_dirs=' -/usr/X11/include -/usr/X11R6/include -/usr/X11R5/include -/usr/X11R4/include +/* + * If this system has a BSD-style getpgrp(), + * which takes a pid argument, exit unsuccessfully. + * + * Snarfed from Chet Ramey's bash pgrp.c test program + */ -/usr/include/X11 -/usr/include/X11R6 -/usr/include/X11R5 -/usr/include/X11R4 +int pid; +int pg1, pg2, pg3, pg4; +int ng, np, s, child; -/usr/local/X11/include -/usr/local/X11R6/include -/usr/local/X11R5/include -/usr/local/X11R4/include +int +main () +{ + pid = getpid (); + pg1 = getpgrp (0); + pg2 = getpgrp (); + pg3 = getpgrp (pid); + pg4 = getpgrp (1); -/usr/local/include/X11 -/usr/local/include/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 + /* If all of these values are the same, it's pretty sure that we're + on a system that ignores getpgrp's first argument. */ + if (pg2 == pg4 && pg1 == pg3 && pg2 == pg3) + exit (0); -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 + child = fork (); + if (child < 0) + exit(1); + else if (child == 0) + { + np = getpid (); + /* If this is Sys V, this will not work; pgrp will be set to np + because setpgrp just changes a pgrp to be the same as the + pid. */ + setpgrp (np, pg1); + ng = getpgrp (0); /* Same result for Sys V and BSD */ + if (ng == pg1) + exit (1); + else + exit (0); + } + else + { + wait (&s); + exit (s>>8); + } +} -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:6041: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6044: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:6046: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6049: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_getpgrp_void=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_getpgrp_void=no +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi;; +esac # $ac_func_getpgrp_0:$ac_func_getpgrp_1 -/usr/openwin/include -/usr/openwin/share/include' +fi +echo "$as_me:6063: result: $ac_cv_func_getpgrp_void" >&5 +echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6 +if test $ac_cv_func_getpgrp_void = yes; then -if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. - # First, try using that file with no special directory specified. +cat >>confdefs.h <<\EOF +#define GETPGRP_VOID 1 +EOF + +fi + +echo "$as_me:6073: checking if killpg is needed" >&5 +echo $ECHO_N "checking if killpg is needed... $ECHO_C" >&6 +if test "${cf_cv_need_killpg+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +if test "$cross_compiling" = yes; then + cf_cv_need_killpg=unknown +else cat >conftest.$ac_ext <<_ACEOF -#line 6482 "configure" +#line 6083 "configure" #include "confdefs.h" -#include + +#include +#include +RETSIGTYPE +handler(s) + int s; +{ + exit(0); +} + +main() +{ +#ifdef SETPGRP_VOID + (void) setpgrp(); +#else + (void) setpgrp(0,0); +#endif + (void) signal(SIGINT, handler); + (void) kill(-getpid(), SIGINT); + exit(1); +} _ACEOF -if { (eval echo "$as_me:6486: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:6108: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:6492: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi + echo "$as_me:6111: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:6113: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6116: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cf_cv_need_killpg=no else - ac_cpp_err=yes + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +cf_cv_need_killpg=yes fi -if test -z "$ac_cpp_err"; then - # We can compile using X headers with no special include directory. -ac_x_includes= -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then - ac_x_includes=$ac_dir - break - fi -done +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_ext -fi # $ac_x_includes = no -if test "$ac_x_libraries" = no; then - # Check for the libraries. - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 6525 "configure" +fi +echo "$as_me:6129: result: $cf_cv_need_killpg" >&5 +echo "${ECHO_T}$cf_cv_need_killpg" >&6 + +test $cf_cv_need_killpg = yes && cat >>confdefs.h <<\EOF +#define HAVE_KILLPG 1 +EOF + +echo "$as_me:6136: checking if external errno is declared" >&5 +echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6 +if test "${cf_cv_dcl_errno+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +#line 6143 "configure" #include "confdefs.h" -#include + +#ifdef HAVE_STDLIB_H +#include +#endif +#include +#include +#include int main () { -XtMalloc (0) +long x = (long) errno ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6537: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6161: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6540: \$? = $ac_status" >&5 + echo "$as_me:6164: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6543: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6167: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6546: \$? = $ac_status" >&5 + echo "$as_me:6170: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - LIBS=$ac_save_LIBS -# We can link X programs with no special library path. -ac_x_libraries= + cf_cv_dcl_errno=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -LIBS=$ac_save_LIBS -for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -do - # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl; do - if test -r $ac_dir/libXt.$ac_extension; then - ac_x_libraries=$ac_dir - break 2 - fi - done -done +cf_cv_dcl_errno=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi # $ac_x_libraries = no +rm -f conftest.$ac_objext conftest.$ac_ext -if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then - # Didn't find X anywhere. Cache the known absence of X. - ac_cv_have_x="have_x=no" -else - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" -fi fi +echo "$as_me:6181: result: $cf_cv_dcl_errno" >&5 +echo "${ECHO_T}$cf_cv_dcl_errno" >&6 - fi - eval "$ac_cv_have_x" -fi # $with_x != no +if test "$cf_cv_dcl_errno" = no ; then + +cf_result=`echo "decl_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h <&5 -echo "${ECHO_T}$have_x" >&6 - no_x=yes -else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:6594: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi -# We need to check for -lsocket and -lnsl here in order to work around an -# autoconf bug. autoconf-2.12 is not checking for these prior to checking for -# the X11R6 -lSM and -lICE libraries. The resultant failures cascade... -# (tested on Solaris 2.5 w/ X11R6) -SYSTEM_NAME=`echo "$cf_cv_system_name"|tr ' ' -` -cf_have_X_LIBS=no -case $SYSTEM_NAME in -irix[56]*) ;; -clix*) - # FIXME: modify the library lookup in autoconf to - # allow _s.a suffix ahead of .a - echo "$as_me:6609: checking for open in -lc_s" >&5 -echo $ECHO_N "checking for open in -lc_s... $ECHO_C" >&6 -if test "${ac_cv_lib_c_s_open+set}" = set; then +# It's possible (for near-UNIX clones) that the data doesn't exist + +echo "$as_me:6196: checking if external errno exists" >&5 +echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6 +if test "${cf_cv_have_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lc_s $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 6617 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 6203 "configure" #include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char open (); +#undef errno +extern int errno; + int main () { -open (); +errno = 2 ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6636: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6218: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6639: \$? = $ac_status" >&5 + echo "$as_me:6221: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6642: \"$ac_try\"") >&5 + { (eval echo "$as_me:6224: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6645: \$? = $ac_status" >&5 + echo "$as_me:6227: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_c_s_open=yes + cf_cv_have_errno=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_c_s_open=no +cf_cv_have_errno=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + +fi +echo "$as_me:6238: result: $cf_cv_have_errno" >&5 +echo "${ECHO_T}$cf_cv_have_errno" >&6 + +if test "$cf_cv_have_errno" = yes ; then + +cf_result=`echo "have_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h <&5 -echo "${ECHO_T}$ac_cv_lib_c_s_open" >&6 -if test $ac_cv_lib_c_s_open = yes; then - LIBS="-lc_s $LIBS" - echo "$as_me:6660: checking for gethostname in -lbsd" >&5 -echo $ECHO_N "checking for gethostname in -lbsd... $ECHO_C" >&6 -if test "${ac_cv_lib_bsd_gethostname+set}" = set; then + +echo "$as_me:6251: checking if external sys_nerr is declared" >&5 +echo $ECHO_N "checking if external sys_nerr is declared... $ECHO_C" >&6 +if test "${cf_cv_dcl_sys_nerr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 6668 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 6258 "configure" #include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" +#ifdef HAVE_STDLIB_H +#include #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostname (); +#include +#include +#include int main () { -gethostname (); +long x = (long) sys_nerr ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6687: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6276: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6690: \$? = $ac_status" >&5 + echo "$as_me:6279: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6693: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6282: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6696: \$? = $ac_status" >&5 + echo "$as_me:6285: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_bsd_gethostname=yes + cf_cv_dcl_sys_nerr=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_bsd_gethostname=no +cf_cv_dcl_sys_nerr=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:6296: result: $cf_cv_dcl_sys_nerr" >&5 +echo "${ECHO_T}$cf_cv_dcl_sys_nerr" >&6 + +if test "$cf_cv_dcl_sys_nerr" = no ; then + +cf_result=`echo "decl_sys_nerr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h <&5 -echo "${ECHO_T}$ac_cv_lib_bsd_gethostname" >&6 -if test $ac_cv_lib_bsd_gethostname = yes; then - LIBS="-lbsd $LIBS" - echo "$as_me:6711: checking for gethostname in -lnsl_s" >&5 -echo $ECHO_N "checking for gethostname in -lnsl_s... $ECHO_C" >&6 -if test "${ac_cv_lib_nsl_s_gethostname+set}" = set; then + +# It's possible (for near-UNIX clones) that the data doesn't exist + +echo "$as_me:6311: checking if external sys_nerr exists" >&5 +echo $ECHO_N "checking if external sys_nerr exists... $ECHO_C" >&6 +if test "${cf_cv_have_sys_nerr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl_s $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 6719 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 6318 "configure" #include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostname (); +#undef sys_nerr +extern int sys_nerr; + int main () { -gethostname (); +sys_nerr = 2 ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6738: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6333: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6741: \$? = $ac_status" >&5 + echo "$as_me:6336: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6744: \"$ac_try\"") >&5 + { (eval echo "$as_me:6339: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6747: \$? = $ac_status" >&5 + echo "$as_me:6342: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_nsl_s_gethostname=yes + cf_cv_have_sys_nerr=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_nsl_s_gethostname=no +cf_cv_have_sys_nerr=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + +fi +echo "$as_me:6353: result: $cf_cv_have_sys_nerr" >&5 +echo "${ECHO_T}$cf_cv_have_sys_nerr" >&6 + +if test "$cf_cv_have_sys_nerr" = yes ; then + +cf_result=`echo "have_sys_nerr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h <&5 -echo "${ECHO_T}$ac_cv_lib_nsl_s_gethostname" >&6 -if test $ac_cv_lib_nsl_s_gethostname = yes; then - LIBS="-lnsl_s $LIBS" - echo "$as_me:6762: checking for XOpenDisplay in -lX11_s" >&5 -echo $ECHO_N "checking for XOpenDisplay in -lX11_s... $ECHO_C" >&6 -if test "${ac_cv_lib_X11_s_XOpenDisplay+set}" = set; then + +echo "$as_me:6366: checking if external sys_errlist is declared" >&5 +echo $ECHO_N "checking if external sys_errlist is declared... $ECHO_C" >&6 +if test "${cf_cv_dcl_sys_errlist+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lX11_s $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 6770 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 6373 "configure" #include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" +#ifdef HAVE_STDLIB_H +#include #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XOpenDisplay (); +#include +#include +#include int main () { -XOpenDisplay (); +long x = (long) sys_errlist ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6789: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6391: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6792: \$? = $ac_status" >&5 + echo "$as_me:6394: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6795: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6397: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6798: \$? = $ac_status" >&5 + echo "$as_me:6400: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_X11_s_XOpenDisplay=yes + cf_cv_dcl_sys_errlist=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_X11_s_XOpenDisplay=no +cf_cv_dcl_sys_errlist=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.$ac_objext conftest.$ac_ext + +fi +echo "$as_me:6411: result: $cf_cv_dcl_sys_errlist" >&5 +echo "${ECHO_T}$cf_cv_dcl_sys_errlist" >&6 + +if test "$cf_cv_dcl_sys_errlist" = no ; then + +cf_result=`echo "decl_sys_errlist" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h <&5 -echo "${ECHO_T}$ac_cv_lib_X11_s_XOpenDisplay" >&6 -if test $ac_cv_lib_X11_s_XOpenDisplay = yes; then - LIBS="-lX11_s $LIBS" - echo "$as_me:6813: checking for XtAppInitialize in -lXt_s" >&5 -echo $ECHO_N "checking for XtAppInitialize in -lXt_s... $ECHO_C" >&6 -if test "${ac_cv_lib_Xt_s_XtAppInitialize+set}" = set; then + +# It's possible (for near-UNIX clones) that the data doesn't exist + +echo "$as_me:6426: checking if external sys_errlist exists" >&5 +echo $ECHO_N "checking if external sys_errlist exists... $ECHO_C" >&6 +if test "${cf_cv_have_sys_errlist+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXt_s $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 6821 "configure" + + cat >conftest.$ac_ext <<_ACEOF +#line 6433 "configure" #include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char XtAppInitialize (); +#undef sys_errlist +extern int sys_errlist; + int main () { -XtAppInitialize (); +sys_errlist = 2 ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6840: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6448: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6843: \$? = $ac_status" >&5 + echo "$as_me:6451: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6846: \"$ac_try\"") >&5 + { (eval echo "$as_me:6454: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6849: \$? = $ac_status" >&5 + echo "$as_me:6457: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_Xt_s_XtAppInitialize=yes + cf_cv_have_sys_errlist=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_Xt_s_XtAppInitialize=no +cf_cv_have_sys_errlist=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + +fi +echo "$as_me:6468: result: $cf_cv_have_sys_errlist" >&5 +echo "${ECHO_T}$cf_cv_have_sys_errlist" >&6 + +if test "$cf_cv_have_sys_errlist" = yes ; then + +cf_result=`echo "have_sys_errlist" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >>confdefs.h <>confdefs.h <<\EOF +#define SYS_UNIX 1 +EOF + +cat >>confdefs.h <<\EOF +#define scrn_chosen 1 +EOF + +# Try to eventually eliminate the following +cat >>confdefs.h <<\EOF +#define os_chosen 1 +EOF + +echo "$as_me:6494: checking for screen type" >&5 +echo $ECHO_N "checking for screen type... $ECHO_C" >&6 + +# Check whether --with-screen or --without-screen was given. +if test "${with_screen+set}" = set; then + withval="$with_screen" + screen=$withval +fi; + +if test -z "$screen"; then + +# Check whether --with-scr or --without-scr was given. +if test "${with_scr+set}" = set; then + withval="$with_scr" + screen=$withval +fi; +fi +test -z "$screen" && test "$with_x" = yes && screen=x11 +if test -z "$screen"; then + screen=termcap; +fi +echo "$as_me:6515: result: $screen" >&5 +echo "${ECHO_T}$screen" >&6 + +: See if this is any type of xvile configuration: +case "$screen" in + [Oo]pen[Ll]ook | [Mm]otif* | [xX] | [Aa]thena | [xX][atTmMoO]* | [xX]11 | neXtaw | XawPlus ) + EXTRA_INSTALL_FILES="$EXTRA_INSTALL_FILES \$(INSTALL_X_FILES)" + echo "$as_me:6522: checking for X" >&5 +echo $ECHO_N "checking for X... $ECHO_C" >&6 + +# Check whether --with-x or --without-x was given. +if test "${with_x+set}" = set; then + withval="$with_x" + +fi; +# $have_x is `yes', `no', `disabled', or empty when we do not yet know. +if test "x$with_x" = xno; then + # The user explicitly disabled X. + have_x=disabled +else + if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then + # Both variables are already set. + have_x=yes + else + if test "${ac_cv_have_x+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # One or both of the vars are not set, and there is no cached value. +ac_x_includes=no ac_x_libraries=no +rm -fr conftest.dir +if mkdir conftest.dir; then + cd conftest.dir + # Make sure to not put "make" in the Imakefile rules, since we grep it out. + cat >Imakefile <<'EOF' +acfindx: + @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' +EOF + if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. + eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` + # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. + for ac_extension in a so sl; do + if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && + test -f $ac_im_libdir/libX11.$ac_extension; then + ac_im_usrlibdir=$ac_im_libdir; break + fi + done + # Screen out bogus values from the imake configuration. They are + # bogus both because they are the default anyway, and because + # using them would break gcc on systems where it needs fixed includes. + case $ac_im_incroot in + /usr/include) ;; + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; + esac + case $ac_im_usrlibdir in + /usr/lib | /lib) ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; + esac + fi + cd .. + rm -fr conftest.dir fi -echo "$as_me:6860: result: $ac_cv_lib_Xt_s_XtAppInitialize" >&5 -echo "${ECHO_T}$ac_cv_lib_Xt_s_XtAppInitialize" >&6 -if test $ac_cv_lib_Xt_s_XtAppInitialize = yes; then - LIBS="-lXt_s $LIBS" - cf_have_X_LIBS=Xt -fi +# Standard set of common directories for X headers. +# Check X11 before X11Rn because it is often a symlink to the current release. +ac_x_header_dirs=' +/usr/X11/include +/usr/X11R6/include +/usr/X11R5/include +/usr/X11R4/include -fi +/usr/include/X11 +/usr/include/X11R6 +/usr/include/X11R5 +/usr/include/X11R4 -fi +/usr/local/X11/include +/usr/local/X11R6/include +/usr/local/X11R5/include +/usr/local/X11R4/include -fi +/usr/local/include/X11 +/usr/local/include/X11R6 +/usr/local/include/X11R5 +/usr/local/include/X11R4 -fi +/usr/X386/include +/usr/x386/include +/usr/XFree86/include/X11 - ;; -*) +/usr/include +/usr/local/include +/usr/unsupported/include +/usr/athena/include +/usr/local/x11r5/include +/usr/lpp/Xamples/include -echo "$as_me:6879: checking for socket in -lsocket" >&5 -echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6 -if test "${ac_cv_lib_socket_socket+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 6887 "configure" -#include "confdefs.h" +/usr/openwin/include +/usr/openwin/share/include' -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char socket (); -int -main () -{ -socket (); - ; - return 0; -} +if test "$ac_x_includes" = no; then + # Guess where to find include files, by looking for Intrinsic.h. + # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF +#line 6619 "configure" +#include "confdefs.h" +#include _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6906: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:6909: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6912: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (eval echo "$as_me:6623: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - echo "$as_me:6915: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_socket_socket=yes + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:6629: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_socket_socket=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + ac_cpp_err=yes fi -echo "$as_me:6926: result: $ac_cv_lib_socket_socket" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6 -if test $ac_cv_lib_socket_socket = yes; then - cat >>confdefs.h <&5 + cat conftest.$ac_ext >&5 + for ac_dir in $ac_x_header_dirs; do + if test -r "$ac_dir/X11/Intrinsic.h"; then + ac_x_includes=$ac_dir + break + fi +done fi +rm -f conftest.err conftest.$ac_ext +fi # $ac_x_includes = no -echo "$as_me:6937: checking for gethostname in -lnsl" >&5 -echo $ECHO_N "checking for gethostname in -lnsl... $ECHO_C" >&6 -if test "${ac_cv_lib_nsl_gethostname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 6945 "configure" +if test "$ac_x_libraries" = no; then + # Check for the libraries. + # See if we find them without any special options. + # Don't add to $LIBS permanently. + ac_save_LIBS=$LIBS + LIBS="-lXt $LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line 6662 "configure" #include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostname (); +#include int main () { -gethostname (); +XtMalloc (0) ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6964: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6674: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6967: \$? = $ac_status" >&5 + echo "$as_me:6677: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6970: \"$ac_try\"") >&5 + { (eval echo "$as_me:6680: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6973: \$? = $ac_status" >&5 + echo "$as_me:6683: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_nsl_gethostname=yes + LIBS=$ac_save_LIBS +# We can link X programs with no special library path. +ac_x_libraries= else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_nsl_gethostname=no +LIBS=$ac_save_LIBS +for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` +do + # Don't even attempt the hair of trying to link an X program! + for ac_extension in a so sl; do + if test -r $ac_dir/libXt.$ac_extension; then + ac_x_libraries=$ac_dir + break 2 + fi + done +done fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +fi # $ac_x_libraries = no + +if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then + # Didn't find X anywhere. Cache the known absence of X. + ac_cv_have_x="have_x=no" +else + # Record where we found X for the cache. + ac_cv_have_x="have_x=yes \ + ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" +fi fi -echo "$as_me:6984: result: $ac_cv_lib_nsl_gethostname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostname" >&6 -if test $ac_cv_lib_nsl_gethostname = yes; then - cat >>confdefs.h <&5 +echo "${ECHO_T}$have_x" >&6 + no_x=yes +else + # If each of the values was on the command line, it overrides each guess. + test "x$x_includes" = xNONE && x_includes=$ac_x_includes + test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries + # Update the cache value to reflect the command line values. + ac_cv_have_x="have_x=yes \ + ac_x_includes=$x_includes ac_x_libraries=$x_libraries" + echo "$as_me:6731: result: libraries $x_libraries, headers $x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi - ;; -esac - -if test $cf_have_X_LIBS = no ; then - if test "$no_x" = yes; then +if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. cat >>confdefs.h <<\EOF @@ -7016,11 +6752,11 @@ # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:7019: checking whether -R must be followed by a space" >&5 + echo "$as_me:6755: checking whether -R must be followed by a space" >&5 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" cat >conftest.$ac_ext <<_ACEOF -#line 7023 "configure" +#line 6759 "configure" #include "confdefs.h" int @@ -7032,16 +6768,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7035: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6771: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7038: \$? = $ac_status" >&5 + echo "$as_me:6774: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7041: \"$ac_try\"") >&5 + { (eval echo "$as_me:6777: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7044: \$? = $ac_status" >&5 + echo "$as_me:6780: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_R_nospace=yes else @@ -7051,13 +6787,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_nospace = yes; then - echo "$as_me:7054: result: no" >&5 + echo "$as_me:6790: result: no" >&5 echo "${ECHO_T}no" >&6 X_LIBS="$X_LIBS -R$x_libraries" else LIBS="$ac_xsave_LIBS -R $x_libraries" cat >conftest.$ac_ext <<_ACEOF -#line 7060 "configure" +#line 6796 "configure" #include "confdefs.h" int @@ -7069,16 +6805,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7072: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6808: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7075: \$? = $ac_status" >&5 + echo "$as_me:6811: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7078: \"$ac_try\"") >&5 + { (eval echo "$as_me:6814: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7081: \$? = $ac_status" >&5 + echo "$as_me:6817: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_R_space=yes else @@ -7088,11 +6824,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_space = yes; then - echo "$as_me:7091: result: yes" >&5 + echo "$as_me:6827: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:7095: result: neither works" >&5 + echo "$as_me:6831: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -7112,7 +6848,7 @@ # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >conftest.$ac_ext <<_ACEOF -#line 7115 "configure" +#line 6851 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7131,22 +6867,22 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7134: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6870: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7137: \$? = $ac_status" >&5 + echo "$as_me:6873: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7140: \"$ac_try\"") >&5 + { (eval echo "$as_me:6876: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7143: \$? = $ac_status" >&5 + echo "$as_me:6879: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:7149: checking for dnet_ntoa in -ldnet" >&5 +echo "$as_me:6885: checking for dnet_ntoa in -ldnet" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7154,7 +6890,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7157 "configure" +#line 6893 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7173,16 +6909,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7176: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6912: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7179: \$? = $ac_status" >&5 + echo "$as_me:6915: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7182: \"$ac_try\"") >&5 + { (eval echo "$as_me:6918: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7185: \$? = $ac_status" >&5 + echo "$as_me:6921: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else @@ -7193,14 +6929,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7196: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:6932: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:7203: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:6939: checking for dnet_ntoa in -ldnet_stub" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7208,7 +6944,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7211 "configure" +#line 6947 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7227,16 +6963,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7230: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6966: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7233: \$? = $ac_status" >&5 + echo "$as_me:6969: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7236: \"$ac_try\"") >&5 + { (eval echo "$as_me:6972: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7239: \$? = $ac_status" >&5 + echo "$as_me:6975: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -7247,7 +6983,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7250: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:6986: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" @@ -7266,13 +7002,13 @@ # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:7269: checking for gethostbyname" >&5 + echo "$as_me:7005: checking for gethostbyname" >&5 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 if test "${ac_cv_func_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7275 "configure" +#line 7011 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname (); below. */ @@ -7303,16 +7039,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7306: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7042: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7309: \$? = $ac_status" >&5 + echo "$as_me:7045: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7312: \"$ac_try\"") >&5 + { (eval echo "$as_me:7048: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7315: \$? = $ac_status" >&5 + echo "$as_me:7051: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gethostbyname=yes else @@ -7322,11 +7058,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7325: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:7061: result: $ac_cv_func_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:7329: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:7065: checking for gethostbyname in -lnsl" >&5 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7334,7 +7070,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7337 "configure" +#line 7073 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7353,16 +7089,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7356: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7092: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7359: \$? = $ac_status" >&5 + echo "$as_me:7095: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7362: \"$ac_try\"") >&5 + { (eval echo "$as_me:7098: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7365: \$? = $ac_status" >&5 + echo "$as_me:7101: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -7373,14 +7109,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7376: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:7112: result: $ac_cv_lib_nsl_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 if test $ac_cv_lib_nsl_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:7383: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:7119: checking for gethostbyname in -lbsd" >&5 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7388,7 +7124,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7391 "configure" +#line 7127 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7407,16 +7143,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7410: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7146: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7413: \$? = $ac_status" >&5 + echo "$as_me:7149: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7416: \"$ac_try\"") >&5 + { (eval echo "$as_me:7152: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7419: \$? = $ac_status" >&5 + echo "$as_me:7155: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gethostbyname=yes else @@ -7427,7 +7163,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7430: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:7166: result: $ac_cv_lib_bsd_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 if test $ac_cv_lib_bsd_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" @@ -7443,13 +7179,13 @@ # variants that don't use the nameserver (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:7446: checking for connect" >&5 + echo "$as_me:7182: checking for connect" >&5 echo $ECHO_N "checking for connect... $ECHO_C" >&6 if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7452 "configure" +#line 7188 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect (); below. */ @@ -7480,16 +7216,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7483: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7219: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7486: \$? = $ac_status" >&5 + echo "$as_me:7222: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7489: \"$ac_try\"") >&5 + { (eval echo "$as_me:7225: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7492: \$? = $ac_status" >&5 + echo "$as_me:7228: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_connect=yes else @@ -7499,11 +7235,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7502: result: $ac_cv_func_connect" >&5 +echo "$as_me:7238: result: $ac_cv_func_connect" >&5 echo "${ECHO_T}$ac_cv_func_connect" >&6 if test $ac_cv_func_connect = no; then - echo "$as_me:7506: checking for connect in -lsocket" >&5 + echo "$as_me:7242: checking for connect in -lsocket" >&5 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7511,7 +7247,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7514 "configure" +#line 7250 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7530,16 +7266,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7533: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7269: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7536: \$? = $ac_status" >&5 + echo "$as_me:7272: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7539: \"$ac_try\"") >&5 + { (eval echo "$as_me:7275: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7542: \$? = $ac_status" >&5 + echo "$as_me:7278: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_socket_connect=yes else @@ -7550,7 +7286,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7553: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:7289: result: $ac_cv_lib_socket_connect" >&5 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" @@ -7559,13 +7295,13 @@ fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:7562: checking for remove" >&5 + echo "$as_me:7298: checking for remove" >&5 echo $ECHO_N "checking for remove... $ECHO_C" >&6 if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7568 "configure" +#line 7304 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove (); below. */ @@ -7596,16 +7332,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7599: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7335: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7602: \$? = $ac_status" >&5 + echo "$as_me:7338: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7605: \"$ac_try\"") >&5 + { (eval echo "$as_me:7341: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7608: \$? = $ac_status" >&5 + echo "$as_me:7344: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_remove=yes else @@ -7615,11 +7351,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7618: result: $ac_cv_func_remove" >&5 +echo "$as_me:7354: result: $ac_cv_func_remove" >&5 echo "${ECHO_T}$ac_cv_func_remove" >&6 if test $ac_cv_func_remove = no; then - echo "$as_me:7622: checking for remove in -lposix" >&5 + echo "$as_me:7358: checking for remove in -lposix" >&5 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 if test "${ac_cv_lib_posix_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7627,7 +7363,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7630 "configure" +#line 7366 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7646,16 +7382,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7649: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7385: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7652: \$? = $ac_status" >&5 + echo "$as_me:7388: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7655: \"$ac_try\"") >&5 + { (eval echo "$as_me:7391: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7658: \$? = $ac_status" >&5 + echo "$as_me:7394: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_posix_remove=yes else @@ -7666,7 +7402,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7669: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:7405: result: $ac_cv_lib_posix_remove" >&5 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" @@ -7675,13 +7411,13 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:7678: checking for shmat" >&5 + echo "$as_me:7414: checking for shmat" >&5 echo $ECHO_N "checking for shmat... $ECHO_C" >&6 if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7684 "configure" +#line 7420 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat (); below. */ @@ -7712,16 +7448,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7715: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7451: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7718: \$? = $ac_status" >&5 + echo "$as_me:7454: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7721: \"$ac_try\"") >&5 + { (eval echo "$as_me:7457: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7724: \$? = $ac_status" >&5 + echo "$as_me:7460: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_shmat=yes else @@ -7731,11 +7467,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7734: result: $ac_cv_func_shmat" >&5 +echo "$as_me:7470: result: $ac_cv_func_shmat" >&5 echo "${ECHO_T}$ac_cv_func_shmat" >&6 if test $ac_cv_func_shmat = no; then - echo "$as_me:7738: checking for shmat in -lipc" >&5 + echo "$as_me:7474: checking for shmat in -lipc" >&5 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 if test "${ac_cv_lib_ipc_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7743,7 +7479,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7746 "configure" +#line 7482 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7762,16 +7498,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7765: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7501: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7768: \$? = $ac_status" >&5 + echo "$as_me:7504: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7771: \"$ac_try\"") >&5 + { (eval echo "$as_me:7507: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7774: \$? = $ac_status" >&5 + echo "$as_me:7510: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ipc_shmat=yes else @@ -7782,7 +7518,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7785: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:7521: result: $ac_cv_lib_ipc_shmat" >&5 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" @@ -7800,7 +7536,7 @@ # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - echo "$as_me:7803: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:7539: checking for IceConnectionNumber in -lICE" >&5 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7808,7 +7544,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7811 "configure" +#line 7547 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7827,16 +7563,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7830: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7566: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7833: \$? = $ac_status" >&5 + echo "$as_me:7569: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7836: \"$ac_try\"") >&5 + { (eval echo "$as_me:7572: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7839: \$? = $ac_status" >&5 + echo "$as_me:7575: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -7847,7 +7583,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7850: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:7586: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" @@ -7857,19 +7593,45 @@ fi - LDFLAGS="$LDFLAGS $X_LIBS" +# SYSTEM_NAME=`echo "$cf_cv_system_name"|tr ' ' -` + +cf_have_X_LIBS=no + +LDFLAGS="$X_LIBS $LDFLAGS" test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" +cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= +cf_new_extra_cppflags= + for cf_add_cflags in $X_CFLAGS do +case $cf_fix_cppflags in +no) case $cf_add_cflags in #(vi -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac case "$CPPFLAGS" in *$cf_add_cflags) #(vi ;; @@ -7882,6 +7644,17 @@ cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac done if test -n "$cf_new_cflags" ; then @@ -7896,47 +7669,115 @@ CPPFLAGS="$cf_new_cppflags $CPPFLAGS" fi +if test -n "$cf_new_extra_cppflags" ; then + test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi + if test "$cf_check_cflags" != "$CFLAGS" ; then cat >conftest.$ac_ext <<_ACEOF -#line 7901 "configure" +#line 7680 "configure" #include "confdefs.h" #include int main () { -printf("Hello world"); +printf("Hello world"); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7692: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7695: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7698: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7701: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 + + if test "$cf_check_cppflags" != "$CPPFLAGS" ; then + test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 + + fi + CFLAGS="$cf_check_flags" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi + +echo "$as_me:7718: 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 7724 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char XOpenDisplay (); below. */ +#include +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char XOpenDisplay (); +char (*f) (); + +int +main () +{ +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_XOpenDisplay) || defined (__stub___XOpenDisplay) +choke me +#else +f = XOpenDisplay; +#endif + ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7913: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7755: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7916: \$? = $ac_status" >&5 + echo "$as_me:7758: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7919: \"$ac_try\"") >&5 + { (eval echo "$as_me:7761: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7922: \$? = $ac_status" >&5 + echo "$as_me:7764: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + ac_cv_func_XOpenDisplay=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 - - if test "$cf_check_cppflags" != "$CPPFLAGS" ; then - test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 - - fi - CFLAGS="$cf_check_flags" +ac_cv_func_XOpenDisplay=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:7774: 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:7939: checking for XOpenDisplay in -lX11" >&5 +echo "$as_me:7780: 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 @@ -7944,7 +7785,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7947 "configure" +#line 7788 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7963,16 +7804,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7966: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7807: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7969: \$? = $ac_status" >&5 + echo "$as_me:7810: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7972: \"$ac_try\"") >&5 + { (eval echo "$as_me:7813: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7975: \$? = $ac_status" >&5 + echo "$as_me:7816: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -7983,23 +7824,25 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7986: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:7827: 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 LIBS="-lX11 $LIBS" fi - echo "$as_me:7992: 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 +fi + +echo "$as_me:7835: 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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 8000 "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 7841 "configure" #include "confdefs.h" - +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char XtAppInitialize (); below. */ +#include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -8007,130 +7850,112 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char XtAppInitialize (); +char (*f) (); + int main () { -XtAppInitialize (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_XtAppInitialize) || defined (__stub___XtAppInitialize) +choke me +#else +f = XtAppInitialize; +#endif + ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8019: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7872: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8022: \$? = $ac_status" >&5 + echo "$as_me:7875: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8025: \"$ac_try\"") >&5 + { (eval echo "$as_me:7878: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8028: \$? = $ac_status" >&5 + echo "$as_me:7881: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_Xt_XtAppInitialize=yes + ac_cv_func_XtAppInitialize=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_Xt_XtAppInitialize=no +ac_cv_func_XtAppInitialize=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:8039: 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 - cat >>confdefs.h <<\EOF -#define HAVE_LIBXT 1 -EOF - - cf_have_X_LIBS=Xt - LIBS="-lXt $X_PRE_LIBS $LIBS" fi - +echo "$as_me:7891: result: $ac_cv_func_XtAppInitialize" >&5 +echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6 +if test $ac_cv_func_XtAppInitialize = yes; then + : else - LDFLAGS="$LDFLAGS $X_LIBS" - -test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 - -cf_check_cflags="$CFLAGS" -cf_check_cppflags="$CPPFLAGS" - -cf_new_cflags= -cf_new_cppflags= -for cf_add_cflags in $X_CFLAGS -do - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi - case "$CPPFLAGS" in - *$cf_add_cflags) #(vi - ;; - *) #(vi - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" - ;; - esac - ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" - ;; - esac -done - -if test -n "$cf_new_cflags" ; then - test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 - CFLAGS="$CFLAGS $cf_new_cflags" -fi - -if test -n "$cf_new_cppflags" ; then - test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 - - CPPFLAGS="$cf_new_cppflags $CPPFLAGS" -fi - -if test "$cf_check_cflags" != "$CFLAGS" ; then +echo "$as_me:7897: 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 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8092 "configure" +#line 7905 "configure" #include "confdefs.h" -#include + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char XtAppInitialize (); int main () { -printf("Hello world"); +XtAppInitialize (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8104: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7924: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8107: \$? = $ac_status" >&5 + echo "$as_me:7927: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8110: \"$ac_try\"") >&5 + { (eval echo "$as_me:7930: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8113: \$? = $ac_status" >&5 + echo "$as_me:7933: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - : + ac_cv_lib_Xt_XtAppInitialize=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 - - if test "$cf_check_cppflags" != "$CPPFLAGS" ; then - test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 - - fi - CFLAGS="$cf_check_flags" +ac_cv_lib_Xt_XtAppInitialize=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7944: 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 + cat >>confdefs.h <<\EOF +#define HAVE_LIBXT 1 +EOF + + cf_have_X_LIBS=Xt + LIBS="-lXt $X_PRE_LIBS $LIBS" fi fi if test $cf_have_X_LIBS = no ; then - { echo "$as_me:8133: WARNING: Unable to successfully link X Toolkit library (-lXt) with + { echo "$as_me:7958: 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 @@ -8142,7 +7967,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:8145: checking for $ac_word" >&5 +echo "$as_me:7970: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_IMAKE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8159,7 +7984,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_IMAKE="$ac_dir/$ac_word" - echo "$as_me:8162: found $ac_dir/$ac_word" >&5 + echo "$as_me:7987: found $ac_dir/$ac_word" >&5 break fi done @@ -8170,10 +7995,10 @@ IMAKE=$ac_cv_path_IMAKE if test -n "$IMAKE"; then - echo "$as_me:8173: result: $IMAKE" >&5 + echo "$as_me:7998: result: $IMAKE" >&5 echo "${ECHO_T}$IMAKE" >&6 else - echo "$as_me:8176: result: no" >&5 + echo "$as_me:8001: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8184,6 +8009,10 @@ */imake) cf_imake_opts="-DUseInstalled=YES" # (vi ;; +*/util/xmkmf) + # A single parameter tells xmkmf where the config-files are: + cf_imake_opts="`echo $IMAKE|sed -e s,/config/util/xmkmf,,`" # (vi + ;; *) cf_imake_opts= ;; @@ -8193,19 +8022,35 @@ # config directory. if test -n "$IMAKE" ; then if mkdir conftestdir; then - cf_makefile=`cd $srcdir;pwd`/Imakefile CDPATH=; export CDPATH + cf_makefile=`cd $srcdir;pwd`/Imakefile cd conftestdir + + cat >fix_cflags.sed <<'CF_EOF' +s/\\//g +s/"//g +s/\(-D[a-zA-Z0-9_][a-zA-Z0-9_]*\)=\([^\\"0-9 ][^ ]*\([ ][ ]*[^- ][^ ]*\)*\)/\1='\\"\2\\"'/g +s/^IMAKE[ ]*/IMAKE_CFLAGS="/ +s/$/"/ +CF_EOF + + cat >fix_lflags.sed <<'CF_EOF' +s/^IMAKE[ ]*/IMAKE_LOADFLAGS="/ +s/$/"/ +CF_EOF + echo >./Imakefile test -f $cf_makefile && cat $cf_makefile >>./Imakefile + cat >> ./Imakefile <<'CF_EOF' findstddefs: - @echo 'IMAKE_CFLAGS="${ALLDEFINES} "' - @echo 'IMAKE_LOADFLAGS="${EXTRA_LOAD_FLAGS} "' + @echo IMAKE $(ALLDEFINES) | sed -f fix_cflags.sed + @echo IMAKE $(EXTRA_LOAD_FLAGS) | sed -f fix_lflags.sed CF_EOF + if ( $IMAKE $cf_imake_opts 1>/dev/null 2>&5 && test -f Makefile) then - test -n "$verbose" && echo " Using $IMAKE" 1>&6 + test -n "$verbose" && echo " Using $IMAKE $cf_imake_opts" 1>&6 else # sometimes imake doesn't have the config path compiled in. Find it. @@ -8223,7 +8068,7 @@ esac done if test -z "$cf_config" ; then - { echo "$as_me:8226: WARNING: Could not find imake config-directory" >&5 + { echo "$as_me:8071: WARNING: Could not find imake config-directory" >&5 echo "$as_me: WARNING: Could not find imake config-directory" >&2;} else cf_imake_opts="$cf_imake_opts -I$cf_config" @@ -8232,7 +8077,7 @@ test -n "$verbose" && echo " Using $IMAKE $cf_config" 1>&6 else - { echo "$as_me:8235: WARNING: Cannot run $IMAKE" >&5 + { echo "$as_me:8080: WARNING: Cannot run $IMAKE" >&5 echo "$as_me: WARNING: Cannot run $IMAKE" >&2;} fi fi @@ -8283,6 +8128,10 @@ fi fi +test -n "$verbose" && echo " IMAKE_CFLAGS $IMAKE_CFLAGS" 1>&6 + +test -n "$verbose" && echo " IMAKE_LOADFLAGS $IMAKE_LOADFLAGS" 1>&6 + X_CFLAGS="$X_CFLAGS $IMAKE_CFLAGS" LDFLAGS="$LDFLAGS $X_LIBS" @@ -8291,12 +8140,34 @@ cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" +cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= +cf_new_extra_cppflags= + for cf_add_cflags in $X_CFLAGS do +case $cf_fix_cppflags in +no) case $cf_add_cflags in #(vi -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac case "$CPPFLAGS" in *$cf_add_cflags) #(vi ;; @@ -8309,6 +8180,17 @@ cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac done if test -n "$cf_new_cflags" ; then @@ -8323,9 +8205,15 @@ CPPFLAGS="$cf_new_cppflags $CPPFLAGS" fi +if test -n "$cf_new_extra_cppflags" ; then + test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi + if test "$cf_check_cflags" != "$CFLAGS" ; then cat >conftest.$ac_ext <<_ACEOF -#line 8328 "configure" +#line 8216 "configure" #include "confdefs.h" #include int @@ -8337,16 +8225,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8340: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8228: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8343: \$? = $ac_status" >&5 + echo "$as_me:8231: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8346: \"$ac_try\"") >&5 + { (eval echo "$as_me:8234: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8349: \$? = $ac_status" >&5 + echo "$as_me:8237: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -8376,23 +8264,23 @@ for ac_header in X11/IntrinsicI.h X11/Xpoll.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:8379: checking for $ac_header" >&5 +echo "$as_me:8267: 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 8385 "configure" +#line 8273 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:8389: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:8277: \"$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:8395: \$? = $ac_status" >&5 + echo "$as_me:8283: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -8411,7 +8299,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:8414: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:8302: 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:8328: 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 @@ -8445,7 +8333,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXmu $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8448 "configure" +#line 8336 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8464,16 +8352,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8467: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8355: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8470: \$? = $ac_status" >&5 + echo "$as_me:8358: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8473: \"$ac_try\"") >&5 + { (eval echo "$as_me:8361: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8476: \$? = $ac_status" >&5 + echo "$as_me:8364: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xmu_XmuClientWindow=yes else @@ -8484,7 +8372,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8487: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5 +echo "$as_me:8375: 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:8386: checking for OlToolkitInitialize in -lXol" >&5 echo $ECHO_N "checking for OlToolkitInitialize in -lXol... $ECHO_C" >&6 if test "${ac_cv_lib_Xol_OlToolkitInitialize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8503,7 +8391,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXol $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8506 "configure" +#line 8394 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8522,16 +8410,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8525: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8413: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8528: \$? = $ac_status" >&5 + echo "$as_me:8416: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8531: \"$ac_try\"") >&5 + { (eval echo "$as_me:8419: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8534: \$? = $ac_status" >&5 + echo "$as_me:8422: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xol_OlToolkitInitialize=yes else @@ -8542,12 +8430,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8545: result: $ac_cv_lib_Xol_OlToolkitInitialize" >&5 +echo "$as_me:8433: result: $ac_cv_lib_Xol_OlToolkitInitialize" >&5 echo "${ECHO_T}$ac_cv_lib_Xol_OlToolkitInitialize" >&6 if test $ac_cv_lib_Xol_OlToolkitInitialize = yes; then LIBS="-lXol -lm $LIBS" else - { { echo "$as_me:8550: error: Unable to successfully link OpenLook library (-lXol) with test program" >&5 + { { echo "$as_me:8438: error: Unable to successfully link OpenLook library (-lXol) with test program" >&5 echo "$as_me: error: Unable to successfully link OpenLook library (-lXol) with test program" >&2;} { (exit 1); exit 1; }; } fi @@ -8562,23 +8450,23 @@ for ac_header in X11/IntrinsicI.h Xm/XmP.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:8565: checking for $ac_header" >&5 +echo "$as_me:8453: 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 8571 "configure" +#line 8459 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:8575: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:8463: \"$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:8581: \$? = $ac_status" >&5 + echo "$as_me:8469: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -8597,7 +8485,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:8600: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:8488: 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:8498: 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 @@ -8615,7 +8503,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgen $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8618 "configure" +#line 8506 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8634,16 +8522,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8637: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8525: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8640: \$? = $ac_status" >&5 + echo "$as_me:8528: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8643: \"$ac_try\"") >&5 + { (eval echo "$as_me:8531: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8646: \$? = $ac_status" >&5 + echo "$as_me:8534: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gen_regcmp=yes else @@ -8654,7 +8542,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8657: result: $ac_cv_lib_gen_regcmp" >&5 +echo "$as_me:8545: 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:8556: 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 @@ -8673,7 +8561,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXmu $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8676 "configure" +#line 8564 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8692,16 +8580,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8695: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8583: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8698: \$? = $ac_status" >&5 + echo "$as_me:8586: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8701: \"$ac_try\"") >&5 + { (eval echo "$as_me:8589: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8704: \$? = $ac_status" >&5 + echo "$as_me:8592: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xmu_XmuClientWindow=yes else @@ -8712,7 +8600,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8715: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5 +echo "$as_me:8603: 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:8614: 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 @@ -8731,7 +8619,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXp $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8734 "configure" +#line 8622 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8750,16 +8638,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8753: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8641: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8756: \$? = $ac_status" >&5 + echo "$as_me:8644: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8759: \"$ac_try\"") >&5 + { (eval echo "$as_me:8647: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8762: \$? = $ac_status" >&5 + echo "$as_me:8650: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xp_XpStartDoc=yes else @@ -8770,7 +8658,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8773: result: $ac_cv_lib_Xp_XpStartDoc" >&5 +echo "$as_me:8661: 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:8672: 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 @@ -8789,7 +8677,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8792 "configure" +#line 8680 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8808,16 +8696,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8811: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8699: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8814: \$? = $ac_status" >&5 + echo "$as_me:8702: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8817: \"$ac_try\"") >&5 + { (eval echo "$as_me:8705: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8820: \$? = $ac_status" >&5 + echo "$as_me:8708: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xext_XextCreateExtension=yes else @@ -8828,13 +8716,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8831: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "$as_me:8719: 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:8837: checking for XpmCreatePixmapFromXpmImage in -lXpm" >&5 +echo "$as_me:8725: 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 @@ -8842,7 +8730,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXpm $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8845 "configure" +#line 8733 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8861,16 +8749,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8864: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8752: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8867: \$? = $ac_status" >&5 + echo "$as_me:8755: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8870: \"$ac_try\"") >&5 + { (eval echo "$as_me:8758: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8873: \$? = $ac_status" >&5 + echo "$as_me:8761: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage=yes else @@ -8881,13 +8769,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8884: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage" >&5 +echo "$as_me:8772: 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:8890: checking for XmbTextListToTextProperty in -lXIM" >&5 +echo "$as_me:8778: 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 @@ -8895,7 +8783,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXIM $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8898 "configure" +#line 8786 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8914,16 +8802,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8917: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8805: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8920: \$? = $ac_status" >&5 + echo "$as_me:8808: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8923: \"$ac_try\"") >&5 + { (eval echo "$as_me:8811: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8926: \$? = $ac_status" >&5 + echo "$as_me:8814: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_XIM_XmbTextListToTextProperty=yes else @@ -8934,7 +8822,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8937: result: $ac_cv_lib_XIM_XmbTextListToTextProperty" >&5 +echo "$as_me:8825: 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:8835: 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 @@ -8952,7 +8840,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXm $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8955 "configure" +#line 8843 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8971,16 +8859,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8974: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8862: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8977: \$? = $ac_status" >&5 + echo "$as_me:8865: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8980: \"$ac_try\"") >&5 + { (eval echo "$as_me:8868: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8983: \$? = $ac_status" >&5 + echo "$as_me:8871: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xm_XmProcessTraversal=yes else @@ -8991,12 +8879,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8994: result: $ac_cv_lib_Xm_XmProcessTraversal" >&5 +echo "$as_me:8882: 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:8999: error: Unable to successfully link Motif library (-lXm) with test program" >&5 + { { echo "$as_me:8887: 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 @@ -9017,25 +8905,61 @@ cf_x_athena=${cf_x_athena-Xaw} +echo "$as_me:8908: 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= + # Check whether --with-Xaw3d or --without-Xaw3d was given. if test "${with_Xaw3d+set}" = set; then withval="$with_Xaw3d" - cf_x_athena=Xaw3d + fi; +if test "$withval" = yes ; then + cf_x_athena=Xaw3d + echo "$as_me:8919: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me:8922: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +echo "$as_me:8926: 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= # Check whether --with-neXtaw or --without-neXtaw was given. if test "${with_neXtaw+set}" = set; then withval="$with_neXtaw" - cf_x_athena=neXtaw + fi; +if test "$withval" = yes ; then + cf_x_athena=neXtaw + echo "$as_me:8937: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me:8940: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +echo "$as_me:8944: 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= # Check whether --with-XawPlus or --without-XawPlus was given. if test "${with_XawPlus+set}" = set; then withval="$with_XawPlus" - cf_x_athena=XawPlus + fi; +if test "$withval" = yes ; then + cf_x_athena=XawPlus + echo "$as_me:8955: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me:8958: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi -echo "$as_me:9038: checking for XextCreateExtension in -lXext" >&5 +echo "$as_me:8962: 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 @@ -9043,7 +8967,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9046 "configure" +#line 8970 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9062,16 +8986,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9065: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8989: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9068: \$? = $ac_status" >&5 + echo "$as_me:8992: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9071: \"$ac_try\"") >&5 + { (eval echo "$as_me:8995: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9074: \$? = $ac_status" >&5 + echo "$as_me:8998: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xext_XextCreateExtension=yes else @@ -9082,7 +9006,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9085: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "$as_me:9009: 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" @@ -9104,14 +9028,14 @@ cf_test=X11/$cf_x_athena_root/SimpleMenu.h if test $cf_path != default ; then CPPFLAGS="-I$cf_path/include $cf_save" - echo "$as_me:9107: checking for $cf_test in $cf_path" >&5 + echo "$as_me:9031: 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:9110: checking for $cf_test" >&5 + echo "$as_me:9034: checking for $cf_test" >&5 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 fi cat >conftest.$ac_ext <<_ACEOF -#line 9114 "configure" +#line 9038 "configure" #include "confdefs.h" #include @@ -9125,16 +9049,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9128: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9052: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9131: \$? = $ac_status" >&5 + echo "$as_me:9055: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9134: \"$ac_try\"") >&5 + { (eval echo "$as_me:9058: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9137: \$? = $ac_status" >&5 + echo "$as_me:9061: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -9143,7 +9067,7 @@ cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:9146: result: $cf_result" >&5 + echo "$as_me:9070: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_x_athena_include=$cf_path @@ -9155,7 +9079,7 @@ done if test -z "$cf_x_athena_include" ; then - { echo "$as_me:9158: WARNING: Unable to successfully find Athena header files with test program" >&5 + { echo "$as_me:9082: WARNING: Unable to successfully find Athena header files with test program" >&5 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;} elif test "$cf_x_athena_include" != default ; then CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include" @@ -9180,17 +9104,17 @@ cf_test=XawSimpleMenuAddGlobalActions if test $cf_path != default ; then LIBS="-L$cf_path/lib $cf_lib $LIBS" - echo "$as_me:9183: checking for $cf_lib in $cf_path" >&5 + echo "$as_me:9107: checking for $cf_lib in $cf_path" >&5 echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6 else LIBS="$cf_lib $LIBS" - echo "$as_me:9187: checking for $cf_test in $cf_lib" >&5 + echo "$as_me:9111: checking for $cf_test in $cf_lib" >&5 echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6 fi cf_SAVE="$LIBS" LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9193 "configure" +#line 9117 "configure" #include "confdefs.h" int @@ -9202,16 +9126,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9205: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9129: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9208: \$? = $ac_status" >&5 + echo "$as_me:9132: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9211: \"$ac_try\"") >&5 + { (eval echo "$as_me:9135: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9214: \$? = $ac_status" >&5 + echo "$as_me:9138: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -9220,7 +9144,7 @@ cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:9223: result: $cf_result" >&5 + echo "$as_me:9147: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_x_athena_lib="$cf_lib" @@ -9234,7 +9158,7 @@ done if test -z "$cf_x_athena_lib" ; then - { { echo "$as_me:9237: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 + { { echo "$as_me:9161: 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 @@ -9270,7 +9194,7 @@ #define DISP_CURSES 1 EOF -echo "$as_me:9273: checking for extra include directories" >&5 +echo "$as_me:9197: 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 @@ -9290,11 +9214,11 @@ esac fi -echo "$as_me:9293: result: $cf_cv_curses_incdir" >&5 +echo "$as_me:9217: result: $cf_cv_curses_incdir" >&5 echo "${ECHO_T}$cf_cv_curses_incdir" >&6 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS" -echo "$as_me:9297: checking if we have identified curses headers" >&5 +echo "$as_me:9221: 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 @@ -9308,7 +9232,7 @@ ncurses/ncurses.h do cat >conftest.$ac_ext <<_ACEOF -#line 9311 "configure" +#line 9235 "configure" #include "confdefs.h" #include <${cf_header}> int @@ -9320,16 +9244,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:9323: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9247: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:9326: \$? = $ac_status" >&5 + echo "$as_me:9250: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:9329: \"$ac_try\"") >&5 + { (eval echo "$as_me:9253: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9332: \$? = $ac_status" >&5 + echo "$as_me:9256: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_header=$cf_header; break else @@ -9340,11 +9264,11 @@ done fi -echo "$as_me:9343: result: $cf_cv_ncurses_header" >&5 +echo "$as_me:9267: 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:9347: error: No curses header-files found" >&5 + { { echo "$as_me:9271: error: No curses header-files found" >&5 echo "$as_me: error: No curses header-files found" >&2;} { (exit 1); exit 1; }; } fi @@ -9354,23 +9278,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:9357: checking for $ac_header" >&5 +echo "$as_me:9281: 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 9363 "configure" +#line 9287 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:9367: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:9291: \"$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:9373: \$? = $ac_status" >&5 + echo "$as_me:9297: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9389,7 +9313,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:9392: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:9316: 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:9326: 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 @@ -9425,10 +9349,10 @@ #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:9428: \"$cf_try\"") >&5 + { (eval echo "$as_me:9352: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:9431: \$? = $ac_status" >&5 + echo "$as_me:9355: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -9438,7 +9362,7 @@ else cat >conftest.$ac_ext <<_ACEOF -#line 9441 "configure" +#line 9365 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -9463,15 +9387,15 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:9466: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9390: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9469: \$? = $ac_status" >&5 + echo "$as_me:9393: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9471: \"$ac_try\"") >&5 + { (eval echo "$as_me:9395: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9474: \$? = $ac_status" >&5 + echo "$as_me:9398: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -9485,16 +9409,16 @@ rm -f $cf_tempfile fi -echo "$as_me:9488: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:9412: 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:9494: checking if we have identified curses libraries" >&5 +echo "$as_me:9418: 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 9497 "configure" +#line 9421 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -9506,16 +9430,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9509: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9433: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9512: \$? = $ac_status" >&5 + echo "$as_me:9436: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9515: \"$ac_try\"") >&5 + { (eval echo "$as_me:9439: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9518: \$? = $ac_status" >&5 + echo "$as_me:9442: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -9524,13 +9448,13 @@ cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:9527: result: $cf_result" >&5 +echo "$as_me:9451: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = no ; then case $host_os in #(vi freebsd*) #(vi - echo "$as_me:9533: checking for tgoto in -lmytinfo" >&5 + echo "$as_me:9457: 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 @@ -9538,7 +9462,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9541 "configure" +#line 9465 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9557,16 +9481,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9560: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9484: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9563: \$? = $ac_status" >&5 + echo "$as_me:9487: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9566: \"$ac_try\"") >&5 + { (eval echo "$as_me:9490: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9569: \$? = $ac_status" >&5 + echo "$as_me:9493: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -9577,7 +9501,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9580: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:9504: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test $ac_cv_lib_mytinfo_tgoto = yes; then LIBS="-lmytinfo $LIBS" @@ -9585,7 +9509,7 @@ ;; hpux10.*|hpux11.*) #(vi - echo "$as_me:9588: checking for initscr in -lcur_colr" >&5 + echo "$as_me:9512: 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 @@ -9593,7 +9517,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lcur_colr $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9596 "configure" +#line 9520 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9612,16 +9536,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9615: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9539: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9618: \$? = $ac_status" >&5 + echo "$as_me:9542: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9621: \"$ac_try\"") >&5 + { (eval echo "$as_me:9545: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9624: \$? = $ac_status" >&5 + echo "$as_me:9548: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_cur_colr_initscr=yes else @@ -9632,7 +9556,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9635: result: $ac_cv_lib_cur_colr_initscr" >&5 +echo "$as_me:9559: 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 @@ -9641,7 +9565,7 @@ else - echo "$as_me:9644: checking for initscr in -lHcurses" >&5 + echo "$as_me:9568: 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 @@ -9649,7 +9573,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lHcurses $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9652 "configure" +#line 9576 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9668,16 +9592,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9671: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9595: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9674: \$? = $ac_status" >&5 + echo "$as_me:9598: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9677: \"$ac_try\"") >&5 + { (eval echo "$as_me:9601: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9680: \$? = $ac_status" >&5 + echo "$as_me:9604: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Hcurses_initscr=yes else @@ -9688,7 +9612,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9691: result: $ac_cv_lib_Hcurses_initscr" >&5 +echo "$as_me:9615: 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 @@ -9726,13 +9650,13 @@ # Check for library containing tgoto. Do this before curses library # because it may be needed to link the test-case for initscr. - echo "$as_me:9729: checking for tgoto" >&5 + echo "$as_me:9653: 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 9735 "configure" +#line 9659 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char tgoto (); below. */ @@ -9763,16 +9687,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9766: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9690: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9769: \$? = $ac_status" >&5 + echo "$as_me:9693: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9772: \"$ac_try\"") >&5 + { (eval echo "$as_me:9696: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9775: \$? = $ac_status" >&5 + echo "$as_me:9699: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_tgoto=yes else @@ -9782,7 +9706,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9785: result: $ac_cv_func_tgoto" >&5 +echo "$as_me:9709: 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 @@ -9791,7 +9715,7 @@ for cf_term_lib in $cf_check_list termcap termlib unknown do as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh` -echo "$as_me:9794: checking for tgoto in -l$cf_term_lib" >&5 +echo "$as_me:9718: 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 @@ -9799,7 +9723,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_term_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9802 "configure" +#line 9726 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9818,16 +9742,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9821: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9745: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9824: \$? = $ac_status" >&5 + echo "$as_me:9748: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9827: \"$ac_try\"") >&5 + { (eval echo "$as_me:9751: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9830: \$? = $ac_status" >&5 + echo "$as_me:9754: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -9838,7 +9762,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9841: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:9765: result: `eval echo '${'$as_ac_Lib'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 if test `eval echo '${'$as_ac_Lib'}'` = yes; then break @@ -9853,7 +9777,7 @@ for cf_curs_lib in $cf_check_list xcurses jcurses unknown do as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh` -echo "$as_me:9856: checking for initscr in -l$cf_curs_lib" >&5 +echo "$as_me:9780: checking for initscr in -l$cf_curs_lib" >&5 echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9861,7 +9785,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_curs_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9864 "configure" +#line 9788 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9880,16 +9804,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9883: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9807: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9886: \$? = $ac_status" >&5 + echo "$as_me:9810: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9889: \"$ac_try\"") >&5 + { (eval echo "$as_me:9813: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9892: \$? = $ac_status" >&5 + echo "$as_me:9816: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -9900,23 +9824,23 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9903: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:9827: result: `eval echo '${'$as_ac_Lib'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 if test `eval echo '${'$as_ac_Lib'}'` = yes; then break fi done - test $cf_curs_lib = unknown && { { echo "$as_me:9910: error: no curses library found" >&5 + test $cf_curs_lib = unknown && { { echo "$as_me:9834: error: no curses library found" >&5 echo "$as_me: error: no curses library found" >&2;} { (exit 1); exit 1; }; } LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown ; then - echo "$as_me:9916: checking if we can link with $cf_curs_lib library" >&5 + echo "$as_me:9840: 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 9919 "configure" +#line 9843 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -9928,16 +9852,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9931: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9855: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9934: \$? = $ac_status" >&5 + echo "$as_me:9858: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9937: \"$ac_try\"") >&5 + { (eval echo "$as_me:9861: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9940: \$? = $ac_status" >&5 + echo "$as_me:9864: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -9946,18 +9870,18 @@ cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:9949: result: $cf_result" >&5 + echo "$as_me:9873: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 - test $cf_result = no && { { echo "$as_me:9951: error: Cannot link curses library" >&5 + test $cf_result = no && { { echo "$as_me:9875: error: Cannot link curses library" >&5 echo "$as_me: error: Cannot link curses library" >&2;} { (exit 1); exit 1; }; } elif test "$cf_curs_lib" = "$cf_term_lib" ; then : elif test "$cf_term_lib" != predefined ; then - echo "$as_me:9957: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 + echo "$as_me:9881: 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 9960 "configure" +#line 9884 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -9969,16 +9893,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9972: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9896: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9975: \$? = $ac_status" >&5 + echo "$as_me:9899: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9978: \"$ac_try\"") >&5 + { (eval echo "$as_me:9902: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9981: \$? = $ac_status" >&5 + echo "$as_me:9905: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=no else @@ -9987,7 +9911,7 @@ LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9990 "configure" +#line 9914 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -9999,16 +9923,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10002: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9926: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10005: \$? = $ac_status" >&5 + echo "$as_me:9929: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10008: \"$ac_try\"") >&5 + { (eval echo "$as_me:9932: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10011: \$? = $ac_status" >&5 + echo "$as_me:9935: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -10020,7 +9944,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:10023: result: $cf_result" >&5 + echo "$as_me:9947: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 fi fi @@ -10057,7 +9981,7 @@ withval=`echo $withval | sed -e s%NONE%$ac_default_prefix%` ;; *) - { { echo "$as_me:10060: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:9984: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -10074,7 +9998,7 @@ test "$cf_cv_curses_dir" != "no" && \ CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" -echo "$as_me:10077: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:10001: 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 @@ -10086,7 +10010,7 @@ do cat >conftest.$ac_ext <<_ACEOF -#line 10089 "configure" +#line 10013 "configure" #include "confdefs.h" #include <$cf_header> @@ -10110,16 +10034,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10113: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10037: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10116: \$? = $ac_status" >&5 + echo "$as_me:10040: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10119: \"$ac_try\"") >&5 + { (eval echo "$as_me:10043: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10122: \$? = $ac_status" >&5 + echo "$as_me:10046: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h=$cf_header @@ -10134,13 +10058,13 @@ done fi -echo "$as_me:10137: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:10061: 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:10143: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:10067: 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 @@ -10235,7 +10159,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 10238 "configure" +#line 10162 "configure" #include "confdefs.h" #include int @@ -10247,16 +10171,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10250: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10174: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10253: \$? = $ac_status" >&5 + echo "$as_me:10177: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10256: \"$ac_try\"") >&5 + { (eval echo "$as_me:10180: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10259: \$? = $ac_status" >&5 + echo "$as_me:10183: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -10283,7 +10207,7 @@ do cat >conftest.$ac_ext <<_ACEOF -#line 10286 "configure" +#line 10210 "configure" #include "confdefs.h" #include <$cf_header> @@ -10307,16 +10231,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10310: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10234: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10313: \$? = $ac_status" >&5 + echo "$as_me:10237: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10316: \"$ac_try\"") >&5 + { (eval echo "$as_me:10240: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10319: \$? = $ac_status" >&5 + echo "$as_me:10243: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h2=$cf_header @@ -10337,12 +10261,12 @@ CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10340: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:10264: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:10345: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:10269: 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%/[^/]*$%%'` @@ -10364,7 +10288,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 10367 "configure" +#line 10291 "configure" #include "confdefs.h" #include int @@ -10376,16 +10300,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:10379: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10303: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:10382: \$? = $ac_status" >&5 + echo "$as_me:10306: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:10385: \"$ac_try\"") >&5 + { (eval echo "$as_me:10309: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10388: \$? = $ac_status" >&5 + echo "$as_me:10312: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -10436,7 +10360,7 @@ ;; esac -echo "$as_me:10439: checking for ncurses version" >&5 +echo "$as_me:10363: 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 @@ -10462,10 +10386,10 @@ #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:10465: \"$cf_try\"") >&5 + { (eval echo "$as_me:10389: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:10468: \$? = $ac_status" >&5 + echo "$as_me:10392: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -10475,7 +10399,7 @@ else cat >conftest.$ac_ext <<_ACEOF -#line 10478 "configure" +#line 10402 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -10500,15 +10424,15 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:10503: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10427: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10506: \$? = $ac_status" >&5 + echo "$as_me:10430: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:10508: \"$ac_try\"") >&5 + { (eval echo "$as_me:10432: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10511: \$? = $ac_status" >&5 + echo "$as_me:10435: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -10522,7 +10446,7 @@ rm -f $cf_tempfile fi -echo "$as_me:10525: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:10449: 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 @@ -10534,7 +10458,7 @@ # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:10537: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:10461: 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 @@ -10542,7 +10466,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10545 "configure" +#line 10469 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10561,16 +10485,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10564: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10488: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10567: \$? = $ac_status" >&5 + echo "$as_me:10491: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10570: \"$ac_try\"") >&5 + { (eval echo "$as_me:10494: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10573: \$? = $ac_status" >&5 + echo "$as_me:10497: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -10581,10 +10505,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10584: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:10508: 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:10587: checking for initscr in -lgpm" >&5 + echo "$as_me:10511: 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 @@ -10592,7 +10516,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10595 "configure" +#line 10519 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10611,16 +10535,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10614: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10538: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10617: \$? = $ac_status" >&5 + echo "$as_me:10541: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10620: \"$ac_try\"") >&5 + { (eval echo "$as_me:10544: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10623: \$? = $ac_status" >&5 + echo "$as_me:10547: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -10631,7 +10555,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10634: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:10558: 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" @@ -10645,7 +10569,8 @@ freebsd*) # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). - echo "$as_me:10648: checking for tgoto in -lmytinfo" >&5 + if test "$cf_nculib_root" = ncurses ; then + echo "$as_me:10573: 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 @@ -10653,7 +10578,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10656 "configure" +#line 10581 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10672,16 +10597,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10675: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10600: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10678: \$? = $ac_status" >&5 + echo "$as_me:10603: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10681: \"$ac_try\"") >&5 + { (eval echo "$as_me:10606: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10684: \$? = $ac_status" >&5 + echo "$as_me:10609: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -10692,12 +10617,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10695: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:10620: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test $ac_cv_lib_mytinfo_tgoto = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" fi + fi ;; esac @@ -10710,13 +10636,13 @@ eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" - echo "$as_me:10713: checking for initscr" >&5 + echo "$as_me:10639: 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 10719 "configure" +#line 10645 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr (); below. */ @@ -10747,16 +10673,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10750: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10676: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10753: \$? = $ac_status" >&5 + echo "$as_me:10679: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10756: \"$ac_try\"") >&5 + { (eval echo "$as_me:10682: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10759: \$? = $ac_status" >&5 + echo "$as_me:10685: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_initscr=yes else @@ -10766,18 +10692,18 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10769: result: $ac_cv_func_initscr" >&5 +echo "$as_me:10695: 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:10776: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:10702: 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 10780 "configure" +#line 10706 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -10789,25 +10715,25 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10792: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10718: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10795: \$? = $ac_status" >&5 + echo "$as_me:10721: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10798: \"$ac_try\"") >&5 + { (eval echo "$as_me:10724: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10801: \$? = $ac_status" >&5 + echo "$as_me:10727: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:10803: result: yes" >&5 + echo "$as_me:10729: 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:10810: result: no" >&5 +echo "$as_me:10736: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search="" @@ -10867,11 +10793,11 @@ for cf_libdir in $cf_search do - echo "$as_me:10870: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:10796: 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 10874 "configure" +#line 10800 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -10883,25 +10809,25 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10886: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10812: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10889: \$? = $ac_status" >&5 + echo "$as_me:10815: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10892: \"$ac_try\"") >&5 + { (eval echo "$as_me:10818: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10895: \$? = $ac_status" >&5 + echo "$as_me:10821: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:10897: result: yes" >&5 + echo "$as_me:10823: 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:10904: result: no" >&5 +echo "$as_me:10830: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -10916,7 +10842,7 @@ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root if test $cf_found_library = no ; then - { { echo "$as_me:10919: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:10845: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -10924,7 +10850,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:10927: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:10853: 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 @@ -10934,7 +10860,7 @@ fi done cat >conftest.$ac_ext <<_ACEOF -#line 10937 "configure" +#line 10863 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -10946,23 +10872,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10949: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10875: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10952: \$? = $ac_status" >&5 + echo "$as_me:10878: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10955: \"$ac_try\"") >&5 + { (eval echo "$as_me:10881: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10958: \$? = $ac_status" >&5 + echo "$as_me:10884: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:10960: result: yes" >&5 + echo "$as_me:10886: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:10965: result: no" >&5 +echo "$as_me:10891: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -10989,7 +10915,7 @@ test "$cf_cv_curses_dir" != "no" && \ CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" -echo "$as_me:10992: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:10918: 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 @@ -11001,7 +10927,7 @@ do cat >conftest.$ac_ext <<_ACEOF -#line 11004 "configure" +#line 10930 "configure" #include "confdefs.h" #define _XOPEN_SOURCE_EXTENDED @@ -11033,16 +10959,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11036: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10962: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11039: \$? = $ac_status" >&5 + echo "$as_me:10965: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11042: \"$ac_try\"") >&5 + { (eval echo "$as_me:10968: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11045: \$? = $ac_status" >&5 + echo "$as_me:10971: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h=$cf_header @@ -11057,13 +10983,13 @@ done fi -echo "$as_me:11060: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:10986: 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:11066: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:10992: 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 @@ -11158,7 +11084,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 11161 "configure" +#line 11087 "configure" #include "confdefs.h" #include int @@ -11170,16 +11096,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11173: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11099: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11176: \$? = $ac_status" >&5 + echo "$as_me:11102: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11179: \"$ac_try\"") >&5 + { (eval echo "$as_me:11105: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11182: \$? = $ac_status" >&5 + echo "$as_me:11108: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -11206,7 +11132,7 @@ do cat >conftest.$ac_ext <<_ACEOF -#line 11209 "configure" +#line 11135 "configure" #include "confdefs.h" #define _XOPEN_SOURCE_EXTENDED @@ -11238,16 +11164,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11241: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11167: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11244: \$? = $ac_status" >&5 + echo "$as_me:11170: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11247: \"$ac_try\"") >&5 + { (eval echo "$as_me:11173: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11250: \$? = $ac_status" >&5 + echo "$as_me:11176: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h2=$cf_header @@ -11268,12 +11194,12 @@ CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11271: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11197: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:11276: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:11202: 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%/[^/]*$%%'` @@ -11295,7 +11221,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 11298 "configure" +#line 11224 "configure" #include "confdefs.h" #include int @@ -11307,16 +11233,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11310: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11236: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11313: \$? = $ac_status" >&5 + echo "$as_me:11239: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11316: \"$ac_try\"") >&5 + { (eval echo "$as_me:11242: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11319: \$? = $ac_status" >&5 + echo "$as_me:11245: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -11367,7 +11293,7 @@ ;; esac -echo "$as_me:11370: checking for ncurses version" >&5 +echo "$as_me:11296: 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 @@ -11393,10 +11319,10 @@ #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:11396: \"$cf_try\"") >&5 + { (eval echo "$as_me:11322: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:11399: \$? = $ac_status" >&5 + echo "$as_me:11325: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -11406,7 +11332,7 @@ else cat >conftest.$ac_ext <<_ACEOF -#line 11409 "configure" +#line 11335 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -11431,15 +11357,15 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:11434: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11360: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11437: \$? = $ac_status" >&5 + echo "$as_me:11363: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:11439: \"$ac_try\"") >&5 + { (eval echo "$as_me:11365: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11442: \$? = $ac_status" >&5 + echo "$as_me:11368: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -11453,7 +11379,7 @@ rm -f $cf_tempfile fi -echo "$as_me:11456: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:11382: 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 @@ -11465,7 +11391,7 @@ # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:11468: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:11394: 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 @@ -11473,7 +11399,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11476 "configure" +#line 11402 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11492,16 +11418,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11495: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11421: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11498: \$? = $ac_status" >&5 + echo "$as_me:11424: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11501: \"$ac_try\"") >&5 + { (eval echo "$as_me:11427: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11504: \$? = $ac_status" >&5 + echo "$as_me:11430: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -11512,10 +11438,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11515: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:11441: 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:11518: checking for initscr in -lgpm" >&5 + echo "$as_me:11444: 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 @@ -11523,7 +11449,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11526 "configure" +#line 11452 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11542,16 +11468,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11545: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11471: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11548: \$? = $ac_status" >&5 + echo "$as_me:11474: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11551: \"$ac_try\"") >&5 + { (eval echo "$as_me:11477: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11554: \$? = $ac_status" >&5 + echo "$as_me:11480: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -11562,7 +11488,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11565: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:11491: 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" @@ -11576,7 +11502,8 @@ freebsd*) # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). - echo "$as_me:11579: checking for tgoto in -lmytinfo" >&5 + if test "$cf_nculib_root" = ncurses ; then + echo "$as_me:11506: 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 @@ -11584,7 +11511,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11587 "configure" +#line 11514 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11603,16 +11530,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11606: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11533: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11609: \$? = $ac_status" >&5 + echo "$as_me:11536: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11612: \"$ac_try\"") >&5 + { (eval echo "$as_me:11539: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11615: \$? = $ac_status" >&5 + echo "$as_me:11542: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -11623,12 +11550,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11626: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:11553: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test $ac_cv_lib_mytinfo_tgoto = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" fi + fi ;; esac @@ -11641,13 +11569,13 @@ eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" - echo "$as_me:11644: checking for initscr" >&5 + echo "$as_me:11572: 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 11650 "configure" +#line 11578 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr (); below. */ @@ -11678,16 +11606,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11681: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11609: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11684: \$? = $ac_status" >&5 + echo "$as_me:11612: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11687: \"$ac_try\"") >&5 + { (eval echo "$as_me:11615: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11690: \$? = $ac_status" >&5 + echo "$as_me:11618: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_initscr=yes else @@ -11697,18 +11625,18 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11700: result: $ac_cv_func_initscr" >&5 +echo "$as_me:11628: 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:11707: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:11635: 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 11711 "configure" +#line 11639 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -11720,25 +11648,25 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11723: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11651: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11726: \$? = $ac_status" >&5 + echo "$as_me:11654: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11729: \"$ac_try\"") >&5 + { (eval echo "$as_me:11657: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11732: \$? = $ac_status" >&5 + echo "$as_me:11660: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:11734: result: yes" >&5 + echo "$as_me:11662: 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:11741: result: no" >&5 +echo "$as_me:11669: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search="" @@ -11798,11 +11726,11 @@ for cf_libdir in $cf_search do - echo "$as_me:11801: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:11729: 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 11805 "configure" +#line 11733 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -11814,25 +11742,25 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11817: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11745: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11820: \$? = $ac_status" >&5 + echo "$as_me:11748: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11823: \"$ac_try\"") >&5 + { (eval echo "$as_me:11751: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11826: \$? = $ac_status" >&5 + echo "$as_me:11754: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:11828: result: yes" >&5 + echo "$as_me:11756: 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:11835: result: no" >&5 +echo "$as_me:11763: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -11847,7 +11775,7 @@ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root if test $cf_found_library = no ; then - { { echo "$as_me:11850: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:11778: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -11855,7 +11783,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:11858: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:11786: 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 @@ -11865,7 +11793,7 @@ fi done cat >conftest.$ac_ext <<_ACEOF -#line 11868 "configure" +#line 11796 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -11877,23 +11805,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11880: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11808: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11883: \$? = $ac_status" >&5 + echo "$as_me:11811: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11886: \"$ac_try\"") >&5 + { (eval echo "$as_me:11814: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11889: \$? = $ac_status" >&5 + echo "$as_me:11817: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:11891: result: yes" >&5 + echo "$as_me:11819: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:11896: result: no" >&5 +echo "$as_me:11824: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -11914,7 +11842,7 @@ #define DISP_TERMCAP 1 EOF - echo "$as_me:11917: checking if you want to use ncurses" >&5 + echo "$as_me:11845: 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. @@ -11924,7 +11852,7 @@ else withval=no fi; - echo "$as_me:11927: result: $withval" >&5 + echo "$as_me:11855: result: $withval" >&5 echo "${ECHO_T}$withval" >&6 if test "${cf_cv_termlib+set}" = set; then @@ -11933,7 +11861,7 @@ cf_cv_termlib=none cat >conftest.$ac_ext <<_ACEOF -#line 11936 "configure" +#line 11864 "configure" #include "confdefs.h" int @@ -11945,19 +11873,19 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11948: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11876: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11951: \$? = $ac_status" >&5 + echo "$as_me:11879: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11954: \"$ac_try\"") >&5 + { (eval echo "$as_me:11882: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11957: \$? = $ac_status" >&5 + echo "$as_me:11885: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >conftest.$ac_ext <<_ACEOF -#line 11960 "configure" +#line 11888 "configure" #include "confdefs.h" int @@ -11969,16 +11897,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11972: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11900: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11975: \$? = $ac_status" >&5 + echo "$as_me:11903: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11978: \"$ac_try\"") >&5 + { (eval echo "$as_me:11906: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11981: \$? = $ac_status" >&5 + echo "$as_me:11909: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_termlib=terminfo else @@ -12002,7 +11930,7 @@ test "$cf_cv_curses_dir" != "no" && \ CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS" -echo "$as_me:12005: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "$as_me:11933: 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 @@ -12014,7 +11942,7 @@ do cat >conftest.$ac_ext <<_ACEOF -#line 12017 "configure" +#line 11945 "configure" #include "confdefs.h" #include <$cf_header> @@ -12038,16 +11966,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12041: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11969: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12044: \$? = $ac_status" >&5 + echo "$as_me:11972: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12047: \"$ac_try\"") >&5 + { (eval echo "$as_me:11975: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12050: \$? = $ac_status" >&5 + echo "$as_me:11978: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h=$cf_header @@ -12062,13 +11990,13 @@ done fi -echo "$as_me:12065: result: $cf_cv_ncurses_h" >&5 +echo "$as_me:11993: 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:12071: checking for $cf_ncuhdr_root include-path" >&5 +echo "$as_me:11999: 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 @@ -12163,7 +12091,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 12166 "configure" +#line 12094 "configure" #include "confdefs.h" #include int @@ -12175,16 +12103,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12178: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12106: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12181: \$? = $ac_status" >&5 + echo "$as_me:12109: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12184: \"$ac_try\"") >&5 + { (eval echo "$as_me:12112: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12187: \$? = $ac_status" >&5 + echo "$as_me:12115: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -12211,7 +12139,7 @@ do cat >conftest.$ac_ext <<_ACEOF -#line 12214 "configure" +#line 12142 "configure" #include "confdefs.h" #include <$cf_header> @@ -12235,16 +12163,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12238: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12166: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12241: \$? = $ac_status" >&5 + echo "$as_me:12169: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12244: \"$ac_try\"") >&5 + { (eval echo "$as_me:12172: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12247: \$? = $ac_status" >&5 + echo "$as_me:12175: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_h2=$cf_header @@ -12265,12 +12193,12 @@ CPPFLAGS="$cf_save2_CPPFLAGS" test "$cf_cv_ncurses_h2" != no && break done - test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12268: error: not found" >&5 + test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12196: error: not found" >&5 echo "$as_me: error: not found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:12273: result: $cf_cv_ncurses_h2" >&5 +echo "$as_me:12201: 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%/[^/]*$%%'` @@ -12292,7 +12220,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat >conftest.$ac_ext <<_ACEOF -#line 12295 "configure" +#line 12223 "configure" #include "confdefs.h" #include int @@ -12304,16 +12232,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12307: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12235: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12310: \$? = $ac_status" >&5 + echo "$as_me:12238: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12313: \"$ac_try\"") >&5 + { (eval echo "$as_me:12241: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12316: \$? = $ac_status" >&5 + echo "$as_me:12244: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -12364,7 +12292,7 @@ ;; esac -echo "$as_me:12367: checking for ncurses version" >&5 +echo "$as_me:12295: 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 @@ -12390,10 +12318,10 @@ #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo "$as_me:12393: \"$cf_try\"") >&5 + { (eval echo "$as_me:12321: \"$cf_try\"") >&5 (eval $cf_try) 2>&5 ac_status=$? - echo "$as_me:12396: \$? = $ac_status" >&5 + echo "$as_me:12324: \$? = $ac_status" >&5 (exit $ac_status); } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` @@ -12403,7 +12331,7 @@ else cat >conftest.$ac_ext <<_ACEOF -#line 12406 "configure" +#line 12334 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -12428,15 +12356,15 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:12431: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12359: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12434: \$? = $ac_status" >&5 + echo "$as_me:12362: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:12436: \"$ac_try\"") >&5 + { (eval echo "$as_me:12364: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12439: \$? = $ac_status" >&5 + echo "$as_me:12367: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -12450,7 +12378,7 @@ rm -f $cf_tempfile fi -echo "$as_me:12453: result: $cf_cv_ncurses_version" >&5 +echo "$as_me:12381: 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 @@ -12462,7 +12390,7 @@ # to link gpm. cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" -echo "$as_me:12465: checking for Gpm_Open in -lgpm" >&5 +echo "$as_me:12393: 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 @@ -12470,7 +12398,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12473 "configure" +#line 12401 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12489,16 +12417,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12492: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12420: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12495: \$? = $ac_status" >&5 + echo "$as_me:12423: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12498: \"$ac_try\"") >&5 + { (eval echo "$as_me:12426: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12501: \$? = $ac_status" >&5 + echo "$as_me:12429: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_Gpm_Open=yes else @@ -12509,10 +12437,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12512: result: $ac_cv_lib_gpm_Gpm_Open" >&5 +echo "$as_me:12440: 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:12515: checking for initscr in -lgpm" >&5 + echo "$as_me:12443: 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 @@ -12520,7 +12448,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgpm $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12523 "configure" +#line 12451 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12539,16 +12467,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12542: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12470: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12545: \$? = $ac_status" >&5 + echo "$as_me:12473: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12548: \"$ac_try\"") >&5 + { (eval echo "$as_me:12476: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12551: \$? = $ac_status" >&5 + echo "$as_me:12479: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gpm_initscr=yes else @@ -12559,7 +12487,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12562: result: $ac_cv_lib_gpm_initscr" >&5 +echo "$as_me:12490: 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" @@ -12573,7 +12501,8 @@ freebsd*) # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). - echo "$as_me:12576: checking for tgoto in -lmytinfo" >&5 + if test "$cf_nculib_root" = ncurses ; then + echo "$as_me:12505: 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 @@ -12581,7 +12510,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lmytinfo $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12584 "configure" +#line 12513 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12600,16 +12529,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12603: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12532: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12606: \$? = $ac_status" >&5 + echo "$as_me:12535: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12609: \"$ac_try\"") >&5 + { (eval echo "$as_me:12538: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12612: \$? = $ac_status" >&5 + echo "$as_me:12541: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_mytinfo_tgoto=yes else @@ -12620,12 +12549,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12623: result: $ac_cv_lib_mytinfo_tgoto" >&5 +echo "$as_me:12552: result: $ac_cv_lib_mytinfo_tgoto" >&5 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 if test $ac_cv_lib_mytinfo_tgoto = yes; then cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS" fi + fi ;; esac @@ -12638,13 +12568,13 @@ eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" - echo "$as_me:12641: checking for initscr" >&5 + echo "$as_me:12571: 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 12647 "configure" +#line 12577 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr (); below. */ @@ -12675,16 +12605,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12678: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12608: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12681: \$? = $ac_status" >&5 + echo "$as_me:12611: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12684: \"$ac_try\"") >&5 + { (eval echo "$as_me:12614: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12687: \$? = $ac_status" >&5 + echo "$as_me:12617: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_initscr=yes else @@ -12694,18 +12624,18 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12697: result: $ac_cv_func_initscr" >&5 +echo "$as_me:12627: 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:12704: checking for initscr in -l$cf_nculib_root" >&5 + echo "$as_me:12634: 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 12708 "configure" +#line 12638 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -12717,25 +12647,25 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12720: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12650: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12723: \$? = $ac_status" >&5 + echo "$as_me:12653: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12726: \"$ac_try\"") >&5 + { (eval echo "$as_me:12656: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12729: \$? = $ac_status" >&5 + echo "$as_me:12659: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:12731: result: yes" >&5 + echo "$as_me:12661: 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:12738: result: no" >&5 +echo "$as_me:12668: result: no" >&5 echo "${ECHO_T}no" >&6 cf_search="" @@ -12795,11 +12725,11 @@ for cf_libdir in $cf_search do - echo "$as_me:12798: checking for -l$cf_nculib_root in $cf_libdir" >&5 + echo "$as_me:12728: 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 12802 "configure" +#line 12732 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -12811,25 +12741,25 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12814: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12744: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12817: \$? = $ac_status" >&5 + echo "$as_me:12747: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12820: \"$ac_try\"") >&5 + { (eval echo "$as_me:12750: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12823: \$? = $ac_status" >&5 + echo "$as_me:12753: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:12825: result: yes" >&5 + echo "$as_me:12755: 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:12832: result: no" >&5 +echo "$as_me:12762: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_save_LIBS" fi @@ -12844,7 +12774,7 @@ eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root if test $cf_found_library = no ; then - { { echo "$as_me:12847: error: Cannot link $cf_nculib_root library" >&5 + { { echo "$as_me:12777: error: Cannot link $cf_nculib_root library" >&5 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;} { (exit 1); exit 1; }; } fi @@ -12852,7 +12782,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then - echo "$as_me:12855: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 + echo "$as_me:12785: 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 @@ -12862,7 +12792,7 @@ fi done cat >conftest.$ac_ext <<_ACEOF -#line 12865 "configure" +#line 12795 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> int @@ -12874,23 +12804,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12877: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12807: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12880: \$? = $ac_status" >&5 + echo "$as_me:12810: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12883: \"$ac_try\"") >&5 + { (eval echo "$as_me:12813: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12886: \$? = $ac_status" >&5 + echo "$as_me:12816: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:12888: result: yes" >&5 + echo "$as_me:12818: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:12893: result: no" >&5 +echo "$as_me:12823: result: no" >&5 echo "${ECHO_T}no" >&6 LIBS="$cf_ncurses_SAVE" fi @@ -12916,10 +12846,10 @@ LIBS="-l$cf_lib $cf_save_LIBS" for cf_func in tigetstr tgetstr do - echo "$as_me:12919: checking for $cf_func in -l$cf_lib" >&5 + echo "$as_me:12849: 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 12922 "configure" +#line 12852 "configure" #include "confdefs.h" int @@ -12931,16 +12861,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12934: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12864: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12937: \$? = $ac_status" >&5 + echo "$as_me:12867: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12940: \"$ac_try\"") >&5 + { (eval echo "$as_me:12870: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12943: \$? = $ac_status" >&5 + echo "$as_me:12873: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -12949,7 +12879,7 @@ cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:12952: result: $cf_result" >&5 + echo "$as_me:12882: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then if test "$cf_func" = tigetstr ; then @@ -12966,7 +12896,7 @@ fi if test "$cf_cv_termlib" = none; then # allow curses library for broken AIX system. - echo "$as_me:12969: checking for initscr in -lcurses" >&5 + echo "$as_me:12899: 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 @@ -12974,7 +12904,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lcurses $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12977 "configure" +#line 12907 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12993,16 +12923,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12996: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12926: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12999: \$? = $ac_status" >&5 + echo "$as_me:12929: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13002: \"$ac_try\"") >&5 + { (eval echo "$as_me:12932: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13005: \$? = $ac_status" >&5 + echo "$as_me:12935: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_curses_initscr=yes else @@ -13013,13 +12943,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13016: result: $ac_cv_lib_curses_initscr" >&5 +echo "$as_me:12946: 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 LIBS="$LIBS -lcurses" cf_cv_termlib=termcap fi - echo "$as_me:13022: checking for tgoto in -ltermcap" >&5 + echo "$as_me:12952: 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 @@ -13027,7 +12957,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ltermcap $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13030 "configure" +#line 12960 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13046,16 +12976,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13049: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12979: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13052: \$? = $ac_status" >&5 + echo "$as_me:12982: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13055: \"$ac_try\"") >&5 + { (eval echo "$as_me:12985: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13058: \$? = $ac_status" >&5 + echo "$as_me:12988: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_termcap_tgoto=yes else @@ -13066,7 +12996,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13069: result: $ac_cv_lib_termcap_tgoto" >&5 +echo "$as_me:12999: 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 LIBS="$LIBS -ltermcap" cf_cv_termlib=termcap @@ -13077,7 +13007,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test "$cf_cv_termlib" = none; then - { echo "$as_me:13080: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5 + { echo "$as_me:13010: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;} fi @@ -13097,7 +13027,7 @@ cf_cv_termlib=none cat >conftest.$ac_ext <<_ACEOF -#line 13100 "configure" +#line 13030 "configure" #include "confdefs.h" int @@ -13109,19 +13039,19 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13112: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13042: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13115: \$? = $ac_status" >&5 + echo "$as_me:13045: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13118: \"$ac_try\"") >&5 + { (eval echo "$as_me:13048: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13121: \$? = $ac_status" >&5 + echo "$as_me:13051: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >conftest.$ac_ext <<_ACEOF -#line 13124 "configure" +#line 13054 "configure" #include "confdefs.h" int @@ -13133,16 +13063,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13136: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13066: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13139: \$? = $ac_status" >&5 + echo "$as_me:13069: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13142: \"$ac_try\"") >&5 + { (eval echo "$as_me:13072: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13145: \$? = $ac_status" >&5 + echo "$as_me:13075: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_termlib=terminfo else @@ -13166,10 +13096,10 @@ LIBS="-l$cf_lib $cf_save_LIBS" for cf_func in tigetstr tgetstr do - echo "$as_me:13169: checking for $cf_func in -l$cf_lib" >&5 + echo "$as_me:13099: 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 13172 "configure" +#line 13102 "configure" #include "confdefs.h" int @@ -13181,16 +13111,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13184: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13114: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13187: \$? = $ac_status" >&5 + echo "$as_me:13117: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13190: \"$ac_try\"") >&5 + { (eval echo "$as_me:13120: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13193: \$? = $ac_status" >&5 + echo "$as_me:13123: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -13199,7 +13129,7 @@ cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:13202: result: $cf_result" >&5 + echo "$as_me:13132: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then if test "$cf_func" = tigetstr ; then @@ -13216,7 +13146,7 @@ fi if test "$cf_cv_termlib" = none; then # allow curses library for broken AIX system. - echo "$as_me:13219: checking for initscr in -lcurses" >&5 + echo "$as_me:13149: 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 @@ -13224,7 +13154,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lcurses $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13227 "configure" +#line 13157 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13243,16 +13173,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13246: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13176: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13249: \$? = $ac_status" >&5 + echo "$as_me:13179: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13252: \"$ac_try\"") >&5 + { (eval echo "$as_me:13182: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13255: \$? = $ac_status" >&5 + echo "$as_me:13185: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_curses_initscr=yes else @@ -13263,13 +13193,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13266: result: $ac_cv_lib_curses_initscr" >&5 +echo "$as_me:13196: 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 LIBS="$LIBS -lcurses" cf_cv_termlib=termcap fi - echo "$as_me:13272: checking for tgoto in -ltermcap" >&5 + echo "$as_me:13202: 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 @@ -13277,7 +13207,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ltermcap $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13280 "configure" +#line 13210 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -13296,16 +13226,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13299: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13229: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13302: \$? = $ac_status" >&5 + echo "$as_me:13232: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13305: \"$ac_try\"") >&5 + { (eval echo "$as_me:13235: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13308: \$? = $ac_status" >&5 + echo "$as_me:13238: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_termcap_tgoto=yes else @@ -13316,7 +13246,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:13319: result: $ac_cv_lib_termcap_tgoto" >&5 +echo "$as_me:13249: 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 LIBS="$LIBS -ltermcap" cf_cv_termlib=termcap @@ -13327,7 +13257,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test "$cf_cv_termlib" = none; then - { echo "$as_me:13330: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5 + { echo "$as_me:13260: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;} fi @@ -13349,7 +13279,7 @@ elif test ".$cf_cv_termlib" = .termcap ; then # BSD 'tputs()' may need 'PC' to be set. cat >conftest.$ac_ext <<_ACEOF -#line 13352 "configure" +#line 13282 "configure" #include "confdefs.h" int @@ -13361,16 +13291,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13364: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13294: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13367: \$? = $ac_status" >&5 + echo "$as_me:13297: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13370: \"$ac_try\"") >&5 + { (eval echo "$as_me:13300: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13373: \$? = $ac_status" >&5 + echo "$as_me:13303: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >>confdefs.h <<\EOF #define HAVE_EXTERN_TCAP_PC 1 @@ -13389,14 +13319,14 @@ LIBS="$LIBS $X_EXTRA_LIBS" -echo "$as_me:13392: checking for /dev/tty" >&5 +echo "$as_me:13322: 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:13399: result: $cf_result" >&5 +echo "$as_me:13329: 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` @@ -13409,7 +13339,7 @@ fi -echo "$as_me:13412: checking for crypt function" >&5 +echo "$as_me:13342: 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 @@ -13417,7 +13347,7 @@ cf_cv_crypt_func= cat >conftest.$ac_ext <<_ACEOF -#line 13420 "configure" +#line 13350 "configure" #include "confdefs.h" int @@ -13429,16 +13359,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13432: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13362: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13435: \$? = $ac_status" >&5 + echo "$as_me:13365: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13438: \"$ac_try\"") >&5 + { (eval echo "$as_me:13368: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13441: \$? = $ac_status" >&5 + echo "$as_me:13371: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_crypt_func=yes @@ -13449,7 +13379,7 @@ cf_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 13452 "configure" +#line 13382 "configure" #include "confdefs.h" int @@ -13461,16 +13391,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13464: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13394: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13467: \$? = $ac_status" >&5 + echo "$as_me:13397: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13470: \"$ac_try\"") >&5 + { (eval echo "$as_me:13400: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13473: \$? = $ac_status" >&5 + echo "$as_me:13403: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_crypt_func="-lcrypt" @@ -13487,12 +13417,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13490: result: $cf_cv_crypt_func" >&5 +echo "$as_me:13420: 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:13495: checking if crypt works" >&5 +echo "$as_me:13425: 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 @@ -13503,7 +13433,7 @@ cf_cv_crypt_works=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 13506 "configure" +#line 13436 "configure" #include "confdefs.h" #include @@ -13515,15 +13445,15 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:13518: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13448: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13521: \$? = $ac_status" >&5 + echo "$as_me:13451: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:13523: \"$ac_try\"") >&5 + { (eval echo "$as_me:13453: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13526: \$? = $ac_status" >&5 + echo "$as_me:13456: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_crypt_works=yes @@ -13538,7 +13468,7 @@ fi LIBS="$cf_save_LIBS" fi -echo "$as_me:13541: result: $cf_cv_crypt_works" >&5 +echo "$as_me:13471: 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 @@ -13551,14 +13481,14 @@ fi fi -echo "$as_me:13554: checking for declaration of fd_set" >&5 +echo "$as_me:13484: 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 "trying sys/types alone" 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 13561 "configure" +#line 13491 "configure" #include "confdefs.h" #include @@ -13571,16 +13501,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13574: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13504: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13577: \$? = $ac_status" >&5 + echo "$as_me:13507: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13580: \"$ac_try\"") >&5 + { (eval echo "$as_me:13510: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13583: \$? = $ac_status" >&5 + echo "$as_me:13513: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_fd_set=sys/types.h else @@ -13588,7 +13518,7 @@ cat conftest.$ac_ext >&5 echo "trying X11/Xpoll.h" 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 13591 "configure" +#line 13521 "configure" #include "confdefs.h" #ifdef HAVE_X11_XPOLL_H @@ -13603,16 +13533,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13606: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13536: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13609: \$? = $ac_status" >&5 + echo "$as_me:13539: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13612: \"$ac_try\"") >&5 + { (eval echo "$as_me:13542: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13615: \$? = $ac_status" >&5 + echo "$as_me:13545: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_fd_set=X11/Xpoll.h else @@ -13620,7 +13550,7 @@ cat conftest.$ac_ext >&5 echo "trying sys/select.h" 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 13623 "configure" +#line 13553 "configure" #include "confdefs.h" #include @@ -13634,16 +13564,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13637: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13567: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13640: \$? = $ac_status" >&5 + echo "$as_me:13570: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13643: \"$ac_try\"") >&5 + { (eval echo "$as_me:13573: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13646: \$? = $ac_status" >&5 + echo "$as_me:13576: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_fd_set=sys/select.h else @@ -13657,7 +13587,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13660: result: $cf_cv_type_fd_set" >&5 +echo "$as_me:13590: 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 cat >>confdefs.h <<\EOF @@ -13666,14 +13596,14 @@ fi -echo "$as_me:13669: checking for fd_set macros" >&5 +echo "$as_me:13599: 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 13676 "configure" +#line 13606 "configure" #include "confdefs.h" #include @@ -13702,16 +13632,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13705: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13635: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13708: \$? = $ac_status" >&5 + echo "$as_me:13638: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13711: \"$ac_try\"") >&5 + { (eval echo "$as_me:13641: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13714: \$? = $ac_status" >&5 + echo "$as_me:13644: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_macros_fd_set=yes else @@ -13721,7 +13651,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13724: result: $cf_cv_macros_fd_set" >&5 +echo "$as_me:13654: 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 #define HAVE_TYPE_FD_SET 1 @@ -13767,13 +13697,13 @@ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:13770: checking for $ac_func" >&5 +echo "$as_me:13700: 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 13776 "configure" +#line 13706 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -13804,16 +13734,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13807: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13737: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13810: \$? = $ac_status" >&5 + echo "$as_me:13740: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13813: \"$ac_try\"") >&5 + { (eval echo "$as_me:13743: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13816: \$? = $ac_status" >&5 + echo "$as_me:13746: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -13823,7 +13753,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13826: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:13756: 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:13766: checking for standard qsort" >&5 echo $ECHO_N "checking for standard qsort... $ECHO_C" >&6 if test "${cf_cv_ansi_qsort+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13843 "configure" +#line 13773 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -13858,16 +13788,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:13861: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13791: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:13864: \$? = $ac_status" >&5 + echo "$as_me:13794: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13867: \"$ac_try\"") >&5 + { (eval echo "$as_me:13797: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13870: \$? = $ac_status" >&5 + echo "$as_me:13800: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_ansi_qsort=yes else @@ -13878,7 +13808,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:13881: result: $cf_cv_ansi_qsort" >&5 +echo "$as_me:13811: result: $cf_cv_ansi_qsort" >&5 echo "${ECHO_T}$cf_cv_ansi_qsort" >&6 if test $cf_cv_ansi_qsort = yes; then @@ -13893,7 +13823,7 @@ fi -echo "$as_me:13896: checking for working mkstemp" >&5 +echo "$as_me:13826: 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 @@ -13901,13 +13831,13 @@ rm -f conftest* if test "$cross_compiling" = yes; then - echo "$as_me:13904: checking for mkstemp" >&5 + echo "$as_me:13834: 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 13910 "configure" +#line 13840 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char mkstemp (); below. */ @@ -13938,16 +13868,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:13941: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13871: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:13944: \$? = $ac_status" >&5 + echo "$as_me:13874: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:13947: \"$ac_try\"") >&5 + { (eval echo "$as_me:13877: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:13950: \$? = $ac_status" >&5 + echo "$as_me:13880: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mkstemp=yes else @@ -13957,12 +13887,12 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13960: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:13890: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 13965 "configure" +#line 13895 "configure" #include "confdefs.h" #include @@ -14000,15 +13930,15 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:14003: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13933: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14006: \$? = $ac_status" >&5 + echo "$as_me:13936: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14008: \"$ac_try\"") >&5 + { (eval echo "$as_me:13938: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14011: \$? = $ac_status" >&5 + echo "$as_me:13941: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_mkstemp=yes @@ -14023,7 +13953,7 @@ fi fi -echo "$as_me:14026: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:13956: result: $cf_cv_func_mkstemp" >&5 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 if test "$cf_cv_func_mkstemp" = yes ; then cat >>confdefs.h <<\EOF @@ -14041,7 +13971,7 @@ cf_save_cppflags="${CPPFLAGS}" cf_save_ldflags="${LDFLAGS}" -echo "$as_me:14044: checking if you want to use the Xpm library for colored icon" >&5 +echo "$as_me:13974: 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. @@ -14051,7 +13981,7 @@ else cf_Xpm_library=no fi; -echo "$as_me:14054: result: $cf_Xpm_library" >&5 +echo "$as_me:13984: result: $cf_Xpm_library" >&5 echo "${ECHO_T}$cf_Xpm_library" >&6 if test "$cf_Xpm_library" != no ; then @@ -14059,23 +13989,23 @@ CPPFLAGS="$CPPFLAGS -I$withval/include" LDFLAGS="$LDFLAGS -L$withval/lib" fi - echo "$as_me:14062: checking for X11/xpm.h" >&5 + echo "$as_me:13992: 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 14068 "configure" +#line 13998 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:14072: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14002: \"$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:14078: \$? = $ac_status" >&5 + echo "$as_me:14008: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14094,11 +14024,11 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14097: result: $ac_cv_header_X11_xpm_h" >&5 +echo "$as_me:14027: 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:14101: checking for XpmCreatePixmapFromData in -lXpm" >&5 + echo "$as_me:14031: 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 @@ -14106,7 +14036,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXpm -lX11 $X_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14109 "configure" +#line 14039 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14125,16 +14055,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14128: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14058: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14131: \$? = $ac_status" >&5 + echo "$as_me:14061: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14134: \"$ac_try\"") >&5 + { (eval echo "$as_me:14064: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14137: \$? = $ac_status" >&5 + echo "$as_me:14067: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xpm_XpmCreatePixmapFromData=yes else @@ -14145,7 +14075,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14148: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5 +echo "$as_me:14078: 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 @@ -14166,7 +14096,7 @@ fi if test -n "$cf_x_athena" ; then - echo "$as_me:14169: checking if you want to use Xaw scrollbars rather than our own" >&5 + echo "$as_me:14099: 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. @@ -14176,7 +14106,7 @@ else cf_Xaw_scrollbars=no fi; - echo "$as_me:14179: result: $cf_Xaw_scrollbars" >&5 + echo "$as_me:14109: result: $cf_Xaw_scrollbars" >&5 echo "${ECHO_T}$cf_Xaw_scrollbars" >&6 if test "$cf_Xaw_scrollbars" = no ; then @@ -14193,7 +14123,7 @@ #define OPT_XAW_SCROLLBARS 1 EOF - echo "$as_me:14196: checking if you want to use the drag/scrolling extension with Xaw" >&5 + echo "$as_me:14126: 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. @@ -14203,7 +14133,7 @@ else cf_drag_extension=no fi; - echo "$as_me:14206: result: $cf_drag_extension" >&5 + echo "$as_me:14136: result: $cf_drag_extension" >&5 echo "${ECHO_T}$cf_drag_extension" >&6 if test "$cf_drag_extension" != "no" ; then cat >>confdefs.h <<\EOF @@ -14216,7 +14146,7 @@ fi -echo "$as_me:14219: checking if you want to change the number of exec-macros" >&5 +echo "$as_me:14149: 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. @@ -14226,7 +14156,7 @@ else cf_exec_macros=no fi; -echo "$as_me:14229: result: $cf_exec_macros" >&5 +echo "$as_me:14159: result: $cf_exec_macros" >&5 echo "${ECHO_T}$cf_exec_macros" >&6 test "$cf_exec_macros" != no && cat >>confdefs.h <&5 +echo "$as_me:14168: 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 14245 "configure" +#line 14175 "configure" #include "confdefs.h" #include int @@ -14254,16 +14184,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14257: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14187: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14260: \$? = $ac_status" >&5 + echo "$as_me:14190: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14263: \"$ac_try\"") >&5 + { (eval echo "$as_me:14193: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14266: \$? = $ac_status" >&5 + echo "$as_me:14196: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_locale=yes else @@ -14275,7 +14205,7 @@ fi -echo "$as_me:14278: result: $cf_cv_locale" >&5 +echo "$as_me:14208: result: $cf_cv_locale" >&5 echo "${ECHO_T}$cf_cv_locale" >&6 test $cf_cv_locale = yes && { cat >>confdefs.h <<\EOF #define LOCALE 1 @@ -14283,7 +14213,7 @@ } if test $cf_cv_locale = yes ; then -echo "$as_me:14286: checking if you want to use i18n locale support" >&5 +echo "$as_me:14216: 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. @@ -14293,7 +14223,7 @@ else cf_locale=yes fi; -echo "$as_me:14296: result: $cf_locale" >&5 +echo "$as_me:14226: result: $cf_locale" >&5 echo "${ECHO_T}$cf_locale" >&6 test "$cf_locale" != no && cat >>confdefs.h <<\EOF #define OPT_LOCALE 1 @@ -14303,7 +14233,7 @@ ### Debugging/development options -echo "$as_me:14306: checking if you want to link with dbmalloc for testing" >&5 +echo "$as_me:14236: checking if you want to link with dbmalloc for testing" >&5 echo $ECHO_N "checking if you want to link with dbmalloc for testing... $ECHO_C" >&6 # Check whether --with-dbmalloc or --without-dbmalloc was given. @@ -14313,26 +14243,26 @@ else with_dbmalloc=no fi; -echo "$as_me:14316: result: $with_dbmalloc" >&5 +echo "$as_me:14246: result: $with_dbmalloc" >&5 echo "${ECHO_T}$with_dbmalloc" >&6 if test "$with_dbmalloc" = yes ; then - echo "$as_me:14319: checking for dbmalloc.h" >&5 + echo "$as_me:14249: 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 14325 "configure" +#line 14255 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:14329: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14259: \"$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:14335: \$? = $ac_status" >&5 + echo "$as_me:14265: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14351,11 +14281,11 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14354: result: $ac_cv_header_dbmalloc_h" >&5 +echo "$as_me:14284: 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:14358: checking for debug_malloc in -ldbmalloc" >&5 +echo "$as_me:14288: 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 @@ -14363,7 +14293,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldbmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14366 "configure" +#line 14296 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14382,16 +14312,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14385: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14315: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14388: \$? = $ac_status" >&5 + echo "$as_me:14318: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14391: \"$ac_try\"") >&5 + { (eval echo "$as_me:14321: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14394: \$? = $ac_status" >&5 + echo "$as_me:14324: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dbmalloc_debug_malloc=yes else @@ -14402,7 +14332,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14405: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "$as_me:14335: 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:14350: checking if you want to link with dmalloc for testing" >&5 echo $ECHO_N "checking if you want to link with dmalloc for testing... $ECHO_C" >&6 # Check whether --with-dmalloc or --without-dmalloc was given. @@ -14427,26 +14357,26 @@ else with_dmalloc=no fi; -echo "$as_me:14430: result: $with_dmalloc" >&5 +echo "$as_me:14360: result: $with_dmalloc" >&5 echo "${ECHO_T}$with_dmalloc" >&6 if test "$with_dmalloc" = yes ; then - echo "$as_me:14433: checking for dmalloc.h" >&5 + echo "$as_me:14363: 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 14439 "configure" +#line 14369 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:14443: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:14373: \"$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:14449: \$? = $ac_status" >&5 + echo "$as_me:14379: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14465,11 +14395,11 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:14468: result: $ac_cv_header_dmalloc_h" >&5 +echo "$as_me:14398: 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:14472: checking for dmalloc_debug in -ldmalloc" >&5 +echo "$as_me:14402: 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 @@ -14477,7 +14407,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldmalloc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14480 "configure" +#line 14410 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14496,16 +14426,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14499: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14429: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14502: \$? = $ac_status" >&5 + echo "$as_me:14432: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14505: \"$ac_try\"") >&5 + { (eval echo "$as_me:14435: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14508: \$? = $ac_status" >&5 + echo "$as_me:14438: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dmalloc_dmalloc_debug=yes else @@ -14516,7 +14446,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14519: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "$as_me:14449: 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:14523: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 GCC_VERSION="`${CC} --version|sed -e '2,$d' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:14597: result: $GCC_VERSION" >&5 + echo "$as_me:14527: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi if ( test "$GCC" = yes || test "$GXX" = yes ) then -echo "$as_me:14603: checking if you want to check for gcc warnings" >&5 +echo "$as_me:14533: checking if you want to check for gcc warnings" >&5 echo $ECHO_N "checking if you want to check for gcc warnings... $ECHO_C" >&6 # Check whether --with-warnings or --without-warnings was given. @@ -14610,7 +14540,7 @@ else cf_opt_with_warnings=no fi; -echo "$as_me:14613: result: $cf_opt_with_warnings" >&5 +echo "$as_me:14543: result: $cf_opt_with_warnings" >&5 echo "${ECHO_T}$cf_opt_with_warnings" >&6 if test "$cf_opt_with_warnings" != no ; then @@ -14632,10 +14562,10 @@ EOF if test "$GCC" = yes then - { echo "$as_me:14635: checking for $CC __attribute__ directives..." >&5 + { echo "$as_me:14565: 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:14606: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14679: \$? = $ac_status" >&5 + echo "$as_me:14609: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:14681: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:14611: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h fi @@ -14692,10 +14622,10 @@ if test "$GCC" = yes then cat > conftest.$ac_ext <&5 + { echo "$as_me:14628: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" @@ -14715,12 +14645,12 @@ Wundef $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:14718: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:14648: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14721: \$? = $ac_status" >&5 + echo "$as_me:14651: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:14723: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:14653: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in #(vi Wcast-qual) #(vi @@ -14770,7 +14700,7 @@ ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -echo "$as_me:14773: checking for missing \"${ac_func}\" extern" >&5 +echo "$as_me:14703: 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 @@ -14779,7 +14709,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG" cat >conftest.$ac_ext <<_ACEOF -#line 14782 "configure" +#line 14712 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -14801,16 +14731,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14804: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14734: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14807: \$? = $ac_status" >&5 + echo "$as_me:14737: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14810: \"$ac_try\"") >&5 + { (eval echo "$as_me:14740: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14813: \$? = $ac_status" >&5 + echo "$as_me:14743: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval 'cf_cv_func_'${ac_func}'=yes' else @@ -14824,7 +14754,7 @@ fi eval 'cf_result=$cf_cv_func_'${ac_func} -echo "$as_me:14827: result: $cf_result" >&5 +echo "$as_me:14757: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test $cf_result = yes && cat >>confdefs.h < " -echo "$as_me:14841: checking for term.h" >&5 +echo "$as_me:14771: 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 @@ -14851,7 +14781,7 @@ term.h do cat >conftest.$ac_ext <<_ACEOF -#line 14854 "configure" +#line 14784 "configure" #include "confdefs.h" #include <${cf_cv_ncurses_header-curses.h}> @@ -14865,16 +14795,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:14868: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14798: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:14871: \$? = $ac_status" >&5 + echo "$as_me:14801: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14874: \"$ac_try\"") >&5 + { (eval echo "$as_me:14804: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14877: \$? = $ac_status" >&5 + echo "$as_me:14807: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_term_header=$cf_header break @@ -14887,7 +14817,7 @@ done fi -echo "$as_me:14890: result: $cf_cv_term_header" >&5 +echo "$as_me:14820: result: $cf_cv_term_header" >&5 echo "${ECHO_T}$cf_cv_term_header" >&6 case $cf_cv_term_header in #(vi @@ -14911,7 +14841,7 @@ ;; esac -echo "$as_me:14914: checking if we should include curses.h or termcap.h" >&5 +echo "$as_me:14844: 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 @@ -14930,7 +14860,7 @@ test -n "$cf_t_opts" && CPPFLAGS="$CPPFLAGS -D$cf_t_opts" cat >conftest.$ac_ext <<_ACEOF -#line 14933 "configure" +#line 14863 "configure" #include "confdefs.h" /* $cf_c_opts $cf_t_opts */ $CHECK_DECL_HDRS @@ -14943,16 +14873,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14946: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14876: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14949: \$? = $ac_status" >&5 + echo "$as_me:14879: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14952: \"$ac_try\"") >&5 + { (eval echo "$as_me:14882: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14955: \$? = $ac_status" >&5 + echo "$as_me:14885: \$? = $ac_status" >&5 (exit $ac_status); }; }; then test "$cf_cv_need_curses_h" = no && { cf_cv_need_curses_h=maybe @@ -14964,7 +14894,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 14967 "configure" +#line 14897 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -14977,16 +14907,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14980: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14910: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14983: \$? = $ac_status" >&5 + echo "$as_me:14913: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14986: \"$ac_try\"") >&5 + { (eval echo "$as_me:14916: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14989: \$? = $ac_status" >&5 + echo "$as_me:14919: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_need_curses_h=yes cf_ok_c_opts=$cf_c_opts @@ -15023,7 +14953,7 @@ fi fi -echo "$as_me:15026: result: $cf_cv_need_curses_h" >&5 +echo "$as_me:14956: result: $cf_cv_need_curses_h" >&5 echo "${ECHO_T}$cf_cv_need_curses_h" >&6 case $cf_cv_need_curses_h in @@ -15057,7 +14987,7 @@ ;; esac -echo "$as_me:15060: checking declaration of tputs 3rd param" >&5 +echo "$as_me:14990: 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 @@ -15073,10 +15003,10 @@ for R in int char; do for S in "" const; do -echo "(line 15076) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 +echo "(line 15006) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 15079 "configure" +#line 15009 "configure" #include "confdefs.h" $CHECK_DECL_HDRS int @@ -15090,16 +15020,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:15093: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:15023: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:15096: \$? = $ac_status" >&5 + echo "$as_me:15026: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15099: \"$ac_try\"") >&5 + { (eval echo "$as_me:15029: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15102: \$? = $ac_status" >&5 + echo "$as_me:15032: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_outchar="$Q OutChar($R)" cf_cv_found=yes @@ -15118,7 +15048,7 @@ done fi -echo "$as_me:15121: result: $cf_cv_type_outchar" >&5 +echo "$as_me:15051: result: $cf_cv_type_outchar" >&5 echo "${ECHO_T}$cf_cv_type_outchar" >&6 case $cf_cv_type_outchar in @@ -15150,7 +15080,7 @@ ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -echo "$as_me:15153: checking for missing \"${ac_func}\" extern" >&5 +echo "$as_me:15083: 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 @@ -15159,7 +15089,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG" cat >conftest.$ac_ext <<_ACEOF -#line 15162 "configure" +#line 15092 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -15181,16 +15111,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15184: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15114: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15187: \$? = $ac_status" >&5 + echo "$as_me:15117: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15190: \"$ac_try\"") >&5 + { (eval echo "$as_me:15120: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15193: \$? = $ac_status" >&5 + echo "$as_me:15123: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval 'cf_cv_func_'${ac_func}'=yes' else @@ -15204,7 +15134,7 @@ fi eval 'cf_result=$cf_cv_func_'${ac_func} -echo "$as_me:15207: result: $cf_result" >&5 +echo "$as_me:15137: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test $cf_result = yes && cat >>confdefs.h <&5 +echo "$as_me:15211: 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 @@ -15287,7 +15217,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG" cat >conftest.$ac_ext <<_ACEOF -#line 15290 "configure" +#line 15220 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -15309,16 +15239,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15312: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15242: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15315: \$? = $ac_status" >&5 + echo "$as_me:15245: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15318: \"$ac_try\"") >&5 + { (eval echo "$as_me:15248: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15321: \$? = $ac_status" >&5 + echo "$as_me:15251: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval 'cf_cv_func_'${ac_func}'=yes' else @@ -15332,7 +15262,7 @@ fi eval 'cf_result=$cf_cv_func_'${ac_func} -echo "$as_me:15335: result: $cf_result" >&5 +echo "$as_me:15265: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test $cf_result = yes && cat >>confdefs.h <&5 +echo "$as_me:15285: 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 @@ -15361,7 +15291,7 @@ cf_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG" cat >conftest.$ac_ext <<_ACEOF -#line 15364 "configure" +#line 15294 "configure" #include "confdefs.h" $CHECK_DECL_HDRS @@ -15383,16 +15313,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15386: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15316: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15389: \$? = $ac_status" >&5 + echo "$as_me:15319: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15392: \"$ac_try\"") >&5 + { (eval echo "$as_me:15322: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15395: \$? = $ac_status" >&5 + echo "$as_me:15325: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval 'cf_cv_func_'${ac_func}'=yes' else @@ -15406,7 +15336,7 @@ fi eval 'cf_result=$cf_cv_func_'${ac_func} -echo "$as_me:15409: result: $cf_result" >&5 +echo "$as_me:15339: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 test $cf_result = yes && cat >>confdefs.h <>confdefs.h <<\EOF +#define OPT_PLUGIN 1 +EOF + + EXTRAOBJS="$EXTRAOBJS plugin.o" +fi + +if test "$cf_need_libdl" = yes ; then - echo "$as_me:15447: checking for dlsym" >&5 +cf_have_dlsym=no +echo "$as_me:15395: 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 15453 "configure" +#line 15401 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlsym (); below. */ @@ -15481,16 +15429,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15484: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15432: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15487: \$? = $ac_status" >&5 + echo "$as_me:15435: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15490: \"$ac_try\"") >&5 + { (eval echo "$as_me:15438: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15493: \$? = $ac_status" >&5 + echo "$as_me:15441: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_dlsym=yes else @@ -15500,13 +15448,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15503: result: $ac_cv_func_dlsym" >&5 +echo "$as_me:15451: 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 - echo "$as_me:15509: checking for dlsym in -ldl" >&5 +cf_have_libdl=no +echo "$as_me:15458: 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 @@ -15514,7 +15463,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15517 "configure" +#line 15466 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15533,16 +15482,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15536: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15485: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15539: \$? = $ac_status" >&5 + echo "$as_me:15488: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15542: \"$ac_try\"") >&5 + { (eval echo "$as_me:15491: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15545: \$? = $ac_status" >&5 + echo "$as_me:15494: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dl_dlsym=yes else @@ -15553,118 +15502,126 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15556: result: $ac_cv_lib_dl_dlsym" >&5 +echo "$as_me:15505: 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 - cf_have_dlsym=yes - cf_have_libdl=yes + cf_have_dlsym=yes + cf_have_libdl=yes fi fi - if test "$cf_have_dlsym" = yes ; then - test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS" - if test "$GCC" = yes ; then +if test "$cf_have_dlsym" = yes ; then + test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS" - # FIXME: this doesn't work (gcc doesn't give an error - # on an unrecognized option). - cf_opt_rdynamic=no - cf_save_CFLAGS="$CFLAGS" - CFLAGS="-Wall -rdynamic $CFLAGS" - echo "$as_me:15575: checking if gcc has -rdynamic option" >&5 -echo $ECHO_N "checking if gcc has -rdynamic option... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line 15578 "configure" + echo "$as_me:15518: 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 15521 "configure" #include "confdefs.h" -#include +#include int main () { -printf("Hello"); + + void *obj; + if ((obj = dlopen("filename", 0)) != 0) { + if (dlsym(obj, "symbolname") == 0) { + dlclose(obj); + } + } ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15590: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15539: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15593: \$? = $ac_status" >&5 + echo "$as_me:15542: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15596: \"$ac_try\"") >&5 + { (eval echo "$as_me:15545: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15599: \$? = $ac_status" >&5 + echo "$as_me:15548: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cf_opt_rdynamic=yes + + cat >>confdefs.h <<\EOF +#define HAVE_LIBDL 1 +EOF + else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cf_opt_rdynamic=no + + { { echo "$as_me:15559: 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:15608: result: $cf_opt_rdynamic" >&5 -echo "${ECHO_T}$cf_opt_rdynamic" >&6 - test "$cf_opt_rdynamic" = no && CFLAGS="$cf_save_CFLAGS" + echo "$as_me:15564: result: ok" >&5 +echo "${ECHO_T}ok" >&6 +else + { { echo "$as_me:15567: error: Cannot find dlsym function" >&5 +echo "$as_me: error: Cannot find dlsym function" >&2;} + { (exit 1); exit 1; }; } +fi - SH_CFLAGS="-fPIC" - SH_LDFLAGS="-shared" - else - # this works for Solaris and IRIX64 - SH_CFLAGS="-KPIC" - SH_LDFLAGS="-G" - fi +fi + +if test "$VILE_LOADABLE_FILTERS" != none ; then + if test "$GCC" = yes ; then + # FIXME: this doesn't work (gcc doesn't give an error + # on an unrecognized option). + cf_opt_rdynamic=no + cf_save_CFLAGS="$CFLAGS" + CFLAGS="-Wall -rdynamic $CFLAGS" + echo "$as_me:15582: checking if gcc has -rdynamic option" >&5 +echo $ECHO_N "checking if gcc has -rdynamic option... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 15621 "configure" +#line 15585 "configure" #include "confdefs.h" -#include +#include int main () { - - void *obj; - if ((obj = dlopen("filename", 0)) != 0) { - if (dlsym(obj, "symbolname") == 0) { - dlclose(obj); - } - } +printf("Hello"); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15639: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15597: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15642: \$? = $ac_status" >&5 + echo "$as_me:15600: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15645: \"$ac_try\"") >&5 + { (eval echo "$as_me:15603: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15648: \$? = $ac_status" >&5 + echo "$as_me:15606: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - - cat >>confdefs.h <<\EOF -#define HAVE_LIBDL 1 -EOF - + cf_opt_rdynamic=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - - { { echo "$as_me:15659: error: Cannot link test program for libdl" >&5 -echo "$as_me: error: Cannot link test program for libdl" >&2;} - { (exit 1); exit 1; }; } +cf_opt_rdynamic=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + echo "$as_me:15615: result: $cf_opt_rdynamic" >&5 +echo "${ECHO_T}$cf_opt_rdynamic" >&6 + test "$cf_opt_rdynamic" = no && CFLAGS="$cf_save_CFLAGS" + + SH_CFLAGS="-fPIC" + SH_LDFLAGS="-shared" else - { { echo "$as_me:15665: error: Cannot find dlsym function" >&5 -echo "$as_me: error: Cannot find dlsym function" >&2;} - { (exit 1); exit 1; }; } + # this works for Solaris and IRIX64 + SH_CFLAGS="-KPIC" + SH_LDFLAGS="-G" fi fi @@ -15672,7 +15629,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:15675: checking for $ac_word" >&5 +echo "$as_me:15632: 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 @@ -15687,7 +15644,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:15690: found $ac_dir/$ac_word" >&5 +echo "$as_me:15647: found $ac_dir/$ac_word" >&5 break done @@ -15695,10 +15652,10 @@ fi SPELL_PROG=$ac_cv_prog_SPELL_PROG if test -n "$SPELL_PROG"; then - echo "$as_me:15698: result: $SPELL_PROG" >&5 + echo "$as_me:15655: result: $SPELL_PROG" >&5 echo "${ECHO_T}$SPELL_PROG" >&6 else - echo "$as_me:15701: result: no" >&5 + echo "$as_me:15658: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -15801,7 +15758,7 @@ : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:15804: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:15761: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -15977,7 +15934,7 @@ echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:15980: error: ambiguous option: $1 + { { echo "$as_me:15937: 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;} @@ -15996,7 +15953,7 @@ ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:15999: error: unrecognized option: $1 + -*) { { echo "$as_me:15956: 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;} @@ -16054,7 +16011,7 @@ "filters/makefile.tmp" ) CONFIG_FILES="$CONFIG_FILES filters/makefile.tmp:filters/makefile.2nd" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config_h.in" ;; - *) { { echo "$as_me:16057: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:16014: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -16144,7 +16101,6 @@ s,@host_cpu@,$host_cpu,;t t s,@host_vendor@,$host_vendor,;t t s,@host_os@,$host_os,;t t -s,@cf_cv_makeflags@,$cf_cv_makeflags,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t @@ -16153,6 +16109,12 @@ s,@EXEEXT@,$EXEEXT,;t t s,@OBJEXT@,$OBJEXT,;t t s,@CPP@,$CPP,;t t +s,@PROG_EXT@,$PROG_EXT,;t t +s,@EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t +s,@LEX@,$LEX,;t t +s,@LEXLIB@,$LEXLIB,;t t +s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t +s,@cf_cv_makeflags@,$cf_cv_makeflags,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t @@ -16160,9 +16122,6 @@ s,@AWK@,$AWK,;t t s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@LEX@,$LEX,;t t -s,@LEXLIB@,$LEXLIB,;t t -s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t s,@AR@,$AR,;t t s,@AR_OPTS@,$AR_OPTS,;t t s,@ECHO_LT@,$ECHO_LT,;t t @@ -16171,7 +16130,6 @@ s,@SHOW_CC@,$SHOW_CC,;t t s,@ECHO_CC@,$ECHO_CC,;t t s,@PATHSEP@,$PATHSEP,;t t -s,@PROG_EXT@,$PROG_EXT,;t t s,@LIB_PREFIX@,$LIB_PREFIX,;t t s,@MAKE_FILTERS@,$MAKE_FILTERS,;t t s,@VILE_BUILT_IN_FILTERS@,$VILE_BUILT_IN_FILTERS,;t t @@ -16319,7 +16277,7 @@ esac if test x"$ac_file" != x-; then - { echo "$as_me:16322: creating $ac_file" >&5 + { echo "$as_me:16280: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -16337,7 +16295,7 @@ -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:16340: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:16298: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -16350,7 +16308,7 @@ echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:16353: error: cannot find input file: $f" >&5 + { { echo "$as_me:16311: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -16416,7 +16374,7 @@ * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:16419: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:16377: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -16427,7 +16385,7 @@ -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:16430: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:16388: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -16440,7 +16398,7 @@ echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:16443: error: cannot find input file: $f" >&5 + { { echo "$as_me:16401: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -16498,7 +16456,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:16501: $ac_file is unchanged" >&5 + { echo "$as_me:16459: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ Index: configure.in Prereq: 1.204 --- vile-9.4f+/configure.in 2004-03-17 23:50:30.000000000 +0000 +++ vile-9.4g/configure.in 2004-06-17 00:44:17.000000000 +0000 @@ -1,12 +1,12 @@ dnl Process this file with autoconf to produce a configure script. -AC_REVISION($Revision: 1.204 $) -AC_PREREQ(2.13.20020210) +AC_REVISION($Revision: 1.207 $) +AC_PREREQ(2.13.20030927) rm -f config.cache ### Use "configure -with-screen" to override the default configuration, which is ### termcap-based on unix systems. -dnl $Header: /usr/build/vile/vile/RCS/configure.in,v 1.204 2004/03/17 23:50:30 tom Exp $ +dnl $Header: /usr/build/vile/vile/RCS/configure.in,v 1.207 2004/06/17 00:44:17 tom Exp $ define(MAKELIST, sh $srcdir/filters/makelist.sh $srcdir/filters/genmake.mak) @@ -16,36 +16,38 @@ CF_CHECK_CACHE -### checks for alternative programs -CF_MAKEFLAGS +### checks for compiler AC_PROG_CC AC_PROG_CPP AC_GCC_TRADITIONAL + +### checks for UNIX variants that set C preprocessor variables +AC_AIX +AC_ISC_POSIX +AC_MINIX + +### checks for compiler characteristics +CF_PROG_EXT +CF_ANSI_CC_REQD +AC_CONST +CF_CC_INIT_UNIONS +case $host_os in hpux*) CPPFLAGS="-DYYCHAR_ARRAY $CPPFLAGS";; esac; AC_DECL_YYTEXT + +### checks for alternative programs +CF_MAKEFLAGS AC_PROG_INSTALL AC_PROG_MAKE_SET AC_PROG_AWK AC_PROG_RANLIB -case $host_os in hpux*) CPPFLAGS="-DYYCHAR_ARRAY $CPPFLAGS";; esac; AC_DECL_YYTEXT CF_SUBST(archiver,AR,ar) CF_SUBST(archiver options,AR_OPTS,rv) CF_DISABLE_ECHO CF_PATHSEP -CF_PROG_EXT CF_LIB_PREFIX -### checks for UNIX variants that set C preprocessor variables -AC_AIX -AC_ISC_POSIX -AC_MINIX - -### checks for compiler characteristics -CF_ANSI_CC_REQD -AC_CONST -CF_CC_INIT_UNIONS - ### options to control how much we build AC_MSG_CHECKING(if you wish to build only core functions) CF_ARG_DISABLE(extensions, @@ -77,7 +79,7 @@ ### use option --with-cflags to set default CFLAGS AC_MSG_CHECKING(for CFLAGS options) AC_ARG_WITH(CFLAGS, - [ --with-CFLAGS=value set default for \$CFLAGS], + [ --with-CFLAGS=value set default for $CFLAGS], [cflags="$withval"]) if test -z "$cflags"; then AC_ARG_WITH(cflags, @@ -94,6 +96,13 @@ fi AC_MSG_RESULT($cflags) +AC_MSG_CHECKING(if you want to compile-in plugin support) +CF_ARG_ENABLE(plugins, + [ --enable-plugins compile-in plugin support], + [with_plugins=yes], + [with_plugins=no]) +AC_MSG_RESULT($with_plugins) + AC_MSG_CHECKING(if you want to build syntax filters) CF_ARG_DISABLE(filters, [ --disable-filters do not build syntax filters], @@ -821,51 +830,48 @@ AC_SUBST(FILTER_LIBS) AC_SUBST(LIBBUILTFLT) +# --- check dynamic loading capabilities + +cf_need_libdl=no + +test "$VILE_LOADABLE_FILTERS" != none && cf_need_libdl=yes +test "$with_plugins" != no && cf_need_libdl=yes + +if test "$with_plugins" != no ; then + if test "$GCC" = yes ; then + LDFLAGS="$LDFLAGS -export-dynamic" + # TODO: how to do with other compilers ? can libtool help ? + fi + AC_DEFINE(OPT_PLUGIN) + EXTRAOBJS="$EXTRAOBJS plugin.o" +fi + +if test "$cf_need_libdl" = yes ; then + CF_FUNC_DLSYM +fi + if test "$VILE_LOADABLE_FILTERS" != none ; then - cf_have_dlsym=no - cf_have_libdl=no + if test "$GCC" = yes ; then - AC_CHECK_FUNC(dlsym,cf_have_dlsym=yes,[ - AC_CHECK_LIB(dl,dlsym,[ - cf_have_dlsym=yes - cf_have_libdl=yes])]) - - if test "$cf_have_dlsym" = yes ; then - test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS" - if test "$GCC" = yes ; then - - # FIXME: this doesn't work (gcc doesn't give an error - # on an unrecognized option). - cf_opt_rdynamic=no - cf_save_CFLAGS="$CFLAGS" - CFLAGS="-Wall -rdynamic $CFLAGS" - AC_MSG_CHECKING(if gcc has -rdynamic option) - AC_TRY_LINK([#include ], - [printf("Hello");], - [cf_opt_rdynamic=yes], - [cf_opt_rdynamic=no]) - AC_MSG_RESULT($cf_opt_rdynamic) - test "$cf_opt_rdynamic" = no && CFLAGS="$cf_save_CFLAGS" - - SH_CFLAGS="-fPIC" - SH_LDFLAGS="-shared" - else - # this works for Solaris and IRIX64 - SH_CFLAGS="-KPIC" - SH_LDFLAGS="-G" - fi + # FIXME: this doesn't work (gcc doesn't give an error + # on an unrecognized option). + cf_opt_rdynamic=no + cf_save_CFLAGS="$CFLAGS" + CFLAGS="-Wall -rdynamic $CFLAGS" + AC_MSG_CHECKING(if gcc has -rdynamic option) + AC_TRY_LINK([#include ], + [printf("Hello");], + [cf_opt_rdynamic=yes], + [cf_opt_rdynamic=no]) + AC_MSG_RESULT($cf_opt_rdynamic) + test "$cf_opt_rdynamic" = no && CFLAGS="$cf_save_CFLAGS" - AC_TRY_LINK([#include ],[ - void *obj; - if ((obj = dlopen("filename", 0)) != 0) { - if (dlsym(obj, "symbolname") == 0) { - dlclose(obj); - } - }],[ - AC_DEFINE(HAVE_LIBDL)],[ - AC_MSG_ERROR(Cannot link test program for libdl)]) + SH_CFLAGS="-fPIC" + SH_LDFLAGS="-shared" else - AC_MSG_ERROR(Cannot find dlsym function) + # this works for Solaris and IRIX64 + SH_CFLAGS="-KPIC" + SH_LDFLAGS="-G" fi fi Index: display.c Prereq: 1.385 --- vile-9.4f+/display.c 2004-03-21 22:21:11.000000000 +0000 +++ vile-9.4g/display.c 2004-06-09 00:03:36.000000000 +0000 @@ -5,7 +5,7 @@ * functions use hints that are left in the windows by the commands. * * - * $Header: /usr/build/vile/vile/RCS/display.c,v 1.385 2004/03/21 22:21:11 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/display.c,v 1.386 2004/06/09 00:03:36 tom Exp $ * */ @@ -106,18 +106,27 @@ } /* - * Do format a string. + * Do format a string. Return the number of bytes by which 'width' exceeds + * that actually written to the output. */ static int -dfputsn(OutFunc outfunc, const char *s, int n) +dfputsn(OutFunc outfunc, const char *s, int width, int limit) { - int c; int l = 0; - TRACE2(("...str=%s\n", visible_buff(s, (n < 0) ? strlen(s) : n, TRUE))); if (s != 0) { - while ((n-- != 0) && ((c = *s++) != EOS)) { - (*outfunc) (c); + int length = strlen(s); + + if (width < 0) + width = length; + if (limit > 0 && width > limit) + width = limit; + if (width > length) + width = length; + + TRACE2(("...str=%s\n", visible_buff(s, width, TRUE))); + while (width-- > 0) { + (*outfunc) (*s++); l++; } } @@ -128,7 +137,7 @@ static int dfputs(OutFunc outfunc, const char *s) { - return dfputsn(outfunc, s, -1); + return dfputsn(outfunc, s, -1, -1); } /* @@ -191,45 +200,76 @@ } /* + * On entry, *fmt may point to either '*' or a digit. If either, decode the + * appropriate width or limit. + */ +static void +decode_length(const char **fmt, va_list *app, int *result) +{ + int c = **fmt; + int value = 0; + int found = FALSE; + + if (c == '*') { + value = va_arg(*app, int); + found = TRUE; + *(*fmt)++; + } else { + while (isDigit(c)) { + value = (value * 10) + c - '0'; + found = TRUE; + *(*fmt)++; + c = **fmt; + } + } + if (found) + *result = value; +} + +/* * Generic string formatter. Takes printf-like args, and calls * the global function (*dfoutfn)(c) for each c */ static void -dofmt(const char *fmt, va_list * app) +dofmt(const char *fmt, va_list *app) { - register int c; /* current char in format string */ - register int wid; - register int n; - register int nchars = 0; + int c; /* current char in format string */ + int the_width; + int the_limit; + int n; + int nchars = 0; int islong; int int_value; long long_value; UINT radix; OutFunc outfunc = dfoutfn; /* local copy, for recursion */ - TRACE2(("dofmt fmt='%s'\n", fmt)); + TRACE2(("dofmt fmt='%s'\n", visible_buff(fmt, strlen(fmt), FALSE))); while ((c = *fmt++) != 0) { if (c != '%') { (*outfunc) (c); nchars++; continue; } - c = *fmt++; - wid = 0; + the_width = -1; islong = FALSE; - if (c == '*') { - wid = va_arg(*app, int); - c = *fmt++; + decode_length(&fmt, app, &the_width); + if (*fmt == '.') { + ++fmt; + decode_length(&fmt, app, &the_limit); + if (the_width < 0) + the_width = the_limit; } else { - while (isDigit(c)) { - wid = (wid * 10) + c - '0'; - c = *fmt++; - } + the_limit = the_width; } + c = *fmt++; if (c == 'l') { islong = TRUE; c = *fmt++; } + TRACE2(("... fmt='%%%d.%d%c%s'\n", + the_width, the_limit, + c, islong ? "L" : "")); switch (c) { case EOS: n = 0; @@ -291,14 +331,7 @@ break; case 's': - if (wid <= 0) { - n = dfputs(outfunc, va_arg(*app, char *)); - break; - } - /* FALLTHROUGH */ - - case 'S': /* use wid as max width */ - n = dfputsn(outfunc, va_arg(*app, char *), wid); + n = dfputsn(outfunc, va_arg(*app, char *), the_width, the_limit); break; case 'f': @@ -306,15 +339,15 @@ break; case 'P': /* output padding -- pads total output to - "wid" chars, using c as the pad char */ - wid -= nchars; + "the_width" chars, using c as the pad char */ + the_width -= nchars; /* FALLTHROUGH */ - case 'Q': /* field padding -- puts out "wid" + case 'Q': /* field padding -- puts out "the_width" copies of c */ n = 0; c = va_arg(*app, int); - while (n < wid) { + while (n < the_width) { (*outfunc) (c); n++; } @@ -324,9 +357,9 @@ (*outfunc) (c); n = 1; } - wid -= n; + the_width -= n; nchars += n; - while (wid-- > 0) { + while (the_width-- > 0) { (*outfunc) (' '); nchars++; } @@ -2640,7 +2673,7 @@ * a number of special variables that we would like to output quickly. */ void -special_formatter(TBUFF ** result, const char *fs, WINDOW *wp) +special_formatter(TBUFF **result, const char *fs, WINDOW *wp) { BUFFER *bp; char *ms; @@ -3577,7 +3610,7 @@ * line" flag TRUE. */ static void -mlmsg(const char *fmt, va_list * app) +mlmsg(const char *fmt, va_list *app) { static int recur; int end_at; Index: doc/macros.doc Prereq: 1.91 --- vile-9.4f+/doc/macros.doc 2004-04-11 17:20:38.000000000 +0000 +++ vile-9.4g/doc/macros.doc 2004-06-15 22:12:03.000000000 +0000 @@ -483,6 +483,11 @@ $error-match Text from the current buffer which which was matched in the most recent find-next-error command. + $error-tabstop Tabstop value to use when computing the column that + a "%C" pattern will produce. If zero or negative, + use the current buffer's tabstop, otherwise use the + given value. The default is 8. + $exec-path [READ ONLY] Where to find vile. $exec-suffix [READ ONLY] suffix, if any, for execable programs. @@ -981,7 +986,7 @@ ~quiet ------ - Rather than suppress all screen updates, you may suppress any messages + Rather than suppress all screen updates, you may suppress any messages that are written as the command progresses. ~if, ~elseif, ~else, and ~endif @@ -1456,6 +1461,6 @@ ========================= end vile.rc ======================= ----------------------------------- - $Header: /usr/build/vile/vile/doc/RCS/macros.doc,v 1.91 2004/04/11 17:20:38 tom Exp $ + $Header: /usr/build/vile/vile/doc/RCS/macros.doc,v 1.92 2004/06/15 22:12:03 tom Exp $ ----------------------------------- Index: doc/ncu-indent --- /dev/null 2004-06-08 19:45:14.000000000 +0000 +++ vile-9.4g/doc/ncu-indent 2004-06-09 00:02:43.000000000 +0000 @@ -0,0 +1,91 @@ +#!/bin/sh +# $Id: ncu-indent,v 1.9 2004/06/09 00:02:43 tom Exp $ +NOOP=no +OPTS=' +--blank-lines-after-procedures +--braces-on-if-line +--continuation-indentation0 +--continue-at-parentheses +--cuddle-else +--indent-level4 +--leave-preprocessor-space +--no-blank-lines-after-commas +--no-blank-lines-after-declarations +--no-space-after-function-call-names +--procnames-start-lines +--space-special-semicolon +--swallow-optional-blank-lines +--tab-size8 + +-T NCURSES_EXPORT_VAR +-T SCREEN +-T TERMTYPE +-T attr_t +-T chtype +-T inline + +-T BUFFER +-T CHARTYPE +-T FILE +-T GCC_NORETURN +-T LINE +-T MARK +-T RETSIGTYPE +-T TBUFF +-T WINDOW +-T size_t +-T va_list +' +for name in $* +do + case $name in + -v|-n) + NOOP=yes + OPTS="$OPTS -v" + ;; + -*) + OPTS="$OPTS $name" + ;; + *.[ch]) + save="${name}".a$$ + test="${name}".b$$ + rm -f "$save" "$test" + mv "$name" "$save" + sed \ + -e '/MODULE_ID(/s/)$/);/' \ + -e 's,\\),//\1,' \ + "$save" >"$test" + cp "$test" "$name" + chmod u+w "$name" + # ${INDENT_PROG-indent} --version + ${INDENT_PROG-indent} -npro $OPTS "$name" + sed \ + -e '/MODULE_ID(/s/);$/)/' \ + -e 's,;[ ]*//GCC_NORETURN;, GCC_NORETURN;,' \ + -e 's,//\(\\),\1,' \ + "$name" >"$test" + mv "$test" "$name" + rm -f "${name}~" + if test $NOOP = yes ; then + if (cmp -s "$name" "$save" ) then + echo "** no change: $name" + else + diff -u "$save" "$name" + fi + rm -f "$name" + mv "$save" "$name" + elif ( cmp -s "$name" "$save" ) ; then + echo "** unchanged $name" + rm -f "${name}" + mv "$save" "$name" + else + echo "** updated $name" + rm -f "$save" + fi + ;; + *) + echo "** ignored: $name" + ;; + esac +done Index: dumbterm.c Prereq: 1.17 --- vile-9.4f+/dumbterm.c 1999-09-19 19:46:50.000000000 +0000 +++ vile-9.4g/dumbterm.c 2004-06-09 01:08:56.000000000 +0000 @@ -1,74 +1,26 @@ /* Dumb terminal driver, for I/O before we get into screen mode. * - * $Header: /usr/build/vile/vile/RCS/dumbterm.c,v 1.17 1999/09/19 19:46:50 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/dumbterm.c,v 1.18 2004/06/09 01:08:56 tom Exp $ * */ #include "estruct.h" #include "edef.h" -#define NPAUSE 10 /* # times thru update to pause */ +#define NPAUSE 10 /* # times thru update to pause */ -static OUTC_DCL dumb_putc (OUTC_ARGS); -static int dumb_cres (const char * res); -static int dumb_getc (void); -static int dumb_typahead (void); -static void dumb_beep (void); -static void dumb_eeol (void); -static void dumb_eeop (void); -static void dumb_flush (void); -static void dumb_kclose (void); -static void dumb_kopen (void); -static void dumb_move ( int row, int col ); -static void dumb_rev ( UINT state ); - -static void flush_blanks (void); - -TERM dumb_term = { - 1, - 1, - 80, - 80, - NPAUSE, - 0, /* use this to put us into raw mode */ - 0, /* ...and this, just in case we exit */ - dumb_kopen, - dumb_kclose, - dumb_getc, - dumb_putc, - dumb_typahead, - dumb_flush, - dumb_move, - dumb_eeol, - dumb_eeop, - dumb_beep, - dumb_rev, - dumb_cres, - nullterm_setfore, - nullterm_setback, - nullterm_setpal, - nullterm_setccol, - nullterm_scroll, - nullterm_pflush, - nullterm_icursor, - nullterm_settitle, - nullterm_watchfd, - nullterm_unwatchfd, - nullterm_cursorvis, -}; - -static int this_col; -static int last_col; +static int this_col; +static int last_col; static void flush_blanks(void) { - if (last_col > 0) { - while (last_col++ < this_col) - (void)putchar(' '); - last_col = 0; - } - term.flush(); + if (last_col > 0) { + while (last_col++ < this_col) + (void) putchar(' '); + last_col = 0; + } + term.flush(); } static void @@ -84,55 +36,55 @@ static int dumb_getc(void) { - flush_blanks(); - return getchar(); + flush_blanks(); + return getchar(); } static OUTC_DCL dumb_putc(OUTC_ARGS) { - if (isSpace(c)) { - if (last_col == 0) - last_col = this_col; - } else { - flush_blanks(); - (void)putchar(c); - } - this_col++; - OUTC_RET c; + if (isSpace(c)) { + if (last_col == 0) + last_col = this_col; + } else { + flush_blanks(); + (void) putchar(c); + } + this_col++; + OUTC_RET c; } static int dumb_typahead(void) { - return TRUE; + return TRUE; } static void dumb_flush(void) { - (void)fflush(stdout); + (void) fflush(stdout); } /*ARGSUSED*/ static void dumb_move(int row GCC_UNUSED, int col) { - if (last_col == 0) - last_col = this_col; - if (col == 0) { - putchar('\r'); - if (last_col != 0) - putchar('\n'); - } else if (last_col > col) { - while (last_col-- > col) - putchar('\b'); - } else if (last_col < col) { - while (last_col++ < col) - putchar(' '); - } - last_col = 0; - this_col = col; + if (last_col == 0) + last_col = this_col; + if (col == 0) { + putchar('\r'); + if (last_col != 0) + putchar('\n'); + } else if (last_col > col) { + while (last_col-- > col) + putchar('\b'); + } else if (last_col < col) { + while (last_col++ < col) + putchar(' '); + } + last_col = 0; + this_col = col; } static void @@ -147,10 +99,10 @@ /*ARGSUSED*/ static int -dumb_cres( /* change screen resolution */ -const char * res GCC_UNUSED) +dumb_cres( /* change screen resolution */ + const char *res GCC_UNUSED) { - return(FALSE); + return (FALSE); } /* ARGSUSED */ @@ -162,5 +114,39 @@ static void dumb_beep(void) { - putchar(BEL); + putchar(BEL); } + +TERM dumb_term = +{ + 1, + 1, + 80, + 80, + NPAUSE, + 0, /* use this to put us into raw mode */ + 0, /* ...and this, just in case we exit */ + dumb_kopen, + dumb_kclose, + dumb_getc, + dumb_putc, + dumb_typahead, + dumb_flush, + dumb_move, + dumb_eeol, + dumb_eeop, + dumb_beep, + dumb_rev, + dumb_cres, + nullterm_setfore, + nullterm_setback, + nullterm_setpal, + nullterm_setccol, + nullterm_scroll, + nullterm_pflush, + nullterm_icursor, + nullterm_settitle, + nullterm_watchfd, + nullterm_unwatchfd, + nullterm_cursorvis, +}; Index: edef.h Prereq: 1.313 --- vile-9.4f+/edef.h 2003-08-04 22:34:38.000000000 +0000 +++ vile-9.4g/edef.h 2004-06-15 21:54:23.000000000 +0000 @@ -6,7 +6,7 @@ */ /* - * $Header: /usr/build/vile/vile/RCS/edef.h,v 1.313 2003/08/04 22:34:38 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/edef.h,v 1.314 2004/06/15 21:54:23 tom Exp $ */ #ifndef VILE_EDEF_H @@ -384,6 +384,7 @@ decl_init( TBUFF *filename_expr, 0 ); decl_init( TBUFF *error_expr, 0 ); decl_init( TBUFF *error_match, 0 ); +decl_init( int error_tabstop, 8 ); decl_init_const( char ERRORS_BufName[], "[Error Expressions]"); decl_init_const( char ERR_REGEX_BufName[], "[Error Patterns]"); #endif Index: estruct.h Prereq: 1.541 --- vile-9.4f+/estruct.h 2004-03-20 11:48:24.000000000 +0000 +++ vile-9.4g/estruct.h 2004-06-17 00:54:17.000000000 +0000 @@ -12,7 +12,7 @@ */ /* - * $Header: /usr/build/vile/vile/RCS/estruct.h,v 1.541 2004/03/20 11:48:24 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/estruct.h,v 1.543 2004/06/17 00:54:17 tom Exp $ */ #ifndef _estruct_h @@ -436,6 +436,10 @@ #define OPT_PERL 0 /* normally set by configure-script */ #endif +#ifndef OPT_PLUGIN +#define OPT_PLUGIN 0 /* normally set by configure-script */ +#endif + #ifndef OPT_SHELL #define OPT_SHELL 1 /* we'll disable this only as an exercise */ #endif @@ -861,7 +865,7 @@ /* semaphore may be needed to prevent interrupt of display-code */ #if defined(SIGWINCH) || OPT_WORKING -# if OPT_TRACE > 1 +# if OPT_TRACE > 2 extern void beginDisplay(void); extern void endofDisplay(void); # else @@ -2049,7 +2053,7 @@ #if OPT_HILITEMATCH USHORT b_highlight; #endif -#if OPT_PERL || OPT_TCL +#if OPT_PERL || OPT_TCL || OPT_PLUGIN void * b_api_private; /* pointer to private perl, tcl, etc. data */ #endif @@ -2190,7 +2194,7 @@ /* macro for iterating over the marks associated with the current buffer */ -#if OPT_PERL || OPT_TCL +#if OPT_PERL || OPT_TCL || OPT_PLUGIN extern MARK *api_mark_iterator(BUFFER *bp, int *iter); #define api_do_mark_iterate_helper(mp, statement) \ { \ @@ -2897,7 +2901,7 @@ #endif #if OPT_EVAL || OPT_DEBUGMACROS -#define TPRINTF(p) if (tracemacros) tprintf p +#define TPRINTF(p) { TRACE(p); if (tracemacros) tprintf p; } #else #define TPRINTF(p) /* nothing */ #endif Index: eval.c Prereq: 1.324 --- vile-9.4f+/eval.c 2004-04-11 17:18:48.000000000 +0000 +++ vile-9.4g/eval.c 2004-06-11 11:20:34.000000000 +0000 @@ -2,7 +2,7 @@ * eval.c -- function and variable evaluation * original by Daniel Lawrence * - * $Header: /usr/build/vile/vile/RCS/eval.c,v 1.324 2004/04/11 17:18:48 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/eval.c,v 1.330 2004/06/11 11:20:34 tom Exp $ * */ @@ -283,7 +283,7 @@ * Make display of the intersection of the character classes in the argument. */ static void -show_charclass(TBUFF ** result, const char *arg) +show_charclass(TBUFF **result, const char *arg) { CHARTYPE k = charclass_of(arg); #if OPT_SHOW_CTYPE @@ -387,7 +387,7 @@ register char *v; register const char *vv; static const char fmt[] = - {"$%s = %*S\n"}; + {"$%s = %.*s\n"}; const char *const *Names; int showall; int rc = FALSE; @@ -471,6 +471,7 @@ for (n = 0; n < NFUNCS; n++) { if (!strncmp(downcased, vl_ufuncs[n].f_name, m)) { if ((n + 1 >= NFUNCS + || m == strlen(vl_ufuncs[n].f_name) || strncmp(downcased, vl_ufuncs[n + 1].f_name, m))) fnum = n; break; @@ -505,7 +506,7 @@ * result only if we run past the end of the number of tokens. */ static void -extract_token(TBUFF ** result, const char *count, const char *delims, const char *string) +extract_token(TBUFF **result, const char *count, const char *delims, const char *string) { int num = scan_int(count); @@ -524,7 +525,7 @@ * Translate string 'from' 'to'. */ static void -translate_string(TBUFF ** result, const char *from, const char *to, const char *string) +translate_string(TBUFF **result, const char *from, const char *to, const char *string) { int len_to = strlen(to); char *s, *t; @@ -568,7 +569,7 @@ * Extract the head of the given path */ static char * -path_head(TBUFF ** result, const char *path) +path_head(TBUFF **result, const char *path) { char *temp; if ((temp = tb_values(tb_scopy(result, path))) != error_val) { @@ -583,7 +584,7 @@ * simply copy it. */ static void -path_quote(TBUFF ** result, const char *path) +path_quote(TBUFF **result, const char *path) { #if SYS_VMS tb_scopy(result, path); /* no point in quoting here */ @@ -612,7 +613,7 @@ } static void -render_date(TBUFF ** result, char *format, time_t stamp) +render_date(TBUFF **result, char *format, time_t stamp) { #ifdef HAVE_STRFTIME struct tm *tm = localtime(&stamp); @@ -634,7 +635,7 @@ } static void -default_mode_value(TBUFF ** result, char *name) +default_mode_value(TBUFF **result, char *name) { VALARGS args; VWRAP vd; @@ -674,65 +675,63 @@ } } -#define MAXARGS 3 - -/* quote string, so toktyp() will know what it is */ -static void -render_string(TBUFF ** rp) +/* + * Based on mac_tokval(), but unlike that, strips quotes which came from + * evaluating via run_func(). + */ +static char * +dequoted_parameter(TBUFF **tok) { - char *value = tb_values(*rp); + char *previous; + const char *newvalue; + int strip; - if (value != error_val - && *value != EOS - && toktyp(value) != TOK_LITSTR - && toktyp(value) != TOK_QUOTSTR) { - UINT j; - UINT have = strlen(value); /* FIXME: assumes we used EOS */ - UINT need = 2 + have; - - for (j = 0; j < have; ++j) { - if (value[j] == SQUOTE - || value[j] == BACKSLASH) { - ++need; - } - } - tb_alloc(rp, need + 1); - (*rp)->tb_used = need + 1; -#if 0 - /* - * FIXME: We _should_ quote the result just as if it had come from a - * file. But some inputs come from a prompt, which does not (yet) - * quote its input. Taking out the check for empty string above, the - * following loop would quote the string "properly". But returning '' - * would break for various reasons. - */ - value[need] = EOS; - value[need - 1] = SQUOTE; - for (j = 0; j < have; ++j) { - UINT i = have - j - 1; - UINT k = need - j - 2; - value[k] = value[i]; - if (value[k] == SQUOTE - || value[k] == BACKSLASH) { - --need; - value[k - 1] = BACKSLASH; - } + if (mac_token(tok) != 0) { + previous = tb_values(*tok); + + switch (toktyp(previous)) { + default: + case TOK_NULL: + case TOK_QUERY: + case TOK_BUFLINE: + case TOK_TEMPVAR: + case TOK_DIRECTIVE: + case TOK_LABEL: + case TOK_LITSTR: + newvalue = tokval(previous); + strip = FALSE; + break; + case TOK_FUNCTION: + newvalue = tokval(previous); + strip = (toktyp(newvalue) == TOK_QUOTSTR); + break; + case TOK_QUOTSTR: + strip = TRUE; + newvalue = previous; + break; } -#else - /* - * What we actually do is simpler: put a quote character at the front - * of the data so it will be treated as a string. - */ - value[have + 1] = EOS; - for (j = 0; j < have; ++j) { - UINT i = have - j; - value[i] = value[i - 1]; + + if (newvalue == (const char *) error_val) { + return error_val; + } else if (strip) { + if (((const char *) previous) != newvalue) { + TBUFF *fix = 0; + tb_scopy(&fix, newvalue); + tb_free(tok); + *tok = fix; + } + tb_dequote(tok); + } else if (((const char *) previous) != newvalue) { + tb_scopy(tok, newvalue); } -#endif - value[0] = SQUOTE; + return (tb_values(*tok)); } + tb_free(tok); + return (0); } +#define MAXARGS 3 + /* * execute a builtin function */ @@ -754,7 +753,7 @@ long value = 0; long nums[MAXARGS]; - TRACE((T_CALLED "run_func(%d)\n", fnum)); + TRACE((T_CALLED "run_func(%d:%s)\n", fnum, vl_ufuncs[fnum].f_name)); nargs = vl_ufuncs[fnum].f_code & NARGMASK; args_numeric = vl_ufuncs[fnum].f_code & NUM; @@ -763,24 +762,29 @@ ret_numeric = vl_ufuncs[fnum].f_code & NRET; ret_boolean = vl_ufuncs[fnum].f_code & BRET; - TPRINTF(("** evaluate '%s' (0x%x), %d args\n", + TPRINTF(("** evaluate '%s' (0x%x), %d %s args returning %s\n", vl_ufuncs[fnum].f_name, vl_ufuncs[fnum].f_code, - nargs)); + nargs, + (args_numeric + ? "numeric" + : (args_boolean + ? "boolean" + : "string")), + (ret_numeric + ? "numeric" + : (ret_boolean + ? "boolean" + : "string")))); /* fetch required arguments */ for (i = 0; i < nargs; i++) { args[i] = 0; - if ((arg[i] = mac_tokval(&args[i])) == 0 + if ((arg[i] = dequoted_parameter(&args[i])) == 0 || (arg[i] == error_val) || (args[i]->tb_errs)) { arg[i] = error_val; is_error = TRUE; - } else if (arg[i][0] == SQUOTE) { - /* trim leading quote from recursive result from this function */ - for (cp = arg[i] + 1; (cp[-1] = cp[0]) != EOS; ++cp) { - ; - } } tb_free(&result); /* in case mac_tokval() called us */ TPRINTF(("...arg[%d] = '%s'\n", i, arg[i])); @@ -1121,9 +1125,9 @@ else if (ret_boolean) render_boolean(&result, value); else - render_string(&result); + tb_enquote(&result); - TPRINTF(("-> %s'%s'\n", + TPRINTF(("-> %s%s\n", is_error ? "*" : "", is_error ? error_val : tb_values(result))); @@ -1278,7 +1282,7 @@ } static int -PromptForVariableName(TBUFF ** result) +PromptForVariableName(TBUFF **result) { int status; static TBUFF *var; @@ -1734,7 +1738,7 @@ /* represent integer as string */ char * -render_int(TBUFF ** rp, int i) +render_int(TBUFF **rp, int i) { char *p, *q; @@ -1746,7 +1750,7 @@ /* represent long integer as string */ char * -render_long(TBUFF ** rp, long i) +render_long(TBUFF **rp, long i) { char *p, *q; @@ -1760,7 +1764,7 @@ /* represent boolean as string */ char * -render_boolean(TBUFF ** rp, int val) +render_boolean(TBUFF **rp, int val) { static char *bools[] = {"FALSE", "TRUE"}; @@ -1770,7 +1774,7 @@ #if (SYS_WINNT||SYS_VMS) /* unsigned to hex */ char * -render_hex(TBUFF ** rp, unsigned i) +render_hex(TBUFF **rp, unsigned i) { char *p, *q; @@ -1981,7 +1985,7 @@ } static int -read_argument(TBUFF ** paramp, const PARAM_INFO * info) +read_argument(TBUFF **paramp, const PARAM_INFO * info) { int status = TRUE; char *prompt; @@ -2612,7 +2616,7 @@ * Appends the buffer, with quotes */ void -append_quoted_token(TBUFF ** dst, const char *values, unsigned last) +append_quoted_token(TBUFF **dst, const char *values, unsigned last) { unsigned n; Index: exec.c Prereq: 1.261 --- vile-9.4f+/exec.c 2004-04-11 23:10:22.000000000 +0000 +++ vile-9.4g/exec.c 2004-06-09 20:59:35.000000000 +0000 @@ -4,7 +4,7 @@ * original by Daniel Lawrence, but * much modified since then. assign no blame to him. -pgf * - * $Header: /usr/build/vile/vile/RCS/exec.c,v 1.261 2004/04/11 23:10:22 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/exec.c,v 1.264 2004/06/09 20:59:35 tom Exp $ * */ @@ -13,8 +13,6 @@ #include "nefunc.h" #include "nefsms.h" -#define isSPorTAB(c) ((c) == ' ' || (c) == '\t') - static int rangespec(const char *specp, LINEPTR * fromlinep, LINEPTR * tolinep, CMDFLAGS * flagp); @@ -555,7 +553,7 @@ s++; /* skip leading spaces */ - while (isSPorTAB(*s)) + while (isBlank(*s)) s++; /* dot means current position */ @@ -676,7 +674,7 @@ } /* permit extra colons at the start of the line */ - while (isSPorTAB(*specp) || *specp == ':') { + while (isBlank(*specp) || *specp == ':') { specp++; } @@ -717,7 +715,7 @@ *flagp |= DFLALL; /* skip whitespace */ - while (isSPorTAB(*scan)) + while (isBlank(*scan)) scan++; if (*scan) { @@ -926,7 +924,7 @@ * actually found. */ char * -get_token(char *src, TBUFF ** tok, int eolchar, int *actual) +get_token(char *src, TBUFF **tok, int eolchar, int *actual) { tb_init(tok, EOS); return get_token2(src, tok, eolchar, actual); @@ -937,7 +935,7 @@ * re-gluing a "!" to a quoted string from kbd_reply(). */ char * -get_token2(char *src, TBUFF ** tok, int eolchar, int *actual) +get_token2(char *src, TBUFF **tok, int eolchar, int *actual) { int quotef = EOS; /* nonzero iff the current string quoted */ int c, i, d, chr; @@ -950,7 +948,7 @@ return src; /* first scan past any whitespace in the source string */ - while (isSPorTAB(*src)) + while (isBlank(*src)) ++src; /* scan through the source string, which may be quoted */ @@ -1046,14 +1044,14 @@ if (c == eolchar) { if (actual != 0) *actual = *src; - if (!isSPorTAB(c)) + if (!isBlank(c)) src++; break; } else if (c == DQUOTE) { quotef = c; /* note that leading quote is included */ - } else if (isSPorTAB(c)) { + } else if (isBlank(c)) { if (actual != 0) *actual = *src; break; @@ -1072,7 +1070,7 @@ } /* scan past any whitespace remaining in the source string */ - while (isSPorTAB(*src)) + while (isBlank(*src)) ++src; token_ended_line = isreturn(*src) || *src == EOS; @@ -1091,7 +1089,7 @@ * commands are multiple tokens. */ int -macroize(TBUFF ** p, TBUFF * src, int skip) +macroize(TBUFF **p, TBUFF *src, int skip) { register int c; char *ref = tb_values(src); /* FIXME */ @@ -1139,7 +1137,7 @@ /* fetch and isolate the next token from execstr */ int -mac_token(TBUFF ** tok) +mac_token(TBUFF **tok) { int savcle; const char *oldstr = execstr; @@ -1156,7 +1154,7 @@ /* fetch and isolate and evaluate the next token from execstr */ char * -mac_tokval(TBUFF ** tok) +mac_tokval(TBUFF **tok) { if (mac_token(tok) != 0) { char *previous = tb_values(*tok); @@ -1177,6 +1175,7 @@ } else { (void) tb_scopy(tok, newvalue); } + tb_dequote(tok); } return (tb_values(*tok)); } @@ -1188,7 +1187,7 @@ * get a macro line argument */ int -mac_literalarg(TBUFF ** tok) +mac_literalarg(TBUFF **tok) { /* buffer to place argument */ /* grab everything on this line, literally */ (void) tb_scopy(tok, execstr); @@ -1202,7 +1201,7 @@ * Parameter info is given as a keyword, optionally followed by a prompt string. */ static int -decode_parameter_info(TBUFF * tok, PARAM_INFO * result) +decode_parameter_info(TBUFF *tok, PARAM_INFO * result) { char name[NSTRING]; char text[NSTRING]; @@ -1236,7 +1235,7 @@ #endif static int -setup_macro_buffer(TBUFF * name, int flag) +setup_macro_buffer(TBUFF *name, int flag) { #if OPT_MACRO_ARGS || OPT_ONLINEHELP static TBUFF *temp; Index: externs.c Prereq: 1.8 --- vile-9.4f+/externs.c 2001-09-18 09:49:27.000000000 +0000 +++ vile-9.4g/externs.c 2004-06-09 01:03:49.000000000 +0000 @@ -1,7 +1,7 @@ /* * This is just a place holder -- a place in which to pull in edef.h alone * - * $Header: /usr/build/vile/vile/RCS/externs.c,v 1.8 2001/09/18 09:49:27 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/externs.c,v 1.9 2004/06/09 01:03:49 tom Exp $ * */ @@ -13,4 +13,3 @@ #include "nename.h" /* name table */ EXTERN_CONST int nametblsize = TABLESIZE(nametbl); - Index: filec.c Prereq: 1.113 --- vile-9.4f+/filec.c 2003-06-18 21:38:00.000000000 +0000 +++ vile-9.4g/filec.c 2004-06-09 01:03:57.000000000 +0000 @@ -5,7 +5,7 @@ * Written by T.E.Dickey for vile (march 1993). * * - * $Header: /usr/build/vile/vile/RCS/filec.c,v 1.113 2003/06/18 21:38:00 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/filec.c,v 1.114 2004/06/09 01:03:57 tom Exp $ * */ @@ -1171,7 +1171,7 @@ * flag - +1 to read, -1 to write, 0 don't care */ int -mlreply_file(const char *prompt, TBUFF ** buffer, UINT flag, char *result) +mlreply_file(const char *prompt, TBUFF **buffer, UINT flag, char *result) { int status; static TBUFF *last; @@ -1297,7 +1297,7 @@ * Prompt for a directory name, allowing completion via tab and '?' */ int -mlreply_dir(const char *prompt, TBUFF ** buffer, char *result) +mlreply_dir(const char *prompt, TBUFF **buffer, char *result) { int status; static TBUFF *last; Index: filters/c-filt.c Prereq: 1.67 --- vile-9.4f+/filters/c-filt.c 2003-05-24 00:49:25.000000000 +0000 +++ vile-9.4g/filters/c-filt.c 2004-05-14 23:29:23.000000000 +0000 @@ -6,18 +6,19 @@ * string literal ("Literal") support -- ben stoltz * factor-out hashing and file I/O - tom dickey * - * $Header: /usr/build/vile/vile/filters/RCS/c-filt.c,v 1.67 2003/05/24 00:49:25 tom Exp $ + * $Header: /usr/build/vile/vile/filters/RCS/c-filt.c,v 1.72 2004/05/14 23:29:23 tom Exp $ * * Usage: refer to vile.hlp and doc/filters.doc . * * Options: * -j java special cases * -p suppress preprocessor suppoer + * -s javascript special cases */ #include -DefineOptFilter("c", "jp"); +DefineOptFilter("c", "jps"); #define UPPER(c) isalpha(CharOf(c)) ? toupper(CharOf(c)) : c @@ -201,7 +202,7 @@ state = 1; } else if (BeginExponent(radix, ch)) { state = 2; - } else if (ch == 'F') { + } else if (ch == 'F' || (FltOptions('j') && ch == 'D')) { num_f++; state = 3; } else if (ch == 'L') { @@ -223,7 +224,7 @@ state = -1; if (BeginExponent(radix, ch)) { state = 2; - } else if (ch == 'F') { + } else if (ch == 'F' || (FltOptions('j') && ch == 'D')) { num_f++; state = 3; } else if (ch == 'L') { @@ -239,7 +240,7 @@ ch = UPPER(*s); /* FALLTHRU */ case 3: - if (ch == 'F') { + if (ch == 'F' || (FltOptions('j') && ch == 'D')) { if (++num_f > 1) state = -1; } else if (ch == 'L') { @@ -310,6 +311,52 @@ return s; } +/* Java and JavaScript */ +static char * +write_wchar(char *s) +{ + int n; + for (n = 2; n <= 6; ++n) { + if (!isxdigit(CharOf(s[n]))) + break; + } + flt_puts(s, n, n == 6 ? Literal_attr : Error_attr); + return s + n; +} + +/* JavaScript */ +static char * +write_regexp(char *s) +{ + char *base = s; + int escape = 0; + int adjust = 0; + + do { + int ch = *s; + if (escape) { + ++s; + escape = 0; + } else { + if (ch == BACKSLASH) + escape = 1; + ++s; + } + } while ((*s != '\0') && (escape || (*s != '/'))); + if (*s == '/') { + ++s; + adjust = 1; + } + while (*s == 'i' || *s == 'g') { + ++s; + adjust = 1; + } + if (!adjust) + ++s; + flt_puts(base, s - base, Literal_attr); + return s; +} + static char * parse_prepro(char *s, int *literal) { @@ -387,7 +434,12 @@ static char *line; char *s; - int comment, c_length, literal, escaped, was_esc; + int c_length; + int comment; + int escaped; + int literal; + int was_eql; + int was_esc; unsigned len; Comment_attr = class_attr(NAME_COMMENT); @@ -399,6 +451,7 @@ comment = 0; literal = 0; + was_eql = 0; was_esc = 0; while (flt_gets(&line, &used) != NULL) { @@ -429,6 +482,7 @@ && set_symbol_table("cpre")) { s = parse_prepro(s, &literal); set_symbol_table(filter_def.filter_name); + was_eql = 0; } else if (comment && *s) { if ((c_length = has_endofcomment(s)) > 0) { write_comment(s, c_length, 0); @@ -442,31 +496,54 @@ s = s + c_length; } } else if (*s == BACKSLASH) { - if (s[1] != '\n') { - s = write_escape(s, Error_attr); + if (s[1] == '\n') { + flt_putc(*s++); /* escaped newline - ok */ + } else if (FltOptions('j') && (s[1] == 'u')) { + /* FIXME: a Unicode value is potentially part of an + * identifier. For now, simply color it like a string. + */ + s = write_wchar(s); } else { - /* escaped newline - ok */ - flt_putc(*s++); + s = write_escape(s, Error_attr); } + was_eql = 0; } else if (isQuote(*s)) { literal = (literal == 0) ? *s : 0; flt_putc(*s++); if (literal) { s = write_literal(s, &literal, 1); } + was_eql = 0; } else if (isIdent(*s)) { s = extract_identifier(s); + was_eql = 0; } else if (isdigit(CharOf(*s)) || (*s == '.' && (isdigit(CharOf(s[1])) || s[1] == '.'))) { s = write_number(s); + was_eql = 0; } else if (*s == '#') { char *t = s; while (*s == '#') s++; flt_puts(t, s - t, ((s - t) > 2) ? Error_attr : Preproc_attr); + was_eql = 0; + } else if (ispunct(CharOf(*s))) { + if (FltOptions('s') && was_eql && *s == '/') { + s = write_regexp(s); + } else { + /* + * A JavaScript regular expression can appear to the + * right of an assignment, or as a parameter to new() + * or match(). + */ + was_eql = (*s == '=' || *s == L_PAREN || *s == ','); + flt_putc(*s++); + } } else { + if (!isspace(CharOf(*s))) + was_eql = 0; flt_putc(*s++); } } Index: filters/dcl-filt.l Prereq: 1.12 --- vile-9.4f+/filters/dcl-filt.l 2003-05-20 20:38:41.000000000 +0000 +++ vile-9.4g/filters/dcl-filt.l 2004-05-15 11:49:42.000000000 +0000 @@ -1,7 +1,9 @@ +%state NORMAL LITERAL + %{ /* - * $Header: /usr/build/vile/vile/filters/RCS/dcl-filt.l,v 1.12 2003/05/20 20:38:41 tom Exp $ + * $Header: /usr/build/vile/vile/filters/RCS/dcl-filt.l,v 1.14 2004/05/15 11:49:42 tom Exp $ * * Filter to add vile "attribution" sequences to selected bits of DCL files. * @@ -14,7 +16,10 @@ * This filter only finds a label which is followed by either whitespace * or the end of a line. * - * FIXME: It would be nice to implement VMS's equivalent to here-documents + * FIXME: are '$' legal in labels? DEC says alphanumerics, but I see '_' used. + * If a leading '$' were legal, I'd have to introduce more states. + * FIXME: it would be nice to highlight labels that are given in goto and + * /err= options. * FIXME: parameters of lexical functions can be quoted, nested within a * quoted string. */ @@ -30,35 +35,73 @@ static char *Number_attr; static char *String_attr; +static char *look_for = 0; + static void -init_filter(int before GCC_UNUSED) +handle_ident(char *text, int length) { + char *attr = ci_keyword_attr(text); + char *temp = lowercase_of(text); + flt_puts(text, length, attr); + if (!strcmp(temp, "deck")) { + /* FIXME: "DECK" can also have an option /dollars whose value would + * be the actual string to search for. + */ + look_for = "eod"; + } } static void -do_filter(FILE *inputs) +handle_newline(void) { - yyin = inputs; + flt_putc('\n'); + if (look_for != 0) { + BEGIN(LITERAL); + } +} - Action_attr = class_attr(NAME_ACTION); - Comment_attr = class_attr(NAME_COMMENT); - Ident_attr = class_attr(NAME_IDENT); - Ident2_attr = class_attr(NAME_IDENT2); - Number_attr = class_attr(NAME_NUMBER); - String_attr = class_attr(NAME_LITERAL); +static void +handle_literal(char *text, int length) +{ + int dollars = 0; - while (yylex() > 0) { + if (*text == '$') { + flt_puts(text, 1, Comment_attr); + ++text; + --length; + dollars = 1; + } + while (length > 0 && isspace(CharOf(*text))) { + flt_putc(*text); + ++text; + --length; + } + if (length > 0) { + char *attr = String_attr; + + if (dollars) { + char *temp = lowercase_of(text); + if (!strcmp(temp, look_for)) { + look_for = 0; + attr = ci_keyword_attr(temp); + BEGIN(NORMAL); + } + } + flt_puts(text, length, attr); } } %} BLANK [ \t] +LABEL [a-zA-Z0-9_]+ IDENT [a-zA-Z_][$a-zA-Z0-9_]* +OPTION "/"{IDENT} PARAM '{IDENT} -LABEL {IDENT}{BLANK}*:({BLANK}+|$) +LABELLINE {LABEL}{BLANK}*:$ +LABELPLUS {LABEL}{BLANK}*:{BLANK}+ INLINECOMMENT ![^\n]* COMMENT ^({BLANK}*)($)?({BLANK}*)(![^\n]*)? @@ -69,20 +112,51 @@ %% -^{BLANK}*@ { WriteToken(Action_attr); } -\032 { WriteToken(Action_attr); } +^{BLANK}*@ { WriteToken(Action_attr); } +\032 { WriteToken(Action_attr); } + +{LABELLINE} | +{LABELPLUS} { WriteToken(Ident2_attr); } + +{IDENT} { handle_ident(yytext, yyleng); } + +{OPTION} { WriteToken(Ident_attr); } -{LABEL} { WriteToken(Ident2_attr); } +{PARAM} { WriteToken(Ident2_attr); } -{IDENT} { WriteToken(ci_keyword_attr(yytext)); } +{INLINECOMMENT} | +{COMMENT} { WriteToken(Comment_attr); } -"/"{IDENT} { WriteToken(Ident_attr); } +{NUMBER} { WriteToken(Number_attr); } -{PARAM} { WriteToken(Ident2_attr); } +{STRING} { WriteToken(String_attr); } -{INLINECOMMENT} | -{COMMENT} { WriteToken(Comment_attr); } +[\n] { handle_newline(); } -{NUMBER} { WriteToken(Number_attr); } +[^\n]+ { handle_literal(yytext, yyleng); } +[\n] { ECHO; } -{STRING} { WriteToken(String_attr); } +%% + +static void +init_filter(int before GCC_UNUSED) +{ +} + +static void +do_filter(FILE *inputs) +{ + yyin = inputs; + + Action_attr = class_attr(NAME_ACTION); + Comment_attr = class_attr(NAME_COMMENT); + Ident_attr = class_attr(NAME_IDENT); + Ident2_attr = class_attr(NAME_IDENT2); + Number_attr = class_attr(NAME_NUMBER); + String_attr = class_attr(NAME_LITERAL); + + look_for = 0; + BEGIN(NORMAL); + while (yylex() > 0) { + } +} Index: filters/dcl.key Prereq: 1.4 --- vile-9.4f+/filters/dcl.key 2001-01-06 01:34:23.000000000 +0000 +++ vile-9.4g/filters/dcl.key 2004-05-15 11:42:40.000000000 +0000 @@ -1,4 +1,4 @@ -: $Id: dcl.key,v 1.4 2001/01/06 01:34:23 tom Exp $ +: $Id: dcl.key,v 1.5 2004/05/15 11:42:40 tom Exp $ : VAX DCL allows all of the command verbs to be abbreviated; in fact they are : not really distinct past the first four characters. : @@ -18,6 +18,7 @@ call canc*el clos*e +conn*ect cont*inue conv*ert copy @@ -25,6 +26,7 @@ deal*locate deas*sign debu*g +deck def*ine del*ete dep*osit @@ -35,9 +37,11 @@ disk*quota dism*ount dsr +dtm dump edit else +elv enab*le endi*f ends*ubroutine @@ -57,9 +61,11 @@ lice*nse link lo*gout +loca*le lse*dit merg*e mess*age +mms modi*fy mon*itor mou*nt @@ -69,17 +75,21 @@ pass*word patc*h phon*e +pipe pr*int pur*ge quit read reco*ver +redu*ce remo*ve ren*ame repl*ace repl*y req*uest ret*urn +rexe*c +rsh run sea*rch send Index: filters/filters.rc Prereq: 1.186 --- vile-9.4f+/filters/filters.rc 2004-04-11 19:29:50.000000000 +0000 +++ vile-9.4g/filters/filters.rc 2004-06-05 22:52:44.000000000 +0000 @@ -1,4 +1,4 @@ -; $Id: filters.rc,v 1.186 2004/04/11 19:29:50 tom Exp $ +; $Id: filters.rc,v 1.191 2004/06/05 22:52:44 tom Exp $ ; majormodes in this file are ordered alphabetically for convenience - the ; precedence used by vile is strictly alphabetic, counting case. @@ -66,6 +66,7 @@ ; we normally use the builtin values, but this is useful for looking at ; autoconf templates: ~with define-submode c + mode-filename 'llib-.*$' ignoresuffix '\.\(in\|orig\|~\)$' ~endwith @@ -79,7 +80,12 @@ define-mode cpp ~with define-submode cpp before "c" - suffixes '\.\(C\|CC\|cc\|cpp\|cxx\|hxx\|hh\)$' + mode-pathname '.*/include/[cg]++[^/]*/.*' + ~if $filename-ic + suffixes '\.\(cc\|cpp\|cxx\|hh\|hpp\|hxx\)$' + ~else + suffixes '\.\(cc\|cpp\|cxx\|hh\|hpp\|hxx\|[CH]\|CC\)$' + ~endif cindent cindent-chars &cat ':#' $fences filtername 'vile-c-filt -k cpp' @@ -246,7 +252,7 @@ define-mode js ~with define-submode js suffixes '\.\(js\|jsp\)$' - filtername 'vile-c-filt -p -k js' + filtername 'vile-c-filt -j -s -p -k js' cindent cindent-chars &cat ':' $fences ~endwith @@ -276,7 +282,7 @@ define-mode lisp ~with define-submode lisp - suffixes '\.\(lisp\|lsp\)$' + suffixes '\.\(el\|lisp\|lsp\)$' fence-pairs='()' fence-begin='#|' fence-end='|#' @@ -285,7 +291,7 @@ define-mode log ~with define-submode log - mode-filename '^\(run\|make\).*\.out$' + mode-filename '^\(run\|\w\?make\).*\.out$' suffixes '\.\(log.*\)$' before make ~endwith Index: filters/js.key Prereq: 1.2 --- vile-9.4f+/filters/js.key 2003-02-23 17:07:49.000000000 +0000 +++ vile-9.4g/filters/js.key 2004-05-14 19:45:07.000000000 +0000 @@ -1,49 +1,82 @@ -: $Id: js.key,v 1.2 2003/02/23 17:07:49 tom Exp $ -: JavaScript keywords -abstract +: $Id: js.key,v 1.4 2004/05/14 19:45:07 tom Exp $ +: JavaScript/ECMAScript keywords break -byte case catch continue -defaults +default +delete do -double else -extends -false -float +finally for function -functions -goto if +in +instanceof +new +return +switch +this +throw +try +typeof +var +while +with +: literals +void +false +true +null +: ECMA-262 "future" reserved words +abstract +boolean +byte +char +class +const +debugger +double +enum +export +extends +final +float +goto implements import -in int interface long native -new -null package private protected public -return short static super -switch synchronized -this -throw throws transient -true -try -var -void -while -with +volatile +: JScript extensions (also some of ECMAScript's "future" keywords) +decimal +enum +get +implements +internal +sbyte +set +uint +ushort +: +assert +ensure +event +invariant +namespace +require +transient +use Index: filters/latexflt.l Prereq: 1.36 --- vile-9.4f+/filters/latexflt.l 2003-11-02 20:41:00.000000000 +0000 +++ vile-9.4g/filters/latexflt.l 2004-05-17 19:16:45.000000000 +0000 @@ -5,7 +5,7 @@ %{ /* - * $Header: /usr/build/vile/vile/filters/RCS/latexflt.l,v 1.36 2003/11/02 20:41:00 tom Exp $ + * $Header: /usr/build/vile/vile/filters/RCS/latexflt.l,v 1.37 2004/05/17 19:16:45 tom Exp $ * * Filter to add vile "attribution" sequences to selected bits of TeX or LaTeX * input text. @@ -128,7 +128,7 @@ ; else if (FLT_STATE == QUOTED) pop_state(); - else + else if (FLT_STATE != TEXT) push_state(QUOTED); } [^|\n]* { WriteToken(String_attr); } Index: filters/pl-filt.c Prereq: 1.72 --- vile-9.4f+/filters/pl-filt.c 2003-12-15 01:42:54.000000000 +0000 +++ vile-9.4g/filters/pl-filt.c 2004-06-15 21:14:16.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Header: /usr/build/vile/vile/filters/RCS/pl-filt.c,v 1.72 2003/12/15 01:42:54 tom Exp $ + * $Header: /usr/build/vile/vile/filters/RCS/pl-filt.c,v 1.76 2004/06/15 21:14:16 tom Exp $ * * Filter to add vile "attribution" sequences to perl scripts. This is a * translation into C of an earlier version written for LEX/FLEX. @@ -7,6 +7,7 @@ #include +#define DEBUG #ifdef DEBUG DefineOptFilter("perl", "d"); #else @@ -235,29 +236,33 @@ return 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(char *s) +is_NORMALVARS(char *s, int dquoted) { char *base = s; int ch; - int quoted = 0; + int squoted = 0; int part1 = 0; int part2 = 0; while (MORE(s)) { ch = CharOf(*s); if (s == base) { - if (strchr("$%@", ch) == 0) { + if (strchr(dquoted ? "$" : "$%@", ch) == 0) { break; } - } else if (quoted) { + } else if (squoted && !dquoted) { if (isalnum(ch)) part2 = 1; else break; } else { - if (ch == SQUOTE) { - quoted = 1; + if (ch == SQUOTE && !dquoted) { + squoted = 1; } else if (isalnum(ch) || ch == '_') { part1 = 1; } else { @@ -266,7 +271,7 @@ } s++; } - return (part1 && (quoted == part2)) ? (s - base) : 0; + return (part1 && (dquoted || (squoted == part2))) ? (s - base) : 0; } static int @@ -400,11 +405,11 @@ } static int -is_IDENT(char *s) +is_IDENT(char *s, int quoted) { int found; - if ((found = is_NORMALVARS(s)) == 0) + if ((found = is_NORMALVARS(s, quoted)) == 0) found = is_OTHERVARS(s); return found; } @@ -667,7 +672,7 @@ test = 0; if ((test == 0) || (strchr(QUOTE_DELIMS, test) == 0)) s = base; - DPRINTF(("is_QUOTE(%.*s)", + DPRINTF(("is_QUOTE(%.*s)\n", (s != base) ? (s - base) : 1, (s != base) ? base : "")); } @@ -888,6 +893,28 @@ 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 = delim; + 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) { @@ -917,7 +944,7 @@ for (j = k = 0; j < len; j++) { if ((j == 0 || (s[j - 1] != BACKSLASH)) - && (id = is_IDENT(s + j)) != 0) { + && (id = is_IDENT(s + j, 1)) != 0) { if (var_embedded(s + j)) { if (j != k) flt_puts(s + k, j - k, attr); @@ -987,12 +1014,11 @@ * Identifier may be a keyword, or a user identifier. */ static char * -put_IDENT(char *s, int ok, int *had_op, AfterKey * if_wrd) +put_IDENT(char *s, int ok, AfterKey * if_wrd) { char *attr = 0; char save = s[ok]; - *had_op = 0; s[ok] = '\0'; attr = keyword_attr(s); s[ok] = save; @@ -1005,12 +1031,11 @@ * Identifier must be a user identifier. */ static char * -put_NOKEYWORD(char *s, int ok, int *had_op, AfterKey * if_wrd) +put_NOKEYWORD(char *s, int ok, AfterKey * if_wrd) { char *attr = 0; char save = s[ok]; - *had_op = 0; s[ok] = '\0'; attr = keyword_attr(s); s[ok] = save; @@ -1092,6 +1117,12 @@ { } +#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 @%d\n", __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) { @@ -1104,7 +1135,8 @@ char *marker = 0; char *s; int err; - int had_op = 0; + char *had_op = 0; + char *old_op = 0; int ignore; int in_line = -1; int in_stmt = 0; @@ -1160,8 +1192,12 @@ } if_old = if_wrd; if_wrd = nullKey; - DPRINTF(("(%s(%c) line:%d.%d(%d) if:%d op:%d)\n", - stateName(state), *s, in_line, in_stmt, parens, if_wrd, had_op)); + DPRINTF(("(%s(%c) line:%d.%d(%d) if:%d.%d op:%c%c)\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 : ' ')); switch (state) { case eBACKTIC: if ((ok = end_BACKTIC(s)) != 0) { @@ -1199,6 +1235,7 @@ } else if ((ok = begin_PATTERN(s)) != 0) { flt_puts(s, ok, ""); s += ok; + DPRINTF(("\nePATTERN:%d\n", __LINE__)); state = ePATTERN; } else if (in_line < 0 && (ok = begin_POD(s))) { @@ -1220,68 +1257,72 @@ s += ok; if_wrd = if_old; } else if ((if_old.may_have_pattern - || had_op + || opBeforePattern() || (in_stmt == 1)) && isPattern(*s)) { + DPRINTF(("\nePATTERN:%d\n", __LINE__)); state = ePATTERN; } else if (*s == L_CURLY) { - had_op = 1; + saveOp(s); flt_putc(*s++); } else if (*s == L_PAREN) { parens++; - had_op = 1; + saveOp(s); flt_putc(*s++); if (isPattern(*s)) { + DPRINTF(("\nePATTERN:%d\n", __LINE__)); state = ePATTERN; } } else if (*s == R_PAREN) { if (--parens < 0) parens = 0; flt_putc(*s++); - had_op = 0; + clearOp(); } else if ((ok = is_NUMBER(s, &err)) != 0) { - had_op = 0; + clearOp(); flt_puts(s, ok, err ? Error_attr : Number_attr); s += ok; } else if ((ok = is_KEYWORD(s)) != 0) { if ((s != the_file) && (s[-1] == '*')) { /* typeglob */ - s = put_IDENT(s, ok, &had_op, &if_wrd); - break; - } - if ((s != the_file) - && (if_old.has_no_pattern)) { - s = put_NOKEYWORD(s, ok, &had_op, &if_wrd); - break; - } - if (is_QUOTE(s, &ignore)) { + 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; - break; - } - if (is_FORMAT(s, ok)) { - quoted = 0; - state = eHERE; - mark_len = 0; - marker = strcpy(do_alloc(0, 2, &mark_len), "."); + } else { + if (is_FORMAT(s, ok)) { + quoted = 0; + state = eHERE; + mark_len = 0; + marker = strcpy(do_alloc(0, 2, &mark_len), "."); + } + save = s[ok]; + s[ok] = 0; + if (!strcmp(s, "__END__") || !strcmp(s, "__DATA__")) + state = eIGNORED; + clearOp(); + flt_puts(s, ok, keyword_attr(s)); + check_keyword(s, ok, &if_wrd); + s[ok] = save; + s += ok; } - save = s[ok]; - s[ok] = 0; - if (!strcmp(s, "__END__") || !strcmp(s, "__DATA__")) - state = eIGNORED; - had_op = 0; - flt_puts(s, ok, keyword_attr(s)); - check_keyword(s, ok, &if_wrd); - s[ok] = save; - s += ok; } else if ((ok = is_Option(s)) != 0) { - had_op = 0; + clearOp(); flt_puts(s, ok, Keyword_attr); check_keyword(s, ok, &if_wrd); s += ok; - } else if ((ok = is_IDENT(s)) != 0) { - s = put_IDENT(s, ok, &had_op, &if_wrd); + } else if ((ok = is_IDENT(s, 0)) != 0) { + s = put_IDENT(s, ok, &if_wrd); + clearOp(); } else if ((ok = is_String(s, &err)) != 0) { - had_op = 0; + clearOp(); if (*s == DQUOTE) { s = put_embedded(s, ok, err ? Error_attr : String_attr); } else { @@ -1290,15 +1331,18 @@ } } else { if (parens) { - if (strchr("|&=~!", *s) != 0) - had_op = 1; - else if (!isspace(CharOf(*s))) - had_op = 0; + if (strchr("|&=~!", *s) != 0) { + saveOp(s); + } else if (!isspace(CharOf(*s))) { + clearOp(); + } } else { - if (*s == ';') + if (*s == ';') { in_stmt = 0; - if (strchr("|&=~!", *s) != 0) - had_op = 1; + } + if (strchr("|&=~!->", *s) != 0) { + saveOp(s); + } } flt_putc(*s++); } @@ -1321,15 +1365,17 @@ s = skip_BLANKS(s); if (MORE(s)) { if ((ok = is_NAME(s)) != 0 && !is_QUOTE(s, &ignore)) { - s = put_IDENT(s, ok, &had_op, &if_wrd); - } else if ((ok = is_IDENT(s)) != 0 && !is_QUOTE(s, &ignore)) { - s = put_IDENT(s, ok, &had_op, &if_wrd); + 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++); } - had_op = 0; + clearOp(); state = eCODE; } break; Index: finderr.c Prereq: 1.118 --- vile-9.4f+/finderr.c 2003-07-27 17:07:07.000000000 +0000 +++ vile-9.4g/finderr.c 2004-06-15 22:12:52.000000000 +0000 @@ -5,7 +5,7 @@ * * Copyright (c) 1990-2003 by Paul Fox and Thomas Dickey * - * $Header: /usr/build/vile/vile/RCS/finderr.c,v 1.118 2003/07/27 17:07:07 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/finderr.c,v 1.120 2004/06/15 22:12:52 tom Exp $ * */ @@ -234,7 +234,7 @@ char *last = first + want; (void) memset(errp, 0, sizeof(*errp)); - TPRINTF(("error-pattern %*S\n", want, first)); + TPRINTF(("error-pattern %.*s\n", want, first)); /* In the first pass, find the number of fields we'll substitute. * Then allocate a new string that's a genuine regular expression @@ -546,6 +546,22 @@ return failed; } +#define set_tabstop_val(bp,value) set_b_val(bp, VAL_TAB, value) + +static void +goto_column(void) +{ + int saved_tabstop = tabstop_val(curbp); + + if (error_tabstop > 0) + set_tabstop_val(curbp, error_tabstop); + + gocol(fe_colm ? fe_colm - cC_base : 0); + + if (error_tabstop > 0) + set_tabstop_val(curbp, saved_tabstop); +} + /* Edits the file and goes to the line pointed at by the next compiler error in * the "[output]" window. It unfortunately doesn't mark the lines for you, so * adding lines to the file throws off the later numbering. Solutions to this @@ -746,7 +762,7 @@ mlforce("%s", errtext); len = strlen(errtext); } else { - mlforce("Error: %*S", dotp->l_used, dotp->l_text); + mlforce("Error: %.*s", dotp->l_used, dotp->l_text); errtext = dotp->l_text; len = dotp->l_used; } @@ -760,7 +776,7 @@ status = gotoeob(f, n); else status = gotoline(TRUE, -(curbp->b_lines_on_disk - fe_line + lL_base)); - gocol(fe_colm ? fe_colm - cC_base : 0); + goto_column(); oerrline = fe_line; (void) tb_scopy(&oerrfile, errfile); @@ -860,12 +876,12 @@ if (j >= exp_count) break; bprintf("\n%7d ", j); - bprintf("%*S\n", llength(lp), lp->l_text); - bprintf("%*S%s", ERR_PREFIX, " ", exp_table[j].exp_text); + bprintf("%.*s\n", llength(lp), lp->l_text); + bprintf("%.*s%s", ERR_PREFIX, " ", exp_table[j].exp_text); for (k = 0; k < W_LAST; k++) { if (exp_table[j].words[k] != 0) { if (first) { - bprintf("\n%*S", ERR_PREFIX, " "); + bprintf("\n%.*s", ERR_PREFIX, " "); first = FALSE; } else { bprintf(", "); Index: history.c Prereq: 1.76 --- vile-9.4f+/history.c 2003-07-27 16:55:39.000000000 +0000 +++ vile-9.4g/history.c 2004-06-16 22:54:27.000000000 +0000 @@ -55,7 +55,7 @@ * not (yet) correspond to :-commands. Before implementing, probably will * have to make TESTC a settable mode. * - * $Header: /usr/build/vile/vile/RCS/history.c,v 1.76 2003/07/27 16:55:39 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/history.c,v 1.79 2004/06/16 22:54:27 tom Exp $ * */ @@ -228,11 +228,11 @@ * parsing. */ static int -needQuotes(TBUFF * src) +needQuotes(TBUFF *src) { #if HST_QUOTES if (tb_length(MyText) - || must_quote_token(tb_values(src), tb_length(src))) + && must_quote_token(tb_values(src), tb_length(src))) return TRUE; #endif return FALSE; @@ -297,7 +297,7 @@ #endif static void -glueBufferToResult(TBUFF ** dst, TBUFF * src) +glueBufferToResult(TBUFF **dst, TBUFF *src) { int shell_cmd = ((tb_length(*dst) != 0 && isShellOrPipe(tb_values(*dst))) || (tb_length(*dst) != 0 && isShellOrPipe(tb_values(src)))); @@ -343,7 +343,7 @@ } void -hst_append(TBUFF * cmd, int glue) +hst_append(TBUFF *cmd, int glue) { static int skip = 1; /* e.g., after "!" */ @@ -498,12 +498,6 @@ continue; } - /* avoid picking up lines with range-spec, since this is too - * cumbersome to splice in 'namedcmd()'. - */ - if (islinespecchar(lp->l_text[0])) - continue; - /* '/' and '?' are not (yet) :-commands. Don't display them * in the command-name scrolling. */ @@ -588,7 +582,7 @@ * Update the display using a TBUFF as source */ static void -display_TBUFF(HST * parm, TBUFF * tp) +display_TBUFF(HST * parm, TBUFF *tp) { hst_display(parm, tb_args(tp)); } @@ -635,13 +629,12 @@ * escape-character is entered. */ int -edithistory( - TBUFF ** buffer, - unsigned *position, - int *given, - UINT options, - int (*endfunc) (EOL_ARGS), - int eolchar) +edithistory(TBUFF **buffer, + unsigned *position, + int *given, + UINT options, + int (*endfunc) (EOL_ARGS), + int eolchar) { HST param; BUFFER *bp; Index: input.c Prereq: 1.262 --- vile-9.4f+/input.c 2004-03-21 18:27:20.000000000 +0000 +++ vile-9.4g/input.c 2004-06-11 10:08:44.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. * - * $Header: /usr/build/vile/vile/RCS/input.c,v 1.262 2004/03/21 18:27:20 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/input.c,v 1.265 2004/06/11 10:08:44 tom Exp $ * */ @@ -321,7 +321,7 @@ } int -mlreply2(const char *prompt, TBUFF ** buf) +mlreply2(const char *prompt, TBUFF **buf) { return kbd_string2(prompt, buf, '\n', KBD_NORMAL, no_completion); } @@ -647,7 +647,7 @@ /* get a string consisting of inclchartype characters from the current position. if inclchartype is 0, return everything to eol */ int -screen2tbuff(TBUFF ** result, CHARTYPE inclchartype) +screen2tbuff(TBUFF **result, CHARTYPE inclchartype) { int i = 0; MARK save_dot; @@ -665,7 +665,7 @@ } else if (b_is_directory(curbp) && inclchartype == SCREEN_STRING) { whole_line = 1; - inclchartype = (CHARTYPE) ~ 0; + inclchartype = (CHARTYPE) ~0; } if (whole_line @@ -811,7 +811,7 @@ * that don't know it's a TBUFF. */ static char * -tbreserve(TBUFF ** buf) +tbreserve(TBUFF **buf) { char *result = tb_values(tb_alloc(buf, tb_length(*buf) + NSTRING)); BuffToStr(*buf); @@ -820,7 +820,7 @@ /* turn \X into X */ static void -remove_backslashes(TBUFF * buf) +remove_backslashes(TBUFF *buf) { register char *cp = tb_values(buf); register size_t s, d; @@ -838,7 +838,7 @@ * position escaped by one. */ static UINT -countBackSlashes(TBUFF * buf, UINT len) +countBackSlashes(TBUFF *buf, UINT len) { char *buffer = tb_values(buf); register UINT count; @@ -890,7 +890,7 @@ /* expand a single character (only used on interactive input) */ static int -expandChar(TBUFF ** buf, +expandChar(TBUFF **buf, unsigned *position, int c, KBD_OPTIONS options) @@ -1006,7 +1006,7 @@ * Erases the response from the screen for 'kbd_string()' */ void -kbd_kill_response(TBUFF * buffer, unsigned *position, int c) +kbd_kill_response(TBUFF *buffer, unsigned *position, int c) { char *buf = tb_values(buffer); TBUFF *tmp = 0; @@ -1043,7 +1043,7 @@ * necessary. */ int -kbd_show_response(TBUFF ** dst, /* string with escapes */ +kbd_show_response(TBUFF **dst, /* string with escapes */ char *src, /* string w/o escapes */ unsigned bufn, /* # of chars we read from 'src[]' */ int eolchar, @@ -1104,7 +1104,7 @@ static char *pushback_ptr; void -kbd_pushback(TBUFF * buf, int skip) +kbd_pushback(TBUFF *buf, int skip) { static TBUFF *PushBack; char *buffer = tb_values(buf); /* FIXME */ @@ -1156,7 +1156,7 @@ int kbd_string2(const char *prompt, /* put this out first */ - TBUFF ** result, /* the caller's (possibly full) buffer */ + TBUFF **result, /* the caller's (possibly full) buffer */ int eolchar, /* char we can terminate on, in addition to '\n' */ KBD_OPTIONS options, /* KBD_EXPAND/KBD_QUOTES, etc. */ int (*complete) (DONE_ARGS)) /* handles completion */ @@ -1276,7 +1276,7 @@ } static int -editMinibuffer(TBUFF ** buf, unsigned *cpos, int c, int margin, int quoted) +editMinibuffer(TBUFF **buf, unsigned *cpos, int c, int margin, int quoted) { int edited = FALSE; const CMDFUNC *cfp; @@ -1521,7 +1521,7 @@ } static int -may_complete(TBUFF * data, KBD_OPTIONS options) +may_complete(TBUFF *data, KBD_OPTIONS options) { int result = ABORT; @@ -1536,6 +1536,18 @@ } /* + * This undoes the quoting done by tb_enquote() in run_func(), etc. + */ +static void +copy_dequoting(TBUFF **p, const char *string) +{ + (void) tb_init(p, EOS); + tb_scopy(p, string); + tb_dequote(p); + TRACE2(("copy_dequoting(%s) %s\n", string, tb_visible(*p))); +} + +/* * Same as 'kbd_string()', except for adding the 'endfunc' parameter. * * Returns: @@ -1546,7 +1558,7 @@ */ int kbd_reply(const char *prompt, /* put this out first */ - TBUFF ** extbuf, /* the caller's (possibly full) buffer */ + TBUFF **extbuf, /* the caller's (possibly full) buffer */ int (*endfunc) (EOL_ARGS), /* parsing with 'eolchar' delimiter */ int eolchar, /* char we can terminate on, in addition to '\n' */ KBD_OPTIONS options, /* KBD_EXPAND/KBD_QUOTES */ @@ -1626,14 +1638,14 @@ * a quoted string. */ if (result == error_val) { - result = ""; status = ABORT; + (void) tb_scopy(extbuf, ""); } else if (toktyp(tb_values(buf)) == TOK_FUNCTION && toktyp(result) == TOK_QUOTSTR) { - ++result; + copy_dequoting(extbuf, result); + } else { + (void) tb_scopy(extbuf, result); } - - (void) tb_scopy(extbuf, result); tb_free(&buf); tb_unput(*extbuf); /* trim the null */ } @@ -2062,7 +2074,7 @@ /* translate the keyboard-macro into readable form */ void -get_kbd_macro(TBUFF ** rp) +get_kbd_macro(TBUFF **rp) { char temp[80]; unsigned n, last, len; Index: isearch.c Prereq: 1.59 --- vile-9.4f+/isearch.c 2004-03-21 17:18:05.000000000 +0000 +++ vile-9.4g/isearch.c 2004-06-09 01:04:27.000000000 +0000 @@ -7,7 +7,7 @@ * * original author: D. R. Banks 9-May-86 * - * $Header: /usr/build/vile/vile/RCS/isearch.c,v 1.59 2004/03/21 17:18:05 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/isearch.c,v 1.60 2004/06/09 01:04:27 tom Exp $ * */ @@ -35,7 +35,7 @@ */ static int scanmore( /* search forward or back for a pattern */ - TBUFF * patrn, /* string to scan for */ + TBUFF *patrn, /* string to scan for */ int dir) /* direction to search */ { int sts; /* current search status */ Index: line.c Prereq: 1.160 --- vile-9.4f+/line.c 2003-07-27 16:10:52.000000000 +0000 +++ vile-9.4g/line.c 2004-06-09 01:04:34.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. * - * $Header: /usr/build/vile/vile/RCS/line.c,v 1.160 2003/07/27 16:10:52 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/line.c,v 1.162 2004/06/09 01:04:34 tom Exp $ * */ @@ -720,7 +720,7 @@ */ #if OPT_EVAL void -lgrabtext(TBUFF ** rp, CHARTYPE type) +lgrabtext(TBUFF **rp, CHARTYPE type) { (void) screen2tbuff(rp, type); } @@ -1730,7 +1730,7 @@ index2reg(i), REGS_PREFIX - 2, ' '); } else { - bprintf("%*S", + bprintf("%.*s", REGS_PREFIX, "(unnamed)"); } do { Index: macros/color-ls.rc Prereq: 1.1 --- vile-9.4f+/macros/color-ls.rc 2000-04-27 23:46:11.000000000 +0000 +++ vile-9.4g/macros/color-ls.rc 2004-06-11 11:51:23.000000000 +0000 @@ -1,4 +1,4 @@ -; $Id: color-ls.rc,v 1.1 2000/04/27 23:46:11 tom Exp $ +; $Id: color-ls.rc,v 1.2 2004/06/11 11:51:23 tom Exp $ ; Use this macro to render the output of "color ls" into a vile buffer. store-procedure ShowColorLS "Prompt for, and display a color-ls" ;~trace on @@ -8,8 +8,8 @@ write-message "[Cannot find manpage-filter]" ~return ~endif - set-variable %options &query "options? " - ~if &or &seq %options "ERROR" &seq %options "" + ~force set-variable %options &query "options? " + ~if &or &error %options &seq %options "" ~return ~endif set-variable %lsbuffer &cat "" Index: macros/manpage.rc Prereq: 1.18 --- vile-9.4f+/macros/manpage.rc 2003-05-10 00:53:59.000000000 +0000 +++ vile-9.4g/macros/manpage.rc 2004-06-11 11:49:41.000000000 +0000 @@ -3,7 +3,7 @@ ;; ;; Author: Kevin Buettner ;; -;; $Header: /usr/build/vile/vile/macros/RCS/manpage.rc,v 1.18 2003/05/10 00:53:59 tom Exp $ +;; $Header: /usr/build/vile/vile/macros/RCS/manpage.rc,v 1.19 2004/06/11 11:49:41 cmorgan Exp $ ;; store-procedure ShowManpage "Prompt for, and display a manual-page" @@ -13,8 +13,8 @@ write-message "[Cannot find manpage-filter]" ~return ~endif - set-variable %manpage &query "man page? " - ~if &or &seq %manpage "ERROR" &seq %manpage "" + ~force set-variable %manpage &query "man page? " + ~if &or &error %manpage &seq %manpage "" ~return ~endif set-variable %manpagebuf &cat "<" &cat %manpage ">" Index: macros/vileinit.rc Prereq: 1.21 --- vile-9.4f+/macros/vileinit.rc 2002-09-02 16:43:46.000000000 +0000 +++ vile-9.4g/macros/vileinit.rc 2004-05-15 15:26:53.000000000 +0000 @@ -1,4 +1,4 @@ -; $Header: /usr/build/vile/vile/macros/RCS/vileinit.rc,v 1.21 2002/09/02 16:43:46 tom Exp $ +; $Header: /usr/build/vile/vile/macros/RCS/vileinit.rc,v 1.22 2004/05/15 15:26:53 tom Exp $ ; This is a sample which may be installed as .vilerc (or vile.rc for non-Unix ; systems), or source'd as-is to provide quick initialization of some useful ; macros and settings. @@ -65,7 +65,8 @@ map r r map k k ; Shifted arrow-keys from XFree86 xterm, mapped to next-row and - ; previous-row + ; previous-row. They are available when the sunKeyboard resource + ; is false. Old flavor (see modifyCursorKeys in manpage): map   map O2A  map   @@ -74,6 +75,11 @@ map O2C #C map  #D map O2D #D + ; These are the newer flavor: + map   + map   + map  #C + map  #D ; You may have a back-tab (map it to previous-window) map  O ~endif Index: main.c Prereq: 1.516 --- vile-9.4f+/main.c 2004-04-11 15:22:00.000000000 +0000 +++ vile-9.4g/main.c 2004-05-29 14:28:28.000000000 +0000 @@ -22,7 +22,7 @@ */ /* - * $Header: /usr/build/vile/vile/RCS/main.c,v 1.516 2004/04/11 15:22:00 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/main.c,v 1.517 2004/05/29 14:28:28 tom Exp $ */ #define realdef /* Make global definitions not external */ @@ -741,7 +741,7 @@ * initialized. Give it one last chance. */ if ((startstat != TRUE) && tb_length(mlsave)) - mlforce("%*S", tb_length(mlsave), tb_values(mlsave)); + mlforce("%.*s", tb_length(mlsave), tb_values(mlsave)); /* process commands */ main_loop(); Index: mktbls.c Prereq: 1.130 --- vile-9.4f+/mktbls.c 2003-05-27 00:54:48.000000000 +0000 +++ vile-9.4g/mktbls.c 2004-05-28 20:22:45.000000000 +0000 @@ -5,7 +5,7 @@ * included in main.c * * Copyright (c) 1990 by Paul Fox - * Copyright (c) 1995-2003 by Paul Fox and Thomas Dickey + * Copyright (c) 1995-2004 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 * * - * $Header: /usr/build/vile/vile/RCS/mktbls.c,v 1.130 2003/05/27 00:54:48 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/mktbls.c,v 1.131 2004/05/28 20:22:45 tom Exp $ * */ @@ -1745,7 +1745,7 @@ "", "typedef struct UFUNC {", "\tconst char *f_name;\t/* name of function */", - "\tUFuncCode f_code;", + "\tunsigned f_code;", "} UFUNC;", "", "#define NARGMASK 0x000f", @@ -1802,7 +1802,7 @@ init_ufuncs(); Sprintf(temp, "\t{\"%s\",", p->Name); (void) PadTo(15, temp); - Sprintf(temp + strlen(temp), "(UFuncCode)(%s)},", p->Data); + Sprintf(temp + strlen(temp), "(unsigned)(%s)},", p->Data); if (p->Note[0]) { (void) PadTo(32, temp); Sprintf(temp + strlen(temp), "/* %s */", p->Note); Index: modes.c Prereq: 1.274 --- vile-9.4f+/modes.c 2004-04-11 23:53:32.000000000 +0000 +++ vile-9.4g/modes.c 2004-05-29 14:37:14.000000000 +0000 @@ -7,7 +7,7 @@ * Major extensions for vile by Paul Fox, 1991 * Majormode extensions for vile by T.E.Dickey, 1997 * - * $Header: /usr/build/vile/vile/RCS/modes.c,v 1.274 2004/04/11 23:53:32 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/modes.c,v 1.275 2004/05/29 14:37:14 tom Exp $ * */ @@ -2770,7 +2770,7 @@ else ptr->sm = p; } - TRACE2(("...get_sm_vals(%s:%s)\n", ptr->name, p->sm_name)); + TRACE2(("...get_sm_vals(%s:%s)\n", ptr->shortname, p->sm_name)); return &(p->sm_vals.bv[0]); } Index: modetbl Prereq: 1.224 --- vile-9.4f+/modetbl 2004-04-11 23:43:17.000000000 +0000 +++ vile-9.4g/modetbl 2004-06-15 21:55:03.000000000 +0000 @@ -11,7 +11,7 @@ # # The modes are table entries in the BUFFER and WINDOW structures. # -# $Header: /usr/build/vile/vile/RCS/modetbl,v 1.224 2004/04/11 23:43:17 tom Exp $ +# $Header: /usr/build/vile/vile/RCS/modetbl,v 1.225 2004/06/15 21:55:03 tom Exp $ # # # Mode-table entries. Capitalized letters are used for abbreviations. @@ -229,6 +229,7 @@ "error-buffer" ERROR_BUFFER OPT_FINDERR # buffer to use for find-next-error "error-expr" ERROR_EXPR OPT_FINDERR # last matched error pattern "error-match" ERROR_MATCH OPT_FINDERR # " " " matching text +"error-tabstop" ERROR_TABSTOP OPT_FINDERR # tabstop to use when interpreting %C "exec-path" EXEC_PATH # directory where vile's executable is found "exec-suffix" EXEC_SUFFIX # suffix to append when looking for execable programs "exit-hook" EXITHOOK OPT_HOOKS # procedure to run when quitting Index: npopen.c Prereq: 1.89 --- vile-9.4f+/npopen.c 2002-11-02 16:41:25.000000000 +0000 +++ vile-9.4g/npopen.c 2004-06-09 01:04:53.000000000 +0000 @@ -1,7 +1,7 @@ /* npopen: like popen, but grabs stderr, too * written by John Hutchinson, heavily modified by Paul Fox * - * $Header: /usr/build/vile/vile/RCS/npopen.c,v 1.89 2002/11/02 16:41:25 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/npopen.c,v 1.90 2004/06/09 01:04:53 tom Exp $ * */ @@ -69,7 +69,7 @@ #if SYS_UNIX int -inout_popen(FILE ** fr, FILE ** fw, char *cmd) +inout_popen(FILE **fr, FILE **fw, char *cmd) { int rp[2]; int wp[2]; @@ -145,7 +145,7 @@ } void -npclose(FILE * fp) +npclose(FILE *fp) { int child; (void) fflush(fp); @@ -348,7 +348,7 @@ } static void -closePipe(FILE *** pp) +closePipe(FILE ***pp) { if (*pp != 0) { if (**pp != 0) { @@ -443,7 +443,7 @@ * on SYS_MSDOS, we don't need both at the same instant. */ int -inout_popen(FILE ** fr, FILE ** fw, char *cmd) +inout_popen(FILE **fr, FILE **fw, char *cmd) { char *type = (fw != 0) ? "w" : "r"; static FILE *pp[2] = @@ -503,7 +503,7 @@ } void -npclose(FILE * fp) +npclose(FILE *fp) { #if SYS_MSDOS if (myWrtr != 0 && myPipe == 0) Index: patchlev.h --- vile-9.4f+/patchlev.h 2004-03-22 22:33:34.000000000 +0000 +++ vile-9.4g/patchlev.h 2004-05-13 23:57:03.000000000 +0000 @@ -1,2 +1,2 @@ /* set to "" for no patches */ -#define PATCHLEVEL "f" +#define PATCHLEVEL "g" Index: plugin.c --- /dev/null 2004-06-08 19:45:14.000000000 +0000 +++ vile-9.4g/plugin.c 2004-06-17 23:48:26.000000000 +0000 @@ -0,0 +1,58 @@ +/* + * $Header: /usr/build/vile/vile/RCS/plugin.c,v 1.1 2004/06/17 23:48:26 tom Exp $ + */ +#include "estruct.h" +#include "edef.h" +#include "plugin.h" + +#include + +#if defined(RTLD_NOW) +#define my_RTLD RTLD_NOW +#elif defined(RTLD_LAZY) +#define my_RTLD RTLD_LAZY +#else +#define my_RTLD 0 +#endif + +int +loadplugin(int f GCC_UNUSED, int n GCC_UNUSED) +{ + int ret = FALSE; + int status; + static char name[NSTRING - sizeof(PLUGIN_INIT_NAME)] = ""; + char leafname[NSTRING]; + char symname[NSTRING]; + const char *cp = libdir_path; + void *found = 0; + plugin_init init; + + /* obtain name from user/rcfile */ + status = mlreply("Plugin name: ", name, (sizeof name) - 1); + if (status == ABORT) + return FALSE; + + sprintf(leafname, PLUGIN_SO_FMT, name); + sprintf(symname, PLUGIN_INIT_NAME, name); + + TRACE(("leafname %s\n", leafname)); + TRACE(("symname %s\n", symname)); + + if ((cp = cfg_locate(leafname, LOCATE_EXEC)) != 0) { + TRACE(("try dlopen(%s)\n", cp)); + found = dlopen(cp, my_RTLD); + } + + if (found == 0) + mlwarn("Error: plugin '%s' not found", name); + else if ((init = (plugin_init) dlsym(found, symname)) == 0) + mlwarn("Error: plugin '%s' initialization function not found", name); + else if (init() == 0) + mlwarn("Error: failed to initialize plugin '%s'", name); + else + ret = TRUE; + + /* TODO: on success, remember in loaded plugin list */ + + return ret; +} Index: plugin.h --- /dev/null 2004-06-08 19:45:14.000000000 +0000 +++ vile-9.4g/plugin.h 2004-06-16 23:05:03.000000000 +0000 @@ -0,0 +1,13 @@ +#ifndef plugin_h_ +#define plugin_h_ + +/* function implemented by plugin, called at initialization */ +/* return: ==0 (FALSE) not ok, !=0 (TRUE) ok */ +typedef int (* plugin_init) (void) ; + +/* name of shared object file for a plugin */ +#define PLUGIN_SO_FMT "vile-%s-plugin.so" +/* name of initialization function of a shared object plugin */ +#define PLUGIN_INIT_NAME "%s_vile_plugin_init" + +#endif /* plugin_h_ */ Index: plugins/Makefile --- /dev/null 2004-06-08 19:45:14.000000000 +0000 +++ vile-9.4g/plugins/Makefile 2004-06-16 23:05:03.000000000 +0000 @@ -0,0 +1,15 @@ +CC = gcc +CFLAGS = -O2 -pipe -Wall -DHAVE_CONFIG_H -I.. $(SH_CFLAGS) +LDFLAGS = -s $(SH_LDFLAGS) + +SH_CFLAGS = -DPIC -fPIC +SH_LDFLAGS = -shared + +PLUGINS = test +SHLIBS = $(PLUGINS:%=vile-%-plugin.so) + +all : $(SHLIBS) + +vile-%-plugin.so : %.o + $(CC) $(LDFLAGS) -o $@ $< + Index: plugins/test.c --- /dev/null 2004-06-08 19:45:14.000000000 +0000 +++ vile-9.4g/plugins/test.c 2004-06-17 23:53:47.000000000 +0000 @@ -0,0 +1,17 @@ +/* + * $Header: /usr/build/vile/vile/plugins/RCS/test.c,v 1.1 2004/06/17 23:53:47 Fabien.Coutant Exp $ + */ +#include "estruct.h" +#include "edef.h" + +int +test_vile_plugin_init(void) +{ + static int done = 0; + if (done) + mlwarn("test plugin already loaded"); + else + mlwarn("test plugin loaded"); + done = 1; + return TRUE; +} Index: plugins/test.rc --- /dev/null 2004-06-08 19:45:14.000000000 +0000 +++ vile-9.4g/plugins/test.rc 2004-06-17 23:54:35.000000000 +0000 @@ -0,0 +1,2 @@ +; $Header: /usr/build/vile/vile/plugins/RCS/test.rc,v 1.1 2004/06/17 23:54:35 Fabien.Coutant Exp $ +load-plugin "test" Index: proto.h Prereq: 1.522 --- vile-9.4f+/proto.h 2003-11-12 01:55:37.000000000 +0000 +++ vile-9.4g/proto.h 2004-06-17 00:56:50.000000000 +0000 @@ -4,7 +4,7 @@ * * Created: Thu May 14 15:44:40 1992 * - * $Header: /usr/build/vile/vile/RCS/proto.h,v 1.522 2003/11/12 01:55:37 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/proto.h,v 1.525 2004/06/17 00:56:50 tom Exp $ * */ @@ -81,7 +81,9 @@ extern int perl_call_sub(void *, int, int, int); extern void perl_free_sub(void *); #endif +#endif +#if OPT_PERL || OPT_PLUGIN /* api.c */ extern void api_free_private(void *); /* There are others as well, but the rest are found in api.h */ @@ -1084,11 +1086,12 @@ #endif /* OPT_TAGS */ /* tbuff.c */ -size_t tb_length (TBUFF *p); TBUFF * tb_alloc (TBUFF **p, size_t n); TBUFF * tb_append (TBUFF **p, int c); TBUFF * tb_bappend (TBUFF **p, const char *s, size_t len); TBUFF * tb_copy (TBUFF **d, TBUFF *s); +TBUFF * tb_dequote (TBUFF **p); +TBUFF * tb_enquote (TBUFF **p); TBUFF * tb_init (TBUFF **p, int c); TBUFF * tb_insert (TBUFF **p, size_t n, int c); TBUFF * tb_put (TBUFF **p, size_t n, int c); @@ -1101,6 +1104,7 @@ int tb_more (TBUFF *p); int tb_next (TBUFF *p); int tb_peek (TBUFF *p); +size_t tb_length (TBUFF *p); void tb_first (TBUFF *p); void tb_free (TBUFF **p); void tb_stuff (TBUFF *p, int c); @@ -1539,7 +1543,7 @@ extern int setjmp (jmp_buf env); #endif #ifdef MISSING_EXTERN_SETPGRP -#if SETPGRP_VOID +#ifdef SETPGRP_VOID extern pid_t setpgrp (void); #else extern int setpgrp (int pid, int pgid); Index: region.c Prereq: 1.127 --- vile-9.4f+/region.c 2003-11-12 01:56:30.000000000 +0000 +++ vile-9.4g/region.c 2004-06-09 01:04:59.000000000 +0000 @@ -3,7 +3,7 @@ * and mark. Some functions are commands. Some functions are just for * internal use. * - * $Header: /usr/build/vile/vile/RCS/region.c,v 1.127 2003/11/12 01:56:30 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/region.c,v 1.128 2004/06/09 01:04:59 tom Exp $ * */ @@ -1031,7 +1031,7 @@ } ENCODEREG; static void -encode_one_attribute(TBUFF ** result, int count, char *hypercmd, VIDEO_ATTR attr) +encode_one_attribute(TBUFF **result, int count, char *hypercmd, VIDEO_ATTR attr) { char temp[80]; Index: revlist --- vile-9.4f+/revlist 2004-04-12 00:45:09.000000000 +0000 +++ vile-9.4g/revlist 2004-06-18 00:55:05.000000000 +0000 @@ -1,6 +1,6 @@ -revlist for vile, version v9_4f +revlist for vile, version v9_4g -------------------------------------------------------------------------------- -CHANGES 1.739 +CHANGES 1.745 CHANGES.R3 1.1 CHANGES.R4 1.1 CHANGES.R5 1.1 @@ -13,54 +13,54 @@ README 1.90 README.PC 1.31 README.VMS 1.5 -aclocal.m4 1.129 -ansi.c 1.44 -api.c 1.34 +aclocal.m4 1.131 +ansi.c 1.45 +api.c 1.35 api.h 1.12 -basic.c 1.119 +basic.c 1.120 bind.c 1.267 borland.c 1.32 btree.c 1.17 btree.h 1.4 -buffer.c 1.264 +buffer.c 1.266 buglist 1.398 -builtflt.c 1.37 +builtflt.c 1.38 chgdfunc.h 1.16 -cmdtbl 1.228 +cmdtbl 1.229 config.emx 1.2 config_h.in 1.2 configure none -configure.in 1.204 +configure.in 1.207 csrch.c 1.32 curses.c 1.20 descrip.mms 1.44 dirstuff.h 1.25 -display.c 1.385 +display.c 1.386 djhandl.c 1.6 -dumbterm.c 1.17 -edef.h 1.313 -estruct.h 1.541 -eval.c 1.324 -exec.c 1.261 -externs.c 1.8 +dumbterm.c 1.18 +edef.h 1.314 +estruct.h 1.543 +eval.c 1.330 +exec.c 1.264 +externs.c 1.9 fences.c 1.82 file.c 1.351 -filec.c 1.113 +filec.c 1.114 fileio.c 1.172 -finderr.c 1.118 +finderr.c 1.120 glob.c 1.78 globals.c 1.48 gppconio.c 1.2 -history.c 1.76 +history.c 1.79 ibmpc.c 1.97 -input.c 1.262 +input.c 1.265 insert.c 1.141 install.sh 1.6 -isearch.c 1.59 +isearch.c 1.60 itbuff.c 1.18 lckfiles.c 1.11 -line.c 1.160 -main.c 1.516 +line.c 1.162 +main.c 1.517 makefile.blc 1.17 makefile.djg 1.32 makefile.emx 1.5 @@ -73,11 +73,11 @@ menu.c 1.43 mkdirs.sh 1.5 mkprlenv.wnt 1.8 -mktbls.c 1.130 -modes.c 1.274 -modetbl 1.224 +mktbls.c 1.131 +modes.c 1.275 +modetbl 1.225 msgs.c 1.25 -npopen.c 1.89 +npopen.c 1.90 ntconio.c 1.76 ntwinio.c 1.134 oneliner.c 1.104 @@ -85,34 +85,36 @@ os2keys.h 1.1 os2pipe.c 1.5 os2vio.c 1.29 -patchlev.h 1.310 +patchlev.h 1.311 path.c 1.135 perl.xs 1.91 -proto.h 1.522 +plugin.c 1.1 +plugin.h 1.1 +proto.h 1.525 pscreen.h 1.1 ptypemap 1.7 random.c 1.272 regexp.c 1.108 -region.c 1.127 -revlist v9_4f -search.c 1.134 -select.c 1.149 +region.c 1.128 +revlist v9_4g +search.c 1.135 +select.c 1.151 sinstall.sh 1.1 -spawn.c 1.178 -statevar.c 1.78 +spawn.c 1.179 +statevar.c 1.80 tags.c 1.120 -tbuff.c 1.44 +tbuff.c 1.47 tcap.c 1.152 tcap.h 1.9 -termio.c 1.195 -trace.c 1.41 +termio.c 1.196 +trace.c 1.44 trace.h 1.20 ucrypt.c 1.15 undo.c 1.84 version.c 1.55 -vile-9.4.spec 1.7 +vile-9.4.spec 1.8 vile.1 1.30 -vile.hlp 1.580 +vile.hlp 1.584 vile.wmconfig 1.1 vms2unix.c 1.37 vmsbuild.com 1.39 @@ -134,10 +136,10 @@ winvile.h 1.8 winvile.odl 1.6 winvile.rc 1.10 -word.c 1.74 +word.c 1.75 wordmov.c 1.22 wvwrap.cpp 1.7 -x11.c 1.272 +x11.c 1.273 x11menu.c 1.6 xshell.sh 1.4 xvile.wmconfig 1.1 @@ -145,10 +147,10 @@ doc/config.doc 1.14 doc/dir.doc 1.3 doc/filters.doc 1.30 -doc/indent.pro 1.4 -doc/macros.doc 1.91 +doc/macros.doc 1.92 doc/menus.doc 1.7 doc/modes.doc 1.16 +doc/ncu-indent 1.9 doc/oleauto.doc 1.7 doc/perl.doc 1.2 doc/visvile.doc 1.9 @@ -168,7 +170,7 @@ filters/basic.key 1.3 filters/bat-filt.l 1.17 filters/bat.key 1.4 -filters/c-filt.c 1.67 +filters/c-filt.c 1.72 filters/c-filt.flx 1.1 filters/c.key 1.11 filters/cfg-filt.l 1.8 @@ -176,8 +178,8 @@ filters/csh.key 1.1 filters/cweb.key 1.2 filters/cwebfilt.l 1.14 -filters/dcl-filt.l 1.12 -filters/dcl.key 1.4 +filters/dcl-filt.l 1.14 +filters/dcl.key 1.5 filters/def-filt.l 1.3 filters/def.key 1.1 filters/diff.key 1.1 @@ -194,7 +196,7 @@ filters/filterio.c 1.22 filters/filters.c 1.89 filters/filters.h 1.81 -filters/filters.rc 1.186 +filters/filters.rc 1.191 filters/fltstack.h 1.8 filters/genmake.c 1.4 filters/genmake.mak 1.23 @@ -204,10 +206,10 @@ filters/imakeflt.l 1.10 filters/infofilt.l 1.2 filters/java.key 1.3 -filters/js.key 1.2 +filters/js.key 1.4 filters/key-filt.c 1.17 filters/latex.key 1.2 -filters/latexflt.l 1.36 +filters/latexflt.l 1.37 filters/lex-filt.l 1.22 filters/lex.key 1.4 filters/lisp.key 1.2 @@ -241,7 +243,7 @@ filters/pc.key 1.1 filters/perl.key 1.8 filters/perlfilt.l 1.39 -filters/pl-filt.c 1.72 +filters/pl-filt.c 1.76 filters/pot-filt.l 1.2 filters/pot.key 1.1 filters/ps-filt.l 1.3 @@ -311,18 +313,18 @@ icons/vile.xbm 1.1 icons/vile.xpm 1.1 macros/XVile.ad 1.1 -macros/color-ls.rc 1.1 +macros/color-ls.rc 1.2 macros/dates.rc 1.2 macros/digraphs.rc 1.2 macros/gnugpg.rc 1.2 macros/loaderrs.rc 1.1 -macros/manpage.rc 1.18 +macros/manpage.rc 1.19 macros/palettes.rc 1.7 macros/pictmode.rc 1.3 macros/search.rc 1.3 macros/shifts.rc 1.4 macros/vile-pager 1.5 -macros/vileinit.rc 1.21 +macros/vileinit.rc 1.22 macros/vilemenu.rc 1.2 macros/vileperl.rc 1.7 macros/which.rc 1.4 @@ -350,6 +352,9 @@ perl/spell.pm 1.3 perl/vileget 1.7 perl/winops.pm 1.1 +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.1 Index: search.c Prereq: 1.134 --- vile-9.4f+/search.c 2003-05-25 23:34:52.000000000 +0000 +++ vile-9.4g/search.c 2004-06-09 01:05:06.000000000 +0000 @@ -3,7 +3,7 @@ * and backward directions. * heavily modified by Paul Fox, 1990 * - * $Header: /usr/build/vile/vile/RCS/search.c,v 1.134 2003/05/25 23:34:52 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/search.c,v 1.135 2004/06/09 01:05:06 tom Exp $ * * original written Aug. 1986 by John M. Gamble, but I (pgf) have since * replaced his regex stuff with Henry Spencer's regexp package. @@ -719,7 +719,7 @@ int readpattern( const char *prompt, - TBUFF ** apat, + TBUFF **apat, regexp ** srchexpp, int c, int fromscreen) Index: select.c Prereq: 1.149 --- vile-9.4f+/select.c 2004-03-18 01:15:46.000000000 +0000 +++ vile-9.4g/select.c 2004-06-09 00:00:44.000000000 +0000 @@ -18,7 +18,7 @@ * transferring the selection are not dealt with in this file. Procedures * for dealing with the representation are maintained in this file. * - * $Header: /usr/build/vile/vile/RCS/select.c,v 1.149 2004/03/18 01:15:46 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/select.c,v 1.151 2004/06/09 00:00:44 tom Exp $ * */ @@ -46,7 +46,7 @@ static int attribute_cntl_a_sequences(void); static void free_line_attribs(BUFFER *bp); static int add_line_attrib(BUFFER *bp, REGION * rp, REGIONSHAPE rs, - VIDEO_ATTR vattr, TBUFF * hypercmd); + VIDEO_ATTR vattr, TBUFF *hypercmd); static void purge_line_attribs(BUFFER *bp, REGION * rp, REGIONSHAPE rs, int owner); @@ -675,7 +675,7 @@ { char temp[NLINE]; (void) kcod2pstr(fnc2kcod(&f_multimotion), temp); - mlforce("[%s (end with %*S)]", msg, *temp, temp + 1); + mlforce("[%s (end with %.*s)]", msg, CharOf(*temp), temp + 1); } static int @@ -1817,6 +1817,12 @@ } attach_attrib(selbufp, &selregion); attach_attrib(startbufp, &startregion); +#if OPT_HILITEMATCH + if (curbp->b_highlight & HILITE_ON) { + curbp->b_highlight |= HILITE_DIRTY; + attrib_matches(); + } +#endif } #endif return code; @@ -1979,7 +1985,7 @@ static int add_line_attrib(BUFFER *bp, REGION * rp, REGIONSHAPE rs, VIDEO_ATTR vattr, - TBUFF * hypercmdp) + TBUFF *hypercmdp) { #if OPT_LINE_ATTRS LINEPTR lp; Index: spawn.c Prereq: 1.178 --- vile-9.4f+/spawn.c 2003-05-25 20:21:34.000000000 +0000 +++ vile-9.4g/spawn.c 2004-06-09 01:05:13.000000000 +0000 @@ -1,7 +1,7 @@ /* Spawn: various DOS access commands * for MicroEMACS * - * $Header: /usr/build/vile/vile/RCS/spawn.c,v 1.178 2003/05/25 20:21:34 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/spawn.c,v 1.179 2004/06/09 01:05:13 tom Exp $ * */ @@ -306,7 +306,7 @@ * Note that for 'capturecmd()', we must retain a leading "!". */ static int -ShellPrompt(TBUFF ** holds, +ShellPrompt(TBUFF **holds, char *result, int rerun) /* TRUE/FALSE: spawn, -TRUE: capturecmd */ { Index: statevar.c Prereq: 1.78 --- vile-9.4f+/statevar.c 2004-03-18 01:15:55.000000000 +0000 +++ vile-9.4g/statevar.c 2004-06-15 22:01:21.000000000 +0000 @@ -3,7 +3,7 @@ * for getting and setting the values of the vile state variables, * plus helper utility functions. * - * $Header: /usr/build/vile/vile/RCS/statevar.c,v 1.78 2004/03/18 01:15:55 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/statevar.c,v 1.80 2004/06/15 22:01:21 tom Exp $ */ #include "estruct.h" @@ -59,7 +59,7 @@ } static int -any_ro_BOOL(TBUFF ** rp, const char *vp, int value) +any_ro_BOOL(TBUFF **rp, const char *vp, int value) { if (rp) { render_boolean(rp, value); @@ -72,7 +72,7 @@ } static int -any_rw_BOOL(TBUFF ** rp, const char *vp, int *value) +any_rw_BOOL(TBUFF **rp, const char *vp, int *value) { if (rp) { render_boolean(rp, *value); @@ -86,7 +86,7 @@ } static int -any_ro_INT(TBUFF ** rp, const char *vp, int value) +any_ro_INT(TBUFF **rp, const char *vp, int value) { if (rp) { render_int(rp, value); @@ -99,7 +99,20 @@ } static int -any_ro_STR(TBUFF ** rp, const char *vp, const char *value) +any_rw_INT(TBUFF **rp, const char *vp, int *value) +{ + if (rp) { + render_int(rp, *value); + return TRUE; + } else if (vp) { + *value = scan_int(vp); + return TRUE; + } else { + return FALSE; + } +} +static int +any_ro_STR(TBUFF **rp, const char *vp, const char *value) { if (rp) { if (value != 0) { @@ -113,7 +126,7 @@ } static int -any_rw_STR(TBUFF ** rp, const char *vp, TBUFF ** value) +any_rw_STR(TBUFF **rp, const char *vp, TBUFF **value) { if (rp) { if (value != 0 && *value != 0) { @@ -128,7 +141,7 @@ } static int -any_rw_EXPR(TBUFF ** rp, const char *vp, TBUFF ** value) +any_rw_EXPR(TBUFF **rp, const char *vp, TBUFF **value) { if (rp) { if (value != 0) { @@ -149,7 +162,7 @@ } static int -any_rw_TXT(TBUFF ** rp, const char *vp, char **value) +any_rw_TXT(TBUFF **rp, const char *vp, char **value) { if (rp) { tb_scopy(rp, *value); @@ -163,7 +176,7 @@ } static int -any_REPL(TBUFF ** rp, const char *vp, CHARTYPE type) +any_REPL(TBUFF **rp, const char *vp, CHARTYPE type) { if (rp) { lgrabtext(rp, type); @@ -177,7 +190,7 @@ #if OPT_HOOKS static int -any_HOOK(TBUFF ** rp, const char *vp, HOOK * hook) +any_HOOK(TBUFF **rp, const char *vp, HOOK * hook) { if (rp) { tb_scopy(rp, hook->proc); @@ -279,7 +292,7 @@ /* access the default kill buffer */ static char * -getkill(TBUFF ** rp) +getkill(TBUFF **rp) { tb_init(rp, EOS); if (kbs[0].kbufh != 0) { @@ -301,7 +314,7 @@ } int -var_CDPATH(TBUFF ** rp, const char *vp) +var_CDPATH(TBUFF **rp, const char *vp) { if (rp) { tb_scopy(rp, get_cdpath()); @@ -385,7 +398,7 @@ #if OPT_EVAL int -var_ABUFNAME(TBUFF ** rp, const char *vp) +var_ABUFNAME(TBUFF **rp, const char *vp) { BUFFER *bp; return any_ro_STR(rp, vp, ((bp = find_alt()) != 0) ? bp->b_bname : ""); @@ -393,14 +406,14 @@ #if OPT_HOOKS int -var_AUTOCOLORHOOK(TBUFF ** rp, const char *vp) +var_AUTOCOLORHOOK(TBUFF **rp, const char *vp) { return any_HOOK(rp, vp, &autocolorhook); } #endif int -var_BCHARS(TBUFF ** rp, const char *vp) +var_BCHARS(TBUFF **rp, const char *vp) { return (valid_buffer(curbp) ? any_ro_INT(rp, vp, curbp->b_bytecount) @@ -408,7 +421,7 @@ } int -var_BFLAGS(TBUFF ** rp, const char *vp) +var_BFLAGS(TBUFF **rp, const char *vp) { if (rp) { tb_init(rp, EOS); @@ -422,7 +435,7 @@ } int -var_BLINES(TBUFF ** rp, const char *vp) +var_BLINES(TBUFF **rp, const char *vp) { return (valid_buffer(curbp) ? any_ro_INT(rp, vp, curbp->b_linecount) @@ -446,7 +459,7 @@ } int -var_BRIGHTNESS(TBUFF ** rp, const char *vp) +var_BRIGHTNESS(TBUFF **rp, const char *vp) { char temp[80]; @@ -467,14 +480,14 @@ #if OPT_HOOKS int -var_BUFHOOK(TBUFF ** rp, const char *vp) +var_BUFHOOK(TBUFF **rp, const char *vp) { return any_HOOK(rp, vp, &bufhook); } #endif int -var_CBUFNAME(TBUFF ** rp, const char *vp) +var_CBUFNAME(TBUFF **rp, const char *vp) { if (rp) { tb_scopy(rp, curbp->b_bname); @@ -491,7 +504,7 @@ } int -var_BWINDOWS(TBUFF ** rp, const char *vp) +var_BWINDOWS(TBUFF **rp, const char *vp) { return (valid_buffer(curbp) ? any_ro_INT(rp, vp, curbp->b_nwnd) @@ -500,20 +513,20 @@ #if OPT_HOOKS int -var_CDHOOK(TBUFF ** rp, const char *vp) +var_CDHOOK(TBUFF **rp, const char *vp) { return any_HOOK(rp, vp, &cdhook); } #endif int -var_CFGOPTS(TBUFF ** rp, const char *vp) +var_CFGOPTS(TBUFF **rp, const char *vp) { return any_ro_STR(rp, vp, cfgopts()); } int -var_CFNAME(TBUFF ** rp, const char *vp) +var_CFNAME(TBUFF **rp, const char *vp) { if (rp) { tb_scopy(rp, ((valid_buffer(curbp) && curbp->b_fname) @@ -532,7 +545,7 @@ } int -var_CHAR(TBUFF ** rp, const char *vp) +var_CHAR(TBUFF **rp, const char *vp) { if (rp) { if (valid_buffer(curbp) && !is_empty_buf(curbp)) { @@ -566,7 +579,7 @@ #if OPT_ENCRYPT int -var_CRYPTKEY(TBUFF ** rp, const char *vp) +var_CRYPTKEY(TBUFF **rp, const char *vp) { if (rp) { tb_scopy(rp, WRITE_ONLY); @@ -586,7 +599,7 @@ #if !SMALLER int -var_CURCHAR(TBUFF ** rp, const char *vp) +var_CURCHAR(TBUFF **rp, const char *vp) { if (rp) { render_int(rp, vl_getcchar() + 1); @@ -600,7 +613,7 @@ #endif int -var_CURCOL(TBUFF ** rp, const char *vp) +var_CURCOL(TBUFF **rp, const char *vp) { if (rp) { render_int(rp, getccol(FALSE) + 1); @@ -613,7 +626,7 @@ } int -var_CURLINE(TBUFF ** rp, const char *vp) +var_CURLINE(TBUFF **rp, const char *vp) { if (rp) { render_int(rp, getcline()); @@ -627,7 +640,7 @@ #if OPT_SHELL int -var_CWD(TBUFF ** rp, const char *vp) +var_CWD(TBUFF **rp, const char *vp) { if (rp) { tb_scopy(rp, current_directory(FALSE)); @@ -641,7 +654,7 @@ #endif int -var_CWLINE(TBUFF ** rp, const char *vp) +var_CWLINE(TBUFF **rp, const char *vp) { if (rp) { render_int(rp, getlinerow()); @@ -654,14 +667,14 @@ } int -var_DEBUG(TBUFF ** rp, const char *vp) +var_DEBUG(TBUFF **rp, const char *vp) { return any_rw_BOOL(rp, vp, &tracemacros); } #if OPT_SHELL int -var_DIRECTORY(TBUFF ** rp, const char *vp) +var_DIRECTORY(TBUFF **rp, const char *vp) { if (rp) { tb_scopy(rp, get_directory()); @@ -676,31 +689,31 @@ #endif int -var_CMD_COUNT(TBUFF ** rp, const char *vp) +var_CMD_COUNT(TBUFF **rp, const char *vp) { return any_ro_INT(rp, vp, cmd_count); } int -var_DISCMD(TBUFF ** rp, const char *vp) +var_DISCMD(TBUFF **rp, const char *vp) { return any_rw_BOOL(rp, vp, &vl_msgs); } int -var_DISINP(TBUFF ** rp, const char *vp) +var_DISINP(TBUFF **rp, const char *vp) { return any_rw_BOOL(rp, vp, &vl_echo); } int -var_EOC(TBUFF ** rp, const char *vp) +var_EOC(TBUFF **rp, const char *vp) { return any_ro_BOOL(rp, vp, ev_end_of_cmd ? 1 : 0); } int -var_FILENAME_IC(TBUFF ** rp, const char *vp) +var_FILENAME_IC(TBUFF **rp, const char *vp) { #if OPT_CASELESS || SYS_VMS static int myvalue = TRUE; @@ -712,7 +725,7 @@ #if OPT_FINDERR int -var_FILENAME_EXPR(TBUFF ** rp, const char *vp) +var_FILENAME_EXPR(TBUFF **rp, const char *vp) { int code = any_rw_EXPR(rp, vp, &filename_expr); if (rp != 0 && code == TRUE) { @@ -723,13 +736,13 @@ } int -var_ERROR_EXPR(TBUFF ** rp, const char *vp) +var_ERROR_EXPR(TBUFF **rp, const char *vp) { return any_rw_EXPR(rp, vp, &error_expr); } int -var_ERROR_MATCH(TBUFF ** rp, const char *vp) +var_ERROR_MATCH(TBUFF **rp, const char *vp) { if (rp) { tb_scopy(rp, tb_values(error_match)); @@ -742,7 +755,7 @@ } int -var_ERROR_BUFFER(TBUFF ** rp, const char *vp) +var_ERROR_BUFFER(TBUFF **rp, const char *vp) { if (rp) { tb_scopy(rp, get_febuff()); @@ -754,10 +767,16 @@ return FALSE; } } + +int +var_ERROR_TABSTOP(TBUFF **rp, const char *vp) +{ + return any_rw_INT(rp, vp, &error_tabstop); +} #endif int -var_EXEC_PATH(TBUFF ** rp, const char *vp) +var_EXEC_PATH(TBUFF **rp, const char *vp) { return any_ro_STR(rp, vp, exec_pathname); } @@ -769,14 +788,14 @@ #endif int -var_EXEC_SUFFIX(TBUFF ** rp, const char *vp) +var_EXEC_SUFFIX(TBUFF **rp, const char *vp) { return any_ro_STR(rp, vp, the_EXEC_SUFFIX); } #if OPT_HOOKS int -var_EXITHOOK(TBUFF ** rp, const char *vp) +var_EXITHOOK(TBUFF **rp, const char *vp) { return any_HOOK(rp, vp, &exithook); } @@ -784,7 +803,7 @@ #if SYS_WINNT int -var_FAVORITES(TBUFF ** rp, const char *vp) +var_FAVORITES(TBUFF **rp, const char *vp) { return any_ro_STR(rp, vp, get_favorites()); } @@ -792,7 +811,7 @@ #if OPT_FINDPATH int -var_FINDPATH(TBUFF ** rp, const char *vp) +var_FINDPATH(TBUFF **rp, const char *vp) { if (rp) { tb_scopy(rp, get_findpath()); @@ -807,7 +826,7 @@ /* debug aid -- this may go away */ int -var_FINDCMD(TBUFF ** rp, const char *vp) +var_FINDCMD(TBUFF **rp, const char *vp) { char *cmd = last_findcmd(); @@ -817,7 +836,7 @@ #if DISP_X11||DISP_NTWIN int -var_FONT(TBUFF ** rp, const char *vp) +var_FONT(TBUFF **rp, const char *vp) { #if SYS_WINNT && DISP_NTWIN if (rp) { @@ -843,20 +862,20 @@ #endif int -var_FWD_SEARCH(TBUFF ** rp, const char *vp) +var_FWD_SEARCH(TBUFF **rp, const char *vp) { return any_rw_BOOL(rp, vp, &last_srch_direc); } int -var_HELPFILE(TBUFF ** rp, const char *vp) +var_HELPFILE(TBUFF **rp, const char *vp) { return any_rw_TXT(rp, vp, &helpfile); } #if DISP_X11 int -var_ICONNAM(TBUFF ** rp, const char *vp) +var_ICONNAM(TBUFF **rp, const char *vp) { if (rp) { tb_scopy(rp, x_get_icon_name()); @@ -871,13 +890,13 @@ #endif int -var_IDENTIF(TBUFF ** rp, const char *vp) +var_IDENTIF(TBUFF **rp, const char *vp) { return any_REPL(rp, vp, vl_ident); } int -var_KBDMACRO(TBUFF ** rp, const char *vp) +var_KBDMACRO(TBUFF **rp, const char *vp) { if (rp) { get_kbd_macro(rp); @@ -890,7 +909,7 @@ } int -var_KILL(TBUFF ** rp, const char *vp) +var_KILL(TBUFF **rp, const char *vp) { if (rp) { getkill(rp); @@ -903,21 +922,13 @@ } int -var_LASTKEY(TBUFF ** rp, const char *vp) +var_LASTKEY(TBUFF **rp, const char *vp) { - if (rp) { - render_int(rp, lastkey); - return TRUE; - } else if (vp) { - lastkey = scan_int(vp); - return TRUE; - } else { - return FALSE; - } + return any_rw_INT(rp, vp, &lastkey); } int -var_LCOLS(TBUFF ** rp, const char *vp) +var_LCOLS(TBUFF **rp, const char *vp) { if (rp) { int col; @@ -942,26 +953,26 @@ } int -var_LIBDIR_PATH(TBUFF ** rp, const char *vp) +var_LIBDIR_PATH(TBUFF **rp, const char *vp) { return any_rw_TXT(rp, vp, &libdir_path); } int -var_LINE(TBUFF ** rp, const char *vp) +var_LINE(TBUFF **rp, const char *vp) { return any_REPL(rp, vp, (CHARTYPE) 0); } int -var_LLENGTH(TBUFF ** rp, const char *vp) +var_LLENGTH(TBUFF **rp, const char *vp) { return valid_buffer(curbp) ? any_ro_INT(rp, vp, llength(DOT.l)) : FALSE; } #if OPT_MAJORMODE int -var_MAJORMODE(TBUFF ** rp, const char *vp) +var_MAJORMODE(TBUFF **rp, const char *vp) { return any_ro_STR(rp, vp, ((valid_buffer(curbp) && curbp->majr != 0) ? curbp->majr->shortname @@ -969,14 +980,14 @@ } int -var_MAJORMODEHOOK(TBUFF ** rp, const char *vp) +var_MAJORMODEHOOK(TBUFF **rp, const char *vp) { return any_HOOK(rp, vp, &majormodehook); } #endif int -var_MATCH(TBUFF ** rp, const char *vp) +var_MATCH(TBUFF **rp, const char *vp) { return any_ro_STR(rp, vp, (tb_length(tb_matched_pat) @@ -986,21 +997,21 @@ #if OPT_MENUS int -var_MENU_FILE(TBUFF ** rp, const char *vp) +var_MENU_FILE(TBUFF **rp, const char *vp) { return any_rw_TXT(rp, vp, &menu_file); } #endif int -var_MODE(TBUFF ** rp, const char *vp) +var_MODE(TBUFF **rp, const char *vp) { return any_ro_STR(rp, vp, current_modename()); } #if OPT_MLFORMAT int -var_MLFORMAT(TBUFF ** rp, const char *vp) +var_MLFORMAT(TBUFF **rp, const char *vp) { if (rp) { if (modeline_format == 0) @@ -1019,14 +1030,14 @@ #endif int -var_MODIFIED(TBUFF ** rp, const char *vp) +var_MODIFIED(TBUFF **rp, const char *vp) { return any_ro_BOOL(rp, vp, valid_buffer(curbp) && b_is_changed(curbp)); } #if OPT_COLOR int -var_NCOLORS(TBUFF ** rp, const char *vp) +var_NCOLORS(TBUFF **rp, const char *vp) { if (rp) { render_int(rp, ncolors); @@ -1038,14 +1049,14 @@ } #else int -var_NCOLORS(TBUFF ** rp GCC_UNUSED, const char *vp GCC_UNUSED) +var_NCOLORS(TBUFF **rp GCC_UNUSED, const char *vp GCC_UNUSED) { return FALSE; } #endif int -var_NTILDES(TBUFF ** rp, const char *vp) +var_NTILDES(TBUFF **rp, const char *vp) { if (rp) { render_int(rp, ntildes); @@ -1062,20 +1073,20 @@ #if OPT_SHELL int -var_OCWD(TBUFF ** rp, const char *vp) +var_OCWD(TBUFF **rp, const char *vp) { return any_ro_STR(rp, vp, previous_directory()); } #endif int -var_OS(TBUFF ** rp, const char *vp) +var_OS(TBUFF **rp, const char *vp) { return any_ro_STR(rp, vp, opersys); } int -var_PAGELEN(TBUFF ** rp, const char *vp) +var_PAGELEN(TBUFF **rp, const char *vp) { if (rp) { render_int(rp, term.rows); @@ -1094,7 +1105,7 @@ /* separator for lists of pathnames */ int -var_PATHCHR(TBUFF ** rp, const char *vp) +var_PATHCHR(TBUFF **rp, const char *vp) { if (rp) { tb_append(rp, vl_pathchr); @@ -1111,7 +1122,7 @@ /* separator for levels of pathnames */ int -var_PATHSEP(TBUFF ** rp, const char *vp) +var_PATHSEP(TBUFF **rp, const char *vp) { if (rp) { tb_append(rp, vl_pathsep); @@ -1128,7 +1139,7 @@ #if OPT_POSFORMAT int -var_POSFORMAT(TBUFF ** rp, const char *vp) +var_POSFORMAT(TBUFF **rp, const char *vp) { if (rp) { if (position_format == 0) @@ -1146,7 +1157,7 @@ #endif int -var_CURWIDTH(TBUFF ** rp, const char *vp) +var_CURWIDTH(TBUFF **rp, const char *vp) { if (rp) { render_int(rp, term.cols); @@ -1164,7 +1175,7 @@ } int -var_PALETTE(TBUFF ** rp, const char *vp) +var_PALETTE(TBUFF **rp, const char *vp) { if (rp) { tb_scopy(rp, (tb_length(tb_curpalette) @@ -1179,25 +1190,25 @@ } int -var_PATCHLEVEL(TBUFF ** rp, const char *vp) +var_PATCHLEVEL(TBUFF **rp, const char *vp) { return any_ro_STR(rp, vp, PATCHLEVEL); } int -var_PATHNAME(TBUFF ** rp, const char *vp) +var_PATHNAME(TBUFF **rp, const char *vp) { return any_REPL(rp, vp, vl_pathn); } int -var_PENDING(TBUFF ** rp, const char *vp) +var_PENDING(TBUFF **rp, const char *vp) { return any_ro_BOOL(rp, vp, keystroke_avail()); } int -var_PROCESSID(TBUFF ** rp, const char *vp) +var_PROCESSID(TBUFF **rp, const char *vp) { if (rp) { #if SYS_UNIX @@ -1220,26 +1231,26 @@ } int -var_PROGNAME(TBUFF ** rp, const char *vp) +var_PROGNAME(TBUFF **rp, const char *vp) { return any_ro_STR(rp, vp, prognam); } int -var_PROMPT(TBUFF ** rp, const char *vp) +var_PROMPT(TBUFF **rp, const char *vp) { return any_rw_STR(rp, vp, &prompt_string); } int -var_QIDENTIF(TBUFF ** rp, const char *vp) +var_QIDENTIF(TBUFF **rp, const char *vp) { return any_REPL(rp, vp, vl_qident); } #if OPT_HOOKS int -var_RDHOOK(TBUFF ** rp, const char *vp) +var_RDHOOK(TBUFF **rp, const char *vp) { return any_HOOK(rp, vp, &readhook); } @@ -1249,7 +1260,7 @@ * Note that replacepat is stored without a trailing null. */ int -var_REPLACE(TBUFF ** rp, const char *vp) +var_REPLACE(TBUFF **rp, const char *vp) { if (rp) { tb_copy(rp, replacepat); @@ -1267,7 +1278,7 @@ * Note that searchpat is stored without a trailing null. */ int -var_SEARCH(TBUFF ** rp, const char *vp) +var_SEARCH(TBUFF **rp, const char *vp) { if (rp) { tb_copy(rp, searchpat); @@ -1288,7 +1299,7 @@ } int -var_SEED(TBUFF ** rp, const char *vp) +var_SEED(TBUFF **rp, const char *vp) { if (rp) { render_int(rp, seed); @@ -1304,7 +1315,7 @@ #if OPT_SHELL int -var_SHELL(TBUFF ** rp, const char *vp) +var_SHELL(TBUFF **rp, const char *vp) { if (rp) { tb_scopy(rp, get_shell()); @@ -1319,7 +1330,7 @@ #endif int -var_SRES(TBUFF ** rp, const char *vp) +var_SRES(TBUFF **rp, const char *vp) { if (rp) { tb_scopy(rp, screen_desc); @@ -1332,13 +1343,13 @@ } int -var_STARTUP_FILE(TBUFF ** rp, const char *vp) +var_STARTUP_FILE(TBUFF **rp, const char *vp) { return any_rw_TXT(rp, vp, &startup_file); } int -var_STARTUP_PATH(TBUFF ** rp, const char *vp) +var_STARTUP_PATH(TBUFF **rp, const char *vp) { return any_rw_TXT(rp, vp, &startup_path); } @@ -1352,14 +1363,14 @@ } int -var_STATUS(TBUFF ** rp, const char *vp) +var_STATUS(TBUFF **rp, const char *vp) { return any_rw_BOOL(rp, vp, &lastcmdstatus); } #if OPT_TITLE int -var_TITLE(TBUFF ** rp, const char *vp) +var_TITLE(TBUFF **rp, const char *vp) { if (rp) { #if SYS_WINNT @@ -1378,40 +1389,32 @@ } int -var_TITLEFORMAT(TBUFF ** rp, const char *vp) +var_TITLEFORMAT(TBUFF **rp, const char *vp) { return any_rw_STR(rp, vp, &title_format); } #endif /* OPT_TITLE */ int -var_TPAUSE(TBUFF ** rp, const char *vp) +var_TPAUSE(TBUFF **rp, const char *vp) { - if (rp) { - render_int(rp, term.pausecount); - return TRUE; - } else if (vp) { - term.pausecount = strtol(vp, 0, 0); - return TRUE; - } else { - return FALSE; - } + return any_rw_INT(rp, vp, &term.pausecount); } int -var_VERSION(TBUFF ** rp, const char *vp) +var_VERSION(TBUFF **rp, const char *vp) { return any_ro_STR(rp, vp, version); } int -var_WITHPREFIX(TBUFF ** rp, const char *vp) +var_WITHPREFIX(TBUFF **rp, const char *vp) { return any_ro_STR(rp, vp, tb_values(with_prefix)); } int -var_WLINES(TBUFF ** rp, const char *vp) +var_WLINES(TBUFF **rp, const char *vp) { if (rp) { render_int(rp, curwp->w_ntrows); @@ -1424,14 +1427,14 @@ } int -var_WORD(TBUFF ** rp, const char *vp) +var_WORD(TBUFF **rp, const char *vp) { return any_REPL(rp, vp, vl_nonspace); } #if OPT_HOOKS int -var_WRHOOK(TBUFF ** rp, const char *vp) +var_WRHOOK(TBUFF **rp, const char *vp) { return any_HOOK(rp, vp, &writehook); } @@ -1439,7 +1442,7 @@ #if DISP_X11 && OPT_SHELL int -var_XDISPLAY(TBUFF ** rp, const char *vp) +var_XDISPLAY(TBUFF **rp, const char *vp) { if (rp) { tb_scopy(rp, get_xdisplay()); @@ -1453,7 +1456,7 @@ } int -var_XSHELL(TBUFF ** rp, const char *vp) +var_XSHELL(TBUFF **rp, const char *vp) { if (rp) { tb_scopy(rp, get_xshell()); @@ -1467,7 +1470,7 @@ } int -var_XSHELLFLAGS(TBUFF ** rp, const char *vp) +var_XSHELLFLAGS(TBUFF **rp, const char *vp) { if (rp) { tb_scopy(rp, get_xshellflags()); Index: tbuff.c Prereq: 1.44 --- vile-9.4f+/tbuff.c 2003-07-27 17:04:27.000000000 +0000 +++ vile-9.4g/tbuff.c 2004-06-11 11:22:15.000000000 +0000 @@ -7,7 +7,7 @@ * To do: add 'tb_ins()' and 'tb_del()' to support cursor-level command * editing. * - * $Header: /usr/build/vile/vile/RCS/tbuff.c,v 1.44 2003/07/27 17:04:27 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/tbuff.c,v 1.47 2004/06/11 11:22:15 tom Exp $ * */ @@ -29,7 +29,7 @@ #define FreedBuffer(q) tb_forget(q) static void -tb_remember(TBUFF * p) +tb_remember(TBUFF *p) { TB_LIST *q; @@ -40,7 +40,7 @@ } static void -tb_forget(TBUFF * p) +tb_forget(TBUFF *p) { TB_LIST *q, *r; @@ -79,7 +79,7 @@ * ensure that the given temp-buff has as much space as specified */ TBUFF * -tb_alloc(TBUFF ** p, size_t n) +tb_alloc(TBUFF **p, size_t n) { TBUFF *q = *p; @@ -104,7 +104,7 @@ * (re)initialize a temp-buff */ TBUFF * -tb_init(TBUFF ** p, int c) +tb_init(TBUFF **p, int c) { TBUFF *q = *p; if (q == 0) @@ -120,7 +120,7 @@ * deallocate a temp-buff */ void -tb_free(TBUFF ** p) +tb_free(TBUFF **p) { TBUFF *q = *p; @@ -140,7 +140,7 @@ * put a character c at the nth position of the temp-buff */ TBUFF * -tb_put(TBUFF ** p, size_t n, int c) +tb_put(TBUFF **p, size_t n, int c) { TBUFF *q; @@ -157,7 +157,7 @@ * it's sort of the opposite of tb_peek */ void -tb_stuff(TBUFF * p, int c) +tb_stuff(TBUFF *p, int c) { if (p->tb_last < p->tb_used) p->tb_data[p->tb_last] = c; @@ -170,7 +170,7 @@ * append a character to the temp-buff */ TBUFF * -tb_append(TBUFF ** p, int c) +tb_append(TBUFF **p, int c) { TBUFF *q = *p; size_t n = (q != 0) ? q->tb_used : 0; @@ -182,7 +182,7 @@ * insert a character into the temp-buff */ TBUFF * -tb_insert(TBUFF ** p, size_t n, int c) +tb_insert(TBUFF **p, size_t n, int c) { size_t m = tb_length(*p); TBUFF *q = tb_append(p, c); @@ -201,7 +201,7 @@ * Copy one temp-buff to another */ TBUFF * -tb_copy(TBUFF ** d, TBUFF * s) +tb_copy(TBUFF **d, TBUFF *s) { TBUFF *p; @@ -217,7 +217,7 @@ * append a binary data to the temp-buff */ TBUFF * -tb_bappend(TBUFF ** p, const char *s, size_t len) +tb_bappend(TBUFF **p, const char *s, size_t len) { TBUFF *q = *p; size_t n = (q != 0) ? q->tb_used : 0; @@ -236,7 +236,7 @@ * append a string to the temp-buff */ TBUFF * -tb_sappend(TBUFF ** p, const char *s) +tb_sappend(TBUFF **p, const char *s) { if (s != 0) (void) tb_bappend(p, s, strlen(s)); @@ -248,7 +248,7 @@ * target which is removed. */ TBUFF * -tb_sappend0(TBUFF ** p, const char *s) +tb_sappend0(TBUFF **p, const char *s) { if (s != 0) { TBUFF *q = *p; @@ -267,7 +267,7 @@ * copy a string to the temp-buff, including a null */ TBUFF * -tb_scopy(TBUFF ** p, const char *s) +tb_scopy(TBUFF **p, const char *s) { (void) tb_init(p, EOS); (void) tb_sappend(p, s); @@ -291,7 +291,7 @@ * get the nth character from the temp-buff */ int -tb_get(TBUFF * p, size_t n) +tb_get(TBUFF *p, size_t n) { int c = esc_c; @@ -305,7 +305,7 @@ * undo the last 'tb_put' */ void -tb_unput(TBUFF * p) +tb_unput(TBUFF *p) { if (p != 0 && p->tb_used != 0) @@ -319,7 +319,7 @@ * Reset the iteration-count */ void -tb_first(TBUFF * p) +tb_first(TBUFF *p) { if (p != 0) p->tb_last = 0; @@ -331,7 +331,7 @@ * Returns true iff the iteration-count has not gone past the end of temp-buff. */ int -tb_more(TBUFF * p) +tb_more(TBUFF *p) { return (p != 0) ? (p->tb_last < p->tb_used) : FALSE; } @@ -340,7 +340,7 @@ * get the next character from the temp-buff */ int -tb_next(TBUFF * p) +tb_next(TBUFF *p) { if (p != 0) return tb_get(p, p->tb_last++); @@ -353,7 +353,7 @@ * undo a tb_next */ void -tb_unnext(TBUFF * p) +tb_unnext(TBUFF *p) { if (p == 0) return; @@ -365,7 +365,7 @@ * get the next character from the temp-buff w/o incrementing index */ int -tb_peek(TBUFF * p) +tb_peek(TBUFF *p) { if (p != 0) return tb_get(p, p->tb_last); @@ -373,13 +373,110 @@ } #endif /* NEEDED */ +/*******(evaluation)***********************************************************/ +/* + * Strip single- or double-quotes from the content, adjusting the size. + */ +TBUFF * +tb_dequote(TBUFF **p) +{ + char *value = tb_values(*p); + + TRACE2(("tb_dequote %s\n", tb_visible(*p))); + if (value != error_val) { + int escaped = FALSE; + UINT delim = CharOf(value[0]); + UINT j, k, ch; + UINT have = tb_length(*p); + UINT used = have - 1; + + if (delim == SQUOTE) { + for (j = 0, k = 1; k < have; ++k) { + ch = CharOf(value[j] = value[k]); + if (escaped) { + escaped = FALSE; + ++j; + } else if (ch == BACKSLASH && CharOf(value[k + 1]) == delim) { + escaped = TRUE; + --used; + } else if (ch == delim) { + --used; + } else { + ++j; + } + } + (*p)->tb_used = used; + TRACE2(("...tb_dequote 1: %s\n", tb_visible(*p))); + } else if (delim == DQUOTE) { + for (j = 0, k = 1; k < have; ++k) { + ch = CharOf(value[j] = value[k]); + if (escaped) { + escaped = FALSE; + ++j; + } else if (ch == BACKSLASH) { + escaped = TRUE; + --used; + } else if (ch == delim) { + --used; + } else { + ++j; + } + } + (*p)->tb_used = used; + TRACE2(("...tb_dequote 2: %s\n", tb_visible(*p))); + } else { + TRACE2(("...tb_dequote OOPS: %s\n", tb_visible(*p))); + } + } + return *p; +} + +/* + * Quote the content. We prefer single-quotes since they're simpler. + */ +TBUFF * +tb_enquote(TBUFF **p) +{ + char *value = tb_values(*p); + + TRACE2(("tb_enquote %s\n", tb_visible(*p))); + if (value != error_val && tb_length(*p)) { + UINT j; + UINT have = tb_length(*p) - 1; + UINT need = 2 + have; + + for (j = 0; j < have; ++j) { + if (value[j] == SQUOTE) { + ++need; + } + } + tb_alloc(p, need + 1); + (*p)->tb_used = need + 1; + + value[need] = EOS; + value[need - 1] = SQUOTE; + for (j = 0; j < have; ++j) { + UINT i = have - j - 1; + UINT k = need - j - 2; + UINT ch = CharOf(value[k] = value[i]); + if (ch == SQUOTE) { + --need; + value[k - 1] = BACKSLASH; + } + } + value[0] = SQUOTE; + TRACE2(("...tb_enquote %s\n", tb_visible(*p))); + } + return *p; +} + /*******(bulk-data)************************************************************/ /* * returns a pointer to data, assumes it is one long string */ char * -tb_values(TBUFF * p) +tb_values(TBUFF *p) { char *result = 0; @@ -397,7 +494,7 @@ * returns the length of the data */ size_t -tb_length(TBUFF * p) +tb_length(TBUFF *p) { size_t result = 0; Index: termio.c Prereq: 1.195 --- vile-9.4f+/termio.c 2003-05-25 20:21:52.000000000 +0000 +++ vile-9.4g/termio.c 2004-05-28 18:33:24.000000000 +0000 @@ -3,7 +3,7 @@ * characters, and write characters in a barely buffered fashion on the display. * All operating systems. * - * $Header: /usr/build/vile/vile/RCS/termio.c,v 1.195 2003/05/25 20:21:52 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/termio.c,v 1.196 2004/05/28 18:33:24 tom Exp $ * */ @@ -128,6 +128,10 @@ #define USE_POLL 0 #endif +#ifndef USE_SELECT +#define USE_SELECT 0 +#endif + #ifndef USE_SGTTY #define USE_SGTTY 0 #endif Index: trace.c Prereq: 1.41 --- vile-9.4f+/trace.c 2003-02-26 13:49:49.000000000 +0000 +++ vile-9.4g/trace.c 2004-06-16 21:31:17.000000000 +0000 @@ -1,7 +1,7 @@ /* * debugging support -- tom dickey. * - * $Header: /usr/build/vile/vile/RCS/trace.c,v 1.41 2003/02/26 13:49:49 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/trace.c,v 1.44 2004/06/16 21:31:17 tom Exp $ * */ @@ -28,8 +28,8 @@ #if defined(sun) && !defined(__SVR4) extern void perror(const char *s); extern int gettimeofday(struct timeval *t, struct timezone *z); -extern int vfprintf(FILE * fp, const char *fmt, va_list v); -extern int fflush(FILE * fp); +extern int vfprintf(FILE *fp, const char *fmt, va_list v); +extern int fflush(FILE *fp); #endif #include @@ -184,7 +184,7 @@ beginDisplay(); if (buffer == 0) { buffer = ""; - length = 1; + length = 0; } result = alloc_visible(need); @@ -226,7 +226,7 @@ } char * -tb_visible(TBUFF * p) +tb_visible(TBUFF *p) { return visible_buff(tb_values(p), tb_length(p), FALSE); } @@ -698,7 +698,7 @@ } } -#if OPT_WORKING && (OPT_TRACE > 1) +#if OPT_WORKING && (OPT_TRACE > 2) #undef beginDisplay void beginDisplay(void) Index: vile-9.4.spec Prereq: 1.7 --- vile-9.4f+/vile-9.4.spec 2004-03-22 22:33:07.000000000 +0000 +++ vile-9.4g/vile-9.4.spec 2004-05-13 23:57:47.000000000 +0000 @@ -1,7 +1,7 @@ Summary: VILE VI Like Emacs editor -# $Header: /usr/build/vile/vile/RCS/vile-9.4.spec,v 1.7 2004/03/22 22:33:07 tom Exp $ +# $Header: /usr/build/vile/vile/RCS/vile-9.4.spec,v 1.8 2004/05/13 23:57:47 tom Exp $ Name: vile -Version: 9.4f +Version: 9.4g # each patch should update the version Release: 1 Copyright: GPL @@ -14,6 +14,7 @@ Patch4: vile-9.4d.patch.gz Patch5: vile-9.4e.patch.gz Patch6: vile-9.4f.patch.gz +Patch7: vile-9.4g.patch.gz # each patch should add itself to this list Packager: Thomas Dickey BuildRoot: %{_tmppath}/%{name}-root @@ -32,6 +33,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 # each patch should add itself to this list %build @@ -79,6 +81,9 @@ %changelog # each patch should add its ChangeLog entries here +* Thu May 13 2004 Thomas Dickey +- added patch for 9.4g + * Mon Mar 22 2004 Thomas Dickey - added patch for 9.4f Index: vile.hlp Prereq: 1.580 --- vile-9.4f+/vile.hlp 2004-04-11 23:43:55.000000000 +0000 +++ vile-9.4g/vile.hlp 2004-06-15 22:10:08.000000000 +0000 @@ -1220,11 +1220,13 @@ [Map Sequences] [Map! Sequences] [Named Marks] + [Printable Chars] [Registers] [Select-Bindings] [Settings] [Tag Stack] [Terminal Characters] + [Variables] Turning off "animated" is rarely necessary: the capability is present mostly as a debugging aid. (B) @@ -2679,6 +2681,7 @@ $error-buffer buffer name assigned to the error-buffer $error-expr regular expression that matched the error-buffer $error-match text that matched the error-buffer + $error-tabstop tabstop to use with error-buffer for %C $exec-path where to find vile (read only) $exec-suffix suffix, if any, for execable programs (read only) $exit-hook name of procedure to run when quitting @@ -2788,31 +2791,31 @@ ÷ 2 division &dquery 2 prompt user for input, given default value &env 1 retrieve a system environment variable - &equal 2 logical equality + &equal 2 numeric equality &error 1 true if the parameter was ERROR &execable 1 is a file exec'able &filter 1 true if the given majormode's filter is builtin &ftime 1 modification-time of the given file, as a number - &geq 2 logical greater than or equal + &geq 2 numeric greater than or equal &global 1 retrieves global mode setting - &greater 2 logical greater than - > 2 logical greater than + &greater 2 numeric greater than + > 2 numeric greater than >key 0 get 1 character >sequence 0 get keycode sequence, e.g., #1 &indirect 1 evaluate indirect value &left 2 left string(string, len) &length 1 string length - &leq 2 logical less than or equal - &lessthan 2 logical less than + &leq 2 numeric less than or equal + &lessthan 2 numeric less than &local 1 retrieves local mode setting &lookup 2 look for filename (see below for arguments) &lower 1 lower case string - < 2 logical less than + < 2 numeric less than &match 2 match regular-expression value &middle 3 mid string(string, pos, len) &modulo 2 modulus &negate 1 negate - &neq 2 logical inequality + &neq 2 numeric inequality ¬ 1 logical not &or 2 logical or &path 2 extract/translate pathname (see below for args) @@ -4185,27 +4188,43 @@ doc/modes.doc . Rather than regurgitating the contents of that file here, we'll hit the high points with a couple of examples. - To define a new majormode, do this in your vile startup file: + To define a new majormode, add this in your vile startup file: define-mode ~with define-submode - suffixes "" - preamble "" - before "" - filtername "" + mode-pathname "" ; see next para + mode-filename "" ; see next para + suffixes "" ; see next para + preamble "" ; see next para + before "" + filtername "" buffer mode setting#1 buffer mode setting#2 ; etc. ~endwith - For example, suppose someone wanted to edit this help file and - subsequently submit patches to the vile's developers. In the spirit + Selecting file(s) for inclusion within a majormode is a matter of + specifying an appropriate regular expression, like so: + + regexp mode name selection based on + ---------------- ------------------ + mode-pathname any file component in path + mode-filename leaf filename + suffixes . + preamble first line of file + + One or more of these regular expressions may be specified within a + majormode definition, with selection precedence given in the order + listed above. + + As an actual example, suppose someone wanted to edit this help file + and subsequently submit patches to vile's developers. In the spirit of cooperation, the developers would appreciate changes that were made with the same tabstops and tab insertion policies as used in the existing help file (vile.hlp). Taking a peek at vile.hlp, it can readily be seen that physical tabs are indeed used, with stops apparently set at intervals of 8. Also, it appears that the right - margin is set fairly close to 80. To mirror this policy, create this + margin is set fairly close to 80. To mirror this policy, create this new majormode: define-mode hlp @@ -4274,6 +4293,40 @@ setl cppmode ; <-- force cppmode for current buffer + Distinguishing between C/C++ include files + ------------------------------------------ + Both C and C++ use ".h" as an include file suffix. vile's current + majormode definitions favor "*.h" for inclusion in cmode (not + cppmode), which is not desirable for C++ programmers and/or a C++ + project. There are two workarounds: + + 1) On a project-by-project basis (i.e., developer does not devote all + of his/her time to C++ coding), simply add something like this to + the vile startup file: + + source "filters.rc" + ; ... + define-mode cpp + ~with define-submode cpp + mode-pathname 'project_root_directory_name/.*\.h$' + ~endwith + + This change specifies that all "*.h" files beneath a root + directory name are presumed to be C++ files. + + 2) If coding C++ more than C, then make these changes: + + source "filters.rc" + ; ... + define-mode cpp + ~with define-submode cpp + suffixes '\.\(C\|CC\|cc\|cpp\|cxx\|hxx\|h\|hh\)$' + ~endwith + + This change adds ".h" to the list of C++ files and since vile + tests cppmode before cmode, all "*.h" files will now be edited in + cppmode. + cmode: the original vile builtin majormode ------------------------------------------- Long before Tom Dickey added majormodes to vile, there existed @@ -6016,4 +6069,4 @@ Copyright 1995-2003 by Paul Fox, Thomas Dickey, and Kevin Buettner -------------------------------------------------------------------- - $Header: /usr/build/vile/vile/RCS/vile.hlp,v 1.580 2004/04/11 23:43:55 tom Exp $ + $Header: /usr/build/vile/vile/RCS/vile.hlp,v 1.584 2004/06/15 22:10:08 tom Exp $ Index: word.c Prereq: 1.74 --- vile-9.4f+/word.c 2002-04-30 23:24:11.000000000 +0000 +++ vile-9.4g/word.c 2004-06-09 01:06:32.000000000 +0000 @@ -3,7 +3,7 @@ * paragraph at a time. There are all sorts of word mode commands. If I * do any sentence mode commands, they are likely to be put in this file. * - * $Header: /usr/build/vile/vile/RCS/word.c,v 1.74 2002/04/30 23:24:11 tom Exp $ + * $Header: /usr/build/vile/vile/RCS/word.c,v 1.75 2004/06/09 01:06:32 tom Exp $ * */ @@ -385,7 +385,7 @@ && memcmp("/*", tb_values(*wp), 2) == 0) static int -do_formatting(TBUFF ** wp, TBUFF ** cp) +do_formatting(TBUFF **wp, TBUFF **cp) { register int c; /* current char during scan */ register int clength; /* position on line during fill */ Index: x11.c Prereq: 1.272 --- vile-9.4f+/x11.c 2003-10-08 20:57:58.000000000 +0000 +++ vile-9.4g/x11.c 2004-06-09 01:06:39.000000000 +0000 @@ -2,7 +2,7 @@ * X11 support, Dave Lemke, 11/91 * X Toolkit support, Kevin Buettner, 2/94 * - * $Header: /usr/build/vile/vile/RCS/x11.c,v 1.272 2003/10/08 20:57:58 Mark.Robinson Exp $ + * $Header: /usr/build/vile/vile/RCS/x11.c,v 1.273 2004/06/09 01:06:39 tom Exp $ * */ @@ -4703,7 +4703,7 @@ * Copy a single character into the paste-buffer, quoting it if necessary */ static int -add2paste(TBUFF ** p, int c) +add2paste(TBUFF **p, int c) { if (c == '\n' || isBlank(c)) /*EMPTY */ ; @@ -4725,7 +4725,7 @@ #define OLD_PASTE 0 static int -copy_paste(TBUFF ** p, char *value, size_t length) +copy_paste(TBUFF **p, char *value, size_t length) { WINDOW *wp = row2window(ttrow); BUFFER *bp = valid_window(wp) ? wp->w_bufp : 0;