# vile 9.5q
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Mon May 28 17:59:57 UTC 2007
# ------------------------------------------------------------------------------
# CHANGES | 61
# MANIFEST | 5
# aclocal.m4 | 48
# bind.c | 21
# buffer.c | 50
# builtflt.c | 8
# cmdtbl | 9
# config.guess | 16
# config.sub | 13
# configure | 3582 ++++++++++++++++++++---------------------
# configure.in | 11
# curses.c | 27
# display.c | 5
# estruct.h | 16
# eval.c | 4
# exec.c | 6
# fileio.c | 10
# filters/atr2ansi.c | 20
# filters/atr2html.c | 16
# filters/atr2text.c | 12
# filters/c-filt.c | 18
# filters/ecrypt.c | 6
# filters/filterio.c | 19
# filters/filters.c | 270 ++-
# filters/filters.h | 3
# filters/flt_defs.h | 4
# filters/fltstack.h | 4
# filters/genmake.mak | 3
# filters/htmlfilt.l | 28
# filters/m4-filt.c | 52
# filters/manfilt.c | 6
# filters/perlfilt.l | 24
# filters/pl-filt.c | 72
# filters/rb-filt.l | 35
# filters/rcs-filt.l | 11
# filters/rpm-filt.l | 29
# filters/rubyfilt.c | 24
# filters/sh-filt.l | 29
# filters/spell.rc | 6
# filters/spellflt.l | 41
# filters/unfilter.c | 4
# line.c | 102 -
# macros/modes.rc | 30
# macros/vileinit.rc | 4
# main.c | 20
# makeargv.c | 20
# makeargv.h | 5
# makefile.in | 9
# menu.c | 5
# mkdirs.sh | 19
# ntwinio.c | 102 -
# package/winvile.iss | 4
# patchlev.h | 2
# path.c | 4
# revlist | 139 -
# spawn.c | 4
# termio.c | 6
# trace.c | 25
# undo.c | 67
# version.c | 4
# vile-9.5.spec | 9
# vile-9.5q/filters/rtf-filt.l | 74
# vile-9.5q/filters/rtf.key | 1509 +++++++++++++++++
# vile-9.5q/vl_stdio.h | 54
# w32misc.c | 1316 ++++++---------
# w32ole.rc | 2
# window.c | 5
# winvile.rc | 3
# wvwrap.cpp | 9
# x11.c | 15
# xterm.c | 4
# 71 files changed, 5093 insertions(+), 3106 deletions(-)
# ------------------------------------------------------------------------------
Index: CHANGES
--- vile-9.5p+/CHANGES 2007-04-25 00:46:46.000000000 +0000
+++ vile-9.5q/CHANGES 2007-05-28 16:35:08.000000000 +0000
@@ -1,5 +1,66 @@
Changes for vile 9.6 (released ??? ??? ?? ????)
+ 20070528 (q)
+ + change configure script to check for ispell before aspell; Fedora 5's
+ problem with aspell was eventually fixed.
+ + make cursor-adjustment after paste in xvile dependent on whether the
+ pasted text ended with a newline (request by Eric Krohn).
+ + cleanup the bottom line on the screen when exiting the curses driver,
+ to match the termcap/terminfo driver (report by Chris Green).
+ + fixes for pl-filt.c (perl highlighter):
+ + allow blanks before tag for here-document, e.g.,
+ cat << 'TAG'
+ + allow '~' as a quote-delimiter (this is used by linklint).
+ + modify CF_IMAKE_CFLAGS to work with Solaris sed, which (unlike a
+ standard UNIX implementation) does not honor nested subexpressions.
+ + add rename-other-buffer command, use that to modify spell.rc so it
+ can work with scratch buffers which otherwise would be lost, e.g.,
+ "[Help]".
+ + add modelines for winvile.rc and w32ole.rc to set the majormode to
+ rcmode, and modify a special case in main.c to make "vile winvile.rc"
+ get the corresponding majormode.
+ + add some null-pointer checks in filters for result from flt_alloc().
+ + add a check in flt_alloc() in case the pointer has not been
+ allocated.
+ + derive $(SRC) from $(OBJ) in makefile.in, to avoid losing trace.c
+ in tags rule.
+ + check for empty/default "put" in line.c's PutChar() to avoid
+ attempting to remove a trailing newline from that, since the
+ corresponding line has already been freed as part of the undo process
+ (report by Paul Fox).
+ + use O_NONBLOCK if O_NDELAY is undefined, needed for a few platforms
+ which have the POSIX definition but not the legacy, e.g., Minix and
+ OS X.
+ + make autocolor work for curses-driver, e.g., --with-screen=ncurses
+ (report by Chris Green).
+ + widen the check for "winvile" in vileinit's initialization for win32
+ shifted cursor bind-key's.
+ + modify spell filter so that it can get VILE_SPELL_FILT from the
+ registry on win32.
+ + improve spell filter camelcasing that when parsing things like
+ "UXTerm" it splits off the "Term" as a possible word.
+ + amend 9.5m change to check for file ownership to ensure this is
+ only done for files that might be source'd. It was checking files
+ for read/write too.
+ + correct syntax highlighting for end of JavaScript embedded in HTML,
+ which did not allow for the marker in an inline comment.
+ + modify "filename" shown in :show-filtermsgs to use the buffer name
+ if no filename is available.
+ + modify preamble patterns for shell modes such as awk, etc., to allow
+ for programs without an absolute pathname, e.g., "#! awk".
+ + modify the symbol-table lookup in filters.c to use tsearch() when
+ available. For an 8Mb rtf file this improved performance by about
+ a factor of two (on Linux - Visual C++ has no tsearch).
+ + add configure check for getc_unlocked(), putc_unlocked() and
+ tsearch() to use in performance improvements for syntax filters.
+ + add syntax filter for RTF files.
+ + improve autocolor on win32 by not allowing the cursor to be repainted
+ while autocoloring is in progress.
+ + modify winvile's command-line parsing, adding "-i" option to perform
+ the case used for "Send To": use the part of the command line after
+ options as the filename and change working directory to match
+ (request by Larry Gensch).
+
20070425 (p)
> Tom Dickey:
+ modify spell- and txt-filters to allow users to add words to their
Index: MANIFEST
--- vile-9.5p+/MANIFEST 2007-04-25 21:00:15.000000000 +0000
+++ vile-9.5q/MANIFEST 2007-05-28 17:37:22.000000000 +0000
@@ -1,4 +1,4 @@
-MANIFEST for vile, version v9_5p
+MANIFEST for vile, version v9_5q
--------------------------------------------------------------------------------
MANIFEST this file
CHANGES Change-log for VILE
@@ -122,6 +122,7 @@
vl_alloc.h malloc-macros for vile
vl_ctype.h character-set tests for vile
vl_regex.h interface for vile's regexp.c
+vl_stdio.h customized stdio.h definitions for vile.
vms2unix.c VMS/UNIX compatibility support functions
vmsbuild.com VAX/VMS DCL build script
vmspipe.c pipe-filter support for VMS
@@ -292,6 +293,8 @@
filters/rexxfilt.l syntax filter for REXX
filters/rpm-filt.l syntax highlighter for rpm spec-files
filters/rpm.key keywords for rpm spec files
+filters/rtf-filt.l syntax filter for RTF files
+filters/rtf.key control keywords for RTF
filters/rubyfilt.c syntax filter for Ruby
filters/sccs.key keywords for SCCS syntax filter
filters/sccsfilt.l syntax filter for SCCS files.
Index: aclocal.m4
Prereq: 1.169
--- vile-9.5p+/aclocal.m4 2006-12-16 19:24:05.000000000 +0000
+++ vile-9.5q/aclocal.m4 2007-05-27 17:05:28.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.169 2006/12/16 19:24:05 tom Exp $
+dnl $Header: /usr/build/vile/vile/RCS/aclocal.m4,v 1.173 2007/05/27 17:05:28 tom Exp $
dnl
dnl ---------------------------------------------------------------------------
dnl ---------------------------------------------------------------------------
@@ -463,7 +463,7 @@
test $cf_cv_macros_fd_set = yes && AC_DEFINE(HAVE_TYPE_FD_SET)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CRYPT_FUNC version: 3 updated: 1999/11/11 10:39:43
+dnl CF_CRYPT_FUNC version: 4 updated: 2007/04/28 09:15:55
dnl -------------
dnl Check if we have a working crypt() function
AC_DEFUN([CF_CRYPT_FUNC],
@@ -489,7 +489,7 @@
extern char *crypt();
int main() {
char *s = crypt("vi-crypt", "vi");
- exit(strcmp("vi6r2tczBYLvM", s) != 0);
+ ${cf_cv_main_return-return}(strcmp("vi6r2tczBYLvM", s) != 0);
}
],[
cf_cv_crypt_works=yes],[
@@ -1332,7 +1332,7 @@
test $cf_cv_select_with_time = yes && AC_DEFINE(SELECT_WITH_TIME)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_IMAKE_CFLAGS version: 28 updated: 2006/10/28 14:00:40
+dnl CF_IMAKE_CFLAGS version: 29 updated: 2007/05/24 20:53:19
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
@@ -1369,11 +1369,14 @@
cat >fix_cflags.sed <<'CF_EOF'
s/\\//g
+s/[[ ]][[ ]]*/ /g
s/"//g
-s/\(-D[[a-zA-Z0-9_]][[a-zA-Z0-9_]]*\)=\([[^\\'"0-9 ]][[^ ]]*\([[ ]][[ ]]*[[^- ]][[^ ]]*\)*\)/\1='\\"\2\\"'/g
-s/\(-D[[a-zA-Z0-9_]][[a-zA-Z0-9_]]*\)=\([[^\\'"0-9 ]][[^ ]]*\)[[ ]]/\1='\\"\2\\"' /g
-s/\(-D[[a-zA-Z0-9_]][[a-zA-Z0-9_]]*\)=\([[^\\'"0-9 ]][[^ ]]*\)$/\1='\\"\2\\"'/g
-s/^IMAKE[[ ]]*/IMAKE_CFLAGS="/
+:pack
+s/\(=[[^ ]][[^ ]]*\) \([[^-]]\)/\1 \2/g
+t pack
+s/\(-D[[a-zA-Z0-9_]][[a-zA-Z0-9_]]*\)=\([[^\'0-9 ]][[^ ]]*\)/\1='\\"\2\\"'/g
+s/^IMAKE[[ ]]/IMAKE_CFLAGS="/
+s/ / /g
s/$/"/
CF_EOF
@@ -1521,7 +1524,7 @@
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_KILLPG version: 3 updated: 2001/12/30 18:17:27
+dnl CF_KILLPG version: 4 updated: 2007/05/05 10:45:50
dnl ---------
dnl Note: must follow AC_FUNC_SETPGRP, but cannot use AC_REQUIRE, since that
dnl messes up the messages...
@@ -1547,7 +1550,7 @@
#endif
(void) signal(SIGINT, handler);
(void) kill(-getpid(), SIGINT);
- exit(1);
+ ${cf_cv_main_return-return}(1);
}],
[cf_cv_need_killpg=no],
[cf_cv_need_killpg=yes],
@@ -2105,7 +2108,7 @@
AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_VERSION version: 11 updated: 2003/11/06 19:59:57
+dnl CF_NCURSES_VERSION version: 12 updated: 2007/04/28 09:15:55
dnl ------------------
dnl Check for the version of ncurses, to aid in reporting bugs, etc.
dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS. We don't use
@@ -2136,7 +2139,7 @@
make an error
# endif
#endif
- exit(0);
+ ${cf_cv_main_return-return}(0);
}],[
cf_cv_ncurses_version=`cat $cf_tempfile`],,[
@@ -2457,7 +2460,7 @@
-e 's/-[[UD]]$3\(=[[^ ]]*\)\?[$]//g'`
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_RESTARTABLE_PIPEREAD version: 3 updated: 2001/12/30 18:23:20
+dnl CF_RESTARTABLE_PIPEREAD version: 4 updated: 2007/04/28 09:17:29
dnl -----------------------
dnl CF_RESTARTABLE_PIPEREAD is a modified version of AC_RESTARTABLE_SYSCALLS
dnl from acspecific.m4, which uses a read on a pipe (surprise!) rather than a
@@ -2504,12 +2507,12 @@
sleep (2);
write(fd[1],"done",4);
close(fd[1]);
- exit (0);
+ ${cf_cv_main_return-return} (0);
}
sigwrapper (SIGINT, ucatch);
status = read(fd[0], buff, sizeof(buff));
wait (&i);
- exit (status == -1);
+ ${cf_cv_main_return-return} (status == -1);
}
],
[cf_cv_can_restart_read=yes],
@@ -2590,6 +2593,17 @@
fi
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_STDIO_UNLOCKED version: 1 updated: 2007/05/05 11:11:12
+dnl -----------------
+dnl The four functions getc_unlocked(), getchar_unlocked(), putc_unlocked(),
+dnl putchar_unlocked() are in POSIX.1-2001.
+AC_DEFUN([CF_STDIO_UNLOCKED],[
+AC_HAVE_FUNCS( \
+getc_unlocked \
+putc_unlocked \
+)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_STRUCT_TERMIOS version: 5 updated: 2000/11/04 12:22:46
dnl -----------------
dnl Some machines require _POSIX_SOURCE to completely define struct termios.
@@ -3224,7 +3238,7 @@
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 24 updated: 2006/04/02 16:41:09
+dnl CF_XOPEN_SOURCE version: 25 updated: 2007/01/29 18:36:38
dnl ---------------
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -3258,7 +3272,7 @@
irix[[56]].*) #(vi
CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
;;
-linux*|gnu*) #(vi
+linux*|gnu*|k*bsd*-gnu) #(vi
CF_GNU_SOURCE
;;
mirbsd*) #(vi
Index: bind.c
Prereq: 1.303
--- vile-9.5p+/bind.c 2006-12-14 00:00:58.000000000 +0000
+++ vile-9.5q/bind.c 2007-05-11 00:30:02.000000000 +0000
@@ -3,7 +3,7 @@
*
* written 11-feb-86 by Daniel Lawrence
*
- * $Header: /usr/build/vile/vile/RCS/bind.c,v 1.303 2006/12/14 00:00:58 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/bind.c,v 1.304 2007/05/11 00:30:02 tom Exp $
*
*/
@@ -1492,14 +1492,19 @@
if (ffaccess(fname, mode)) {
#if SYS_UNIX
int success = FALSE;
- char *dname = malloc(NFILEN + strlen(fname) + 10);
- if (dname != 0) {
- sprintf(dname, "%s%c..", fname, vl_pathsep);
- lengthen_path(dname);
- if (is_our_file(dname) && is_our_file(fname)) {
- success = TRUE;
+
+ if (mode & FL_EXECABLE) {
+ char *dname = malloc(NFILEN + strlen(fname) + 10);
+ if (dname != 0) {
+ sprintf(dname, "%s%c..", fname, vl_pathsep);
+ lengthen_path(dname);
+ if (is_our_file(dname) && is_our_file(fname)) {
+ success = TRUE;
+ }
+ free(dname);
}
- free(dname);
+ } else {
+ success = TRUE;
}
if (success)
#endif
Index: buffer.c
Prereq: 1.314
--- vile-9.5p+/buffer.c 2007-01-14 23:51:45.000000000 +0000
+++ vile-9.5q/buffer.c 2007-05-27 16:45:05.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.314 2007/01/14 23:51:45 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/buffer.c,v 1.316 2007/05/27 16:45:05 tom Exp $
*
*/
@@ -1833,16 +1833,18 @@
char bufn[NBUFN]; /* buffer to hold buffer name */
WINDOW *wp;
+ TRACE((T_CALLED "renamebuffer(%s, %s)\n", rbp->b_bname, bufname));
+
if (*mktrimmed(strcpy(bufn, bufname)) == EOS)
- return (ABORT);
+ returnCode(ABORT);
bp = find_b_name(bufn);
if (bp == curbp)
- return (ABORT); /* no change */
+ returnCode(ABORT); /* no change */
if (valid_buffer(bp))
- return FALSE; /* name already in use */
+ returnCode(FALSE); /* name already in use */
#if OPT_NAMEBST
if (is_scratchname(rbp->b_bname)) {
@@ -1850,7 +1852,7 @@
(void) strip_brackets(procname, rbp->b_bname);
if (search_namebst(procname)
&& rename_namebst(procname, bufn) != TRUE)
- return ABORT;
+ returnCode(ABORT);
}
#endif
set_bname(rbp, bufn); /* copy buffer name to structure */
@@ -1860,13 +1862,11 @@
wp->w_flag |= WFMODE;
}
- return (TRUE);
+ returnCode(TRUE);
}
-/* Rename the current buffer */
-/* ARGSUSED */
-int
-namebuffer(int f GCC_UNUSED, int n GCC_UNUSED)
+static int
+rename_specific_buffer(BUFFER *bp)
{
static char bufn[NBUFN]; /* buffer to hold buffer name */
const char *prompt = "New name for buffer: ";
@@ -1877,17 +1877,41 @@
if (mlreply(prompt, bufn, sizeof(bufn)) != TRUE)
return (FALSE);
prompt = "That name's been used. New name: ";
- status = renamebuffer(curbp, bufn);
+ status = renamebuffer(bp, bufn);
if (status == ABORT)
return (FALSE);
} while (status == FALSE);
- b_clr_scratch(curbp); /* if renamed, we must want it */
+ b_clr_scratch(bp); /* if renamed, we must want it */
mlerase();
updatelistbuffers();
return (TRUE);
}
+/* Rename the current buffer */
+/* ARGSUSED */
+int
+namebuffer(int f GCC_UNUSED, int n GCC_UNUSED)
+{
+ TRACE((T_CALLED "namebuffer()\n"));
+ returnCode(rename_specific_buffer(curbp));
+}
+
+/*
+ * Rename a buffer, may be the current one.
+ */
+int
+name_a_buffer(int f GCC_UNUSED, int n GCC_UNUSED)
+{
+ BUFFER *bp;
+ int s;
+ char bufn[NBUFN];
+
+ TRACE((T_CALLED "name_a_buffer()\n"));
+ ASK_FOR_OLD_BNAME("Rename buffer: ", s, bufn, bp);
+ returnCode(rename_specific_buffer(bp));
+}
+
/* create or find a window, and stick this buffer in it. when
done, we own the window and the buffer, but they are _not_
necessarily curwp and curbp */
@@ -2466,6 +2490,7 @@
}
beginDisplay();
+ TRACE((T_CALLED "bfind(%s, %u)\n", bname, bflag));
/* set everything to 0's unless we want nonzero */
if ((bp = typecalloc(BUFFER)) == NULL) {
@@ -2538,6 +2563,7 @@
set_record_sep(bp, (RECORD_SEP) global_b_val(VAL_RECORD_SEP));
}
}
+ TRACE((T_RETURN "%p\n", bp));
endofDisplay();
return (bp);
}
Index: builtflt.c
Prereq: 1.48
--- vile-9.5p+/builtflt.c 2007-04-23 23:14:18.000000000 +0000
+++ vile-9.5q/builtflt.c 2007-05-08 00:39:55.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.48 2007/04/23 23:14:18 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/builtflt.c,v 1.49 2007/05/08 00:39:55 tom Exp $
*
*/
@@ -323,7 +323,11 @@
{
#ifdef MDFILTERMSGS
if (b_val(curbp, MDFILTERMSGS)) {
- const char *filename = (curbp != 0) ? curbp->b_fname : "<stdin>";
+ const char *filename = ((curbp != 0)
+ ? (isInternalName(curbp->b_fname)
+ ? curbp->b_bname
+ : curbp->b_fname)
+ : "<stdin>");
BUFFER *bp;
va_list ap;
Index: cmdtbl
Prereq: 1.245
--- vile-9.5p+/cmdtbl 2006-12-01 21:23:01.000000000 +0000
+++ vile-9.5q/cmdtbl 2007-05-28 14:00:53.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.245 2006/12/01 21:23:01 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/cmdtbl,v 1.247 2007/05/28 14:00:53 tom Exp $
#
#
@@ -548,7 +548,7 @@
execbuf NONE !SMALLER
"execute-buffer" !FEWNAMES
<run the given buffer as a script, CNT times>
-execfile NONE !SMALLER
+execfile NONE
"execute-file" !FEWNAMES
"source"
<run the given file as a script, CNT times>
@@ -1038,6 +1038,9 @@
namebuffer NONE
"rename-buffer"
<give the current buffer a new name>
+name_a_buffer NONE
+ "rename-other-buffer"
+ <give the specified buffer a new name>
newline REDO|UNDO !SMALLER
"newline"
<insert a newline at the cursor, CNT times>
@@ -1704,7 +1707,7 @@
popdown_buffer NONE !SMALLER
"popdown-buffer"
"close-windows" !FEWNAMES
- <open all windows for the given buffer>
+ <close all windows for the given buffer>
usekreg REDO
"use-register" !FEWNAMES
'"'
Index: config.guess
--- vile-9.5p+/config.guess 2006-07-22 15:57:37.000000000 +0000
+++ vile-9.5q/config.guess 2006-12-22 17:00:00.000000000 +0000
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2006-12-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -161,6 +161,7 @@
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -780,7 +781,7 @@
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- i*:MINGW*:*)
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -793,7 +794,7 @@
x86:Interix*:[3456]*)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
- EM64T:Interix*:[3456]*)
+ EM64T:Interix*:[3456]* | authenticamd:Interix*:[3456]*)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -950,6 +951,9 @@
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
+ xtensa:Linux:*:*)
+ echo xtensa-unknown-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -1208,6 +1212,12 @@
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
Index: config.sub
--- vile-9.5p+/config.sub 2006-08-14 16:00:00.000000000 +0000
+++ vile-9.5q/config.sub 2006-12-08 17:00:00.000000000 +0000
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-08-14'
+timestamp='2006-12-08'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -245,7 +245,7 @@
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
@@ -276,6 +276,7 @@
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
+ | score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -323,7 +324,7 @@
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -924,6 +925,9 @@
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1370,6 +1374,9 @@
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
spu-*)
os=-elf
;;
Index: configure
--- vile-9.5p+/configure 2007-01-14 21:51:40.000000000 +0000
+++ vile-9.5q/configure 2007-05-28 16:38:30.000000000 +0000
@@ -1,7 +1,7 @@
#! /bin/sh
-# From configure.in Revision: 1.228 .
+# From configure.in Revision: 1.233 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20061216.
+# Generated by Autoconf 2.52.20030208.
#
# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
@@ -794,7 +794,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.52.20061216. Invocation command line was
+generated by GNU Autoconf 2.52.20030208. Invocation command line was
$ $0 $@
@@ -998,7 +998,6 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_main_return=return
case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
*c*,-n*) ECHO_N= ECHO_C='
@@ -1009,10 +1008,10 @@
echo "#! $SHELL" >conftest.sh
echo "exit 0" >>conftest.sh
chmod +x conftest.sh
-if { (echo "$as_me:1012: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1011: PATH=\".;.\"; conftest.sh") >&5
(PATH=".;."; conftest.sh) 2>&5
ac_status=$?
- echo "$as_me:1015: \$? = $ac_status" >&5
+ echo "$as_me:1014: \$? = $ac_status" >&5
(exit $ac_status); }; then
ac_path_separator=';'
else
@@ -1040,7 +1039,7 @@
fi
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:1043: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+ { { echo "$as_me:1042: 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
@@ -1050,11 +1049,11 @@
# Make sure we can run config.sub.
$ac_config_sub sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:1053: error: cannot run $ac_config_sub" >&5
+ { { echo "$as_me:1052: error: cannot run $ac_config_sub" >&5
echo "$as_me: error: cannot run $ac_config_sub" >&2;}
{ (exit 1); exit 1; }; }
-echo "$as_me:1057: checking build system type" >&5
+echo "$as_me:1056: 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
@@ -1063,16 +1062,16 @@
test -z "$ac_cv_build_alias" &&
ac_cv_build_alias=`$ac_config_guess`
test -z "$ac_cv_build_alias" &&
- { { echo "$as_me:1066: error: cannot guess build type; you must specify one" >&5
+ { { echo "$as_me:1065: 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:1070: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+ { { echo "$as_me:1069: 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:1075: result: $ac_cv_build" >&5
+echo "$as_me:1074: 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/'`
@@ -1080,7 +1079,7 @@
build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
- echo "$as_me:1083: checking host system type" >&5
+ echo "$as_me:1082: 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
@@ -1089,12 +1088,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:1092: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ { { echo "$as_me:1091: 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:1097: result: $ac_cv_host" >&5
+echo "$as_me:1096: 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/'`
@@ -1119,13 +1118,13 @@
fi
test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1122: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1121: 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:1126: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+ echo "$as_me:1125: 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:1128: error: \"Please remove config.cache and try again.\"" >&5
+ { { echo "$as_me:1127: 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
@@ -1136,11 +1135,10 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_main_return=return
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:1143: checking for $ac_word" >&5
+echo "$as_me:1141: 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
@@ -1155,7 +1153,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:1158: found $ac_dir/$ac_word" >&5
+echo "$as_me:1156: found $ac_dir/$ac_word" >&5
break
done
@@ -1163,10 +1161,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1166: result: $CC" >&5
+ echo "$as_me:1164: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1169: result: no" >&5
+ echo "$as_me:1167: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1175,7 +1173,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:1178: checking for $ac_word" >&5
+echo "$as_me:1176: 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
@@ -1190,7 +1188,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:1193: found $ac_dir/$ac_word" >&5
+echo "$as_me:1191: found $ac_dir/$ac_word" >&5
break
done
@@ -1198,10 +1196,10 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1201: result: $ac_ct_CC" >&5
+ echo "$as_me:1199: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1204: result: no" >&5
+ echo "$as_me:1202: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1214,7 +1212,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:1217: checking for $ac_word" >&5
+echo "$as_me:1215: 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
@@ -1229,7 +1227,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:1232: found $ac_dir/$ac_word" >&5
+echo "$as_me:1230: found $ac_dir/$ac_word" >&5
break
done
@@ -1237,10 +1235,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1240: result: $CC" >&5
+ echo "$as_me:1238: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1243: result: no" >&5
+ echo "$as_me:1241: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1249,7 +1247,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:1252: checking for $ac_word" >&5
+echo "$as_me:1250: 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
@@ -1264,7 +1262,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:1267: found $ac_dir/$ac_word" >&5
+echo "$as_me:1265: found $ac_dir/$ac_word" >&5
break
done
@@ -1272,10 +1270,10 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1275: result: $ac_ct_CC" >&5
+ echo "$as_me:1273: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1278: result: no" >&5
+ echo "$as_me:1276: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1288,7 +1286,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:1291: checking for $ac_word" >&5
+echo "$as_me:1289: 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
@@ -1308,7 +1306,7 @@
continue
fi
ac_cv_prog_CC="cc"
-echo "$as_me:1311: found $ac_dir/$ac_word" >&5
+echo "$as_me:1309: found $ac_dir/$ac_word" >&5
break
done
@@ -1330,10 +1328,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1333: result: $CC" >&5
+ echo "$as_me:1331: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1336: result: no" >&5
+ echo "$as_me:1334: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1344,7 +1342,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:1347: checking for $ac_word" >&5
+echo "$as_me:1345: 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
@@ -1359,7 +1357,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:1362: found $ac_dir/$ac_word" >&5
+echo "$as_me:1360: found $ac_dir/$ac_word" >&5
break
done
@@ -1367,10 +1365,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:1370: result: $CC" >&5
+ echo "$as_me:1368: result: $CC" >&5
echo "${ECHO_T}$CC" >&6
else
- echo "$as_me:1373: result: no" >&5
+ echo "$as_me:1371: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1383,7 +1381,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:1386: checking for $ac_word" >&5
+echo "$as_me:1384: 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
@@ -1398,7 +1396,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:1401: found $ac_dir/$ac_word" >&5
+echo "$as_me:1399: found $ac_dir/$ac_word" >&5
break
done
@@ -1406,10 +1404,10 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:1409: result: $ac_ct_CC" >&5
+ echo "$as_me:1407: result: $ac_ct_CC" >&5
echo "${ECHO_T}$ac_ct_CC" >&6
else
- echo "$as_me:1412: result: no" >&5
+ echo "$as_me:1410: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -1421,32 +1419,32 @@
fi
-test -z "$CC" && { { echo "$as_me:1424: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1422: 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:1429:" \
+echo "$as_me:1427:" \
"checking for C compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1432: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1430: \"$ac_compiler --version </dev/null >&5\"") >&5
(eval $ac_compiler --version </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1435: \$? = $ac_status" >&5
+ echo "$as_me:1433: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:1437: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1435: \"$ac_compiler -v </dev/null >&5\"") >&5
(eval $ac_compiler -v </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1440: \$? = $ac_status" >&5
+ echo "$as_me:1438: \$? = $ac_status" >&5
(exit $ac_status); }
-{ (eval echo "$as_me:1442: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1440: \"$ac_compiler -V </dev/null >&5\"") >&5
(eval $ac_compiler -V </dev/null >&5) 2>&5
ac_status=$?
- echo "$as_me:1445: \$? = $ac_status" >&5
+ echo "$as_me:1443: \$? = $ac_status" >&5
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
-#line 1449 "configure"
+#line 1447 "configure"
#include "confdefs.h"
int
@@ -1462,13 +1460,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:1465: checking for C compiler default output" >&5
+echo "$as_me:1463: 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:1468: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1466: \"$ac_link_default\"") >&5
(eval $ac_link_default) 2>&5
ac_status=$?
- echo "$as_me:1471: \$? = $ac_status" >&5
+ echo "$as_me:1469: \$? = $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
@@ -1491,34 +1489,34 @@
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-{ { echo "$as_me:1494: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1492: 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:1500: result: $ac_file" >&5
+echo "$as_me:1498: 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:1505: checking whether the C compiler works" >&5
+echo "$as_me:1503: 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:1511: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1509: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1514: \$? = $ac_status" >&5
+ echo "$as_me:1512: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cross_compiling=no
else
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { echo "$as_me:1521: error: cannot run C compiled programs.
+ { { echo "$as_me:1519: 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;}
@@ -1526,24 +1524,24 @@
fi
fi
fi
-echo "$as_me:1529: result: yes" >&5
+echo "$as_me:1527: 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:1536: checking whether we are cross compiling" >&5
+echo "$as_me:1534: checking whether we are cross compiling" >&5
echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1538: result: $cross_compiling" >&5
+echo "$as_me:1536: result: $cross_compiling" >&5
echo "${ECHO_T}$cross_compiling" >&6
-echo "$as_me:1541: checking for executable suffix" >&5
+echo "$as_me:1539: checking for executable suffix" >&5
echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1543: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1541: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:1546: \$? = $ac_status" >&5
+ echo "$as_me:1544: \$? = $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
@@ -1559,25 +1557,25 @@
esac
done
else
- { { echo "$as_me:1562: error: cannot compute EXEEXT: cannot compile and link" >&5
+ { { echo "$as_me:1560: 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:1568: result: $ac_cv_exeext" >&5
+echo "$as_me:1566: 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:1574: checking for object suffix" >&5
+echo "$as_me:1572: 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 1580 "configure"
+#line 1578 "configure"
#include "confdefs.h"
int
@@ -1589,10 +1587,10 @@
}
_ACEOF
rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1592: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1590: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1595: \$? = $ac_status" >&5
+ echo "$as_me:1593: \$? = $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
@@ -1604,24 +1602,24 @@
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-{ { echo "$as_me:1607: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1605: 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:1614: result: $ac_cv_objext" >&5
+echo "$as_me:1612: result: $ac_cv_objext" >&5
echo "${ECHO_T}$ac_cv_objext" >&6
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-echo "$as_me:1618: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1616: 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 1624 "configure"
+#line 1622 "configure"
#include "confdefs.h"
int
@@ -1636,16 +1634,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1639: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1637: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1642: \$? = $ac_status" >&5
+ echo "$as_me:1640: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1645: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1643: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1648: \$? = $ac_status" >&5
+ echo "$as_me:1646: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_compiler_gnu=yes
else
@@ -1657,19 +1655,19 @@
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:1660: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1658: 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:1666: checking whether $CC accepts -g" >&5
+echo "$as_me:1664: 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 1672 "configure"
+#line 1670 "configure"
#include "confdefs.h"
int
@@ -1681,16 +1679,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1684: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1682: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1687: \$? = $ac_status" >&5
+ echo "$as_me:1685: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1690: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1688: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1693: \$? = $ac_status" >&5
+ echo "$as_me:1691: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cc_g=yes
else
@@ -1700,7 +1698,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:1703: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1701: 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
@@ -1727,16 +1725,16 @@
#endif
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1730: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1728: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1733: \$? = $ac_status" >&5
+ echo "$as_me:1731: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1736: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1734: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1739: \$? = $ac_status" >&5
+ echo "$as_me:1737: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
for ac_declaration in \
''\
@@ -1748,7 +1746,7 @@
'void exit (int);'
do
cat >conftest.$ac_ext <<_ACEOF
-#line 1751 "configure"
+#line 1749 "configure"
#include "confdefs.h"
#include <stdlib.h>
$ac_declaration
@@ -1761,16 +1759,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1764: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1762: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1767: \$? = $ac_status" >&5
+ echo "$as_me:1765: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1770: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1768: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1773: \$? = $ac_status" >&5
+ echo "$as_me:1771: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -1780,7 +1778,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 1783 "configure"
+#line 1781 "configure"
#include "confdefs.h"
$ac_declaration
int
@@ -1792,16 +1790,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1795: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1793: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:1798: \$? = $ac_status" >&5
+ echo "$as_me:1796: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:1801: \"$ac_try\"") >&5
+ { (eval echo "$as_me:1799: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:1804: \$? = $ac_status" >&5
+ echo "$as_me:1802: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -1827,15 +1825,13 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_main_return=return
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_main_return=return
-echo "$as_me:1838: checking how to run the C preprocessor" >&5
+echo "$as_me:1834: 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
@@ -1856,18 +1852,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 1859 "configure"
+#line 1855 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax error
_ACEOF
-if { (eval echo "$as_me:1864: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1860: \"$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:1870: \$? = $ac_status" >&5
+ echo "$as_me:1866: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1890,17 +1886,17 @@
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line 1893 "configure"
+#line 1889 "configure"
#include "confdefs.h"
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:1897: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1893: \"$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:1903: \$? = $ac_status" >&5
+ echo "$as_me:1899: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1937,7 +1933,7 @@
else
ac_cv_prog_CPP=$CPP
fi
-echo "$as_me:1940: result: $CPP" >&5
+echo "$as_me:1936: result: $CPP" >&5
echo "${ECHO_T}$CPP" >&6
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
@@ -1947,18 +1943,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 1950 "configure"
+#line 1946 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax error
_ACEOF
-if { (eval echo "$as_me:1955: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1951: \"$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:1961: \$? = $ac_status" >&5
+ echo "$as_me:1957: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -1981,17 +1977,17 @@
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line 1984 "configure"
+#line 1980 "configure"
#include "confdefs.h"
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:1988: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:1984: \"$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:1994: \$? = $ac_status" >&5
+ echo "$as_me:1990: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2019,7 +2015,7 @@
if $ac_preproc_ok; then
:
else
- { { echo "$as_me:2022: error: C preprocessor \"$CPP\" fails sanity check" >&5
+ { { echo "$as_me:2018: error: C preprocessor \"$CPP\" fails sanity check" >&5
echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -2029,17 +2025,16 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_main_return=return
if test $ac_cv_c_compiler_gnu = yes; then
- echo "$as_me:2035: checking whether $CC needs -traditional" >&5
+ echo "$as_me:2030: 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 2042 "configure"
+#line 2037 "configure"
#include "confdefs.h"
#include <sgtty.h>
int Autoconf = TIOCGETP;
@@ -2054,7 +2049,7 @@
if test $ac_cv_prog_gcc_traditional = no; then
cat >conftest.$ac_ext <<_ACEOF
-#line 2057 "configure"
+#line 2052 "configure"
#include "confdefs.h"
#include <termio.h>
int Autoconf = TCGETA;
@@ -2067,7 +2062,7 @@
fi
fi
-echo "$as_me:2070: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:2065: 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"
@@ -2076,10 +2071,10 @@
### checks for UNIX variants that set C preprocessor variables
-echo "$as_me:2079: checking for AIX" >&5
+echo "$as_me:2074: checking for AIX" >&5
echo $ECHO_N "checking for AIX... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 2082 "configure"
+#line 2077 "configure"
#include "confdefs.h"
#ifdef _AIX
yes
@@ -2088,24 +2083,24 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
- echo "$as_me:2091: result: yes" >&5
+ echo "$as_me:2086: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\EOF
#define _ALL_SOURCE 1
EOF
else
- echo "$as_me:2098: result: no" >&5
+ echo "$as_me:2093: result: no" >&5
echo "${ECHO_T}no" >&6
fi
rm -f conftest*
-echo "$as_me:2103: checking for POSIXized ISC" >&5
+echo "$as_me:2098: 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:2108: result: yes" >&5
+ echo "$as_me:2103: result: yes" >&5
echo "${ECHO_T}yes" >&6
ISC=yes # If later tests want to check for ISC.
@@ -2119,28 +2114,28 @@
CC="$CC -Xp"
fi
else
- echo "$as_me:2122: result: no" >&5
+ echo "$as_me:2117: result: no" >&5
echo "${ECHO_T}no" >&6
ISC=
fi
-echo "$as_me:2127: checking for minix/config.h" >&5
+echo "$as_me:2122: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 2133 "configure"
+#line 2128 "configure"
#include "confdefs.h"
#include <minix/config.h>
_ACEOF
-if { (eval echo "$as_me:2137: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2132: \"$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:2143: \$? = $ac_status" >&5
+ echo "$as_me:2138: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2159,7 +2154,7 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:2162: result: $ac_cv_header_minix_config_h" >&5
+echo "$as_me:2157: 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
@@ -2190,12 +2185,12 @@
if test "$" = yes ; then
case $host_os in
linux*|gnu*)
- echo "$as_me:2193: checking if this is really Intel C compiler" >&5
+ echo "$as_me:2188: checking if this is really Intel C compiler" >&5
echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
cf_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -no-gcc"
cat >conftest.$ac_ext <<_ACEOF
-#line 2198 "configure"
+#line 2193 "configure"
#include "confdefs.h"
int
@@ -2212,16 +2207,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2215: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2210: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2218: \$? = $ac_status" >&5
+ echo "$as_me:2213: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2221: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2216: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2224: \$? = $ac_status" >&5
+ echo "$as_me:2219: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
INTEL_COMPILER=yes
cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
@@ -2232,7 +2227,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
CFLAGS="$cf_save_CFLAGS"
- echo "$as_me:2235: result: $INTEL_COMPILER" >&5
+ echo "$as_me:2230: result: $INTEL_COMPILER" >&5
echo "${ECHO_T}$INTEL_COMPILER" >&6
;;
esac
@@ -2255,7 +2250,7 @@
#define PROG_EXT "$PROG_EXT"
EOF
-echo "$as_me:2258: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "$as_me:2253: checking for ${CC-cc} option to accept ANSI C" >&5
echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
if test "${cf_cv_ansi_cc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2349,7 +2344,7 @@
fi
cat >conftest.$ac_ext <<_ACEOF
-#line 2352 "configure"
+#line 2347 "configure"
#include "confdefs.h"
#ifndef CC_HAS_PROTOS
@@ -2370,16 +2365,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2373: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2368: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2376: \$? = $ac_status" >&5
+ echo "$as_me:2371: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2379: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2374: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2382: \$? = $ac_status" >&5
+ echo "$as_me:2377: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ansi_cc="$cf_arg"; break
else
@@ -2392,7 +2387,7 @@
CPPFLAGS="$cf_save_CPPFLAGS"
fi
-echo "$as_me:2395: result: $cf_cv_ansi_cc" >&5
+echo "$as_me:2390: result: $cf_cv_ansi_cc" >&5
echo "${ECHO_T}$cf_cv_ansi_cc" >&6
if test "$cf_cv_ansi_cc" != "no"; then
@@ -2475,7 +2470,7 @@
fi
if test "$cf_cv_ansi_cc" = "no"; then
- { { echo "$as_me:2478: error: Your compiler does not appear to recognize prototypes.
+ { { echo "$as_me:2473: 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
@@ -2488,7 +2483,7 @@
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:2491: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2486: 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
@@ -2496,7 +2491,7 @@
ac_cv_prog_cc_stdc=no
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
-#line 2499 "configure"
+#line 2494 "configure"
#include "confdefs.h"
#include <stdarg.h>
#include <stdio.h>
@@ -2545,16 +2540,16 @@
do
CC="$ac_save_CC $ac_arg"
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2548: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2543: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2551: \$? = $ac_status" >&5
+ echo "$as_me:2546: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2554: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2549: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2557: \$? = $ac_status" >&5
+ echo "$as_me:2552: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_cc_stdc=$ac_arg
break
@@ -2571,21 +2566,21 @@
case "x$ac_cv_prog_cc_stdc" in
x|xno)
- echo "$as_me:2574: result: none needed" >&5
+ echo "$as_me:2569: result: none needed" >&5
echo "${ECHO_T}none needed" >&6 ;;
*)
- echo "$as_me:2577: result: $ac_cv_prog_cc_stdc" >&5
+ echo "$as_me:2572: result: $ac_cv_prog_cc_stdc" >&5
echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
CC="$CC $ac_cv_prog_cc_stdc" ;;
esac
-echo "$as_me:2582: checking for an ANSI C-conforming const" >&5
+echo "$as_me:2577: 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 2588 "configure"
+#line 2583 "configure"
#include "confdefs.h"
int
@@ -2643,16 +2638,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2646: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2641: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2649: \$? = $ac_status" >&5
+ echo "$as_me:2644: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2652: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2647: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2655: \$? = $ac_status" >&5
+ echo "$as_me:2650: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_c_const=yes
else
@@ -2662,7 +2657,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:2665: result: $ac_cv_c_const" >&5
+echo "$as_me:2660: result: $ac_cv_c_const" >&5
echo "${ECHO_T}$ac_cv_c_const" >&6
if test $ac_cv_c_const = no; then
@@ -2672,14 +2667,14 @@
fi
-echo "$as_me:2675: checking if we can initialize unions" >&5
+echo "$as_me:2670: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 2682 "configure"
+#line 2677 "configure"
#include "confdefs.h"
int
@@ -2691,16 +2686,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2694: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2689: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2697: \$? = $ac_status" >&5
+ echo "$as_me:2692: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2700: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2695: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2703: \$? = $ac_status" >&5
+ echo "$as_me:2698: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_init_unions=yes
else
@@ -2711,13 +2706,13 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:2714: result: $cf_cv_init_unions" >&5
+echo "$as_me:2709: 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:2720: checking if $CC -U and -D options work together" >&5
+echo "$as_me:2715: checking if $CC -U and -D options work together" >&5
echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
if test "${cf_cv_cc_u_d_options+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2726,7 +2721,7 @@
cf_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
cat >conftest.$ac_ext <<_ACEOF
-#line 2729 "configure"
+#line 2724 "configure"
#include "confdefs.h"
int
@@ -2745,16 +2740,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2748: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2743: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2751: \$? = $ac_status" >&5
+ echo "$as_me:2746: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2754: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2749: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2757: \$? = $ac_status" >&5
+ echo "$as_me:2752: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_cc_u_d_options=yes
@@ -2768,7 +2763,7 @@
CPPFLAGS="$cf_save_CPPFLAGS"
fi
-echo "$as_me:2771: result: $cf_cv_cc_u_d_options" >&5
+echo "$as_me:2766: result: $cf_cv_cc_u_d_options" >&5
echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
cf_XOPEN_SOURCE=500
@@ -2792,16 +2787,16 @@
irix[56].*) #(vi
CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
;;
-linux*|gnu*) #(vi
+linux*|gnu*|k*bsd*-gnu) #(vi
-echo "$as_me:2797: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:2792: checking if we must define _GNU_SOURCE" >&5
echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
if test "${cf_cv_gnu_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 2804 "configure"
+#line 2799 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -2816,16 +2811,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2819: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2814: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2822: \$? = $ac_status" >&5
+ echo "$as_me:2817: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2825: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2820: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2828: \$? = $ac_status" >&5
+ echo "$as_me:2823: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_gnu_source=no
else
@@ -2834,7 +2829,7 @@
cf_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
cat >conftest.$ac_ext <<_ACEOF
-#line 2837 "configure"
+#line 2832 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -2849,16 +2844,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2852: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2847: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2855: \$? = $ac_status" >&5
+ echo "$as_me:2850: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2858: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2853: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2861: \$? = $ac_status" >&5
+ echo "$as_me:2856: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_gnu_source=no
else
@@ -2873,7 +2868,7 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:2876: result: $cf_cv_gnu_source" >&5
+echo "$as_me:2871: result: $cf_cv_gnu_source" >&5
echo "${ECHO_T}$cf_cv_gnu_source" >&6
test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
@@ -2900,14 +2895,14 @@
CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
;;
*)
- echo "$as_me:2903: checking if we should define _XOPEN_SOURCE" >&5
+ echo "$as_me:2898: checking if we should define _XOPEN_SOURCE" >&5
echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
if test "${cf_cv_xopen_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 2910 "configure"
+#line 2905 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -2922,16 +2917,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2925: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2920: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2928: \$? = $ac_status" >&5
+ echo "$as_me:2923: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2931: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2926: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2934: \$? = $ac_status" >&5
+ echo "$as_me:2929: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xopen_source=no
else
@@ -2940,7 +2935,7 @@
cf_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
cat >conftest.$ac_ext <<_ACEOF
-#line 2943 "configure"
+#line 2938 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -2955,16 +2950,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2958: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2953: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:2961: \$? = $ac_status" >&5
+ echo "$as_me:2956: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:2964: \"$ac_try\"") >&5
+ { (eval echo "$as_me:2959: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:2967: \$? = $ac_status" >&5
+ echo "$as_me:2962: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_xopen_source=no
else
@@ -2979,7 +2974,7 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:2982: result: $cf_cv_xopen_source" >&5
+echo "$as_me:2977: result: $cf_cv_xopen_source" >&5
echo "${ECHO_T}$cf_cv_xopen_source" >&6
if test "$cf_cv_xopen_source" != no ; then
@@ -3013,16 +3008,16 @@
sed -e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?[ ]/ /g' \
-e 's/-[UD]_POSIX_C_SOURCE\(=[^ ]*\)\?$//g'`
-echo "$as_me:3016: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:3011: checking if we should define _POSIX_C_SOURCE" >&5
echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
if test "${cf_cv_posix_c_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-echo "(line 3022) testing if the symbol is already defined go no further ..." 1>&5
+echo "(line 3017) testing if the symbol is already defined go no further ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 3025 "configure"
+#line 3020 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -3037,16 +3032,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3040: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3035: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3043: \$? = $ac_status" >&5
+ echo "$as_me:3038: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3046: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3041: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3049: \$? = $ac_status" >&5
+ echo "$as_me:3044: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_posix_c_source=no
else
@@ -3067,7 +3062,7 @@
esac
if test "$cf_want_posix_source" = yes ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 3070 "configure"
+#line 3065 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -3082,16 +3077,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3085: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3080: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3088: \$? = $ac_status" >&5
+ echo "$as_me:3083: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3091: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3086: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3094: \$? = $ac_status" >&5
+ echo "$as_me:3089: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -3102,15 +3097,15 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "(line 3105) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "(line 3100) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
CFLAGS="$cf_trim_CFLAGS"
CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
-echo "(line 3110) testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "(line 3105) testing if the second compile does not leave our definition intact error ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 3113 "configure"
+#line 3108 "configure"
#include "confdefs.h"
#include <sys/types.h>
int
@@ -3125,16 +3120,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3128: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3123: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:3131: \$? = $ac_status" >&5
+ echo "$as_me:3126: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:3134: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3129: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3137: \$? = $ac_status" >&5
+ echo "$as_me:3132: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -3150,7 +3145,7 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:3153: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:3148: result: $cf_cv_posix_c_source" >&5
echo "${ECHO_T}$cf_cv_posix_c_source" >&6
if test "$cf_cv_posix_c_source" != no ; then
@@ -3171,7 +3166,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:3174: checking for $ac_word" >&5
+echo "$as_me:3169: 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
@@ -3186,7 +3181,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_LEX="$ac_prog"
-echo "$as_me:3189: found $ac_dir/$ac_word" >&5
+echo "$as_me:3184: found $ac_dir/$ac_word" >&5
break
done
@@ -3194,10 +3189,10 @@
fi
LEX=$ac_cv_prog_LEX
if test -n "$LEX"; then
- echo "$as_me:3197: result: $LEX" >&5
+ echo "$as_me:3192: result: $LEX" >&5
echo "${ECHO_T}$LEX" >&6
else
- echo "$as_me:3200: result: no" >&5
+ echo "$as_me:3195: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -3207,7 +3202,7 @@
if test -z "$LEXLIB"
then
- echo "$as_me:3210: checking for yywrap in -lfl" >&5
+ echo "$as_me:3205: 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
@@ -3215,7 +3210,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lfl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 3218 "configure"
+#line 3213 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -3234,16 +3229,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3237: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3232: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:3240: \$? = $ac_status" >&5
+ echo "$as_me:3235: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:3243: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3238: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3246: \$? = $ac_status" >&5
+ echo "$as_me:3241: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_fl_yywrap=yes
else
@@ -3254,12 +3249,12 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:3257: result: $ac_cv_lib_fl_yywrap" >&5
+echo "$as_me:3252: 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:3262: checking for yywrap in -ll" >&5
+ echo "$as_me:3257: 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
@@ -3267,7 +3262,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ll $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 3270 "configure"
+#line 3265 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -3286,16 +3281,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3289: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3284: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:3292: \$? = $ac_status" >&5
+ echo "$as_me:3287: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:3295: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3290: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3298: \$? = $ac_status" >&5
+ echo "$as_me:3293: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_l_yywrap=yes
else
@@ -3306,7 +3301,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:3309: result: $ac_cv_lib_l_yywrap" >&5
+echo "$as_me:3304: 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"
@@ -3317,7 +3312,7 @@
fi
if test "x$LEX" != "x:"; then
- echo "$as_me:3320: checking lex output file root" >&5
+ echo "$as_me:3315: 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
@@ -3331,16 +3326,16 @@
elif test -f lexyy.c; then
ac_cv_prog_lex_root=lexyy
else
- { { echo "$as_me:3334: error: cannot find output from $LEX; giving up" >&5
+ { { echo "$as_me:3329: 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:3339: result: $ac_cv_prog_lex_root" >&5
+echo "$as_me:3334: 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:3343: checking whether yytext is a pointer" >&5
+echo "$as_me:3338: 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
@@ -3356,16 +3351,16 @@
`cat $LEX_OUTPUT_ROOT.c`
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3359: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3354: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:3362: \$? = $ac_status" >&5
+ echo "$as_me:3357: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:3365: \"$ac_try\"") >&5
+ { (eval echo "$as_me:3360: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:3368: \$? = $ac_status" >&5
+ echo "$as_me:3363: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_prog_lex_yytext_pointer=yes
else
@@ -3377,7 +3372,7 @@
rm -f "${LEX_OUTPUT_ROOT}.c"
fi
-echo "$as_me:3380: result: $ac_cv_prog_lex_yytext_pointer" >&5
+echo "$as_me:3375: 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
@@ -3391,7 +3386,7 @@
### checks for alternative programs
-echo "$as_me:3394: checking for makeflags variable" >&5
+echo "$as_me:3389: 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
@@ -3425,7 +3420,7 @@
rm -f cf_makeflags.tmp
fi
-echo "$as_me:3428: result: $cf_cv_makeflags" >&5
+echo "$as_me:3423: result: $cf_cv_makeflags" >&5
echo "${ECHO_T}$cf_cv_makeflags" >&6
# Find a good install program. We prefer a C program (faster),
@@ -3440,7 +3435,7 @@
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:3443: checking for a BSD compatible install" >&5
+echo "$as_me:3438: 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
@@ -3489,7 +3484,7 @@
INSTALL=$ac_install_sh
fi
fi
-echo "$as_me:3492: result: $INSTALL" >&5
+echo "$as_me:3487: result: $INSTALL" >&5
echo "${ECHO_T}$INSTALL" >&6
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3500,7 +3495,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-echo "$as_me:3503: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:3498: 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
@@ -3520,11 +3515,11 @@
rm -f conftest.make
fi
if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
- echo "$as_me:3523: result: yes" >&5
+ echo "$as_me:3518: result: yes" >&5
echo "${ECHO_T}yes" >&6
SET_MAKE=
else
- echo "$as_me:3527: result: no" >&5
+ echo "$as_me:3522: result: no" >&5
echo "${ECHO_T}no" >&6
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -3533,7 +3528,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:3536: checking for $ac_word" >&5
+echo "$as_me:3531: 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
@@ -3548,7 +3543,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:3551: found $ac_dir/$ac_word" >&5
+echo "$as_me:3546: found $ac_dir/$ac_word" >&5
break
done
@@ -3556,10 +3551,10 @@
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- echo "$as_me:3559: result: $AWK" >&5
+ echo "$as_me:3554: result: $AWK" >&5
echo "${ECHO_T}$AWK" >&6
else
- echo "$as_me:3562: result: no" >&5
+ echo "$as_me:3557: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -3569,7 +3564,7 @@
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:3572: checking for $ac_word" >&5
+echo "$as_me:3567: 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
@@ -3584,7 +3579,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:3587: found $ac_dir/$ac_word" >&5
+echo "$as_me:3582: found $ac_dir/$ac_word" >&5
break
done
@@ -3592,10 +3587,10 @@
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- echo "$as_me:3595: result: $RANLIB" >&5
+ echo "$as_me:3590: result: $RANLIB" >&5
echo "${ECHO_T}$RANLIB" >&6
else
- echo "$as_me:3598: result: no" >&5
+ echo "$as_me:3593: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -3604,7 +3599,7 @@
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
-echo "$as_me:3607: checking for $ac_word" >&5
+echo "$as_me:3602: 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
@@ -3619,7 +3614,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:3622: found $ac_dir/$ac_word" >&5
+echo "$as_me:3617: found $ac_dir/$ac_word" >&5
break
done
@@ -3628,10 +3623,10 @@
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- echo "$as_me:3631: result: $ac_ct_RANLIB" >&5
+ echo "$as_me:3626: result: $ac_ct_RANLIB" >&5
echo "${ECHO_T}$ac_ct_RANLIB" >&6
else
- echo "$as_me:3634: result: no" >&5
+ echo "$as_me:3629: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -3644,7 +3639,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-echo "$as_me:3647: checking for archiver (symbol AR)" >&5
+echo "$as_me:3642: checking for archiver (symbol AR)" >&5
echo $ECHO_N "checking for archiver (symbol AR)... $ECHO_C" >&6
if test -z "$AR" ; then
@@ -3653,7 +3648,7 @@
fi
cf_cv_subst_AR=$AR
-echo "$as_me:3656: result: $AR" >&5
+echo "$as_me:3651: result: $AR" >&5
echo "${ECHO_T}$AR" >&6
fi
@@ -3662,7 +3657,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-echo "$as_me:3665: checking for archiver options (symbol AR_OPTS)" >&5
+echo "$as_me:3660: checking for archiver options (symbol AR_OPTS)" >&5
echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
if test -z "$AR_OPTS" ; then
@@ -3671,12 +3666,12 @@
fi
cf_cv_subst_AR_OPTS=$AR_OPTS
-echo "$as_me:3674: result: $AR_OPTS" >&5
+echo "$as_me:3669: result: $AR_OPTS" >&5
echo "${ECHO_T}$AR_OPTS" >&6
fi
-echo "$as_me:3679: checking if you want to see long compiling messages" >&5
+echo "$as_me:3674: 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.
@@ -3710,7 +3705,7 @@
ECHO_CC=''
fi;
-echo "$as_me:3713: result: $enableval" >&5
+echo "$as_me:3708: result: $enableval" >&5
echo "${ECHO_T}$enableval" >&6
case $cf_cv_system_name in
@@ -3729,7 +3724,7 @@
BUILTLIBS=
BUILTSRCS=
-echo "$as_me:3732: checking if you wish to build only core functions" >&5
+echo "$as_me:3727: 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.
@@ -3746,7 +3741,7 @@
DISABLE_EXTS=no
fi;
-echo "$as_me:3749: result: $DISABLE_EXTS" >&5
+echo "$as_me:3744: result: $DISABLE_EXTS" >&5
echo "${ECHO_T}$DISABLE_EXTS" >&6
if test "$DISABLE_EXTS" = yes ; then
cat >>confdefs.h <<\EOF
@@ -3763,7 +3758,7 @@
cf_extensions=yes
fi
-echo "$as_me:3766: checking if you wish to disable shell/external commands" >&5
+echo "$as_me:3761: 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.
@@ -3780,7 +3775,7 @@
DISABLE_SHELL=no
fi;
-echo "$as_me:3783: result: $DISABLE_SHELL" >&5
+echo "$as_me:3778: result: $DISABLE_SHELL" >&5
echo "${ECHO_T}$DISABLE_SHELL" >&6
if test "$DISABLE_SHELL" = yes ; then
cat >>confdefs.h <<\EOF
@@ -3792,7 +3787,7 @@
fi
### use option --with-cflags to set default CFLAGS
-echo "$as_me:3795: checking for CFLAGS options" >&5
+echo "$as_me:3790: checking for CFLAGS options" >&5
echo $ECHO_N "checking for CFLAGS options... $ECHO_C" >&6
# Check whether --with-CFLAGS or --without-CFLAGS was given.
@@ -3816,10 +3811,10 @@
elif test -z "$CFLAGS" ; then
CFLAGS="-O"
fi
-echo "$as_me:3819: result: $cflags" >&5
+echo "$as_me:3814: result: $cflags" >&5
echo "${ECHO_T}$cflags" >&6
-echo "$as_me:3822: checking if you want to compile-in plugin support" >&5
+echo "$as_me:3817: 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.
@@ -3836,10 +3831,10 @@
with_plugins=no
fi;
-echo "$as_me:3839: result: $with_plugins" >&5
+echo "$as_me:3834: result: $with_plugins" >&5
echo "${ECHO_T}$with_plugins" >&6
-echo "$as_me:3842: checking if you want to build syntax filters" >&5
+echo "$as_me:3837: 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.
@@ -3856,7 +3851,7 @@
with_filters=yes
fi;
-echo "$as_me:3859: result: $with_filters" >&5
+echo "$as_me:3854: result: $with_filters" >&5
echo "${ECHO_T}$with_filters" >&6
MAKE_FILTERS=
@@ -3868,7 +3863,7 @@
: ${VILE_LOADABLE_FILTERS=none}
: ${VILE_EXTERNAL_FILTERS=all}
-echo "$as_me:3871: checking if you want built-in syntax filters" >&5
+echo "$as_me:3866: 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.
@@ -3879,10 +3874,10 @@
VILE_BUILT_IN_FILTERS=none
fi;
test "$VILE_BUILT_IN_FILTERS" = no && VILE_BUILT_IN_FILTERS=none
-echo "$as_me:3882: result: $VILE_BUILT_IN_FILTERS" >&5
+echo "$as_me:3877: result: $VILE_BUILT_IN_FILTERS" >&5
echo "${ECHO_T}$VILE_BUILT_IN_FILTERS" >&6
-echo "$as_me:3885: checking if you want loadable syntax filters" >&5
+echo "$as_me:3880: 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.
@@ -3893,7 +3888,7 @@
VILE_LOADABLE_FILTERS=none
fi;
test "$VILE_LOADABLE_FILTERS" = no && VILE_LOADABLE_FILTERS=none
-echo "$as_me:3896: result: $VILE_LOADABLE_FILTERS" >&5
+echo "$as_me:3891: result: $VILE_LOADABLE_FILTERS" >&5
echo "${ECHO_T}$VILE_LOADABLE_FILTERS" >&6
# If both "--with-builtin-filters" and "--with-loadable-filters" were given,
@@ -3911,7 +3906,7 @@
do
if test "$cf_b" = "$cf_l"
then
- { { echo "$as_me:3914: error: Cannot overlap built-in and loadable filter lists" >&5
+ { { echo "$as_me:3909: 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
@@ -3954,7 +3949,7 @@
test -z "$VILE_EXTERNAL_FILTERS" && VILE_EXTERNAL_FILTERS=none
fi
-echo "$as_me:3957: checking if any filters require flex" >&5
+echo "$as_me:3952: 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"`
@@ -3967,48 +3962,48 @@
else
cf_needflex=no
fi
-echo "$as_me:3970: result: $cf_needflex" >&5
+echo "$as_me:3965: result: $cf_needflex" >&5
echo "${ECHO_T}$cf_needflex" >&6
if test "$cf_needflex" = yes ; then
test -z "$LEX" && LEX=lex
-echo "$as_me:3976: checking if $LEX is really flex" >&5
+echo "$as_me:3971: 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:3980: result: yes" >&5
+ echo "$as_me:3975: result: yes" >&5
echo "${ECHO_T}yes" >&6
- echo "$as_me:3982: checking version of $LEX" >&5
+ echo "$as_me:3977: 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:3985: result: $LEX_VERSION" >&5
+ echo "$as_me:3980: result: $LEX_VERSION" >&5
echo "${ECHO_T}$LEX_VERSION" >&6
else
- echo "$as_me:3988: result: no" >&5
+ echo "$as_me:3983: result: no" >&5
echo "${ECHO_T}no" >&6
fi
if test -z "$LEX_VERSION"
then
- { { echo "$as_me:3994: error: You need flex to compile builtin filters" >&5
+ { { echo "$as_me:3989: 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:3999: error: Sorry - your version of flex is too old: $LEX_VERSION" >&5
+ { { echo "$as_me:3994: 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:4004: error: Sorry - your version of flex is too unstable: $LEX_VERSION" >&5
+ { { echo "$as_me:3999: 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:4011: error: This version of flex cannot compile builtin filters" >&5
+ { { echo "$as_me:4006: 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
@@ -4017,7 +4012,7 @@
elif ( expr $LEX_SUBVERSION \> 4 >/dev/null )
then
- { { echo "$as_me:4020: error: This version of flex cannot compile builtin filters" >&5
+ { { echo "$as_me:4015: 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
@@ -4032,7 +4027,7 @@
MAKE_FILTERS="#"
fi
-echo "$as_me:4035: checking for library path" >&5
+echo "$as_me:4030: 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.
@@ -4072,7 +4067,7 @@
cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:4075: error: expected a pathname, not \"$cf_src_path\"" >&5
+ { { echo "$as_me:4070: 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; }; }
;;
@@ -4094,10 +4089,10 @@
eval 'VILE_LIBDIR_PATH="$cf_dst_path"'
-echo "$as_me:4097: result: $VILE_LIBDIR_PATH" >&5
+echo "$as_me:4092: result: $VILE_LIBDIR_PATH" >&5
echo "${ECHO_T}$VILE_LIBDIR_PATH" >&6
-echo "$as_me:4100: checking for startup path" >&5
+echo "$as_me:4095: 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.
@@ -4137,7 +4132,7 @@
cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:4140: error: expected a pathname, not \"$cf_src_path\"" >&5
+ { { echo "$as_me:4135: 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; }; }
;;
@@ -4159,10 +4154,10 @@
eval 'VILE_STARTUP_PATH="$cf_dst_path"'
-echo "$as_me:4162: result: $VILE_STARTUP_PATH" >&5
+echo "$as_me:4157: result: $VILE_STARTUP_PATH" >&5
echo "${ECHO_T}$VILE_STARTUP_PATH" >&6
-echo "$as_me:4165: checking if $LEX supports character classes" >&5
+echo "$as_me:4160: checking if $LEX supports character classes" >&5
echo $ECHO_N "checking if $LEX supports character classes... $ECHO_C" >&6
cat >conftest.l <<CF_EOF
IDENT [[:alpha:]][[:alnum:]]+
@@ -4172,24 +4167,24 @@
{DATE} { ECHO; }
CF_EOF
cf_lex_char_classes="$LEX conftest.l 1>&5"
-if { (eval echo "$as_me:4175: \"$cf_lex_char_classes\"") >&5
+if { (eval echo "$as_me:4170: \"$cf_lex_char_classes\"") >&5
(eval $cf_lex_char_classes) 2>&5
ac_status=$?
- echo "$as_me:4178: \$? = $ac_status" >&5
+ echo "$as_me:4173: \$? = $ac_status" >&5
(exit $ac_status); }; then
LEX_CHAR_CLASSES=yes
else
LEX_CHAR_CLASSES=no
fi
-echo "$as_me:4184: result: $LEX_CHAR_CLASSES" >&5
+echo "$as_me:4179: result: $LEX_CHAR_CLASSES" >&5
echo "${ECHO_T}$LEX_CHAR_CLASSES" >&6
rm -f conftest.* $LEX_OUTPUT_ROOT.c
if test "$LEX_CHAR_CLASSES" != yes ; then
- { echo "$as_me:4188: WARNING: Your $LEX program does not support character classes. Get flex." >&5
+ { echo "$as_me:4183: WARNING: Your $LEX program does not support character classes. Get flex." >&5
echo "$as_me: WARNING: Your $LEX program does not support character classes. Get flex." >&2;}
fi
-echo "$as_me:4192: checking if $LEX supports states" >&5
+echo "$as_me:4187: checking if $LEX supports states" >&5
echo $ECHO_N "checking if $LEX supports states... $ECHO_C" >&6
cat >conftest.l <<CF_EOF
%s X Y Z
@@ -4199,21 +4194,21 @@
nothing ECHO;
CF_EOF
cf_lex_states="$LEX conftest.l 1>&5"
-if { (eval echo "$as_me:4202: \"$cf_lex_states\"") >&5
+if { (eval echo "$as_me:4197: \"$cf_lex_states\"") >&5
(eval $cf_lex_states) 2>&5
ac_status=$?
- echo "$as_me:4205: \$? = $ac_status" >&5
+ echo "$as_me:4200: \$? = $ac_status" >&5
(exit $ac_status); }; then
cf_lex_states=yes
else
cf_lex_states=no
fi
-echo "$as_me:4211: result: $cf_lex_states" >&5
+echo "$as_me:4206: 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:4216: WARNING: Your $LEX program does not support states. Get flex." >&5
+ { echo "$as_me:4211: 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
@@ -4224,7 +4219,7 @@
LEX_CHAR_CLASSES='sh $(srcdir)/noclass.sh '
fi
-echo "$as_me:4227: checking if you want to use perl as an extension language" >&5
+echo "$as_me:4222: 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.
@@ -4234,16 +4229,16 @@
else
with_perl=no
fi;
-echo "$as_me:4237: result: $with_perl" >&5
+echo "$as_me:4232: result: $with_perl" >&5
echo "${ECHO_T}$with_perl" >&6
if test "$with_perl" = yes ; then
# find perl binary
-echo "$as_me:4241: checking for perl-5.004" >&5
+echo "$as_me:4236: 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:4246: ...version 5.004 required" >&5
+ echo "configure:4241: ...version 5.004 required" >&5
# allow user to override
if test -n "$PERL"; then
cf_try="$PERL"
@@ -4253,7 +4248,7 @@
cf_version=`echo '[]'|sed -e 's/^./$/'`
for cf_prog in $cf_try; do
- echo "configure:4256: trying $cf_prog" >&5
+ echo "configure:4251: 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
@@ -4262,15 +4257,15 @@
fi
PERL="$cf_cv_prog_PERL"
if test -n "$PERL"; then
- echo "$as_me:4265: result: $PERL" >&5
+ echo "$as_me:4260: result: $PERL" >&5
echo "${ECHO_T}$PERL" >&6
else
- echo "$as_me:4268: result: no" >&5
+ echo "$as_me:4263: result: no" >&5
echo "${ECHO_T}no" >&6
fi
if test "$PERL" = no; then
- { { echo "$as_me:4273: error: perl not found" >&5
+ { { echo "$as_me:4268: error: perl not found" >&5
echo "$as_me: error: perl not found" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -4362,7 +4357,7 @@
if test "$cf_check_cflags" != "$CFLAGS" ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 4365 "configure"
+#line 4360 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -4374,16 +4369,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4377: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4372: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4380: \$? = $ac_status" >&5
+ echo "$as_me:4375: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4383: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4378: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4386: \$? = $ac_status" >&5
+ echo "$as_me:4381: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -4408,13 +4403,13 @@
# X11 checks will sometimes add to CFLAGS. We want the state of CFLAGS
# prior to these checks
-echo "$as_me:4411: checking for getpwnam" >&5
+echo "$as_me:4406: 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 4417 "configure"
+#line 4412 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char getpwnam (); below. */
@@ -4445,16 +4440,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4448: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4443: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4451: \$? = $ac_status" >&5
+ echo "$as_me:4446: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4454: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4449: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4457: \$? = $ac_status" >&5
+ echo "$as_me:4452: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_getpwnam=yes
else
@@ -4464,13 +4459,13 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:4467: result: $ac_cv_func_getpwnam" >&5
+echo "$as_me:4462: 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:4473: checking for getpwnam in -lsun" >&5
+echo "$as_me:4468: 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
@@ -4478,7 +4473,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsun $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 4481 "configure"
+#line 4476 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -4497,16 +4492,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4500: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4495: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4503: \$? = $ac_status" >&5
+ echo "$as_me:4498: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4506: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4501: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4509: \$? = $ac_status" >&5
+ echo "$as_me:4504: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_sun_getpwnam=yes
else
@@ -4517,7 +4512,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:4520: result: $ac_cv_lib_sun_getpwnam" >&5
+echo "$as_me:4515: 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 <<EOF
@@ -4535,7 +4530,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:4538: checking for $ac_word" >&5
+echo "$as_me:4533: 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
@@ -4550,7 +4545,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_LINT="$ac_prog"
-echo "$as_me:4553: found $ac_dir/$ac_word" >&5
+echo "$as_me:4548: found $ac_dir/$ac_word" >&5
break
done
@@ -4558,10 +4553,10 @@
fi
LINT=$ac_cv_prog_LINT
if test -n "$LINT"; then
- echo "$as_me:4561: result: $LINT" >&5
+ echo "$as_me:4556: result: $LINT" >&5
echo "${ECHO_T}$LINT" >&6
else
- echo "$as_me:4564: result: no" >&5
+ echo "$as_me:4559: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -4577,13 +4572,13 @@
fi
### checks for header files
-echo "$as_me:4580: checking for ANSI C header files" >&5
+echo "$as_me:4575: 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 4586 "configure"
+#line 4581 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -4591,13 +4586,13 @@
#include <float.h>
_ACEOF
-if { (eval echo "$as_me:4594: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4589: \"$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:4600: \$? = $ac_status" >&5
+ echo "$as_me:4595: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4619,7 +4614,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line 4622 "configure"
+#line 4617 "configure"
#include "confdefs.h"
#include <string.h>
@@ -4637,7 +4632,7 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line 4640 "configure"
+#line 4635 "configure"
#include "confdefs.h"
#include <stdlib.h>
@@ -4658,7 +4653,7 @@
:
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4661 "configure"
+#line 4656 "configure"
#include "confdefs.h"
#include <ctype.h>
#if ((' ' & 0x0FF) == 0x020)
@@ -4679,20 +4674,20 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
- $ac_main_return(2);
- $ac_main_return (0);
+ exit(2);
+ exit (0);
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4687: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4682: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4690: \$? = $ac_status" >&5
+ echo "$as_me:4685: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:4692: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4687: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4695: \$? = $ac_status" >&5
+ echo "$as_me:4690: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -4705,7 +4700,7 @@
fi
fi
fi
-echo "$as_me:4708: result: $ac_cv_header_stdc" >&5
+echo "$as_me:4703: result: $ac_cv_header_stdc" >&5
echo "${ECHO_T}$ac_cv_header_stdc" >&6
if test $ac_cv_header_stdc = yes; then
@@ -4718,13 +4713,13 @@
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:4721: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:4716: 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 4727 "configure"
+#line 4722 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -4739,16 +4734,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4742: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4737: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:4745: \$? = $ac_status" >&5
+ echo "$as_me:4740: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:4748: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4743: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4751: \$? = $ac_status" >&5
+ echo "$as_me:4746: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Header=yes"
else
@@ -4758,7 +4753,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:4761: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4756: 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 <<EOF
@@ -4771,7 +4766,7 @@
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:4774: checking for opendir in -ldir" >&5
+ echo "$as_me:4769: 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
@@ -4779,7 +4774,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldir $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 4782 "configure"
+#line 4777 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -4798,16 +4793,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4801: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4796: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4804: \$? = $ac_status" >&5
+ echo "$as_me:4799: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4807: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4802: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4810: \$? = $ac_status" >&5
+ echo "$as_me:4805: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dir_opendir=yes
else
@@ -4818,14 +4813,14 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:4821: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:4816: result: $ac_cv_lib_dir_opendir" >&5
echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
if test $ac_cv_lib_dir_opendir = yes; then
LIBS="$LIBS -ldir"
fi
else
- echo "$as_me:4828: checking for opendir in -lx" >&5
+ echo "$as_me:4823: 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
@@ -4833,7 +4828,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lx $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 4836 "configure"
+#line 4831 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -4852,16 +4847,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4855: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4850: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4858: \$? = $ac_status" >&5
+ echo "$as_me:4853: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4861: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4856: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4864: \$? = $ac_status" >&5
+ echo "$as_me:4859: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_x_opendir=yes
else
@@ -4872,7 +4867,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:4875: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:4870: 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"
@@ -4880,13 +4875,13 @@
fi
- echo "$as_me:4883: checking for nl_langinfo and CODESET" >&5
+ echo "$as_me:4878: checking for nl_langinfo and CODESET" >&5
echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
if test "${am_cv_langinfo_codeset+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 4889 "configure"
+#line 4884 "configure"
#include "confdefs.h"
#include <langinfo.h>
int
@@ -4898,16 +4893,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4901: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4896: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:4904: \$? = $ac_status" >&5
+ echo "$as_me:4899: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:4907: \"$ac_try\"") >&5
+ { (eval echo "$as_me:4902: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:4910: \$? = $ac_status" >&5
+ echo "$as_me:4905: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
am_cv_langinfo_codeset=yes
else
@@ -4918,7 +4913,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:4921: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:4916: result: $am_cv_langinfo_codeset" >&5
echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
if test $am_cv_langinfo_codeset = yes; then
@@ -4935,6 +4930,7 @@
memory.h \
poll.h \
pwd.h \
+search.h \
select.h \
setjmp.h \
sgtty.h \
@@ -4960,23 +4956,23 @@
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4963: checking for $ac_header" >&5
+echo "$as_me:4959: 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 4969 "configure"
+#line 4965 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:4973: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4969: \"$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:4979: \$? = $ac_status" >&5
+ echo "$as_me:4975: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4995,7 +4991,7 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:4998: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4994: 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 <<EOF
@@ -5006,13 +5002,13 @@
done
### checks for typedefs
-echo "$as_me:5009: checking return type of signal handlers" >&5
+echo "$as_me:5005: 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 5015 "configure"
+#line 5011 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -5034,16 +5030,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5037: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5033: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5040: \$? = $ac_status" >&5
+ echo "$as_me:5036: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5043: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5039: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5046: \$? = $ac_status" >&5
+ echo "$as_me:5042: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_signal=void
else
@@ -5053,7 +5049,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:5056: result: $ac_cv_type_signal" >&5
+echo "$as_me:5052: result: $ac_cv_type_signal" >&5
echo "${ECHO_T}$ac_cv_type_signal" >&6
cat >>confdefs.h <<EOF
@@ -5082,28 +5078,28 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5085: checking for $ac_header" >&5
+echo "$as_me:5081: 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 5091 "configure"
+#line 5087 "configure"
#include "confdefs.h"
$ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5097: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5093: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5100: \$? = $ac_status" >&5
+ echo "$as_me:5096: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5103: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5099: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5106: \$? = $ac_status" >&5
+ echo "$as_me:5102: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Header=yes"
else
@@ -5113,7 +5109,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:5116: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5112: 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 <<EOF
@@ -5123,13 +5119,13 @@
fi
done
-echo "$as_me:5126: checking for size_t" >&5
+echo "$as_me:5122: 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 5132 "configure"
+#line 5128 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -5144,16 +5140,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5147: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5143: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5150: \$? = $ac_status" >&5
+ echo "$as_me:5146: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5153: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5149: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5156: \$? = $ac_status" >&5
+ echo "$as_me:5152: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_size_t=yes
else
@@ -5163,7 +5159,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:5166: result: $ac_cv_type_size_t" >&5
+echo "$as_me:5162: 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
:
@@ -5175,13 +5171,13 @@
fi
-echo "$as_me:5178: checking for uid_t in sys/types.h" >&5
+echo "$as_me:5174: 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 5184 "configure"
+#line 5180 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -5195,7 +5191,7 @@
rm -f conftest*
fi
-echo "$as_me:5198: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:5194: 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
@@ -5209,13 +5205,13 @@
fi
-echo "$as_me:5212: checking for pid_t" >&5
+echo "$as_me:5208: 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 5218 "configure"
+#line 5214 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -5230,16 +5226,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5233: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5229: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5236: \$? = $ac_status" >&5
+ echo "$as_me:5232: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5239: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5235: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5242: \$? = $ac_status" >&5
+ echo "$as_me:5238: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_pid_t=yes
else
@@ -5249,7 +5245,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:5252: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:5248: 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
:
@@ -5261,13 +5257,13 @@
fi
-echo "$as_me:5264: checking for time_t" >&5
+echo "$as_me:5260: 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 5270 "configure"
+#line 5266 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -5282,16 +5278,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5285: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5281: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5288: \$? = $ac_status" >&5
+ echo "$as_me:5284: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5291: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5287: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5294: \$? = $ac_status" >&5
+ echo "$as_me:5290: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_type_time_t=yes
else
@@ -5301,7 +5297,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:5304: result: $ac_cv_type_time_t" >&5
+echo "$as_me:5300: 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
:
@@ -5315,18 +5311,18 @@
### checks for library functions
if test "$cross_compiling" = no; then
- echo "$as_me:5318: checking whether setvbuf arguments are reversed" >&5
+ echo "$as_me:5314: 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:5324: error: cannot run test program while cross compiling" >&5
+ { { echo "$as_me:5320: 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 5329 "configure"
+#line 5325 "configure"
#include "confdefs.h"
#include <stdio.h>
/* If setvbuf has the reversed format, exit 0. */
@@ -5337,21 +5333,21 @@
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)
- $ac_main_return(1);
+ exit(1);
putc('\r', stdout);
- $ac_main_return(0); /* Non-reversed systems segv here. */
+ exit(0); /* Non-reversed systems segv here. */
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5346: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5342: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:5349: \$? = $ac_status" >&5
+ echo "$as_me:5345: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:5351: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5347: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5354: \$? = $ac_status" >&5
+ echo "$as_me:5350: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_setvbuf_reversed=yes
else
@@ -5364,7 +5360,7 @@
fi
rm -f core core.* *.core
fi
-echo "$as_me:5367: result: $ac_cv_func_setvbuf_reversed" >&5
+echo "$as_me:5363: 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
@@ -5377,13 +5373,13 @@
fi
### checks for structures
-echo "$as_me:5380: checking whether stat file-mode macros are broken" >&5
+echo "$as_me:5376: 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 5386 "configure"
+#line 5382 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -5422,7 +5418,7 @@
rm -f conftest*
fi
-echo "$as_me:5425: result: $ac_cv_header_stat_broken" >&5
+echo "$as_me:5421: 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
@@ -5432,13 +5428,13 @@
fi
-echo "$as_me:5435: checking for struct stat.st_blksize" >&5
+echo "$as_me:5431: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 5441 "configure"
+#line 5437 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -5452,16 +5448,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5455: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5451: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5458: \$? = $ac_status" >&5
+ echo "$as_me:5454: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5461: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5457: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5464: \$? = $ac_status" >&5
+ echo "$as_me:5460: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_member_struct_stat_st_blksize=yes
else
@@ -5471,7 +5467,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:5474: result: $ac_cv_member_struct_stat_st_blksize" >&5
+echo "$as_me:5470: 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
@@ -5485,13 +5481,13 @@
fi
-echo "$as_me:5488: checking for struct stat.st_blocks" >&5
+echo "$as_me:5484: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 5494 "configure"
+#line 5490 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -5505,16 +5501,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5508: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5504: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5511: \$? = $ac_status" >&5
+ echo "$as_me:5507: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5514: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5510: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5517: \$? = $ac_status" >&5
+ echo "$as_me:5513: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_member_struct_stat_st_blocks=yes
else
@@ -5524,7 +5520,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:5527: result: $ac_cv_member_struct_stat_st_blocks" >&5
+echo "$as_me:5523: 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
@@ -5540,13 +5536,13 @@
LIBOBJS="$LIBOBJS fileblocks.$ac_objext"
fi
-echo "$as_me:5543: checking for struct stat.st_rdev" >&5
+echo "$as_me:5539: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 5549 "configure"
+#line 5545 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -5560,16 +5556,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5563: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5559: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5566: \$? = $ac_status" >&5
+ echo "$as_me:5562: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5569: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5565: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5572: \$? = $ac_status" >&5
+ echo "$as_me:5568: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_member_struct_stat_st_rdev=yes
else
@@ -5579,7 +5575,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:5582: result: $ac_cv_member_struct_stat_st_rdev" >&5
+echo "$as_me:5578: 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
@@ -5593,13 +5589,13 @@
fi
-echo "$as_me:5596: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "$as_me:5592: 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 5602 "configure"
+#line 5598 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
@@ -5613,16 +5609,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5616: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5612: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5619: \$? = $ac_status" >&5
+ echo "$as_me:5615: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5622: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5618: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5625: \$? = $ac_status" >&5
+ echo "$as_me:5621: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_struct_tm=time.h
else
@@ -5632,7 +5628,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:5635: result: $ac_cv_struct_tm" >&5
+echo "$as_me:5631: result: $ac_cv_struct_tm" >&5
echo "${ECHO_T}$ac_cv_struct_tm" >&6
if test $ac_cv_struct_tm = sys/time.h; then
@@ -5642,13 +5638,13 @@
fi
-echo "$as_me:5645: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:5641: checking whether time.h and sys/time.h may both be included" >&5
echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 5651 "configure"
+#line 5647 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -5664,16 +5660,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5667: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5663: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5670: \$? = $ac_status" >&5
+ echo "$as_me:5666: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5673: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5669: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5676: \$? = $ac_status" >&5
+ echo "$as_me:5672: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_header_time=yes
else
@@ -5683,7 +5679,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:5686: result: $ac_cv_header_time" >&5
+echo "$as_me:5682: result: $ac_cv_header_time" >&5
echo "${ECHO_T}$ac_cv_header_time" >&6
if test $ac_cv_header_time = yes; then
@@ -5693,14 +5689,14 @@
fi
-echo "$as_me:5696: checking if we can include select.h with time.h" >&5
+echo "$as_me:5692: 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 5703 "configure"
+#line 5699 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -5730,16 +5726,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5733: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5729: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5736: \$? = $ac_status" >&5
+ echo "$as_me:5732: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5739: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5735: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5742: \$? = $ac_status" >&5
+ echo "$as_me:5738: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_select_with_time=yes
else
@@ -5750,20 +5746,20 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:5753: result: $cf_cv_select_with_time" >&5
+echo "$as_me:5749: 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
-echo "$as_me:5759: checking if we may include sys/resource.h with sys/wait.h" >&5
+echo "$as_me:5755: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 5766 "configure"
+#line 5762 "configure"
#include "confdefs.h"
#if defined(HAVE_SYS_TIME_H) && (defined(SELECT_WITH_TIME) || !(defined(HAVE_SELECT_H || defined(HAVE_SYS_SELECT_H))))
@@ -5787,16 +5783,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5790: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5786: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5793: \$? = $ac_status" >&5
+ echo "$as_me:5789: \$? = $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:5792: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5799: \$? = $ac_status" >&5
+ echo "$as_me:5795: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_resource_with_wait=yes
else
@@ -5807,7 +5803,7 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:5810: result: $cf_cv_resource_with_wait" >&5
+echo "$as_me:5806: 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
@@ -5820,23 +5816,23 @@
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5823: checking for $ac_header" >&5
+echo "$as_me:5819: 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 5829 "configure"
+#line 5825 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:5833: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5829: \"$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:5839: \$? = $ac_status" >&5
+ echo "$as_me:5835: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5855,7 +5851,7 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:5858: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5854: 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 <<EOF
@@ -5870,23 +5866,23 @@
for ac_header in sys/termio.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5873: checking for $ac_header" >&5
+echo "$as_me:5869: 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 5879 "configure"
+#line 5875 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:5883: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5879: \"$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:5889: \$? = $ac_status" >&5
+ echo "$as_me:5885: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5905,7 +5901,7 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:5908: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5904: 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 <<EOF
@@ -5923,10 +5919,10 @@
*) termios_bad=maybe ;;
esac
if test "$termios_bad" = maybe ; then
- echo "$as_me:5926: checking whether termios.h needs _POSIX_SOURCE" >&5
+ echo "$as_me:5922: 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 5929 "configure"
+#line 5925 "configure"
#include "confdefs.h"
#include <termios.h>
int
@@ -5938,16 +5934,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5941: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5937: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5944: \$? = $ac_status" >&5
+ echo "$as_me:5940: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5947: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5943: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5950: \$? = $ac_status" >&5
+ echo "$as_me:5946: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
termios_bad=no
else
@@ -5955,7 +5951,7 @@
cat conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 5958 "configure"
+#line 5954 "configure"
#include "confdefs.h"
#define _POSIX_SOURCE
@@ -5969,16 +5965,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5972: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5968: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:5975: \$? = $ac_status" >&5
+ echo "$as_me:5971: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:5978: \"$ac_try\"") >&5
+ { (eval echo "$as_me:5974: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:5981: \$? = $ac_status" >&5
+ echo "$as_me:5977: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
termios_bad=unknown
else
@@ -5993,12 +5989,12 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:5996: result: $termios_bad" >&5
+ echo "$as_me:5992: result: $termios_bad" >&5
echo "${ECHO_T}$termios_bad" >&6
fi
fi
-echo "$as_me:6001: checking declaration of size-change" >&5
+echo "$as_me:5997: 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
@@ -6013,7 +6009,7 @@
CPPFLAGS="$cf_save_CPPFLAGS"
test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
cat >conftest.$ac_ext <<_ACEOF
-#line 6016 "configure"
+#line 6012 "configure"
#include "confdefs.h"
#include <sys/types.h>
#ifdef HAVE_TERMIOS_H
@@ -6057,16 +6053,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6060: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6056: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6063: \$? = $ac_status" >&5
+ echo "$as_me:6059: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6066: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6062: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6069: \$? = $ac_status" >&5
+ echo "$as_me:6065: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_sizechange=yes
else
@@ -6085,7 +6081,7 @@
done
fi
-echo "$as_me:6088: result: $cf_cv_sizechange" >&5
+echo "$as_me:6084: result: $cf_cv_sizechange" >&5
echo "${ECHO_T}$cf_cv_sizechange" >&6
if test "$cf_cv_sizechange" != no ; then
cat >>confdefs.h <<\EOF
@@ -6102,7 +6098,7 @@
esac
fi
-echo "$as_me:6105: checking for file-pointer ready definition" >&5
+echo "$as_me:6101: 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
@@ -6116,7 +6112,7 @@
echo "test-compile $definition" 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 6119 "configure"
+#line 6115 "configure"
#include "confdefs.h"
#include <stdio.h>
@@ -6131,16 +6127,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6134: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6130: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6137: \$? = $ac_status" >&5
+ echo "$as_me:6133: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6140: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6136: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6143: \$? = $ac_status" >&5
+ echo "$as_me:6139: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
echo "$definition" >conftest.env
break
@@ -6164,21 +6160,21 @@
test -f conftest.env && cf_cv_fp_isready=`cat conftest.env`
fi
-echo "$as_me:6167: result: $cf_cv_fp_isready" >&5
+echo "$as_me:6163: result: $cf_cv_fp_isready" >&5
echo "${ECHO_T}$cf_cv_fp_isready" >&6
test "$cf_cv_fp_isready" != none && cat >>confdefs.h <<EOF
#define isready_c(p) $cf_cv_fp_isready
EOF
-echo "$as_me:6174: checking for <wctype.h> and functions" >&5
+echo "$as_me:6170: checking for <wctype.h> and functions" >&5
echo $ECHO_N "checking for <wctype.h> 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 6181 "configure"
+#line 6177 "configure"
#include "confdefs.h"
#include <wctype.h>
@@ -6205,16 +6201,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6208: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6204: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6211: \$? = $ac_status" >&5
+ echo "$as_me:6207: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6214: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6210: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6217: \$? = $ac_status" >&5
+ echo "$as_me:6213: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_wctype=yes
else
@@ -6225,10 +6221,10 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:6228: result: $cf_cv_have_wctype" >&5
+echo "$as_me:6224: 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:6231: checking for library containing wctype" >&5
+ echo "$as_me:6227: 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
@@ -6236,7 +6232,7 @@
ac_func_search_save_LIBS=$LIBS
ac_cv_search_wctype=no
cat >conftest.$ac_ext <<_ACEOF
-#line 6239 "configure"
+#line 6235 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -6255,16 +6251,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6258: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6254: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6261: \$? = $ac_status" >&5
+ echo "$as_me:6257: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6264: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6260: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6267: \$? = $ac_status" >&5
+ echo "$as_me:6263: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_search_wctype="none required"
else
@@ -6276,7 +6272,7 @@
for ac_lib in w; do
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 6279 "configure"
+#line 6275 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -6295,16 +6291,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6298: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6294: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6301: \$? = $ac_status" >&5
+ echo "$as_me:6297: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6304: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6300: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6307: \$? = $ac_status" >&5
+ echo "$as_me:6303: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_search_wctype="-l$ac_lib"
break
@@ -6317,7 +6313,7 @@
fi
LIBS=$ac_func_search_save_LIBS
fi
-echo "$as_me:6320: result: $ac_cv_search_wctype" >&5
+echo "$as_me:6316: 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"
@@ -6330,7 +6326,7 @@
fi
### checks for system services and user specified options
-echo "$as_me:6333: checking for long file names" >&5
+echo "$as_me:6329: 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
@@ -6369,7 +6365,7 @@
rm -rf $ac_xdir 2>/dev/null
done
fi
-echo "$as_me:6372: result: $ac_cv_sys_long_file_names" >&5
+echo "$as_me:6368: 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
@@ -6379,7 +6375,7 @@
fi
-echo "$as_me:6382: checking for restartable reads on pipes" >&5
+echo "$as_me:6378: 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
@@ -6389,7 +6385,7 @@
cf_cv_can_restart_read=unknown
else
cat >conftest.$ac_ext <<_ACEOF
-#line 6392 "configure"
+#line 6388 "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
@@ -6426,25 +6422,25 @@
sleep (2);
write(fd[1],"done",4);
close(fd[1]);
- exit (0);
+ ${cf_cv_main_return-return} (0);
}
sigwrapper (SIGINT, ucatch);
status = read(fd[0], buff, sizeof(buff));
wait (&i);
- exit (status == -1);
+ ${cf_cv_main_return-return} (status == -1);
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6439: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6435: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6442: \$? = $ac_status" >&5
+ echo "$as_me:6438: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:6444: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6440: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6447: \$? = $ac_status" >&5
+ echo "$as_me:6443: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_can_restart_read=yes
else
@@ -6457,7 +6453,7 @@
fi
fi
-echo "$as_me:6460: result: $cf_cv_can_restart_read" >&5
+echo "$as_me:6456: 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
@@ -6466,18 +6462,18 @@
# is a read() of a pipe restartable?
-echo "$as_me:6469: checking whether setpgrp takes no argument" >&5
+echo "$as_me:6465: 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
if test "$cross_compiling" = yes; then
- { { echo "$as_me:6475: error: cannot check setpgrp if cross compiling" >&5
+ { { echo "$as_me:6471: 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 6480 "configure"
+#line 6476 "configure"
#include "confdefs.h"
#if HAVE_UNISTD_H
# include <unistd.h>
@@ -6488,21 +6484,21 @@
{
/* If this system has a BSD-style setpgrp, which takes arguments, exit
successfully. */
- $ac_main_return (setpgrp (1,1) == -1);
+ exit (setpgrp (1,1) == -1);
;
return 0;
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6497: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6493: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6500: \$? = $ac_status" >&5
+ echo "$as_me:6496: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:6502: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6498: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6505: \$? = $ac_status" >&5
+ echo "$as_me:6501: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_setpgrp_void=no
else
@@ -6514,7 +6510,7 @@
rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-echo "$as_me:6517: result: $ac_cv_func_setpgrp_void" >&5
+echo "$as_me:6513: 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
@@ -6524,14 +6520,14 @@
fi
-echo "$as_me:6527: checking whether getpgrp takes no argument" >&5
+echo "$as_me:6523: 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
# Use it with a single arg.
cat >conftest.$ac_ext <<_ACEOF
-#line 6534 "configure"
+#line 6530 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -6543,16 +6539,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6546: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6542: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6549: \$? = $ac_status" >&5
+ echo "$as_me:6545: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6552: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6548: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6555: \$? = $ac_status" >&5
+ echo "$as_me:6551: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_func_getpgrp_1=yes
else
@@ -6563,7 +6559,7 @@
rm -f conftest.$ac_objext conftest.$ac_ext
# Use it with no arg.
cat >conftest.$ac_ext <<_ACEOF
-#line 6566 "configure"
+#line 6562 "configure"
#include "confdefs.h"
$ac_includes_default
int
@@ -6575,16 +6571,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6578: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6574: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6581: \$? = $ac_status" >&5
+ echo "$as_me:6577: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6584: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6580: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6587: \$? = $ac_status" >&5
+ echo "$as_me:6583: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_func_getpgrp_0=yes
else
@@ -6598,12 +6594,12 @@
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:6601: error: cannot check getpgrp if cross compiling" >&5
+ { { echo "$as_me:6597: error: cannot check getpgrp if cross compiling" >&5
echo "$as_me: error: cannot check getpgrp if cross compiling" >&2;}
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-#line 6606 "configure"
+#line 6602 "configure"
#include "confdefs.h"
$ac_includes_default
@@ -6630,11 +6626,11 @@
/* 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)
- $ac_main_return (0);
+ exit (0);
child = fork ();
if (child < 0)
- $ac_main_return(1);
+ exit(1);
else if (child == 0)
{
np = getpid ();
@@ -6644,28 +6640,28 @@
setpgrp (np, pg1);
ng = getpgrp (0); /* Same result for Sys V and BSD */
if (ng == pg1)
- $ac_main_return (1);
+ exit (1);
else
- $ac_main_return (0);
+ exit (0);
}
else
{
wait (&s);
- $ac_main_return (s>>8);
+ exit (s>>8);
}
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6660: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6656: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6663: \$? = $ac_status" >&5
+ echo "$as_me:6659: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:6665: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6661: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6668: \$? = $ac_status" >&5
+ echo "$as_me:6664: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_getpgrp_void=yes
else
@@ -6679,7 +6675,7 @@
esac # $ac_func_getpgrp_0:$ac_func_getpgrp_1
fi
-echo "$as_me:6682: result: $ac_cv_func_getpgrp_void" >&5
+echo "$as_me:6678: 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
@@ -6689,7 +6685,7 @@
fi
-echo "$as_me:6692: checking if killpg is needed" >&5
+echo "$as_me:6688: 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
@@ -6699,7 +6695,7 @@
cf_cv_need_killpg=unknown
else
cat >conftest.$ac_ext <<_ACEOF
-#line 6702 "configure"
+#line 6698 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -6720,19 +6716,19 @@
#endif
(void) signal(SIGINT, handler);
(void) kill(-getpid(), SIGINT);
- exit(1);
+ ${cf_cv_main_return-return}(1);
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6727: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6723: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6730: \$? = $ac_status" >&5
+ echo "$as_me:6726: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:6732: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6728: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6735: \$? = $ac_status" >&5
+ echo "$as_me:6731: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_need_killpg=no
else
@@ -6745,21 +6741,21 @@
fi
fi
-echo "$as_me:6748: result: $cf_cv_need_killpg" >&5
+echo "$as_me:6744: 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:6755: checking if external errno is declared" >&5
+echo "$as_me:6751: 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 6762 "configure"
+#line 6758 "configure"
#include "confdefs.h"
#ifdef HAVE_STDLIB_H
@@ -6777,16 +6773,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6780: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6776: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6783: \$? = $ac_status" >&5
+ echo "$as_me:6779: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6786: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6782: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6789: \$? = $ac_status" >&5
+ echo "$as_me:6785: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_dcl_errno=yes
else
@@ -6797,7 +6793,7 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:6800: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:6796: result: $cf_cv_dcl_errno" >&5
echo "${ECHO_T}$cf_cv_dcl_errno" >&6
if test "$cf_cv_dcl_errno" = no ; then
@@ -6812,14 +6808,14 @@
# It's possible (for near-UNIX clones) that the data doesn't exist
-echo "$as_me:6815: checking if external errno exists" >&5
+echo "$as_me:6811: checking if external errno exists" >&5
echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
if test "${cf_cv_have_errno+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 6822 "configure"
+#line 6818 "configure"
#include "confdefs.h"
#undef errno
@@ -6834,16 +6830,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6837: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6833: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6840: \$? = $ac_status" >&5
+ echo "$as_me:6836: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6843: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6839: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6846: \$? = $ac_status" >&5
+ echo "$as_me:6842: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_errno=yes
else
@@ -6854,7 +6850,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:6857: result: $cf_cv_have_errno" >&5
+echo "$as_me:6853: result: $cf_cv_have_errno" >&5
echo "${ECHO_T}$cf_cv_have_errno" >&6
if test "$cf_cv_have_errno" = yes ; then
@@ -6867,14 +6863,14 @@
fi
-echo "$as_me:6870: checking if external sys_nerr is declared" >&5
+echo "$as_me:6866: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 6877 "configure"
+#line 6873 "configure"
#include "confdefs.h"
#ifdef HAVE_STDLIB_H
@@ -6892,16 +6888,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6895: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6891: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:6898: \$? = $ac_status" >&5
+ echo "$as_me:6894: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:6901: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6897: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6904: \$? = $ac_status" >&5
+ echo "$as_me:6900: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_dcl_sys_nerr=yes
else
@@ -6912,7 +6908,7 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:6915: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:6911: 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
@@ -6927,14 +6923,14 @@
# It's possible (for near-UNIX clones) that the data doesn't exist
-echo "$as_me:6930: checking if external sys_nerr exists" >&5
+echo "$as_me:6926: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 6937 "configure"
+#line 6933 "configure"
#include "confdefs.h"
#undef sys_nerr
@@ -6949,16 +6945,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6952: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6948: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:6955: \$? = $ac_status" >&5
+ echo "$as_me:6951: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:6958: \"$ac_try\"") >&5
+ { (eval echo "$as_me:6954: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:6961: \$? = $ac_status" >&5
+ echo "$as_me:6957: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_sys_nerr=yes
else
@@ -6969,7 +6965,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:6972: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:6968: 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
@@ -6982,14 +6978,14 @@
fi
-echo "$as_me:6985: checking if external sys_errlist is declared" >&5
+echo "$as_me:6981: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 6992 "configure"
+#line 6988 "configure"
#include "confdefs.h"
#ifdef HAVE_STDLIB_H
@@ -7007,16 +7003,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7010: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7006: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:7013: \$? = $ac_status" >&5
+ echo "$as_me:7009: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:7016: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7012: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7019: \$? = $ac_status" >&5
+ echo "$as_me:7015: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_dcl_sys_errlist=yes
else
@@ -7027,7 +7023,7 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:7030: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:7026: 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
@@ -7042,14 +7038,14 @@
# It's possible (for near-UNIX clones) that the data doesn't exist
-echo "$as_me:7045: checking if external sys_errlist exists" >&5
+echo "$as_me:7041: 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
cat >conftest.$ac_ext <<_ACEOF
-#line 7052 "configure"
+#line 7048 "configure"
#include "confdefs.h"
#undef sys_errlist
@@ -7064,16 +7060,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7067: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7063: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7070: \$? = $ac_status" >&5
+ echo "$as_me:7066: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7073: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7069: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7076: \$? = $ac_status" >&5
+ echo "$as_me:7072: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_have_sys_errlist=yes
else
@@ -7084,7 +7080,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:7087: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:7083: 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
@@ -7110,7 +7106,7 @@
#define os_chosen 1
EOF
-echo "$as_me:7113: checking for screen type" >&5
+echo "$as_me:7109: checking for screen type" >&5
echo $ECHO_N "checking for screen type... $ECHO_C" >&6
# Check whether --with-screen or --without-screen was given.
@@ -7131,14 +7127,14 @@
if test -z "$screen"; then
screen=termcap;
fi
-echo "$as_me:7134: result: $screen" >&5
+echo "$as_me:7130: 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:7141: checking for X" >&5
+ echo "$as_me:7137: checking for X" >&5
echo $ECHO_N "checking for X... $ECHO_C" >&6
# Check whether --with-x or --without-x was given.
@@ -7235,17 +7231,17 @@
# 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 7238 "configure"
+#line 7234 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
_ACEOF
-if { (eval echo "$as_me:7242: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7238: \"$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:7248: \$? = $ac_status" >&5
+ echo "$as_me:7244: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7278,7 +7274,7 @@
ac_save_LIBS=$LIBS
LIBS="-lXt $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 7281 "configure"
+#line 7277 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
int
@@ -7290,16 +7286,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7289: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7296: \$? = $ac_status" >&5
+ echo "$as_me:7292: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7299: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7295: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7302: \$? = $ac_status" >&5
+ echo "$as_me:7298: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
LIBS=$ac_save_LIBS
# We can link X programs with no special library path.
@@ -7337,7 +7333,7 @@
fi # $with_x != no
if test "$have_x" != yes; then
- echo "$as_me:7340: result: $have_x" >&5
+ echo "$as_me:7336: result: $have_x" >&5
echo "${ECHO_T}$have_x" >&6
no_x=yes
else
@@ -7347,7 +7343,7 @@
# 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:7350: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "$as_me:7346: result: libraries $x_libraries, headers $x_includes" >&5
echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
fi
@@ -7371,11 +7367,11 @@
# others require no space. Words are not sufficient . . . .
case `(uname -sr) 2>/dev/null` in
"SunOS 5"*)
- echo "$as_me:7374: checking whether -R must be followed by a space" >&5
+ echo "$as_me:7370: 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 7378 "configure"
+#line 7374 "configure"
#include "confdefs.h"
int
@@ -7387,16 +7383,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7390: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7386: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7393: \$? = $ac_status" >&5
+ echo "$as_me:7389: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7396: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7392: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7399: \$? = $ac_status" >&5
+ echo "$as_me:7395: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_R_nospace=yes
else
@@ -7406,13 +7402,13 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test $ac_R_nospace = yes; then
- echo "$as_me:7409: result: no" >&5
+ echo "$as_me:7405: 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 7415 "configure"
+#line 7411 "configure"
#include "confdefs.h"
int
@@ -7424,16 +7420,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7427: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7423: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7430: \$? = $ac_status" >&5
+ echo "$as_me:7426: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7433: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7429: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7436: \$? = $ac_status" >&5
+ echo "$as_me:7432: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_R_space=yes
else
@@ -7443,11 +7439,11 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test $ac_R_space = yes; then
- echo "$as_me:7446: result: yes" >&5
+ echo "$as_me:7442: result: yes" >&5
echo "${ECHO_T}yes" >&6
X_LIBS="$X_LIBS -R $x_libraries"
else
- echo "$as_me:7450: result: neither works" >&5
+ echo "$as_me:7446: result: neither works" >&5
echo "${ECHO_T}neither works" >&6
fi
fi
@@ -7467,7 +7463,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 7470 "configure"
+#line 7466 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -7486,22 +7482,22 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7485: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7492: \$? = $ac_status" >&5
+ echo "$as_me:7488: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7495: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7491: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7498: \$? = $ac_status" >&5
+ echo "$as_me:7494: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:7504: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:7500: 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
@@ -7509,7 +7505,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 7512 "configure"
+#line 7508 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -7528,16 +7524,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7531: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7527: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7534: \$? = $ac_status" >&5
+ echo "$as_me:7530: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7537: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7533: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7540: \$? = $ac_status" >&5
+ echo "$as_me:7536: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dnet_dnet_ntoa=yes
else
@@ -7548,14 +7544,14 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:7551: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:7547: 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:7558: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo "$as_me:7554: 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
@@ -7563,7 +7559,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet_stub $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 7566 "configure"
+#line 7562 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -7582,16 +7578,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7585: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7581: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7588: \$? = $ac_status" >&5
+ echo "$as_me:7584: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7591: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7587: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7594: \$? = $ac_status" >&5
+ echo "$as_me:7590: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dnet_stub_dnet_ntoa=yes
else
@@ -7602,7 +7598,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:7605: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:7601: 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"
@@ -7621,13 +7617,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:7624: checking for gethostbyname" >&5
+ echo "$as_me:7620: 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 7630 "configure"
+#line 7626 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname (); below. */
@@ -7658,16 +7654,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7661: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7657: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7664: \$? = $ac_status" >&5
+ echo "$as_me:7660: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7667: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7663: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7670: \$? = $ac_status" >&5
+ echo "$as_me:7666: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_gethostbyname=yes
else
@@ -7677,11 +7673,11 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:7680: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:7676: 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:7684: checking for gethostbyname in -lnsl" >&5
+ echo "$as_me:7680: 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
@@ -7689,7 +7685,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lnsl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 7692 "configure"
+#line 7688 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -7708,16 +7704,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7711: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7707: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7714: \$? = $ac_status" >&5
+ echo "$as_me:7710: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7717: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7713: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7720: \$? = $ac_status" >&5
+ echo "$as_me:7716: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_nsl_gethostbyname=yes
else
@@ -7728,14 +7724,14 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:7731: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:7727: 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:7738: checking for gethostbyname in -lbsd" >&5
+ echo "$as_me:7734: 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
@@ -7743,7 +7739,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lbsd $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 7746 "configure"
+#line 7742 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -7762,16 +7758,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7765: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7761: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7768: \$? = $ac_status" >&5
+ echo "$as_me:7764: \$? = $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:7767: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7774: \$? = $ac_status" >&5
+ echo "$as_me:7770: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_bsd_gethostbyname=yes
else
@@ -7782,7 +7778,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_bsd_gethostbyname" >&5
+echo "$as_me:7781: 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"
@@ -7798,13 +7794,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:7801: checking for connect" >&5
+ echo "$as_me:7797: 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 7807 "configure"
+#line 7803 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect (); below. */
@@ -7835,16 +7831,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7838: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7834: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7841: \$? = $ac_status" >&5
+ echo "$as_me:7837: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7844: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7840: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7847: \$? = $ac_status" >&5
+ echo "$as_me:7843: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_connect=yes
else
@@ -7854,11 +7850,11 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:7857: result: $ac_cv_func_connect" >&5
+echo "$as_me:7853: 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:7861: checking for connect in -lsocket" >&5
+ echo "$as_me:7857: 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
@@ -7866,7 +7862,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 7869 "configure"
+#line 7865 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -7885,16 +7881,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7888: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7884: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7891: \$? = $ac_status" >&5
+ echo "$as_me:7887: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7894: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7890: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7897: \$? = $ac_status" >&5
+ echo "$as_me:7893: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_socket_connect=yes
else
@@ -7905,7 +7901,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:7908: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:7904: 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"
@@ -7914,13 +7910,13 @@
fi
# Guillermo Gomez says -lposix is necessary on A/UX.
- echo "$as_me:7917: checking for remove" >&5
+ echo "$as_me:7913: 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 7923 "configure"
+#line 7919 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove (); below. */
@@ -7951,16 +7947,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7954: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7950: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:7957: \$? = $ac_status" >&5
+ echo "$as_me:7953: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:7960: \"$ac_try\"") >&5
+ { (eval echo "$as_me:7956: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:7963: \$? = $ac_status" >&5
+ echo "$as_me:7959: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_remove=yes
else
@@ -7970,11 +7966,11 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:7973: result: $ac_cv_func_remove" >&5
+echo "$as_me:7969: 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:7977: checking for remove in -lposix" >&5
+ echo "$as_me:7973: 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
@@ -7982,7 +7978,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lposix $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 7985 "configure"
+#line 7981 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -8001,16 +7997,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8004: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8000: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8007: \$? = $ac_status" >&5
+ echo "$as_me:8003: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8010: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8006: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8013: \$? = $ac_status" >&5
+ echo "$as_me:8009: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_posix_remove=yes
else
@@ -8021,7 +8017,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:8024: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:8020: 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"
@@ -8030,13 +8026,13 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
- echo "$as_me:8033: checking for shmat" >&5
+ echo "$as_me:8029: 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 8039 "configure"
+#line 8035 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat (); below. */
@@ -8067,16 +8063,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8070: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8066: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8073: \$? = $ac_status" >&5
+ echo "$as_me:8069: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8076: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8072: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8079: \$? = $ac_status" >&5
+ echo "$as_me:8075: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_shmat=yes
else
@@ -8086,11 +8082,11 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:8089: result: $ac_cv_func_shmat" >&5
+echo "$as_me:8085: 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:8093: checking for shmat in -lipc" >&5
+ echo "$as_me:8089: 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
@@ -8098,7 +8094,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lipc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 8101 "configure"
+#line 8097 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -8117,16 +8113,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8120: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8116: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8123: \$? = $ac_status" >&5
+ echo "$as_me:8119: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8126: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8122: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8129: \$? = $ac_status" >&5
+ echo "$as_me:8125: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_ipc_shmat=yes
else
@@ -8137,7 +8133,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:8140: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:8136: 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"
@@ -8155,7 +8151,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:8158: checking for IceConnectionNumber in -lICE" >&5
+ echo "$as_me:8154: 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
@@ -8163,7 +8159,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 8166 "configure"
+#line 8162 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -8182,16 +8178,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8185: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8181: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8188: \$? = $ac_status" >&5
+ echo "$as_me:8184: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8191: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8187: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8194: \$? = $ac_status" >&5
+ echo "$as_me:8190: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_ICE_IceConnectionNumber=yes
else
@@ -8202,7 +8198,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:8205: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:8201: 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"
@@ -8296,7 +8292,7 @@
if test "$cf_check_cflags" != "$CFLAGS" ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 8299 "configure"
+#line 8295 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -8308,16 +8304,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8311: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8307: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8314: \$? = $ac_status" >&5
+ echo "$as_me:8310: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8317: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8313: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8320: \$? = $ac_status" >&5
+ echo "$as_me:8316: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -8334,13 +8330,13 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:8337: checking for XOpenDisplay" >&5
+echo "$as_me:8333: 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 8343 "configure"
+#line 8339 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char XOpenDisplay (); below. */
@@ -8371,16 +8367,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8374: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8370: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8377: \$? = $ac_status" >&5
+ echo "$as_me:8373: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8380: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8376: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8383: \$? = $ac_status" >&5
+ echo "$as_me:8379: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_XOpenDisplay=yes
else
@@ -8390,13 +8386,13 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:8393: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:8389: 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:8399: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:8395: 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
@@ -8404,7 +8400,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 8407 "configure"
+#line 8403 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -8423,16 +8419,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8426: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8422: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8429: \$? = $ac_status" >&5
+ echo "$as_me:8425: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8432: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8428: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8435: \$? = $ac_status" >&5
+ echo "$as_me:8431: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_X11_XOpenDisplay=yes
else
@@ -8443,7 +8439,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:8446: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:8442: 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"
@@ -8451,13 +8447,13 @@
fi
-echo "$as_me:8454: checking for XtAppInitialize" >&5
+echo "$as_me:8450: checking for XtAppInitialize" >&5
echo $ECHO_N "checking for XtAppInitialize... $ECHO_C" >&6
if test "${ac_cv_func_XtAppInitialize+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 8460 "configure"
+#line 8456 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char XtAppInitialize (); below. */
@@ -8488,16 +8484,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8491: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8487: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8494: \$? = $ac_status" >&5
+ echo "$as_me:8490: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8497: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8493: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8500: \$? = $ac_status" >&5
+ echo "$as_me:8496: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_XtAppInitialize=yes
else
@@ -8507,13 +8503,13 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:8510: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:8506: result: $ac_cv_func_XtAppInitialize" >&5
echo "${ECHO_T}$ac_cv_func_XtAppInitialize" >&6
if test $ac_cv_func_XtAppInitialize = yes; then
:
else
-echo "$as_me:8516: checking for XtAppInitialize in -lXt" >&5
+echo "$as_me:8512: 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
@@ -8521,7 +8517,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 8524 "configure"
+#line 8520 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -8540,16 +8536,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8543: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8539: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:8546: \$? = $ac_status" >&5
+ echo "$as_me:8542: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:8549: \"$ac_try\"") >&5
+ { (eval echo "$as_me:8545: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:8552: \$? = $ac_status" >&5
+ echo "$as_me:8548: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_Xt_XtAppInitialize=yes
else
@@ -8560,7 +8556,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:8563: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:8559: 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
@@ -8574,7 +8570,7 @@
fi
if test $cf_have_X_LIBS = no ; then
- { echo "$as_me:8577: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+ { echo "$as_me:8573: 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
@@ -8582,7 +8578,7 @@
to makefile." >&2;}
fi
-echo "$as_me:8585: checking if you want narrow prototypes for X libraries" >&5
+echo "$as_me:8581: checking if you want narrow prototypes for X libraries" >&5
echo $ECHO_N "checking if you want narrow prototypes for X libraries... $ECHO_C" >&6
case `$ac_config_guess` in #(vi
@@ -8608,10 +8604,10 @@
enable_narrowproto=$cf_default_narrowproto
fi;
-echo "$as_me:8611: result: $enable_narrowproto" >&5
+echo "$as_me:8607: result: $enable_narrowproto" >&5
echo "${ECHO_T}$enable_narrowproto" >&6
-echo "$as_me:8614: checking if we should use imake to help" >&5
+echo "$as_me:8610: checking if we should use imake to help" >&5
echo $ECHO_N "checking if we should use imake to help... $ECHO_C" >&6
# Check whether --enable-imake or --disable-imake was given.
@@ -8628,7 +8624,7 @@
enable_imake=yes
fi;
-echo "$as_me:8631: result: $enable_imake" >&5
+echo "$as_me:8627: result: $enable_imake" >&5
echo "${ECHO_T}$enable_imake" >&6
if test "$enable_imake" = yes ; then
@@ -8637,7 +8633,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:8640: checking for $ac_word" >&5
+echo "$as_me:8636: 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
@@ -8654,7 +8650,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:8657: found $ac_dir/$ac_word" >&5
+ echo "$as_me:8653: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -8665,10 +8661,10 @@
IMAKE=$ac_cv_path_IMAKE
if test -n "$IMAKE"; then
- echo "$as_me:8668: result: $IMAKE" >&5
+ echo "$as_me:8664: result: $IMAKE" >&5
echo "${ECHO_T}$IMAKE" >&6
else
- echo "$as_me:8671: result: no" >&5
+ echo "$as_me:8667: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -8699,11 +8695,14 @@
cat >fix_cflags.sed <<'CF_EOF'
s/\\//g
+s/[ ][ ]*/ /g
s/"//g
-s/\(-D[a-zA-Z0-9_][a-zA-Z0-9_]*\)=\([^\\'"0-9 ][^ ]*\([ ][ ]*[^- ][^ ]*\)*\)/\1='\\"\2\\"'/g
-s/\(-D[a-zA-Z0-9_][a-zA-Z0-9_]*\)=\([^\\'"0-9 ][^ ]*\)[ ]/\1='\\"\2\\"' /g
-s/\(-D[a-zA-Z0-9_][a-zA-Z0-9_]*\)=\([^\\'"0-9 ][^ ]*\)$/\1='\\"\2\\"'/g
-s/^IMAKE[ ]*/IMAKE_CFLAGS="/
+:pack
+s/\(=[^ ][^ ]*\) \([^-]\)/\1 \2/g
+t pack
+s/\(-D[a-zA-Z0-9_][a-zA-Z0-9_]*\)=\([^\'0-9 ][^ ]*\)/\1='\\"\2\\"'/g
+s/^IMAKE[ ]/IMAKE_CFLAGS="/
+s/ / /g
s/$/"/
CF_EOF
@@ -8741,7 +8740,7 @@
esac
done
if test -z "$cf_config" ; then
- { echo "$as_me:8744: WARNING: Could not find imake config-directory" >&5
+ { echo "$as_me:8743: 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"
@@ -8750,7 +8749,7 @@
test -n "$verbose" && echo " Using $IMAKE $cf_config" 1>&6
else
- { echo "$as_me:8753: WARNING: Cannot run $IMAKE" >&5
+ { echo "$as_me:8752: WARNING: Cannot run $IMAKE" >&5
echo "$as_me: WARNING: Cannot run $IMAKE" >&2;}
fi
fi
@@ -9087,7 +9086,7 @@
if test "$cf_check_cflags" != "$CFLAGS" ; then
cat >conftest.$ac_ext <<_ACEOF
-#line 9090 "configure"
+#line 9089 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -9099,16 +9098,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9102: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9101: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9105: \$? = $ac_status" >&5
+ echo "$as_me:9104: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9108: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9107: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9111: \$? = $ac_status" >&5
+ echo "$as_me:9110: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -9138,23 +9137,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:9141: checking for $ac_header" >&5
+echo "$as_me:9140: 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 9147 "configure"
+#line 9146 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:9151: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9150: \"$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:9157: \$? = $ac_status" >&5
+ echo "$as_me:9156: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9173,7 +9172,7 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:9176: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9175: 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 <<EOF
@@ -9199,7 +9198,7 @@
fi
LDFLAGS="$LDFLAGS $X_LIBS"
-echo "$as_me:9202: checking for XmuClientWindow in -lXmu" >&5
+echo "$as_me:9201: 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
@@ -9207,7 +9206,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXmu $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 9210 "configure"
+#line 9209 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -9226,16 +9225,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9229: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9228: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9232: \$? = $ac_status" >&5
+ echo "$as_me:9231: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9235: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9234: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9238: \$? = $ac_status" >&5
+ echo "$as_me:9237: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_Xmu_XmuClientWindow=yes
else
@@ -9246,7 +9245,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:9249: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5
+echo "$as_me:9248: 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 <<EOF
@@ -9257,7 +9256,7 @@
fi
-echo "$as_me:9260: checking for OlToolkitInitialize in -lXol" >&5
+echo "$as_me:9259: 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
@@ -9265,7 +9264,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXol $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 9268 "configure"
+#line 9267 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -9284,16 +9283,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9287: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9286: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9290: \$? = $ac_status" >&5
+ echo "$as_me:9289: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9293: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9292: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9296: \$? = $ac_status" >&5
+ echo "$as_me:9295: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_Xol_OlToolkitInitialize=yes
else
@@ -9304,12 +9303,12 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:9307: result: $ac_cv_lib_Xol_OlToolkitInitialize" >&5
+echo "$as_me:9306: 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:9312: error: Unable to successfully link OpenLook library (-lXol) with test program" >&5
+ { { echo "$as_me:9311: 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
@@ -9324,23 +9323,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:9327: checking for $ac_header" >&5
+echo "$as_me:9326: 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 9333 "configure"
+#line 9332 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:9337: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9336: \"$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:9343: \$? = $ac_status" >&5
+ echo "$as_me:9342: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9359,7 +9358,7 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:9362: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9361: 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 <<EOF
@@ -9369,7 +9368,7 @@
fi
done
-echo "$as_me:9372: checking for regcmp in -lgen" >&5
+echo "$as_me:9371: 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
@@ -9377,7 +9376,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgen $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 9380 "configure"
+#line 9379 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -9396,16 +9395,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9399: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9398: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9402: \$? = $ac_status" >&5
+ echo "$as_me:9401: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9405: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9404: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9408: \$? = $ac_status" >&5
+ echo "$as_me:9407: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_gen_regcmp=yes
else
@@ -9416,7 +9415,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:9419: result: $ac_cv_lib_gen_regcmp" >&5
+echo "$as_me:9418: 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 <<EOF
@@ -9427,7 +9426,7 @@
fi
-echo "$as_me:9430: checking for XmuClientWindow in -lXmu" >&5
+echo "$as_me:9429: 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
@@ -9435,7 +9434,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXmu $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 9438 "configure"
+#line 9437 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -9454,16 +9453,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9457: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9456: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9460: \$? = $ac_status" >&5
+ echo "$as_me:9459: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9463: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9462: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9466: \$? = $ac_status" >&5
+ echo "$as_me:9465: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_Xmu_XmuClientWindow=yes
else
@@ -9474,7 +9473,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:9477: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5
+echo "$as_me:9476: 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 <<EOF
@@ -9485,7 +9484,7 @@
fi
-echo "$as_me:9488: checking for XpStartDoc in -lXp" >&5
+echo "$as_me:9487: 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
@@ -9493,7 +9492,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXp $LIBS $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 9496 "configure"
+#line 9495 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -9512,16 +9511,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9515: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9514: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9518: \$? = $ac_status" >&5
+ echo "$as_me:9517: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9521: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9520: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9524: \$? = $ac_status" >&5
+ echo "$as_me:9523: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_Xp_XpStartDoc=yes
else
@@ -9532,7 +9531,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:9535: result: $ac_cv_lib_Xp_XpStartDoc" >&5
+echo "$as_me:9534: 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 <<EOF
@@ -9543,7 +9542,7 @@
fi
-echo "$as_me:9546: checking for XextCreateExtension in -lXext" >&5
+echo "$as_me:9545: 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
@@ -9551,7 +9550,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXext $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 9554 "configure"
+#line 9553 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -9570,16 +9569,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9573: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9572: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9576: \$? = $ac_status" >&5
+ echo "$as_me:9575: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9579: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9578: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9582: \$? = $ac_status" >&5
+ echo "$as_me:9581: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_Xext_XextCreateExtension=yes
else
@@ -9590,13 +9589,13 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:9593: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:9592: 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:9599: checking for XpmCreatePixmapFromXpmImage in -lXpm" >&5
+echo "$as_me:9598: 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
@@ -9604,7 +9603,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXpm $LIBS $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 9607 "configure"
+#line 9606 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -9623,16 +9622,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9626: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9625: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9629: \$? = $ac_status" >&5
+ echo "$as_me:9628: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9632: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9631: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9635: \$? = $ac_status" >&5
+ echo "$as_me:9634: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage=yes
else
@@ -9643,13 +9642,13 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:9646: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromXpmImage" >&5
+echo "$as_me:9645: 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:9652: checking for XmbTextListToTextProperty in -lXIM" >&5
+echo "$as_me:9651: 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
@@ -9657,7 +9656,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXIM $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 9660 "configure"
+#line 9659 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -9676,16 +9675,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9679: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9678: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9682: \$? = $ac_status" >&5
+ echo "$as_me:9681: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9685: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9684: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9688: \$? = $ac_status" >&5
+ echo "$as_me:9687: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_XIM_XmbTextListToTextProperty=yes
else
@@ -9696,7 +9695,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:9699: result: $ac_cv_lib_XIM_XmbTextListToTextProperty" >&5
+echo "$as_me:9698: 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 <<EOF
@@ -9706,7 +9705,7 @@
LIBS="-lXIM $LIBS"
fi
-echo "$as_me:9709: checking for XmProcessTraversal in -lXm" >&5
+echo "$as_me:9708: 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
@@ -9714,7 +9713,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXm $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 9717 "configure"
+#line 9716 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -9733,16 +9732,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9736: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9735: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9739: \$? = $ac_status" >&5
+ echo "$as_me:9738: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9742: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9741: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9745: \$? = $ac_status" >&5
+ echo "$as_me:9744: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_Xm_XmProcessTraversal=yes
else
@@ -9753,12 +9752,12 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:9756: result: $ac_cv_lib_Xm_XmProcessTraversal" >&5
+echo "$as_me:9755: 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:9761: error: Unable to successfully link Motif library (-lXm) with test program" >&5
+ { { echo "$as_me:9760: 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
@@ -9779,7 +9778,7 @@
cf_x_athena=${cf_x_athena-Xaw}
-echo "$as_me:9782: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:9781: 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=
@@ -9790,14 +9789,14 @@
fi;
if test "$withval" = yes ; then
cf_x_athena=Xaw3d
- echo "$as_me:9793: result: yes" >&5
+ echo "$as_me:9792: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
- echo "$as_me:9796: result: no" >&5
+ echo "$as_me:9795: result: no" >&5
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:9800: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:9799: 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=
@@ -9808,14 +9807,14 @@
fi;
if test "$withval" = yes ; then
cf_x_athena=neXtaw
- echo "$as_me:9811: result: yes" >&5
+ echo "$as_me:9810: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
- echo "$as_me:9814: result: no" >&5
+ echo "$as_me:9813: result: no" >&5
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:9818: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:9817: 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=
@@ -9826,14 +9825,14 @@
fi;
if test "$withval" = yes ; then
cf_x_athena=XawPlus
- echo "$as_me:9829: result: yes" >&5
+ echo "$as_me:9828: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
- echo "$as_me:9832: result: no" >&5
+ echo "$as_me:9831: result: no" >&5
echo "${ECHO_T}no" >&6
fi
-echo "$as_me:9836: checking for XextCreateExtension in -lXext" >&5
+echo "$as_me:9835: 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
@@ -9841,7 +9840,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXext $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 9844 "configure"
+#line 9843 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -9860,16 +9859,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9863: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9862: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:9866: \$? = $ac_status" >&5
+ echo "$as_me:9865: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:9869: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9868: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9872: \$? = $ac_status" >&5
+ echo "$as_me:9871: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_Xext_XextCreateExtension=yes
else
@@ -9880,7 +9879,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:9883: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:9882: 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"
@@ -9902,14 +9901,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:9905: checking for $cf_test in $cf_path" >&5
+ echo "$as_me:9904: 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:9908: checking for $cf_test" >&5
+ echo "$as_me:9907: checking for $cf_test" >&5
echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
fi
cat >conftest.$ac_ext <<_ACEOF
-#line 9912 "configure"
+#line 9911 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
@@ -9923,16 +9922,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9926: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9925: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:9929: \$? = $ac_status" >&5
+ echo "$as_me:9928: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:9932: \"$ac_try\"") >&5
+ { (eval echo "$as_me:9931: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:9935: \$? = $ac_status" >&5
+ echo "$as_me:9934: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -9941,7 +9940,7 @@
cf_result=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:9944: result: $cf_result" >&5
+ echo "$as_me:9943: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test "$cf_result" = yes ; then
cf_x_athena_include=$cf_path
@@ -9953,7 +9952,7 @@
done
if test -z "$cf_x_athena_include" ; then
- { echo "$as_me:9956: WARNING: Unable to successfully find Athena header files with test program" >&5
+ { echo "$as_me:9955: 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"
@@ -9978,15 +9977,15 @@
cf_test=XawSimpleMenuAddGlobalActions
if test $cf_path != default ; then
LIBS="-L$cf_path/lib $cf_lib $LIBS"
- echo "$as_me:9981: checking for $cf_lib in $cf_path" >&5
+ echo "$as_me:9980: 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:9985: checking for $cf_test in $cf_lib" >&5
+ echo "$as_me:9984: checking for $cf_test in $cf_lib" >&5
echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6
fi
cat >conftest.$ac_ext <<_ACEOF
-#line 9989 "configure"
+#line 9988 "configure"
#include "confdefs.h"
int
@@ -9998,16 +9997,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10001: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10000: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10004: \$? = $ac_status" >&5
+ echo "$as_me:10003: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10007: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10006: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10010: \$? = $ac_status" >&5
+ echo "$as_me:10009: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -10016,7 +10015,7 @@
cf_result=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:10019: result: $cf_result" >&5
+ echo "$as_me:10018: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test "$cf_result" = yes ; then
cf_x_athena_lib="$cf_lib"
@@ -10028,7 +10027,7 @@
done
if test -z "$cf_x_athena_lib" ; then
- { { echo "$as_me:10031: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+ { { echo "$as_me:10030: 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
@@ -10064,7 +10063,7 @@
#define DISP_CURSES 1
EOF
-echo "$as_me:10067: checking for extra include directories" >&5
+echo "$as_me:10066: 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
@@ -10084,11 +10083,11 @@
esac
fi
-echo "$as_me:10087: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:10086: 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:10091: checking if we have identified curses headers" >&5
+echo "$as_me:10090: 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
@@ -10102,7 +10101,7 @@
ncurses/ncurses.h
do
cat >conftest.$ac_ext <<_ACEOF
-#line 10105 "configure"
+#line 10104 "configure"
#include "confdefs.h"
#include <${cf_header}>
int
@@ -10114,16 +10113,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10117: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10116: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:10120: \$? = $ac_status" >&5
+ echo "$as_me:10119: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:10123: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10122: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10126: \$? = $ac_status" >&5
+ echo "$as_me:10125: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_header=$cf_header; break
else
@@ -10134,11 +10133,11 @@
done
fi
-echo "$as_me:10137: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:10136: 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:10141: error: No curses header-files found" >&5
+ { { echo "$as_me:10140: error: No curses header-files found" >&5
echo "$as_me: error: No curses header-files found" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -10148,23 +10147,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:10151: checking for $ac_header" >&5
+echo "$as_me:10150: 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 10157 "configure"
+#line 10156 "configure"
#include "confdefs.h"
#include <$ac_header>
_ACEOF
-if { (eval echo "$as_me:10161: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10160: \"$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:10167: \$? = $ac_status" >&5
+ echo "$as_me:10166: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10183,7 +10182,7 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:10186: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:10185: 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 <<EOF
@@ -10193,7 +10192,7 @@
fi
done
-echo "$as_me:10196: checking for terminfo header" >&5
+echo "$as_me:10195: checking for terminfo header" >&5
echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
if test "${cf_cv_term_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10211,7 +10210,7 @@
for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
do
cat >conftest.$ac_ext <<_ACEOF
-#line 10214 "configure"
+#line 10213 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <${cf_cv_ncurses_header-curses.h}>
@@ -10226,16 +10225,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10229: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10228: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:10232: \$? = $ac_status" >&5
+ echo "$as_me:10231: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:10235: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10234: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10238: \$? = $ac_status" >&5
+ echo "$as_me:10237: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_term_header="$cf_test"
@@ -10251,7 +10250,7 @@
done
fi
-echo "$as_me:10254: result: $cf_cv_term_header" >&5
+echo "$as_me:10253: result: $cf_cv_term_header" >&5
echo "${ECHO_T}$cf_cv_term_header" >&6
# Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -10280,7 +10279,7 @@
;;
esac
-echo "$as_me:10283: checking for ncurses version" >&5
+echo "$as_me:10282: 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
@@ -10306,10 +10305,10 @@
#endif
EOF
cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
- { (eval echo "$as_me:10309: \"$cf_try\"") >&5
+ { (eval echo "$as_me:10308: \"$cf_try\"") >&5
(eval $cf_try) 2>&5
ac_status=$?
- echo "$as_me:10312: \$? = $ac_status" >&5
+ echo "$as_me:10311: \$? = $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%".*%%'`
@@ -10319,7 +10318,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-#line 10322 "configure"
+#line 10321 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
@@ -10340,19 +10339,19 @@
make an error
# endif
#endif
- exit(0);
+ ${cf_cv_main_return-return}(0);
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10347: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10346: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10350: \$? = $ac_status" >&5
+ echo "$as_me:10349: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:10352: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10351: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10355: \$? = $ac_status" >&5
+ echo "$as_me:10354: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -10366,16 +10365,16 @@
rm -f $cf_tempfile
fi
-echo "$as_me:10369: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:10368: 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:10375: checking if we have identified curses libraries" >&5
+echo "$as_me:10374: 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 10378 "configure"
+#line 10377 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
int
@@ -10387,16 +10386,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10390: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10389: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10393: \$? = $ac_status" >&5
+ echo "$as_me:10392: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10396: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10395: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10399: \$? = $ac_status" >&5
+ echo "$as_me:10398: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -10405,13 +10404,13 @@
cf_result=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:10408: result: $cf_result" >&5
+echo "$as_me:10407: 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:10414: checking for tgoto in -lmytinfo" >&5
+ echo "$as_me:10413: 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
@@ -10419,7 +10418,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lmytinfo $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10422 "configure"
+#line 10421 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -10438,16 +10437,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10441: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10440: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10444: \$? = $ac_status" >&5
+ echo "$as_me:10443: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10447: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10446: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10450: \$? = $ac_status" >&5
+ echo "$as_me:10449: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_mytinfo_tgoto=yes
else
@@ -10458,7 +10457,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10461: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:10460: 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"
@@ -10466,7 +10465,7 @@
;;
hpux10.*) #(vi
- echo "$as_me:10469: checking for initscr in -lcur_colr" >&5
+ echo "$as_me:10468: 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
@@ -10474,7 +10473,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcur_colr $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10477 "configure"
+#line 10476 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -10493,16 +10492,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10496: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10495: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10499: \$? = $ac_status" >&5
+ echo "$as_me:10498: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10502: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10501: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10505: \$? = $ac_status" >&5
+ echo "$as_me:10504: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_cur_colr_initscr=yes
else
@@ -10513,7 +10512,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10516: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:10515: 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
@@ -10522,7 +10521,7 @@
else
- echo "$as_me:10525: checking for initscr in -lHcurses" >&5
+ echo "$as_me:10524: 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
@@ -10530,7 +10529,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lHcurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10533 "configure"
+#line 10532 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -10549,16 +10548,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10552: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10551: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10555: \$? = $ac_status" >&5
+ echo "$as_me:10554: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10558: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10557: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10561: \$? = $ac_status" >&5
+ echo "$as_me:10560: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_Hcurses_initscr=yes
else
@@ -10569,7 +10568,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10572: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:10571: 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
@@ -10607,13 +10606,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:10610: checking for tgoto" >&5
+ echo "$as_me:10609: 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 10616 "configure"
+#line 10615 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char tgoto (); below. */
@@ -10644,16 +10643,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10647: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10646: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10650: \$? = $ac_status" >&5
+ echo "$as_me:10649: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10653: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10652: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10656: \$? = $ac_status" >&5
+ echo "$as_me:10655: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_tgoto=yes
else
@@ -10663,7 +10662,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:10666: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:10665: 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
@@ -10672,7 +10671,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:10675: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:10674: 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
@@ -10680,7 +10679,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-l$cf_term_lib $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10683 "configure"
+#line 10682 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -10699,16 +10698,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10702: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10701: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10705: \$? = $ac_status" >&5
+ echo "$as_me:10704: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10708: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10707: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10711: \$? = $ac_status" >&5
+ echo "$as_me:10710: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Lib=yes"
else
@@ -10719,7 +10718,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10722: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:10721: 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
@@ -10734,7 +10733,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:10737: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:10736: 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
@@ -10742,7 +10741,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-l$cf_curs_lib $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10745 "configure"
+#line 10744 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -10761,16 +10760,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10764: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10763: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10767: \$? = $ac_status" >&5
+ echo "$as_me:10766: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10770: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10769: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10773: \$? = $ac_status" >&5
+ echo "$as_me:10772: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_Lib=yes"
else
@@ -10781,23 +10780,23 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:10784: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:10783: 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:10791: error: no curses library found" >&5
+ test $cf_curs_lib = unknown && { { echo "$as_me:10790: 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:10797: checking if we can link with $cf_curs_lib library" >&5
+ echo "$as_me:10796: 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 10800 "configure"
+#line 10799 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
int
@@ -10809,16 +10808,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10812: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10811: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10815: \$? = $ac_status" >&5
+ echo "$as_me:10814: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10818: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10817: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10821: \$? = $ac_status" >&5
+ echo "$as_me:10820: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -10827,18 +10826,18 @@
cf_result=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:10830: result: $cf_result" >&5
+ echo "$as_me:10829: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
- test $cf_result = no && { { echo "$as_me:10832: error: Cannot link curses library" >&5
+ test $cf_result = no && { { echo "$as_me:10831: 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:10838: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+ echo "$as_me:10837: 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 10841 "configure"
+#line 10840 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
int
@@ -10850,16 +10849,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10853: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10852: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10856: \$? = $ac_status" >&5
+ echo "$as_me:10855: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10859: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10858: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10862: \$? = $ac_status" >&5
+ echo "$as_me:10861: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=no
else
@@ -10868,7 +10867,7 @@
LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 10871 "configure"
+#line 10870 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
int
@@ -10880,16 +10879,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10883: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10882: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:10886: \$? = $ac_status" >&5
+ echo "$as_me:10885: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:10889: \"$ac_try\"") >&5
+ { (eval echo "$as_me:10888: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:10892: \$? = $ac_status" >&5
+ echo "$as_me:10891: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -10901,7 +10900,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:10904: result: $cf_result" >&5
+ echo "$as_me:10903: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
fi
fi
@@ -10944,7 +10943,7 @@
withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
;;
*)
- { { echo "$as_me:10947: error: expected a pathname, not \"$withval\"" >&5
+ { { echo "$as_me:10946: error: expected a pathname, not \"$withval\"" >&5
echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
{ (exit 1); exit 1; }; }
;;
@@ -10962,7 +10961,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:10965: checking for $ac_word" >&5
+echo "$as_me:10964: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10979,7 +10978,7 @@
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word"
- echo "$as_me:10982: found $ac_dir/$ac_word" >&5
+ echo "$as_me:10981: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -10990,10 +10989,10 @@
NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
if test -n "$NCURSES_CONFIG"; then
- echo "$as_me:10993: result: $NCURSES_CONFIG" >&5
+ echo "$as_me:10992: result: $NCURSES_CONFIG" >&5
echo "${ECHO_T}$NCURSES_CONFIG" >&6
else
- echo "$as_me:10996: result: no" >&5
+ echo "$as_me:10995: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -11028,7 +11027,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:11031: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:11030: 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
@@ -11040,7 +11039,7 @@
do
cat >conftest.$ac_ext <<_ACEOF
-#line 11043 "configure"
+#line 11042 "configure"
#include "confdefs.h"
#include <$cf_header>
@@ -11064,16 +11063,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11067: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11066: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11070: \$? = $ac_status" >&5
+ echo "$as_me:11069: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11073: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11072: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11076: \$? = $ac_status" >&5
+ echo "$as_me:11075: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_h=$cf_header
@@ -11088,14 +11087,14 @@
done
fi
-echo "$as_me:11091: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:11090: 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:11098: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:11097: 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
@@ -11190,7 +11189,7 @@
cf_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 11193 "configure"
+#line 11192 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -11202,16 +11201,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11205: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11204: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11208: \$? = $ac_status" >&5
+ echo "$as_me:11207: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11211: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11210: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11214: \$? = $ac_status" >&5
+ echo "$as_me:11213: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -11238,7 +11237,7 @@
do
cat >conftest.$ac_ext <<_ACEOF
-#line 11241 "configure"
+#line 11240 "configure"
#include "confdefs.h"
#include <$cf_header>
@@ -11262,16 +11261,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11265: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11264: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11268: \$? = $ac_status" >&5
+ echo "$as_me:11267: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11271: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11270: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11274: \$? = $ac_status" >&5
+ echo "$as_me:11273: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_h2=$cf_header
@@ -11292,12 +11291,12 @@
CPPFLAGS="$cf_save2_CPPFLAGS"
test "$cf_cv_ncurses_h2" != no && break
done
- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11295: error: not found" >&5
+ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:11294: error: not found" >&5
echo "$as_me: error: not found" >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:11300: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:11299: 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%/[^/]*$%%'`
@@ -11319,7 +11318,7 @@
cf_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 11322 "configure"
+#line 11321 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -11331,16 +11330,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11334: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11333: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11337: \$? = $ac_status" >&5
+ echo "$as_me:11336: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11340: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11339: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11343: \$? = $ac_status" >&5
+ echo "$as_me:11342: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -11389,7 +11388,7 @@
;;
esac
-echo "$as_me:11392: checking for terminfo header" >&5
+echo "$as_me:11391: checking for terminfo header" >&5
echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
if test "${cf_cv_term_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11407,7 +11406,7 @@
for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
do
cat >conftest.$ac_ext <<_ACEOF
-#line 11410 "configure"
+#line 11409 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <${cf_cv_ncurses_header-curses.h}>
@@ -11422,16 +11421,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11425: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11424: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:11428: \$? = $ac_status" >&5
+ echo "$as_me:11427: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:11431: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11430: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11434: \$? = $ac_status" >&5
+ echo "$as_me:11433: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_term_header="$cf_test"
@@ -11447,7 +11446,7 @@
done
fi
-echo "$as_me:11450: result: $cf_cv_term_header" >&5
+echo "$as_me:11449: result: $cf_cv_term_header" >&5
echo "${ECHO_T}$cf_cv_term_header" >&6
# Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -11481,7 +11480,7 @@
#define NCURSES 1
EOF
-echo "$as_me:11484: checking for ncurses version" >&5
+echo "$as_me:11483: 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
@@ -11507,10 +11506,10 @@
#endif
EOF
cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
- { (eval echo "$as_me:11510: \"$cf_try\"") >&5
+ { (eval echo "$as_me:11509: \"$cf_try\"") >&5
(eval $cf_try) 2>&5
ac_status=$?
- echo "$as_me:11513: \$? = $ac_status" >&5
+ echo "$as_me:11512: \$? = $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%".*%%'`
@@ -11520,7 +11519,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-#line 11523 "configure"
+#line 11522 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
@@ -11541,19 +11540,19 @@
make an error
# endif
#endif
- exit(0);
+ ${cf_cv_main_return-return}(0);
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11548: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11547: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11551: \$? = $ac_status" >&5
+ echo "$as_me:11550: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:11553: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11552: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11556: \$? = $ac_status" >&5
+ echo "$as_me:11555: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -11567,7 +11566,7 @@
rm -f $cf_tempfile
fi
-echo "$as_me:11570: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:11569: 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
@@ -11579,7 +11578,7 @@
# to link gpm.
cf_ncurses_LIBS=""
cf_ncurses_SAVE="$LIBS"
-echo "$as_me:11582: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:11581: 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
@@ -11587,7 +11586,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgpm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 11590 "configure"
+#line 11589 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -11606,16 +11605,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11609: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11608: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11612: \$? = $ac_status" >&5
+ echo "$as_me:11611: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11615: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11614: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11618: \$? = $ac_status" >&5
+ echo "$as_me:11617: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_gpm_Gpm_Open=yes
else
@@ -11626,10 +11625,10 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:11629: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:11628: 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:11632: checking for initscr in -lgpm" >&5
+ echo "$as_me:11631: 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
@@ -11637,7 +11636,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgpm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 11640 "configure"
+#line 11639 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -11656,16 +11655,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11659: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11658: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11662: \$? = $ac_status" >&5
+ echo "$as_me:11661: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11665: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11664: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11668: \$? = $ac_status" >&5
+ echo "$as_me:11667: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_gpm_initscr=yes
else
@@ -11676,7 +11675,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:11679: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:11678: 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"
@@ -11691,7 +11690,7 @@
# This is only necessary if you are linking against an obsolete
# version of ncurses (but it should do no harm, since it's static).
if test "$cf_nculib_root" = ncurses ; then
- echo "$as_me:11694: checking for tgoto in -lmytinfo" >&5
+ echo "$as_me:11693: 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
@@ -11699,7 +11698,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lmytinfo $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 11702 "configure"
+#line 11701 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -11718,16 +11717,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11721: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11720: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11724: \$? = $ac_status" >&5
+ echo "$as_me:11723: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11727: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11726: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11730: \$? = $ac_status" >&5
+ echo "$as_me:11729: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_mytinfo_tgoto=yes
else
@@ -11738,7 +11737,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:11741: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:11740: 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"
@@ -11757,13 +11756,13 @@
eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
cf_libdir=""
- echo "$as_me:11760: checking for initscr" >&5
+ echo "$as_me:11759: 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 11766 "configure"
+#line 11765 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char initscr (); below. */
@@ -11794,16 +11793,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11797: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11796: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11800: \$? = $ac_status" >&5
+ echo "$as_me:11799: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11803: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11802: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11806: \$? = $ac_status" >&5
+ echo "$as_me:11805: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_initscr=yes
else
@@ -11813,18 +11812,18 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:11816: result: $ac_cv_func_initscr" >&5
+echo "$as_me:11815: 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:11823: checking for initscr in -l$cf_nculib_root" >&5
+ echo "$as_me:11822: 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 11827 "configure"
+#line 11826 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
int
@@ -11836,25 +11835,25 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11839: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11838: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11842: \$? = $ac_status" >&5
+ echo "$as_me:11841: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11845: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11844: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11848: \$? = $ac_status" >&5
+ echo "$as_me:11847: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:11850: result: yes" >&5
+ echo "$as_me:11849: 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:11857: result: no" >&5
+echo "$as_me:11856: result: no" >&5
echo "${ECHO_T}no" >&6
cf_search=""
@@ -11914,11 +11913,11 @@
for cf_libdir in $cf_search
do
- echo "$as_me:11917: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo "$as_me:11916: 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 11921 "configure"
+#line 11920 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
int
@@ -11930,25 +11929,25 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11933: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11932: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11936: \$? = $ac_status" >&5
+ echo "$as_me:11935: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:11939: \"$ac_try\"") >&5
+ { (eval echo "$as_me:11938: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:11942: \$? = $ac_status" >&5
+ echo "$as_me:11941: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:11944: result: yes" >&5
+ echo "$as_me:11943: 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:11951: result: no" >&5
+echo "$as_me:11950: result: no" >&5
echo "${ECHO_T}no" >&6
LIBS="$cf_save_LIBS"
fi
@@ -11963,7 +11962,7 @@
eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
if test $cf_found_library = no ; then
- { { echo "$as_me:11966: error: Cannot link $cf_nculib_root library" >&5
+ { { echo "$as_me:11965: error: Cannot link $cf_nculib_root library" >&5
echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -11971,7 +11970,7 @@
fi
if test -n "$cf_ncurses_LIBS" ; then
- echo "$as_me:11974: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo "$as_me:11973: 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
@@ -11981,7 +11980,7 @@
fi
done
cat >conftest.$ac_ext <<_ACEOF
-#line 11984 "configure"
+#line 11983 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
int
@@ -11993,23 +11992,23 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11996: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11995: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:11999: \$? = $ac_status" >&5
+ echo "$as_me:11998: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12002: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12001: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12005: \$? = $ac_status" >&5
+ echo "$as_me:12004: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:12007: result: yes" >&5
+ echo "$as_me:12006: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:12012: result: no" >&5
+echo "$as_me:12011: result: no" >&5
echo "${ECHO_T}no" >&6
LIBS="$cf_ncurses_SAVE"
fi
@@ -12039,7 +12038,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:12042: checking for $ac_word" >&5
+echo "$as_me:12041: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12056,7 +12055,7 @@
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word"
- echo "$as_me:12059: found $ac_dir/$ac_word" >&5
+ echo "$as_me:12058: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -12067,10 +12066,10 @@
NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
if test -n "$NCURSES_CONFIG"; then
- echo "$as_me:12070: result: $NCURSES_CONFIG" >&5
+ echo "$as_me:12069: result: $NCURSES_CONFIG" >&5
echo "${ECHO_T}$NCURSES_CONFIG" >&6
else
- echo "$as_me:12073: result: no" >&5
+ echo "$as_me:12072: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -12105,7 +12104,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:12108: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:12107: 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
@@ -12117,7 +12116,7 @@
do
cat >conftest.$ac_ext <<_ACEOF
-#line 12120 "configure"
+#line 12119 "configure"
#include "confdefs.h"
#define _XOPEN_SOURCE_EXTENDED
@@ -12149,16 +12148,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12152: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12151: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12155: \$? = $ac_status" >&5
+ echo "$as_me:12154: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12158: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12157: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12161: \$? = $ac_status" >&5
+ echo "$as_me:12160: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_h=$cf_header
@@ -12173,14 +12172,14 @@
done
fi
-echo "$as_me:12176: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:12175: 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:12183: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:12182: 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
@@ -12275,7 +12274,7 @@
cf_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 12278 "configure"
+#line 12277 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -12287,16 +12286,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12290: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12289: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12293: \$? = $ac_status" >&5
+ echo "$as_me:12292: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12296: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12295: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12299: \$? = $ac_status" >&5
+ echo "$as_me:12298: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -12323,7 +12322,7 @@
do
cat >conftest.$ac_ext <<_ACEOF
-#line 12326 "configure"
+#line 12325 "configure"
#include "confdefs.h"
#include <$cf_header>
@@ -12347,16 +12346,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12350: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12349: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12353: \$? = $ac_status" >&5
+ echo "$as_me:12352: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12356: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12355: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12359: \$? = $ac_status" >&5
+ echo "$as_me:12358: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_h2=$cf_header
@@ -12377,12 +12376,12 @@
CPPFLAGS="$cf_save2_CPPFLAGS"
test "$cf_cv_ncurses_h2" != no && break
done
- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12380: error: not found" >&5
+ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:12379: error: not found" >&5
echo "$as_me: error: not found" >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:12385: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:12384: 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%/[^/]*$%%'`
@@ -12404,7 +12403,7 @@
cf_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 12407 "configure"
+#line 12406 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -12416,16 +12415,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12419: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12418: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12422: \$? = $ac_status" >&5
+ echo "$as_me:12421: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12425: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12424: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12428: \$? = $ac_status" >&5
+ echo "$as_me:12427: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -12474,7 +12473,7 @@
;;
esac
-echo "$as_me:12477: checking for terminfo header" >&5
+echo "$as_me:12476: checking for terminfo header" >&5
echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
if test "${cf_cv_term_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12492,7 +12491,7 @@
for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
do
cat >conftest.$ac_ext <<_ACEOF
-#line 12495 "configure"
+#line 12494 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <${cf_cv_ncurses_header-curses.h}>
@@ -12507,16 +12506,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12510: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12509: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:12513: \$? = $ac_status" >&5
+ echo "$as_me:12512: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:12516: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12515: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12519: \$? = $ac_status" >&5
+ echo "$as_me:12518: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_term_header="$cf_test"
@@ -12532,7 +12531,7 @@
done
fi
-echo "$as_me:12535: result: $cf_cv_term_header" >&5
+echo "$as_me:12534: result: $cf_cv_term_header" >&5
echo "${ECHO_T}$cf_cv_term_header" >&6
# Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -12566,7 +12565,7 @@
#define NCURSES 1
EOF
-echo "$as_me:12569: checking for ncurses version" >&5
+echo "$as_me:12568: 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
@@ -12592,10 +12591,10 @@
#endif
EOF
cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
- { (eval echo "$as_me:12595: \"$cf_try\"") >&5
+ { (eval echo "$as_me:12594: \"$cf_try\"") >&5
(eval $cf_try) 2>&5
ac_status=$?
- echo "$as_me:12598: \$? = $ac_status" >&5
+ echo "$as_me:12597: \$? = $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%".*%%'`
@@ -12605,7 +12604,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-#line 12608 "configure"
+#line 12607 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
@@ -12626,19 +12625,19 @@
make an error
# endif
#endif
- exit(0);
+ ${cf_cv_main_return-return}(0);
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:12633: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12632: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12636: \$? = $ac_status" >&5
+ echo "$as_me:12635: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:12638: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12637: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12641: \$? = $ac_status" >&5
+ echo "$as_me:12640: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -12652,7 +12651,7 @@
rm -f $cf_tempfile
fi
-echo "$as_me:12655: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:12654: 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
@@ -12664,7 +12663,7 @@
# to link gpm.
cf_ncurses_LIBS=""
cf_ncurses_SAVE="$LIBS"
-echo "$as_me:12667: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:12666: 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
@@ -12672,7 +12671,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgpm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 12675 "configure"
+#line 12674 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -12691,16 +12690,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12694: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12693: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12697: \$? = $ac_status" >&5
+ echo "$as_me:12696: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12700: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12699: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12703: \$? = $ac_status" >&5
+ echo "$as_me:12702: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_gpm_Gpm_Open=yes
else
@@ -12711,10 +12710,10 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:12714: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:12713: 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:12717: checking for initscr in -lgpm" >&5
+ echo "$as_me:12716: 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
@@ -12722,7 +12721,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgpm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 12725 "configure"
+#line 12724 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -12741,16 +12740,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12744: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12743: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12747: \$? = $ac_status" >&5
+ echo "$as_me:12746: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12750: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12749: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12753: \$? = $ac_status" >&5
+ echo "$as_me:12752: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_gpm_initscr=yes
else
@@ -12761,7 +12760,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:12764: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:12763: 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"
@@ -12776,7 +12775,7 @@
# This is only necessary if you are linking against an obsolete
# version of ncurses (but it should do no harm, since it's static).
if test "$cf_nculib_root" = ncurses ; then
- echo "$as_me:12779: checking for tgoto in -lmytinfo" >&5
+ echo "$as_me:12778: 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
@@ -12784,7 +12783,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lmytinfo $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 12787 "configure"
+#line 12786 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -12803,16 +12802,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12806: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12805: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12809: \$? = $ac_status" >&5
+ echo "$as_me:12808: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12812: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12811: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12815: \$? = $ac_status" >&5
+ echo "$as_me:12814: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_mytinfo_tgoto=yes
else
@@ -12823,7 +12822,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:12826: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:12825: 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"
@@ -12842,13 +12841,13 @@
eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
cf_libdir=""
- echo "$as_me:12845: checking for initscr" >&5
+ echo "$as_me:12844: 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 12851 "configure"
+#line 12850 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char initscr (); below. */
@@ -12879,16 +12878,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12882: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12881: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12885: \$? = $ac_status" >&5
+ echo "$as_me:12884: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12888: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12887: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12891: \$? = $ac_status" >&5
+ echo "$as_me:12890: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_initscr=yes
else
@@ -12898,18 +12897,18 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:12901: result: $ac_cv_func_initscr" >&5
+echo "$as_me:12900: 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:12908: checking for initscr in -l$cf_nculib_root" >&5
+ echo "$as_me:12907: 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 12912 "configure"
+#line 12911 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
int
@@ -12921,25 +12920,25 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12924: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12923: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:12927: \$? = $ac_status" >&5
+ echo "$as_me:12926: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:12930: \"$ac_try\"") >&5
+ { (eval echo "$as_me:12929: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:12933: \$? = $ac_status" >&5
+ echo "$as_me:12932: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:12935: result: yes" >&5
+ echo "$as_me:12934: 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:12942: result: no" >&5
+echo "$as_me:12941: result: no" >&5
echo "${ECHO_T}no" >&6
cf_search=""
@@ -12999,11 +12998,11 @@
for cf_libdir in $cf_search
do
- echo "$as_me:13002: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo "$as_me:13001: 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 13006 "configure"
+#line 13005 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
int
@@ -13015,25 +13014,25 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13018: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13017: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13021: \$? = $ac_status" >&5
+ echo "$as_me:13020: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13024: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13023: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13027: \$? = $ac_status" >&5
+ echo "$as_me:13026: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:13029: result: yes" >&5
+ echo "$as_me:13028: 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:13036: result: no" >&5
+echo "$as_me:13035: result: no" >&5
echo "${ECHO_T}no" >&6
LIBS="$cf_save_LIBS"
fi
@@ -13048,7 +13047,7 @@
eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
if test $cf_found_library = no ; then
- { { echo "$as_me:13051: error: Cannot link $cf_nculib_root library" >&5
+ { { echo "$as_me:13050: error: Cannot link $cf_nculib_root library" >&5
echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -13056,7 +13055,7 @@
fi
if test -n "$cf_ncurses_LIBS" ; then
- echo "$as_me:13059: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo "$as_me:13058: 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
@@ -13066,7 +13065,7 @@
fi
done
cat >conftest.$ac_ext <<_ACEOF
-#line 13069 "configure"
+#line 13068 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
int
@@ -13078,23 +13077,23 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13081: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13080: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13084: \$? = $ac_status" >&5
+ echo "$as_me:13083: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13087: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13086: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13090: \$? = $ac_status" >&5
+ echo "$as_me:13089: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:13092: result: yes" >&5
+ echo "$as_me:13091: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:13097: result: no" >&5
+echo "$as_me:13096: result: no" >&5
echo "${ECHO_T}no" >&6
LIBS="$cf_ncurses_SAVE"
fi
@@ -13117,7 +13116,7 @@
#define DISP_TERMCAP 1
EOF
- echo "$as_me:13120: checking if you want to use ncurses" >&5
+ echo "$as_me:13119: 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.
@@ -13127,7 +13126,7 @@
else
withval=no
fi;
- echo "$as_me:13130: result: $withval" >&5
+ echo "$as_me:13129: result: $withval" >&5
echo "${ECHO_T}$withval" >&6
if test "${cf_cv_termlib+set}" = set; then
@@ -13136,7 +13135,7 @@
cf_cv_termlib=none
cat >conftest.$ac_ext <<_ACEOF
-#line 13139 "configure"
+#line 13138 "configure"
#include "confdefs.h"
int
@@ -13148,19 +13147,19 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13151: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13150: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13154: \$? = $ac_status" >&5
+ echo "$as_me:13153: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13157: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13156: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13160: \$? = $ac_status" >&5
+ echo "$as_me:13159: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cat >conftest.$ac_ext <<_ACEOF
-#line 13163 "configure"
+#line 13162 "configure"
#include "confdefs.h"
int
@@ -13172,16 +13171,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13175: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13174: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13178: \$? = $ac_status" >&5
+ echo "$as_me:13177: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13181: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13180: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13184: \$? = $ac_status" >&5
+ echo "$as_me:13183: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_termlib=terminfo
else
@@ -13206,7 +13205,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:13209: checking for $ac_word" >&5
+echo "$as_me:13208: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13223,7 +13222,7 @@
test -z "$ac_dir" && ac_dir=.
if $as_executable_p "$ac_dir/$ac_word"; then
ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word"
- echo "$as_me:13226: found $ac_dir/$ac_word" >&5
+ echo "$as_me:13225: found $ac_dir/$ac_word" >&5
break
fi
done
@@ -13234,10 +13233,10 @@
NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
if test -n "$NCURSES_CONFIG"; then
- echo "$as_me:13237: result: $NCURSES_CONFIG" >&5
+ echo "$as_me:13236: result: $NCURSES_CONFIG" >&5
echo "${ECHO_T}$NCURSES_CONFIG" >&6
else
- echo "$as_me:13240: result: no" >&5
+ echo "$as_me:13239: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -13272,7 +13271,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:13275: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:13274: 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
@@ -13284,7 +13283,7 @@
do
cat >conftest.$ac_ext <<_ACEOF
-#line 13287 "configure"
+#line 13286 "configure"
#include "confdefs.h"
#include <$cf_header>
@@ -13308,16 +13307,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13311: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13310: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13314: \$? = $ac_status" >&5
+ echo "$as_me:13313: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13317: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13316: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13320: \$? = $ac_status" >&5
+ echo "$as_me:13319: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_h=$cf_header
@@ -13332,14 +13331,14 @@
done
fi
-echo "$as_me:13335: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:13334: 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:13342: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:13341: 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
@@ -13434,7 +13433,7 @@
cf_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 13437 "configure"
+#line 13436 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -13446,16 +13445,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13449: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13448: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13452: \$? = $ac_status" >&5
+ echo "$as_me:13451: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13455: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13454: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13458: \$? = $ac_status" >&5
+ echo "$as_me:13457: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -13482,7 +13481,7 @@
do
cat >conftest.$ac_ext <<_ACEOF
-#line 13485 "configure"
+#line 13484 "configure"
#include "confdefs.h"
#include <$cf_header>
@@ -13506,16 +13505,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13509: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13508: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13512: \$? = $ac_status" >&5
+ echo "$as_me:13511: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13515: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13514: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13518: \$? = $ac_status" >&5
+ echo "$as_me:13517: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_h2=$cf_header
@@ -13536,12 +13535,12 @@
CPPFLAGS="$cf_save2_CPPFLAGS"
test "$cf_cv_ncurses_h2" != no && break
done
- test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:13539: error: not found" >&5
+ test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:13538: error: not found" >&5
echo "$as_me: error: not found" >&2;}
{ (exit 1); exit 1; }; }
fi
-echo "$as_me:13544: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:13543: 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%/[^/]*$%%'`
@@ -13563,7 +13562,7 @@
cf_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
cat >conftest.$ac_ext <<_ACEOF
-#line 13566 "configure"
+#line 13565 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -13575,16 +13574,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13578: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13577: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13581: \$? = $ac_status" >&5
+ echo "$as_me:13580: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13584: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13583: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13587: \$? = $ac_status" >&5
+ echo "$as_me:13586: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
@@ -13633,7 +13632,7 @@
;;
esac
-echo "$as_me:13636: checking for terminfo header" >&5
+echo "$as_me:13635: checking for terminfo header" >&5
echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
if test "${cf_cv_term_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13651,7 +13650,7 @@
for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
do
cat >conftest.$ac_ext <<_ACEOF
-#line 13654 "configure"
+#line 13653 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <${cf_cv_ncurses_header-curses.h}>
@@ -13666,16 +13665,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13669: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13668: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:13672: \$? = $ac_status" >&5
+ echo "$as_me:13671: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:13675: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13674: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13678: \$? = $ac_status" >&5
+ echo "$as_me:13677: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_term_header="$cf_test"
@@ -13691,7 +13690,7 @@
done
fi
-echo "$as_me:13694: result: $cf_cv_term_header" >&5
+echo "$as_me:13693: result: $cf_cv_term_header" >&5
echo "${ECHO_T}$cf_cv_term_header" >&6
# Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -13725,7 +13724,7 @@
#define NCURSES 1
EOF
-echo "$as_me:13728: checking for ncurses version" >&5
+echo "$as_me:13727: 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
@@ -13751,10 +13750,10 @@
#endif
EOF
cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
- { (eval echo "$as_me:13754: \"$cf_try\"") >&5
+ { (eval echo "$as_me:13753: \"$cf_try\"") >&5
(eval $cf_try) 2>&5
ac_status=$?
- echo "$as_me:13757: \$? = $ac_status" >&5
+ echo "$as_me:13756: \$? = $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%".*%%'`
@@ -13764,7 +13763,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
-#line 13767 "configure"
+#line 13766 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
@@ -13785,19 +13784,19 @@
make an error
# endif
#endif
- exit(0);
+ ${cf_cv_main_return-return}(0);
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:13792: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13791: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13795: \$? = $ac_status" >&5
+ echo "$as_me:13794: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:13797: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13796: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13800: \$? = $ac_status" >&5
+ echo "$as_me:13799: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -13811,7 +13810,7 @@
rm -f $cf_tempfile
fi
-echo "$as_me:13814: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:13813: 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
@@ -13823,7 +13822,7 @@
# to link gpm.
cf_ncurses_LIBS=""
cf_ncurses_SAVE="$LIBS"
-echo "$as_me:13826: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:13825: 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
@@ -13831,7 +13830,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgpm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 13834 "configure"
+#line 13833 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -13850,16 +13849,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13853: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13852: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13856: \$? = $ac_status" >&5
+ echo "$as_me:13855: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13859: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13858: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13862: \$? = $ac_status" >&5
+ echo "$as_me:13861: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_gpm_Gpm_Open=yes
else
@@ -13870,10 +13869,10 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:13873: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:13872: 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:13876: checking for initscr in -lgpm" >&5
+ echo "$as_me:13875: 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
@@ -13881,7 +13880,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgpm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 13884 "configure"
+#line 13883 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -13900,16 +13899,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13903: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13902: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13906: \$? = $ac_status" >&5
+ echo "$as_me:13905: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13909: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13908: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13912: \$? = $ac_status" >&5
+ echo "$as_me:13911: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_gpm_initscr=yes
else
@@ -13920,7 +13919,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:13923: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:13922: 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"
@@ -13935,7 +13934,7 @@
# This is only necessary if you are linking against an obsolete
# version of ncurses (but it should do no harm, since it's static).
if test "$cf_nculib_root" = ncurses ; then
- echo "$as_me:13938: checking for tgoto in -lmytinfo" >&5
+ echo "$as_me:13937: 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
@@ -13943,7 +13942,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lmytinfo $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 13946 "configure"
+#line 13945 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -13962,16 +13961,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13965: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13964: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:13968: \$? = $ac_status" >&5
+ echo "$as_me:13967: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:13971: \"$ac_try\"") >&5
+ { (eval echo "$as_me:13970: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:13974: \$? = $ac_status" >&5
+ echo "$as_me:13973: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_mytinfo_tgoto=yes
else
@@ -13982,7 +13981,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:13985: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:13984: 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"
@@ -14001,13 +14000,13 @@
eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
cf_libdir=""
- echo "$as_me:14004: checking for initscr" >&5
+ echo "$as_me:14003: 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 14010 "configure"
+#line 14009 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char initscr (); below. */
@@ -14038,16 +14037,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14041: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14040: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14044: \$? = $ac_status" >&5
+ echo "$as_me:14043: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14047: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14046: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14050: \$? = $ac_status" >&5
+ echo "$as_me:14049: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_initscr=yes
else
@@ -14057,18 +14056,18 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:14060: result: $ac_cv_func_initscr" >&5
+echo "$as_me:14059: 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:14067: checking for initscr in -l$cf_nculib_root" >&5
+ echo "$as_me:14066: 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 14071 "configure"
+#line 14070 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
int
@@ -14080,25 +14079,25 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14083: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14082: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14086: \$? = $ac_status" >&5
+ echo "$as_me:14085: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14089: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14088: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14092: \$? = $ac_status" >&5
+ echo "$as_me:14091: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:14094: result: yes" >&5
+ echo "$as_me:14093: 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:14101: result: no" >&5
+echo "$as_me:14100: result: no" >&5
echo "${ECHO_T}no" >&6
cf_search=""
@@ -14158,11 +14157,11 @@
for cf_libdir in $cf_search
do
- echo "$as_me:14161: checking for -l$cf_nculib_root in $cf_libdir" >&5
+ echo "$as_me:14160: 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 14165 "configure"
+#line 14164 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
int
@@ -14174,25 +14173,25 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14177: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14176: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14180: \$? = $ac_status" >&5
+ echo "$as_me:14179: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14183: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14182: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14186: \$? = $ac_status" >&5
+ echo "$as_me:14185: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:14188: result: yes" >&5
+ echo "$as_me:14187: 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:14195: result: no" >&5
+echo "$as_me:14194: result: no" >&5
echo "${ECHO_T}no" >&6
LIBS="$cf_save_LIBS"
fi
@@ -14207,7 +14206,7 @@
eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
if test $cf_found_library = no ; then
- { { echo "$as_me:14210: error: Cannot link $cf_nculib_root library" >&5
+ { { echo "$as_me:14209: error: Cannot link $cf_nculib_root library" >&5
echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -14215,7 +14214,7 @@
fi
if test -n "$cf_ncurses_LIBS" ; then
- echo "$as_me:14218: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+ echo "$as_me:14217: 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
@@ -14225,7 +14224,7 @@
fi
done
cat >conftest.$ac_ext <<_ACEOF
-#line 14228 "configure"
+#line 14227 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
int
@@ -14237,23 +14236,23 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14240: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14239: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14243: \$? = $ac_status" >&5
+ echo "$as_me:14242: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14246: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14245: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14249: \$? = $ac_status" >&5
+ echo "$as_me:14248: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:14251: result: yes" >&5
+ echo "$as_me:14250: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:14256: result: no" >&5
+echo "$as_me:14255: result: no" >&5
echo "${ECHO_T}no" >&6
LIBS="$cf_ncurses_SAVE"
fi
@@ -14281,10 +14280,10 @@
LIBS="-l$cf_lib $cf_save_LIBS"
for cf_func in tigetstr tgetstr
do
- echo "$as_me:14284: checking for $cf_func in -l$cf_lib" >&5
+ echo "$as_me:14283: 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 14287 "configure"
+#line 14286 "configure"
#include "confdefs.h"
int
@@ -14296,16 +14295,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14299: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14298: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14302: \$? = $ac_status" >&5
+ echo "$as_me:14301: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14305: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14304: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14308: \$? = $ac_status" >&5
+ echo "$as_me:14307: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -14314,7 +14313,7 @@
cf_result=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:14317: result: $cf_result" >&5
+ echo "$as_me:14316: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test "$cf_result" = yes ; then
if test "$cf_func" = tigetstr ; then
@@ -14331,7 +14330,7 @@
fi
if test "$cf_cv_termlib" = none; then
# allow curses library for broken AIX system.
- echo "$as_me:14334: checking for initscr in -lcurses" >&5
+ echo "$as_me:14333: 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
@@ -14339,7 +14338,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 14342 "configure"
+#line 14341 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -14358,16 +14357,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14360: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14364: \$? = $ac_status" >&5
+ echo "$as_me:14363: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14367: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14366: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14370: \$? = $ac_status" >&5
+ echo "$as_me:14369: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_curses_initscr=yes
else
@@ -14378,13 +14377,13 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:14381: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:14380: 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:14387: checking for tgoto in -ltermcap" >&5
+ echo "$as_me:14386: 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
@@ -14392,7 +14391,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ltermcap $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 14395 "configure"
+#line 14394 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -14411,16 +14410,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14414: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14413: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14417: \$? = $ac_status" >&5
+ echo "$as_me:14416: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14420: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14419: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14423: \$? = $ac_status" >&5
+ echo "$as_me:14422: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_termcap_tgoto=yes
else
@@ -14431,7 +14430,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:14434: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:14433: 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
@@ -14442,7 +14441,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test "$cf_cv_termlib" = none; then
- { echo "$as_me:14445: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+ { echo "$as_me:14444: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
fi
@@ -14472,7 +14471,7 @@
cf_cv_termlib=none
cat >conftest.$ac_ext <<_ACEOF
-#line 14475 "configure"
+#line 14474 "configure"
#include "confdefs.h"
int
@@ -14484,19 +14483,19 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14487: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14486: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14490: \$? = $ac_status" >&5
+ echo "$as_me:14489: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14493: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14492: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14496: \$? = $ac_status" >&5
+ echo "$as_me:14495: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cat >conftest.$ac_ext <<_ACEOF
-#line 14499 "configure"
+#line 14498 "configure"
#include "confdefs.h"
int
@@ -14508,16 +14507,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14511: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14510: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14514: \$? = $ac_status" >&5
+ echo "$as_me:14513: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14517: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14516: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14520: \$? = $ac_status" >&5
+ echo "$as_me:14519: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_termlib=terminfo
else
@@ -14541,10 +14540,10 @@
LIBS="-l$cf_lib $cf_save_LIBS"
for cf_func in tigetstr tgetstr
do
- echo "$as_me:14544: checking for $cf_func in -l$cf_lib" >&5
+ echo "$as_me:14543: 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 14547 "configure"
+#line 14546 "configure"
#include "confdefs.h"
int
@@ -14556,16 +14555,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14559: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14558: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14562: \$? = $ac_status" >&5
+ echo "$as_me:14561: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14565: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14564: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14568: \$? = $ac_status" >&5
+ echo "$as_me:14567: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_result=yes
else
@@ -14574,7 +14573,7 @@
cf_result=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:14577: result: $cf_result" >&5
+ echo "$as_me:14576: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
if test "$cf_result" = yes ; then
if test "$cf_func" = tigetstr ; then
@@ -14591,7 +14590,7 @@
fi
if test "$cf_cv_termlib" = none; then
# allow curses library for broken AIX system.
- echo "$as_me:14594: checking for initscr in -lcurses" >&5
+ echo "$as_me:14593: 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
@@ -14599,7 +14598,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 14602 "configure"
+#line 14601 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -14618,16 +14617,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14621: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14620: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14624: \$? = $ac_status" >&5
+ echo "$as_me:14623: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14627: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14626: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14630: \$? = $ac_status" >&5
+ echo "$as_me:14629: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_curses_initscr=yes
else
@@ -14638,13 +14637,13 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:14641: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:14640: 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:14647: checking for tgoto in -ltermcap" >&5
+ echo "$as_me:14646: 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
@@ -14652,7 +14651,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ltermcap $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 14655 "configure"
+#line 14654 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -14671,16 +14670,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14674: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14673: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14677: \$? = $ac_status" >&5
+ echo "$as_me:14676: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14680: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14679: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14683: \$? = $ac_status" >&5
+ echo "$as_me:14682: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_termcap_tgoto=yes
else
@@ -14691,7 +14690,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:14694: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:14693: 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
@@ -14702,7 +14701,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test "$cf_cv_termlib" = none; then
- { echo "$as_me:14705: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+ { echo "$as_me:14704: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
fi
@@ -14724,7 +14723,7 @@
elif test ".$cf_cv_termlib" = .termcap ; then
# BSD 'tputs()' may need 'PC' to be set.
cat >conftest.$ac_ext <<_ACEOF
-#line 14727 "configure"
+#line 14726 "configure"
#include "confdefs.h"
int
@@ -14736,16 +14735,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14739: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14738: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14742: \$? = $ac_status" >&5
+ echo "$as_me:14741: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14745: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14744: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14748: \$? = $ac_status" >&5
+ echo "$as_me:14747: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cat >>confdefs.h <<\EOF
#define HAVE_EXTERN_TCAP_PC 1
@@ -14764,14 +14763,14 @@
LIBS="$LIBS $X_EXTRA_LIBS"
-echo "$as_me:14767: checking for /dev/tty" >&5
+echo "$as_me:14766: 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:14774: result: $cf_result" >&5
+echo "$as_me:14773: 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`
@@ -14784,7 +14783,7 @@
fi
-echo "$as_me:14787: checking for crypt function" >&5
+echo "$as_me:14786: 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
@@ -14792,7 +14791,7 @@
cf_cv_crypt_func=
cat >conftest.$ac_ext <<_ACEOF
-#line 14795 "configure"
+#line 14794 "configure"
#include "confdefs.h"
int
@@ -14804,16 +14803,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14807: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14806: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14810: \$? = $ac_status" >&5
+ echo "$as_me:14809: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14813: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14812: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14816: \$? = $ac_status" >&5
+ echo "$as_me:14815: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_crypt_func=yes
@@ -14824,7 +14823,7 @@
cf_save_LIBS="$LIBS"
LIBS="-lcrypt $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 14827 "configure"
+#line 14826 "configure"
#include "confdefs.h"
int
@@ -14836,16 +14835,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14839: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14838: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14842: \$? = $ac_status" >&5
+ echo "$as_me:14841: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:14845: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14844: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14848: \$? = $ac_status" >&5
+ echo "$as_me:14847: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_crypt_func="-lcrypt"
@@ -14862,12 +14861,12 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:14865: result: $cf_cv_crypt_func" >&5
+echo "$as_me:14864: 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:14870: checking if crypt works" >&5
+echo "$as_me:14869: 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
@@ -14878,27 +14877,27 @@
cf_cv_crypt_works=unknown
else
cat >conftest.$ac_ext <<_ACEOF
-#line 14881 "configure"
+#line 14880 "configure"
#include "confdefs.h"
#include <string.h>
extern char *crypt();
int main() {
char *s = crypt("vi-crypt", "vi");
- exit(strcmp("vi6r2tczBYLvM", s) != 0);
+ ${cf_cv_main_return-return}(strcmp("vi6r2tczBYLvM", s) != 0);
}
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14893: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14892: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:14896: \$? = $ac_status" >&5
+ echo "$as_me:14895: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:14898: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14897: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14901: \$? = $ac_status" >&5
+ echo "$as_me:14900: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_crypt_works=yes
@@ -14913,7 +14912,7 @@
fi
LIBS="$cf_save_LIBS"
fi
-echo "$as_me:14916: result: $cf_cv_crypt_works" >&5
+echo "$as_me:14915: 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
@@ -14926,14 +14925,14 @@
fi
fi
-echo "$as_me:14929: checking for declaration of fd_set" >&5
+echo "$as_me:14928: 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 14936 "configure"
+#line 14935 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -14946,16 +14945,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14949: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14948: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:14952: \$? = $ac_status" >&5
+ echo "$as_me:14951: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:14955: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14954: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14958: \$? = $ac_status" >&5
+ echo "$as_me:14957: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_type_fd_set=sys/types.h
else
@@ -14963,7 +14962,7 @@
cat conftest.$ac_ext >&5
echo "trying X11/Xpoll.h" 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 14966 "configure"
+#line 14965 "configure"
#include "confdefs.h"
#ifdef HAVE_X11_XPOLL_H
@@ -14978,16 +14977,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14981: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14980: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:14984: \$? = $ac_status" >&5
+ echo "$as_me:14983: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:14987: \"$ac_try\"") >&5
+ { (eval echo "$as_me:14986: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:14990: \$? = $ac_status" >&5
+ echo "$as_me:14989: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_type_fd_set=X11/Xpoll.h
else
@@ -14995,7 +14994,7 @@
cat conftest.$ac_ext >&5
echo "trying sys/select.h" 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 14998 "configure"
+#line 14997 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -15009,16 +15008,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15012: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15011: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:15015: \$? = $ac_status" >&5
+ echo "$as_me:15014: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:15018: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15017: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15021: \$? = $ac_status" >&5
+ echo "$as_me:15020: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_type_fd_set=sys/select.h
else
@@ -15032,7 +15031,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:15035: result: $cf_cv_type_fd_set" >&5
+echo "$as_me:15034: 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
@@ -15041,14 +15040,14 @@
fi
-echo "$as_me:15044: checking for fd_set macros" >&5
+echo "$as_me:15043: 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 15051 "configure"
+#line 15050 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -15077,16 +15076,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15080: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15079: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:15083: \$? = $ac_status" >&5
+ echo "$as_me:15082: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:15086: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15085: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15089: \$? = $ac_status" >&5
+ echo "$as_me:15088: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_macros_fd_set=yes
else
@@ -15096,13 +15095,85 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:15099: result: $cf_cv_macros_fd_set" >&5
+echo "$as_me:15098: 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
EOF
for ac_func in \
+getc_unlocked \
+putc_unlocked \
+
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:15110: 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 15116 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below. */
+#include <assert.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 $ac_func ();
+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_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:15147: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:15150: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:15153: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:15156: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:15166: 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 <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
+for ac_func in \
_nc_freeall \
access \
alarm \
@@ -15136,6 +15207,7 @@
strtoul \
symlink \
tcgetattr \
+tsearch \
ttyname \
umask \
utime \
@@ -15144,13 +15216,13 @@
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15147: checking for $ac_func" >&5
+echo "$as_me:15219: 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 15153 "configure"
+#line 15225 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
@@ -15181,16 +15253,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15184: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15256: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:15187: \$? = $ac_status" >&5
+ echo "$as_me:15259: \$? = $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:15262: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15193: \$? = $ac_status" >&5
+ echo "$as_me:15265: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
@@ -15200,7 +15272,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:15203: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:15275: 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 <<EOF
@@ -15210,14 +15282,14 @@
fi
done
-echo "$as_me:15213: checking for standard qsort" >&5
+echo "$as_me:15285: 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 15220 "configure"
+#line 15292 "configure"
#include "confdefs.h"
#ifdef HAVE_STDLIB_H
@@ -15235,16 +15307,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15238: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15310: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:15241: \$? = $ac_status" >&5
+ echo "$as_me:15313: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:15244: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15316: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15247: \$? = $ac_status" >&5
+ echo "$as_me:15319: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_ansi_qsort=yes
else
@@ -15255,7 +15327,7 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:15258: result: $cf_cv_ansi_qsort" >&5
+echo "$as_me:15330: result: $cf_cv_ansi_qsort" >&5
echo "${ECHO_T}$cf_cv_ansi_qsort" >&6
if test $cf_cv_ansi_qsort = yes; then
@@ -15270,7 +15342,7 @@
fi
-echo "$as_me:15273: checking for working mkstemp" >&5
+echo "$as_me:15345: 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
@@ -15278,13 +15350,13 @@
rm -f conftest*
if test "$cross_compiling" = yes; then
- echo "$as_me:15281: checking for mkstemp" >&5
+ echo "$as_me:15353: 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 15287 "configure"
+#line 15359 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mkstemp (); below. */
@@ -15315,16 +15387,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15318: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15390: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:15321: \$? = $ac_status" >&5
+ echo "$as_me:15393: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:15324: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15396: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15327: \$? = $ac_status" >&5
+ echo "$as_me:15399: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_mkstemp=yes
else
@@ -15334,12 +15406,12 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:15337: result: $ac_cv_func_mkstemp" >&5
+echo "$as_me:15409: result: $ac_cv_func_mkstemp" >&5
echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 15342 "configure"
+#line 15414 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -15377,15 +15449,15 @@
_ACEOF
rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15380: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15452: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:15383: \$? = $ac_status" >&5
+ echo "$as_me:15455: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:15385: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15457: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15388: \$? = $ac_status" >&5
+ echo "$as_me:15460: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_func_mkstemp=yes
@@ -15400,7 +15472,7 @@
fi
fi
-echo "$as_me:15403: result: $cf_cv_func_mkstemp" >&5
+echo "$as_me:15475: 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
@@ -15418,7 +15490,7 @@
cf_save_cppflags="${CPPFLAGS}"
cf_save_ldflags="${LDFLAGS}"
-echo "$as_me:15421: checking if you want to use the Xpm library for colored icon" >&5
+echo "$as_me:15493: 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.
@@ -15428,7 +15500,7 @@
else
cf_Xpm_library=no
fi;
-echo "$as_me:15431: result: $cf_Xpm_library" >&5
+echo "$as_me:15503: result: $cf_Xpm_library" >&5
echo "${ECHO_T}$cf_Xpm_library" >&6
if test "$cf_Xpm_library" != no ; then
@@ -15436,23 +15508,23 @@
CPPFLAGS="$CPPFLAGS -I$withval/include"
LDFLAGS="$LDFLAGS -L$withval/lib"
fi
- echo "$as_me:15439: checking for X11/xpm.h" >&5
+ echo "$as_me:15511: 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 15445 "configure"
+#line 15517 "configure"
#include "confdefs.h"
#include <X11/xpm.h>
_ACEOF
-if { (eval echo "$as_me:15449: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15521: \"$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:15455: \$? = $ac_status" >&5
+ echo "$as_me:15527: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15471,11 +15543,11 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:15474: result: $ac_cv_header_X11_xpm_h" >&5
+echo "$as_me:15546: 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:15478: checking for XpmCreatePixmapFromData in -lXpm" >&5
+ echo "$as_me:15550: 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
@@ -15483,7 +15555,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lXpm -lX11 $X_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 15486 "configure"
+#line 15558 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -15502,16 +15574,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15505: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15577: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:15508: \$? = $ac_status" >&5
+ echo "$as_me:15580: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:15511: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15583: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15514: \$? = $ac_status" >&5
+ echo "$as_me:15586: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_Xpm_XpmCreatePixmapFromData=yes
else
@@ -15522,7 +15594,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:15525: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
+echo "$as_me:15597: 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
@@ -15543,7 +15615,7 @@
fi
if test -n "$cf_x_athena" ; then
- echo "$as_me:15546: checking if you want to use Xaw scrollbars rather than our own" >&5
+ echo "$as_me:15618: 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.
@@ -15553,7 +15625,7 @@
else
cf_Xaw_scrollbars=no
fi;
- echo "$as_me:15556: result: $cf_Xaw_scrollbars" >&5
+ echo "$as_me:15628: result: $cf_Xaw_scrollbars" >&5
echo "${ECHO_T}$cf_Xaw_scrollbars" >&6
if test "$cf_Xaw_scrollbars" = no ; then
@@ -15570,7 +15642,7 @@
#define OPT_XAW_SCROLLBARS 1
EOF
- echo "$as_me:15573: checking if you want to use the drag/scrolling extension with Xaw" >&5
+ echo "$as_me:15645: 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.
@@ -15580,7 +15652,7 @@
else
cf_drag_extension=no
fi;
- echo "$as_me:15583: result: $cf_drag_extension" >&5
+ echo "$as_me:15655: result: $cf_drag_extension" >&5
echo "${ECHO_T}$cf_drag_extension" >&6
if test "$cf_drag_extension" != "no" ; then
cat >>confdefs.h <<\EOF
@@ -15593,7 +15665,7 @@
fi
-echo "$as_me:15596: checking if you want to change the number of exec-macros" >&5
+echo "$as_me:15668: 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.
@@ -15603,7 +15675,7 @@
else
cf_exec_macros=no
fi;
-echo "$as_me:15606: result: $cf_exec_macros" >&5
+echo "$as_me:15678: result: $cf_exec_macros" >&5
echo "${ECHO_T}$cf_exec_macros" >&6
test "$cf_exec_macros" != no && cat >>confdefs.h <<EOF
#define OPT_EXEC_MACROS $cf_exec_macros
@@ -15616,7 +15688,7 @@
fi;
if test "$enable_largefile" != no; then
- echo "$as_me:15619: checking for special C compiler options needed for large files" >&5
+ echo "$as_me:15691: checking for special C compiler options needed for large files" >&5
echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
if test "${ac_cv_sys_largefile_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15628,7 +15700,7 @@
# IRIX 6.2 and later do not support large files by default,
# so use the C compiler's -n32 option if that helps.
cat >conftest.$ac_ext <<_ACEOF
-#line 15631 "configure"
+#line 15703 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -15648,16 +15720,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15651: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15723: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:15654: \$? = $ac_status" >&5
+ echo "$as_me:15726: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:15657: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15729: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15660: \$? = $ac_status" >&5
+ echo "$as_me:15732: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -15667,16 +15739,16 @@
rm -f conftest.$ac_objext
CC="$CC -n32"
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15670: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15742: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:15673: \$? = $ac_status" >&5
+ echo "$as_me:15745: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:15676: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15748: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15679: \$? = $ac_status" >&5
+ echo "$as_me:15751: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_largefile_CC=' -n32'; break
else
@@ -15690,13 +15762,13 @@
rm -f conftest.$ac_ext
fi
fi
-echo "$as_me:15693: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:15765: result: $ac_cv_sys_largefile_CC" >&5
echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
if test "$ac_cv_sys_largefile_CC" != no; then
CC=$CC$ac_cv_sys_largefile_CC
fi
- echo "$as_me:15699: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+ echo "$as_me:15771: checking for _FILE_OFFSET_BITS value needed for large files" >&5
echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
if test "${ac_cv_sys_file_offset_bits+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15704,7 +15776,7 @@
while :; do
ac_cv_sys_file_offset_bits=no
cat >conftest.$ac_ext <<_ACEOF
-#line 15707 "configure"
+#line 15779 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -15724,16 +15796,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15727: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15799: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:15730: \$? = $ac_status" >&5
+ echo "$as_me:15802: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:15733: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15805: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15736: \$? = $ac_status" >&5
+ echo "$as_me:15808: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -15742,7 +15814,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 15745 "configure"
+#line 15817 "configure"
#include "confdefs.h"
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
@@ -15763,16 +15835,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15766: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15838: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:15769: \$? = $ac_status" >&5
+ echo "$as_me:15841: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:15772: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15844: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15775: \$? = $ac_status" >&5
+ echo "$as_me:15847: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_file_offset_bits=64; break
else
@@ -15783,7 +15855,7 @@
break
done
fi
-echo "$as_me:15786: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:15858: result: $ac_cv_sys_file_offset_bits" >&5
echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
if test "$ac_cv_sys_file_offset_bits" != no; then
@@ -15793,7 +15865,7 @@
fi
rm -f conftest*
- echo "$as_me:15796: checking for _LARGE_FILES value needed for large files" >&5
+ echo "$as_me:15868: checking for _LARGE_FILES value needed for large files" >&5
echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
if test "${ac_cv_sys_large_files+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15801,7 +15873,7 @@
while :; do
ac_cv_sys_large_files=no
cat >conftest.$ac_ext <<_ACEOF
-#line 15804 "configure"
+#line 15876 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -15821,16 +15893,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15824: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15896: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:15827: \$? = $ac_status" >&5
+ echo "$as_me:15899: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:15830: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15902: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15833: \$? = $ac_status" >&5
+ echo "$as_me:15905: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -15839,7 +15911,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 15842 "configure"
+#line 15914 "configure"
#include "confdefs.h"
#define _LARGE_FILES 1
#include <sys/types.h>
@@ -15860,16 +15932,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15863: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15935: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:15866: \$? = $ac_status" >&5
+ echo "$as_me:15938: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:15869: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15941: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15872: \$? = $ac_status" >&5
+ echo "$as_me:15944: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_large_files=1; break
else
@@ -15880,7 +15952,7 @@
break
done
fi
-echo "$as_me:15883: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:15955: result: $ac_cv_sys_large_files" >&5
echo "${ECHO_T}$ac_cv_sys_large_files" >&6
if test "$ac_cv_sys_large_files" != no; then
@@ -15893,7 +15965,7 @@
fi
if test "$enable_largefile" != no ; then
- echo "$as_me:15896: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+ echo "$as_me:15968: checking for _LARGEFILE_SOURCE value needed for large files" >&5
echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
if test "${ac_cv_sys_largefile_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15901,7 +15973,7 @@
while :; do
ac_cv_sys_largefile_source=no
cat >conftest.$ac_ext <<_ACEOF
-#line 15904 "configure"
+#line 15976 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -15913,16 +15985,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15916: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15988: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:15919: \$? = $ac_status" >&5
+ echo "$as_me:15991: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:15922: \"$ac_try\"") >&5
+ { (eval echo "$as_me:15994: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15925: \$? = $ac_status" >&5
+ echo "$as_me:15997: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
break
else
@@ -15931,7 +16003,7 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line 15934 "configure"
+#line 16006 "configure"
#include "confdefs.h"
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
@@ -15944,16 +16016,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15947: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16019: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:15950: \$? = $ac_status" >&5
+ echo "$as_me:16022: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:15953: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16025: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:15956: \$? = $ac_status" >&5
+ echo "$as_me:16028: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_sys_largefile_source=1; break
else
@@ -15964,7 +16036,7 @@
break
done
fi
-echo "$as_me:15967: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:16039: result: $ac_cv_sys_largefile_source" >&5
echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
if test "$ac_cv_sys_largefile_source" != no; then
@@ -15978,13 +16050,13 @@
# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
# in glibc 2.1.3, but that breaks too many other things.
# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:15981: checking for fseeko" >&5
+echo "$as_me:16053: checking for fseeko" >&5
echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
if test "${ac_cv_func_fseeko+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 15987 "configure"
+#line 16059 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -15996,16 +16068,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15999: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16071: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:16002: \$? = $ac_status" >&5
+ echo "$as_me:16074: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:16005: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16077: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16008: \$? = $ac_status" >&5
+ echo "$as_me:16080: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_fseeko=yes
else
@@ -16015,7 +16087,7 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:16018: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:16090: result: $ac_cv_func_fseeko" >&5
echo "${ECHO_T}$ac_cv_func_fseeko" >&6
if test $ac_cv_func_fseeko = yes; then
@@ -16035,14 +16107,14 @@
test "$ac_cv_sys_large_files" != no && CPPFLAGS="$CPPFLAGS -D_LARGE_FILES "
test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
- echo "$as_me:16038: checking whether to use struct dirent64" >&5
+ echo "$as_me:16110: checking whether to use struct dirent64" >&5
echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
if test "${cf_cv_struct_dirent64+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 16045 "configure"
+#line 16117 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -16063,16 +16135,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16066: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16138: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:16069: \$? = $ac_status" >&5
+ echo "$as_me:16141: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:16072: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16144: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16075: \$? = $ac_status" >&5
+ echo "$as_me:16147: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_struct_dirent64=yes
else
@@ -16083,7 +16155,7 @@
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:16086: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:16158: result: $cf_cv_struct_dirent64" >&5
echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
#define HAVE_STRUCT_DIRENT64 1
@@ -16094,14 +16166,14 @@
# I don't know of a reliable test for working locale, but we can at least check
# that it is available before offering it as an option.
-echo "$as_me:16097: checking for setlocale()" >&5
+echo "$as_me:16169: 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 16104 "configure"
+#line 16176 "configure"
#include "confdefs.h"
#include <locale.h>
int
@@ -16113,16 +16185,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16116: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16188: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:16119: \$? = $ac_status" >&5
+ echo "$as_me:16191: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:16122: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16194: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16125: \$? = $ac_status" >&5
+ echo "$as_me:16197: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_locale=yes
else
@@ -16134,7 +16206,7 @@
fi
-echo "$as_me:16137: result: $cf_cv_locale" >&5
+echo "$as_me:16209: result: $cf_cv_locale" >&5
echo "${ECHO_T}$cf_cv_locale" >&6
test $cf_cv_locale = yes && { cat >>confdefs.h <<\EOF
#define LOCALE 1
@@ -16142,7 +16214,7 @@
}
if test $cf_cv_locale = yes ; then
-echo "$as_me:16145: checking if you want to use i18n locale support" >&5
+echo "$as_me:16217: 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.
@@ -16152,24 +16224,24 @@
else
cf_locale=yes
fi;
-echo "$as_me:16155: result: $cf_locale" >&5
+echo "$as_me:16227: result: $cf_locale" >&5
echo "${ECHO_T}$cf_locale" >&6
if test "$cf_locale" != no ; then
cat >>confdefs.h <<\EOF
#define OPT_LOCALE 1
EOF
- EXTRAOBJS="$EXTRAOBJS charsets\$o"
+ test "$cf_extensions" = yes && EXTRAOBJS="$EXTRAOBJS charsets\$o"
eval 'cf_cv_have_lib_'iconv'=no'
cf_libdir=""
- echo "$as_me:16166: checking for iconv" >&5
+ echo "$as_me:16238: checking for iconv" >&5
echo $ECHO_N "checking for iconv... $ECHO_C" >&6
if test "${ac_cv_func_iconv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 16172 "configure"
+#line 16244 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char iconv (); below. */
@@ -16200,16 +16272,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16203: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16275: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:16206: \$? = $ac_status" >&5
+ echo "$as_me:16278: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:16209: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16281: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16212: \$? = $ac_status" >&5
+ echo "$as_me:16284: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_iconv=yes
else
@@ -16219,18 +16291,18 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:16222: result: $ac_cv_func_iconv" >&5
+echo "$as_me:16294: result: $ac_cv_func_iconv" >&5
echo "${ECHO_T}$ac_cv_func_iconv" >&6
if test $ac_cv_func_iconv = yes; then
eval 'cf_cv_have_lib_'iconv'=yes'
else
cf_save_LIBS="$LIBS"
- echo "$as_me:16229: checking for iconv in -liconv" >&5
+ echo "$as_me:16301: checking for iconv in -liconv" >&5
echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6
LIBS="-liconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 16233 "configure"
+#line 16305 "configure"
#include "confdefs.h"
#include <iconv.h>
int
@@ -16242,25 +16314,25 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16245: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16317: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:16248: \$? = $ac_status" >&5
+ echo "$as_me:16320: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:16251: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16323: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16254: \$? = $ac_status" >&5
+ echo "$as_me:16326: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:16256: result: yes" >&5
+ echo "$as_me:16328: result: yes" >&5
echo "${ECHO_T}yes" >&6
eval 'cf_cv_have_lib_'iconv'=yes'
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:16263: result: no" >&5
+echo "$as_me:16335: result: no" >&5
echo "${ECHO_T}no" >&6
cf_search=""
@@ -16320,11 +16392,11 @@
for cf_libdir in $cf_search
do
- echo "$as_me:16323: checking for -liconv in $cf_libdir" >&5
+ echo "$as_me:16395: checking for -liconv in $cf_libdir" >&5
echo $ECHO_N "checking for -liconv in $cf_libdir... $ECHO_C" >&6
LIBS="-L$cf_libdir -liconv $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 16327 "configure"
+#line 16399 "configure"
#include "confdefs.h"
#include <iconv.h>
int
@@ -16336,25 +16408,25 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16339: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16411: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:16342: \$? = $ac_status" >&5
+ echo "$as_me:16414: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:16345: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16417: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16348: \$? = $ac_status" >&5
+ echo "$as_me:16420: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:16350: result: yes" >&5
+ echo "$as_me:16422: result: yes" >&5
echo "${ECHO_T}yes" >&6
eval 'cf_cv_have_lib_'iconv'=yes'
break
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:16357: result: no" >&5
+echo "$as_me:16429: result: no" >&5
echo "${ECHO_T}no" >&6
LIBS="$cf_save_LIBS"
fi
@@ -16368,7 +16440,7 @@
eval 'cf_found_library=$cf_cv_have_lib_'iconv
-echo "$as_me:16371: checking for iconv function library" >&5
+echo "$as_me:16443: checking for iconv function library" >&5
echo $ECHO_N "checking for iconv function library... $ECHO_C" >&6
if test "${cf_cv_func_iconv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16381,11 +16453,11 @@
fi
fi
-echo "$as_me:16384: result: $cf_cv_func_iconv" >&5
+echo "$as_me:16456: result: $cf_cv_func_iconv" >&5
echo "${ECHO_T}$cf_cv_func_iconv" >&6
if test "$cf_cv_func_iconv" != no ; then
-echo "$as_me:16388: checking if you want to use iconv() for locale support" >&5
+echo "$as_me:16460: checking if you want to use iconv() for locale support" >&5
echo $ECHO_N "checking if you want to use iconv() for locale support... $ECHO_C" >&6
# Check whether --with-iconv or --without-iconv was given.
@@ -16395,7 +16467,7 @@
else
cf_func_iconv=yes
fi;
-echo "$as_me:16398: result: $cf_func_iconv" >&5
+echo "$as_me:16470: result: $cf_func_iconv" >&5
echo "${ECHO_T}$cf_func_iconv" >&6
if test "$cf_func_iconv" = yes ; then
cat >>confdefs.h <<\EOF
@@ -16410,7 +16482,7 @@
### Debugging/development options
-echo "$as_me:16413: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:16485: checking if you want to use dmalloc for testing" >&5
echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
# Check whether --with-dmalloc or --without-dmalloc was given.
@@ -16426,7 +16498,7 @@
else
with_dmalloc=
fi;
-echo "$as_me:16429: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:16501: result: ${with_dmalloc:-no}" >&5
echo "${ECHO_T}${with_dmalloc:-no}" >&6
case .$with_cflags in #(vi
@@ -16510,23 +16582,23 @@
esac
if test "$with_dmalloc" = yes ; then
- echo "$as_me:16513: checking for dmalloc.h" >&5
+ echo "$as_me:16585: 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 16519 "configure"
+#line 16591 "configure"
#include "confdefs.h"
#include <dmalloc.h>
_ACEOF
-if { (eval echo "$as_me:16523: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16595: \"$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:16529: \$? = $ac_status" >&5
+ echo "$as_me:16601: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16545,11 +16617,11 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:16548: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:16620: 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:16552: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:16624: 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
@@ -16557,7 +16629,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldmalloc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 16560 "configure"
+#line 16632 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -16576,16 +16648,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16579: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16651: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:16582: \$? = $ac_status" >&5
+ echo "$as_me:16654: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:16585: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16657: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16588: \$? = $ac_status" >&5
+ echo "$as_me:16660: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dmalloc_dmalloc_debug=yes
else
@@ -16596,7 +16668,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:16599: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:16671: 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 <<EOF
@@ -16611,7 +16683,7 @@
fi
-echo "$as_me:16614: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:16686: checking if you want to use dbmalloc for testing" >&5
echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
# Check whether --with-dbmalloc or --without-dbmalloc was given.
@@ -16627,7 +16699,7 @@
else
with_dbmalloc=
fi;
-echo "$as_me:16630: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:16702: result: ${with_dbmalloc:-no}" >&5
echo "${ECHO_T}${with_dbmalloc:-no}" >&6
case .$with_cflags in #(vi
@@ -16711,23 +16783,23 @@
esac
if test "$with_dbmalloc" = yes ; then
- echo "$as_me:16714: checking for dbmalloc.h" >&5
+ echo "$as_me:16786: 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 16720 "configure"
+#line 16792 "configure"
#include "confdefs.h"
#include <dbmalloc.h>
_ACEOF
-if { (eval echo "$as_me:16724: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16796: \"$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:16730: \$? = $ac_status" >&5
+ echo "$as_me:16802: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16746,11 +16818,11 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:16749: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:16821: 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:16753: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:16825: 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
@@ -16758,7 +16830,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldbmalloc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 16761 "configure"
+#line 16833 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -16777,16 +16849,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16780: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16852: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:16783: \$? = $ac_status" >&5
+ echo "$as_me:16855: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:16786: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16858: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16789: \$? = $ac_status" >&5
+ echo "$as_me:16861: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dbmalloc_debug_malloc=yes
else
@@ -16797,7 +16869,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:16800: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:16872: 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 <<EOF
@@ -16812,7 +16884,7 @@
fi
-echo "$as_me:16815: checking if you want to use purify for testing" >&5
+echo "$as_me:16887: checking if you want to use purify for testing" >&5
echo $ECHO_N "checking if you want to use purify for testing... $ECHO_C" >&6
# Check whether --with-purify or --without-purify was given.
@@ -16828,7 +16900,7 @@
else
with_purify=
fi;
-echo "$as_me:16831: result: ${with_purify:-no}" >&5
+echo "$as_me:16903: result: ${with_purify:-no}" >&5
echo "${ECHO_T}${with_purify:-no}" >&6
case .$with_cflags in #(vi
@@ -16911,7 +16983,7 @@
;;
esac
-echo "$as_me:16914: checking if you want to use valgrind for testing" >&5
+echo "$as_me:16986: checking if you want to use valgrind for testing" >&5
echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
# Check whether --with-valgrind or --without-valgrind was given.
@@ -16927,7 +16999,7 @@
else
with_valgrind=
fi;
-echo "$as_me:16930: result: ${with_valgrind:-no}" >&5
+echo "$as_me:17002: result: ${with_valgrind:-no}" >&5
echo "${ECHO_T}${with_valgrind:-no}" >&6
case .$with_cflags in #(vi
@@ -17010,7 +17082,7 @@
;;
esac
-echo "$as_me:17013: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:17085: checking if you want to perform memory-leak testing" >&5
echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
# Check whether --with-no-leaks or --without-no-leaks was given.
@@ -17032,7 +17104,7 @@
else
with_no_leaks=
fi;
-echo "$as_me:17035: result: $with_no_leaks" >&5
+echo "$as_me:17107: result: $with_no_leaks" >&5
echo "${ECHO_T}$with_no_leaks" >&6
# Check whether --with-fakevms or --without-fakevms was given.
@@ -17061,17 +17133,17 @@
GCC_VERSION=none
if test "$GCC" = yes ; then
- echo "$as_me:17064: checking version of $CC" >&5
+ echo "$as_me:17136: 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/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
test -z "$GCC_VERSION" && GCC_VERSION=unknown
- echo "$as_me:17068: result: $GCC_VERSION" >&5
+ echo "$as_me:17140: result: $GCC_VERSION" >&5
echo "${ECHO_T}$GCC_VERSION" >&6
fi
if ( test "$GCC" = yes || test "$GXX" = yes )
then
-echo "$as_me:17074: checking if you want to check for gcc warnings" >&5
+echo "$as_me:17146: 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.
@@ -17081,7 +17153,7 @@
else
cf_opt_with_warnings=no
fi;
-echo "$as_me:17084: result: $cf_opt_with_warnings" >&5
+echo "$as_me:17156: result: $cf_opt_with_warnings" >&5
echo "${ECHO_T}$cf_opt_with_warnings" >&6
if test "$cf_opt_with_warnings" != no ; then
@@ -17103,10 +17175,10 @@
EOF
if test "$GCC" = yes
then
- { echo "$as_me:17106: checking for $CC __attribute__ directives..." >&5
+ { echo "$as_me:17178: checking for $CC __attribute__ directives..." >&5
echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
cat > conftest.$ac_ext <<EOF
-#line 17109 "configure"
+#line 17181 "configure"
#include "confdefs.h"
#include "conftest.h"
#include "conftest.i"
@@ -17144,12 +17216,12 @@
EOF
;;
esac
- if { (eval echo "$as_me:17147: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:17219: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:17150: \$? = $ac_status" >&5
+ echo "$as_me:17222: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:17152: result: ... $cf_attribute" >&5
+ test -n "$verbose" && echo "$as_me:17224: result: ... $cf_attribute" >&5
echo "${ECHO_T}... $cf_attribute" >&6
cat conftest.h >>confdefs.h
fi
@@ -17165,12 +17237,12 @@
if test "$GCC" = yes ; then
case $host_os in
linux*|gnu*)
- echo "$as_me:17168: checking if this is really Intel C compiler" >&5
+ echo "$as_me:17240: checking if this is really Intel C compiler" >&5
echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
cf_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -no-gcc"
cat >conftest.$ac_ext <<_ACEOF
-#line 17173 "configure"
+#line 17245 "configure"
#include "confdefs.h"
int
@@ -17187,16 +17259,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17190: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17262: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:17193: \$? = $ac_status" >&5
+ echo "$as_me:17265: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:17196: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17268: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17199: \$? = $ac_status" >&5
+ echo "$as_me:17271: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
INTEL_COMPILER=yes
cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
@@ -17207,14 +17279,14 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
CFLAGS="$cf_save_CFLAGS"
- echo "$as_me:17210: result: $INTEL_COMPILER" >&5
+ echo "$as_me:17282: result: $INTEL_COMPILER" >&5
echo "${ECHO_T}$INTEL_COMPILER" >&6
;;
esac
fi
cat > conftest.$ac_ext <<EOF
-#line 17217 "configure"
+#line 17289 "configure"
int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
EOF
@@ -17232,7 +17304,7 @@
# remark #981: operands are evaluated in unspecified order
# warning #269: invalid format string conversion
- { echo "$as_me:17235: checking for $CC warning options..." >&5
+ { echo "$as_me:17307: checking for $CC warning options..." >&5
echo "$as_me: checking for $CC warning options..." >&6;}
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="-Wall"
@@ -17249,12 +17321,12 @@
wd981
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
- if { (eval echo "$as_me:17252: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:17324: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:17255: \$? = $ac_status" >&5
+ echo "$as_me:17327: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:17257: result: ... -$cf_opt" >&5
+ test -n "$verbose" && echo "$as_me:17329: result: ... -$cf_opt" >&5
echo "${ECHO_T}... -$cf_opt" >&6
EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
fi
@@ -17263,7 +17335,7 @@
elif test "$GCC" = yes
then
- { echo "$as_me:17266: checking for $CC warning options..." >&5
+ { echo "$as_me:17338: checking for $CC warning options..." >&5
echo "$as_me: checking for $CC warning options..." >&6;}
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="-W -Wall"
@@ -17283,12 +17355,12 @@
Wundef $cf_warn_CONST
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
- if { (eval echo "$as_me:17286: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:17358: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:17289: \$? = $ac_status" >&5
+ echo "$as_me:17361: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:17291: result: ... -$cf_opt" >&5
+ test -n "$verbose" && echo "$as_me:17363: result: ... -$cf_opt" >&5
echo "${ECHO_T}... -$cf_opt" >&6
case $cf_opt in #(vi
Wcast-qual) #(vi
@@ -17338,7 +17410,7 @@
ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-echo "$as_me:17341: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:17413: 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
@@ -17347,7 +17419,7 @@
cf_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
cat >conftest.$ac_ext <<_ACEOF
-#line 17350 "configure"
+#line 17422 "configure"
#include "confdefs.h"
$CHECK_DECL_HDRS
@@ -17369,16 +17441,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17372: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17444: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:17375: \$? = $ac_status" >&5
+ echo "$as_me:17447: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:17378: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17450: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17381: \$? = $ac_status" >&5
+ echo "$as_me:17453: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval 'cf_cv_func_'${ac_func}'=yes'
else
@@ -17392,7 +17464,7 @@
fi
eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:17395: result: $cf_result" >&5
+echo "$as_me:17467: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
test $cf_result = yes && cat >>confdefs.h <<EOF
#define MISSING_EXTERN_${ac_tr_func} 1
@@ -17406,7 +17478,7 @@
#include <tcap.h>
"
-echo "$as_me:17409: checking for term.h" >&5
+echo "$as_me:17481: 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
@@ -17419,7 +17491,7 @@
term.h
do
cat >conftest.$ac_ext <<_ACEOF
-#line 17422 "configure"
+#line 17494 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
@@ -17433,16 +17505,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17436: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17508: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:17439: \$? = $ac_status" >&5
+ echo "$as_me:17511: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:17442: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17514: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17445: \$? = $ac_status" >&5
+ echo "$as_me:17517: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_term_header=$cf_header
break
@@ -17455,7 +17527,7 @@
done
fi
-echo "$as_me:17458: result: $cf_cv_term_header" >&5
+echo "$as_me:17530: result: $cf_cv_term_header" >&5
echo "${ECHO_T}$cf_cv_term_header" >&6
case $cf_cv_term_header in #(vi
@@ -17479,7 +17551,7 @@
;;
esac
-echo "$as_me:17482: checking if we should include curses.h or termcap.h" >&5
+echo "$as_me:17554: 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
@@ -17498,7 +17570,7 @@
test -n "$cf_t_opts" && CPPFLAGS="$CPPFLAGS -D$cf_t_opts"
cat >conftest.$ac_ext <<_ACEOF
-#line 17501 "configure"
+#line 17573 "configure"
#include "confdefs.h"
/* $cf_c_opts $cf_t_opts */
$CHECK_DECL_HDRS
@@ -17511,16 +17583,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17514: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17586: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:17517: \$? = $ac_status" >&5
+ echo "$as_me:17589: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:17520: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17592: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17523: \$? = $ac_status" >&5
+ echo "$as_me:17595: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test "$cf_cv_need_curses_h" = no && {
cf_cv_need_curses_h=maybe
@@ -17532,7 +17604,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 17535 "configure"
+#line 17607 "configure"
#include "confdefs.h"
$CHECK_DECL_HDRS
@@ -17545,16 +17617,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17548: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17620: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:17551: \$? = $ac_status" >&5
+ echo "$as_me:17623: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:17554: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17626: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17557: \$? = $ac_status" >&5
+ echo "$as_me:17629: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_need_curses_h=yes
cf_ok_c_opts=$cf_c_opts
@@ -17591,7 +17663,7 @@
fi
fi
-echo "$as_me:17594: result: $cf_cv_need_curses_h" >&5
+echo "$as_me:17666: result: $cf_cv_need_curses_h" >&5
echo "${ECHO_T}$cf_cv_need_curses_h" >&6
case $cf_cv_need_curses_h in
@@ -17625,7 +17697,7 @@
;;
esac
-echo "$as_me:17628: checking declaration of tputs 3rd param" >&5
+echo "$as_me:17700: 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
@@ -17641,10 +17713,10 @@
for R in int char; do
for S in "" const; do
-echo "(line 17644) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5
+echo "(line 17716) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 17647 "configure"
+#line 17719 "configure"
#include "confdefs.h"
$CHECK_DECL_HDRS
int
@@ -17658,16 +17730,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17661: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17733: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:17664: \$? = $ac_status" >&5
+ echo "$as_me:17736: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:17667: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17739: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17670: \$? = $ac_status" >&5
+ echo "$as_me:17742: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_type_outchar="$Q OutChar($R)"
cf_cv_found=yes
@@ -17686,7 +17758,7 @@
done
fi
-echo "$as_me:17689: result: $cf_cv_type_outchar" >&5
+echo "$as_me:17761: result: $cf_cv_type_outchar" >&5
echo "${ECHO_T}$cf_cv_type_outchar" >&6
case $cf_cv_type_outchar in
@@ -17718,7 +17790,7 @@
ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-echo "$as_me:17721: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:17793: 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
@@ -17727,7 +17799,7 @@
cf_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
cat >conftest.$ac_ext <<_ACEOF
-#line 17730 "configure"
+#line 17802 "configure"
#include "confdefs.h"
$CHECK_DECL_HDRS
@@ -17749,16 +17821,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17752: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17824: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:17755: \$? = $ac_status" >&5
+ echo "$as_me:17827: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:17758: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17830: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17761: \$? = $ac_status" >&5
+ echo "$as_me:17833: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval 'cf_cv_func_'${ac_func}'=yes'
else
@@ -17772,7 +17844,7 @@
fi
eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:17775: result: $cf_result" >&5
+echo "$as_me:17847: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
test $cf_result = yes && cat >>confdefs.h <<EOF
#define MISSING_EXTERN_${ac_tr_func} 1
@@ -17849,7 +17921,7 @@
ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-echo "$as_me:17852: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:17924: 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
@@ -17858,7 +17930,7 @@
cf_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
cat >conftest.$ac_ext <<_ACEOF
-#line 17861 "configure"
+#line 17933 "configure"
#include "confdefs.h"
$CHECK_DECL_HDRS
@@ -17880,16 +17952,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17883: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17955: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:17886: \$? = $ac_status" >&5
+ echo "$as_me:17958: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:17889: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17961: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17892: \$? = $ac_status" >&5
+ echo "$as_me:17964: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval 'cf_cv_func_'${ac_func}'=yes'
else
@@ -17903,7 +17975,7 @@
fi
eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:17906: result: $cf_result" >&5
+echo "$as_me:17978: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
test $cf_result = yes && cat >>confdefs.h <<EOF
#define MISSING_EXTERN_${ac_tr_func} 1
@@ -17923,7 +17995,7 @@
ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-echo "$as_me:17926: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:17998: 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
@@ -17932,7 +18004,7 @@
cf_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
cat >conftest.$ac_ext <<_ACEOF
-#line 17935 "configure"
+#line 18007 "configure"
#include "confdefs.h"
$CHECK_DECL_HDRS
@@ -17954,16 +18026,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17957: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18029: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:17960: \$? = $ac_status" >&5
+ echo "$as_me:18032: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:17963: \"$ac_try\"") >&5
+ { (eval echo "$as_me:18035: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17966: \$? = $ac_status" >&5
+ echo "$as_me:18038: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval 'cf_cv_func_'${ac_func}'=yes'
else
@@ -17977,7 +18049,7 @@
fi
eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:17980: result: $cf_result" >&5
+echo "$as_me:18052: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
test $cf_result = yes && cat >>confdefs.h <<EOF
#define MISSING_EXTERN_${ac_tr_func} 1
@@ -18034,13 +18106,13 @@
if test "$cf_need_libdl" = yes ; then
cf_have_dlsym=no
-echo "$as_me:18037: checking for dlsym" >&5
+echo "$as_me:18109: 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 18043 "configure"
+#line 18115 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlsym (); below. */
@@ -18071,16 +18143,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18074: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18146: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:18077: \$? = $ac_status" >&5
+ echo "$as_me:18149: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:18080: \"$ac_try\"") >&5
+ { (eval echo "$as_me:18152: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:18083: \$? = $ac_status" >&5
+ echo "$as_me:18155: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_dlsym=yes
else
@@ -18090,14 +18162,14 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:18093: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:18165: result: $ac_cv_func_dlsym" >&5
echo "${ECHO_T}$ac_cv_func_dlsym" >&6
if test $ac_cv_func_dlsym = yes; then
cf_have_dlsym=yes
else
cf_have_libdl=no
-echo "$as_me:18100: checking for dlsym in -ldl" >&5
+echo "$as_me:18172: 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
@@ -18105,7 +18177,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 18108 "configure"
+#line 18180 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -18124,16 +18196,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18127: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18199: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:18130: \$? = $ac_status" >&5
+ echo "$as_me:18202: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:18133: \"$ac_try\"") >&5
+ { (eval echo "$as_me:18205: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:18136: \$? = $ac_status" >&5
+ echo "$as_me:18208: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dl_dlsym=yes
else
@@ -18144,7 +18216,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:18147: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:18219: 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
@@ -18157,10 +18229,10 @@
if test "$cf_have_dlsym" = yes ; then
test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
- echo "$as_me:18160: checking whether able to link to dl*() functions" >&5
+ echo "$as_me:18232: 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 18163 "configure"
+#line 18235 "configure"
#include "confdefs.h"
#include <dlfcn.h>
int
@@ -18178,16 +18250,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18181: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18253: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:18184: \$? = $ac_status" >&5
+ echo "$as_me:18256: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:18187: \"$ac_try\"") >&5
+ { (eval echo "$as_me:18259: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:18190: \$? = $ac_status" >&5
+ echo "$as_me:18262: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cat >>confdefs.h <<\EOF
@@ -18198,15 +18270,15 @@
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- { { echo "$as_me:18201: error: Cannot link test program for libdl" >&5
+ { { echo "$as_me:18273: 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:18206: result: ok" >&5
+ echo "$as_me:18278: result: ok" >&5
echo "${ECHO_T}ok" >&6
else
- { { echo "$as_me:18209: error: Cannot find dlsym function" >&5
+ { { echo "$as_me:18281: error: Cannot find dlsym function" >&5
echo "$as_me: error: Cannot find dlsym function" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -18221,10 +18293,10 @@
cf_opt_rdynamic=no
cf_save_CFLAGS="$CFLAGS"
CFLAGS="-Wall -rdynamic $CFLAGS"
- echo "$as_me:18224: checking if gcc has -rdynamic option" >&5
+ echo "$as_me:18296: 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 18227 "configure"
+#line 18299 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -18236,16 +18308,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18239: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18311: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:18242: \$? = $ac_status" >&5
+ echo "$as_me:18314: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:18245: \"$ac_try\"") >&5
+ { (eval echo "$as_me:18317: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:18248: \$? = $ac_status" >&5
+ echo "$as_me:18320: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_opt_rdynamic=yes
else
@@ -18254,7 +18326,7 @@
cf_opt_rdynamic=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:18257: result: $cf_opt_rdynamic" >&5
+ echo "$as_me:18329: result: $cf_opt_rdynamic" >&5
echo "${ECHO_T}$cf_opt_rdynamic" >&6
test "$cf_opt_rdynamic" = no && CFLAGS="$cf_save_CFLAGS"
@@ -18267,11 +18339,11 @@
fi
fi
-for ac_prog in aspell ispell spell
+for ac_prog in ispell aspell spell
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:18274: checking for $ac_word" >&5
+echo "$as_me:18346: 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
@@ -18286,7 +18358,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:18289: found $ac_dir/$ac_word" >&5
+echo "$as_me:18361: found $ac_dir/$ac_word" >&5
break
done
@@ -18294,10 +18366,10 @@
fi
SPELL_PROG=$ac_cv_prog_SPELL_PROG
if test -n "$SPELL_PROG"; then
- echo "$as_me:18297: result: $SPELL_PROG" >&5
+ echo "$as_me:18369: result: $SPELL_PROG" >&5
echo "${ECHO_T}$SPELL_PROG" >&6
else
- echo "$as_me:18300: result: no" >&5
+ echo "$as_me:18372: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -18409,7 +18481,7 @@
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:18412: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:18484: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
@@ -18541,7 +18613,7 @@
cat >>$CONFIG_STATUS <<EOF
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.52.20061216,
+configured by $0, generated by GNU Autoconf 2.52.20030208,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -18585,7 +18657,7 @@
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
- { { echo "$as_me:18588: error: ambiguous option: $1
+ { { echo "$as_me:18660: 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;}
@@ -18604,7 +18676,7 @@
ac_need_defaults=false;;
# This is an error.
- -*) { { echo "$as_me:18607: error: unrecognized option: $1
+ -*) { { echo "$as_me:18679: 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;}
@@ -18623,7 +18695,7 @@
## Running config.status. ##
## ----------------------- ##
-This file was extended by $as_me 2.52.20061216, executed with
+This file was extended by $as_me 2.52.20030208, executed with
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
CONFIG_LINKS = $CONFIG_LINKS
@@ -18662,7 +18734,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:18665: error: invalid argument: $ac_config_target" >&5
+ *) { { echo "$as_me:18737: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
@@ -18932,7 +19004,7 @@
esac
if test x"$ac_file" != x-; then
- { echo "$as_me:18935: creating $ac_file" >&5
+ { echo "$as_me:19007: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
@@ -18950,7 +19022,7 @@
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:18953: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:19025: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -18963,7 +19035,7 @@
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:18966: error: cannot find input file: $f" >&5
+ { { echo "$as_me:19038: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -19029,7 +19101,7 @@
* ) ac_file_in=$ac_file.in ;;
esac
- test x"$ac_file" != x- && { echo "$as_me:19032: creating $ac_file" >&5
+ test x"$ac_file" != x- && { echo "$as_me:19104: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
@@ -19040,7 +19112,7 @@
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:19043: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:19115: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -19053,7 +19125,7 @@
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:19056: error: cannot find input file: $f" >&5
+ { { echo "$as_me:19128: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -19078,7 +19150,7 @@
do
# Write chunks of a limited-size here document to conftest.frag.
echo ' cat >> conftest.frag <<CEOF' >> $CONFIG_STATUS
- sed ${ac_max_here_lines}q conftest.vals | sed -e 's/#ifdef.*/#if 0/' >> $CONFIG_STATUS
+ sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
echo 'CEOF' >> $CONFIG_STATUS
sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
rm -f conftest.vals
@@ -19111,7 +19183,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:19114: $ac_file is unchanged" >&5
+ { echo "$as_me:19186: $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.228
--- vile-9.5p+/configure.in 2007-01-14 21:38:06.000000000 +0000
+++ vile-9.5q/configure.in 2007-05-28 16:31:40.000000000 +0000
@@ -1,12 +1,12 @@
dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.228 $)
+AC_REVISION($Revision: 1.233 $)
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.228 2007/01/14 21:38:06 tom Exp $
+dnl $Header: /usr/build/vile/vile/RCS/configure.in,v 1.233 2007/05/28 16:31:40 tom Exp $
define(MAKELIST, sh $srcdir/filters/makelist.sh $srcdir/filters/genmake.mak)
@@ -335,6 +335,7 @@
memory.h \
poll.h \
pwd.h \
+search.h \
select.h \
setjmp.h \
sgtty.h \
@@ -559,6 +560,7 @@
CF_CRYPT_FUNC
CF_CHECK_FD_SET
+CF_STDIO_UNLOCKED
AC_HAVE_FUNCS( \
_nc_freeall \
@@ -594,6 +596,7 @@
strtoul \
symlink \
tcgetattr \
+tsearch \
ttyname \
umask \
utime \
@@ -685,7 +688,7 @@
AC_MSG_RESULT($cf_locale)
if test "$cf_locale" != no ; then
AC_DEFINE(OPT_LOCALE)
- EXTRAOBJS="$EXTRAOBJS charsets\$o"
+ test "$cf_extensions" = yes && EXTRAOBJS="$EXTRAOBJS charsets\$o"
CF_FUNC_ICONV
if test "$cf_cv_func_iconv" != no ; then
AC_MSG_CHECKING(if you want to use iconv() for locale support)
@@ -907,7 +910,7 @@
AC_SUBST(SH_CFLAGS)
AC_SUBST(SH_LDFLAGS)
-AC_CHECK_PROGS(SPELL_PROG, aspell ispell spell, [])
+AC_CHECK_PROGS(SPELL_PROG, ispell aspell spell, [])
case .$SPELL_PROG in
.aspell)
SPELL_OPTS="-x list"
Index: curses.c
Prereq: 1.27
--- vile-9.5p+/curses.c 2006-01-12 23:37:34.000000000 +0000
+++ vile-9.5q/curses.c 2007-05-27 20:35:50.000000000 +0000
@@ -1,7 +1,7 @@
/*
* A terminal driver using the curses library
*
- * $Header: /usr/build/vile/vile/RCS/curses.c,v 1.27 2006/01/12 23:37:34 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/curses.c,v 1.29 2007/05/27 20:35:50 tom Exp $
*/
#include "estruct.h"
@@ -130,6 +130,12 @@
curs_close(void)
{
TRACE(("curs_close\n"));
+
+ /* see tcap.c */
+ term.curmove(term.rows - 1, 0); /* cf: dumbterm.c */
+ term.eeol();
+ term.set_title(getenv("TERM"));
+
vl_restore_tty();
}
@@ -154,8 +160,27 @@
fflush(stdout);
result = getchar();
} else if (result == -1) {
+#ifdef VAL_AUTOCOLOR
+ int acmilli = global_b_val(VAL_AUTOCOLOR);
+
+ if (acmilli != 0) {
+ timeout(acmilli);
+ for_ever {
+ result = getch();
+ if (result < 0) {
+ autocolor();
+ } else {
+ break;
+ }
+ }
+ } else {
+ nodelay(stdscr, FALSE);
+ result = getch();
+ }
+#else
nodelay(stdscr, FALSE);
result = getch();
+#endif
}
last_key = -1;
TRACE(("curs_getc:%d%s\n", result, in_screen ? "" : "*"));
Index: display.c
Prereq: 1.423
--- vile-9.5p+/display.c 2006-12-13 01:34:10.000000000 +0000
+++ vile-9.5q/display.c 2007-05-28 14:03:37.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.423 2006/12/13 01:34:10 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/display.c,v 1.424 2007/05/28 14:03:37 tom Exp $
*
*/
@@ -1243,8 +1243,11 @@
{
#if !OPT_PSCREEN
int i;
+#if OPT_VIDEO_ATTRS
size_t alen = sizeof(VIDEO_ATTR) * term.cols;
#endif
+#endif
+
kbd_flush();
bottomleft();
term.putch('\n');
Index: estruct.h
Prereq: 1.609
--- vile-9.5p+/estruct.h 2007-02-11 17:34:33.000000000 +0000
+++ vile-9.5q/estruct.h 2007-05-26 11:14:38.000000000 +0000
@@ -12,7 +12,7 @@
*/
/*
- * $Header: /usr/build/vile/vile/RCS/estruct.h,v 1.609 2007/02/11 17:34:33 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/estruct.h,v 1.611 2007/05/26 11:14:38 tom Exp $
*/
#ifndef _estruct_h
@@ -272,7 +272,7 @@
#include "w32vile.h"
#endif
-#include <stdio.h>
+#include <vl_stdio.h>
#if SYS_VMS && (! defined(__DECC_VER))
# include <types.h>
@@ -2748,7 +2748,7 @@
#define PERCENT(num,den) ((den) ? (int)((100.0 * (num))/(den)) : 100)
/* Quiet compiler warnings on places where we're being blamed incorrectly,
- * e.g., for casting away const, or for alignment problems. It's always
+ * e.g., for casting away const, or for alignment problems. It's generally
* legal in c89 to cast a pointer to long w/o loss of precision.
*
* FIXME: c99 may require a wider type.
@@ -2943,11 +2943,15 @@
#endif
#if OPT_TRACE > 1
-#define TRACE2(params) TRACE(params)
-#define return2Code(c) returnCode(c)
+#define TRACE2(params) TRACE(params)
+#define return2Code(c) returnCode(c)
+#define return2String(c) returnString(c)
+#define return2Void() returnVoid()
#else
#define TRACE2(params) /*nothing*/
-#define return2Code(c) return(c)
+#define return2Code(c) return(c)
+#define return2String(c) return(c)
+#define return2Void() return
#endif
#if OPT_EVAL || OPT_DEBUGMACROS
Index: eval.c
Prereq: 1.357
--- vile-9.5p+/eval.c 2006-12-14 21:10:34.000000000 +0000
+++ vile-9.5q/eval.c 2007-02-11 17:37:54.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.357 2006/12/14 21:10:34 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/eval.c,v 1.358 2007/02/11 17:37:54 tom Exp $
*
*/
@@ -422,7 +422,7 @@
vv = "";
} else if (vv[t - 1] == '\n')
t--; /* suppress trailing newline */
- v = lsprintf(v, fmt, Names[s], t, vv);
+ v = lsprintf(v, fmt, Names[s], (int) t, vv);
}
}
rc = liststuff(VARIABLES_BufName, FALSE,
Index: exec.c
Prereq: 1.309
--- vile-9.5p+/exec.c 2007-01-14 20:03:23.000000000 +0000
+++ vile-9.5q/exec.c 2007-05-28 14:02:36.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.309 2007/01/14 20:03:23 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/exec.c,v 1.310 2007/05/28 14:02:36 tom Exp $
*
*/
@@ -2294,7 +2294,9 @@
int save_no_errs = no_errs;
int save_quiet = quiet;
int indent = 0;
+#if !SMALLER
int indstate = 0;
+#endif
static BUFFER *dobuferrbp = 0;
@@ -2683,7 +2685,6 @@
returnCode(status);
}
-#if ! SMALLER
/*
* execute a series of commands in a file
*/
@@ -2701,7 +2702,6 @@
return do_source(fname, n, FALSE);
}
-#endif
static L_NUM
get_b_lineno(BUFFER *bp)
Index: fileio.c
Prereq: 1.181
--- vile-9.5p+/fileio.c 2006-04-25 21:00:42.000000000 +0000
+++ vile-9.5q/fileio.c 2007-05-05 15:01:45.000000000 +0000
@@ -2,7 +2,7 @@
* The routines in this file read and write ASCII files from the disk. All of
* the knowledge about files are here.
*
- * $Header: /usr/build/vile/vile/RCS/fileio.c,v 1.181 2006/04/25 21:00:42 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/fileio.c,v 1.182 2007/05/05 15:01:45 tom Exp $
*
*/
@@ -57,10 +57,10 @@
if ((ofp = fopen(SL_TO_BSL(dst), FOPEN_WRITE)) != 0) {
ok = TRUE;
for_ever {
- chr = getc(ifp);
+ chr = vl_getc(ifp);
if (feof(ifp))
break;
- putc(chr, ofp);
+ vl_putc(chr, ofp);
if (ferror(ifp) || ferror(ofp)) {
ok = FALSE;
break;
@@ -772,7 +772,7 @@
fflinelen = 0;
}
} else {
- putc(d, ffp);
+ vl_putc(d, ffp);
if (ferror(ffp)) {
mlerror("writing");
@@ -851,7 +851,7 @@
{
/* accumulate to a newline */
for_ever {
- c = getc(ffp);
+ c = vl_getc(ffp);
if (feof(ffp) || ferror(ffp))
break;
#if OPT_ENCRYPT
Index: filters/atr2ansi.c
Prereq: 1.3
--- vile-9.5p+/filters/atr2ansi.c 2006-05-21 19:42:21.000000000 +0000
+++ vile-9.5q/filters/atr2ansi.c 2007-05-05 15:23:03.000000000 +0000
@@ -1,7 +1,7 @@
/*
* Convert attributed text to ANSI-style escape sequences, allowing color.
*
- * $Header: /usr/build/vile/vile/filters/RCS/atr2ansi.c,v 1.3 2006/05/21 19:42:21 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/atr2ansi.c,v 1.4 2007/05/05 15:23:03 tom Exp $
*/
#include <unfilter.h>
@@ -21,20 +21,20 @@
markup_unfilter(FILE *dst, int attrib)
{
if (attrib != 0) {
- fputs(CSI "0", dst);
+ vl_fputs(CSI "0", dst);
if (attrib & ATR_BOLD)
- fputs(";1", dst);
+ vl_fputs(";1", dst);
if (attrib & (ATR_UNDERLINE | ATR_ITALIC))
- fputs(";4", dst);
+ vl_fputs(";4", dst);
if (attrib & ATR_REVERSE)
- fputs(";7", dst);
+ vl_fputs(";7", dst);
if (attrib & ATR_COLOR) {
- fputs(";3", dst);
- fputc('0' + (attrib & 7), dst);
+ vl_fputs(";3", dst);
+ vl_putc('0' + (attrib & 7), dst);
}
- fputc('m', dst);
+ vl_putc('m', dst);
} else if (last_attrib != 0) {
- fputs(CSI "0m", dst);
+ vl_fputs(CSI "0m", dst);
}
last_attrib = attrib;
}
@@ -44,7 +44,7 @@
{
(void) attrib;
- fputc(ch, dst);
+ vl_putc(ch, dst);
}
void
Index: filters/atr2html.c
Prereq: 1.3
--- vile-9.5p+/filters/atr2html.c 2006-05-21 19:47:02.000000000 +0000
+++ vile-9.5q/filters/atr2html.c 2007-05-05 15:23:03.000000000 +0000
@@ -1,7 +1,7 @@
/*
* Convert attributed text to html.
*
- * $Header: /usr/build/vile/vile/filters/RCS/atr2html.c,v 1.3 2006/05/21 19:47:02 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/atr2html.c,v 1.4 2007/05/05 15:23:03 tom Exp $
*/
#include <unfilter.h>
@@ -26,17 +26,17 @@
{
if (last_attrib != 0) {
if (CLOSE(ATR_COLOR))
- fputs("</font>", dst);
+ vl_fputs("</font>", dst);
if (CLOSE(ATR_UNDERLINE | ATR_ITALIC))
- fputs("</em>", dst);
+ vl_fputs("</em>", dst);
if (CLOSE(ATR_BOLD))
- fputs("</strong>", dst);
+ vl_fputs("</strong>", dst);
}
if (attrib != 0) {
if (OPEN(ATR_BOLD))
- fputs("<strong>", dst);
+ vl_fputs("<strong>", dst);
if (OPEN(ATR_UNDERLINE | ATR_ITALIC))
- fputs("<em>", dst);
+ vl_fputs("<em>", dst);
if (OPEN(ATR_COLOR)) {
int r = attrib & 1;
int g = attrib & 2;
@@ -70,9 +70,9 @@
break;
}
if (alias != 0) {
- fputs(alias, dst);
+ vl_fputs(alias, dst);
} else {
- fputc(ch, dst);
+ vl_putc(ch, dst);
}
}
Index: filters/atr2text.c
Prereq: 1.3
--- vile-9.5p+/filters/atr2text.c 2006-05-21 19:42:45.000000000 +0000
+++ vile-9.5q/filters/atr2text.c 2007-05-05 15:14:56.000000000 +0000
@@ -1,7 +1,7 @@
/*
* Convert attributed text to something like nroff output.
*
- * $Header: /usr/build/vile/vile/filters/RCS/atr2text.c,v 1.3 2006/05/21 19:42:45 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/atr2text.c,v 1.4 2007/05/05 15:14:56 tom Exp $
*/
#include <unfilter.h>
@@ -23,14 +23,14 @@
{
if (isprint(ch)) {
if (attrib & ATR_BOLD) {
- fputc(ch, dst);
- fputc('\b', dst);
+ vl_putc(ch, dst);
+ vl_putc('\b', dst);
} else if (attrib & (ATR_UNDERLINE | ATR_ITALIC)) {
- fputc('_', dst);
- fputc('\b', dst);
+ vl_putc('_', dst);
+ vl_putc('\b', dst);
}
}
- fputc(ch, dst);
+ vl_putc(ch, dst);
}
void
Index: filters/c-filt.c
Prereq: 1.74
--- vile-9.5p+/filters/c-filt.c 2006-05-21 19:43:05.000000000 +0000
+++ vile-9.5q/filters/c-filt.c 2007-05-26 14:00:25.000000000 +0000
@@ -6,7 +6,7 @@
* 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.74 2006/05/21 19:43:05 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/c-filt.c,v 1.75 2007/05/26 14:00:25 tom Exp $
*
* Usage: refer to vile.hlp and doc/filters.doc .
*
@@ -43,17 +43,21 @@
unsigned need;
char *attr;
char *base = s;
+ int found = 0;
while (isNamex(*s))
s++;
if (base != s) {
need = s - base;
- name = do_alloc(name, need, &have);
- strncpy(name, base, need);
- name[need] = 0;
- if ((attr = keyword_attr(name)) != 0) {
- flt_puts(base, need, attr);
- } else {
+ if ((name = do_alloc(name, need, &have)) != 0) {
+ strncpy(name, base, need);
+ name[need] = 0;
+ if ((attr = keyword_attr(name)) != 0) {
+ flt_puts(base, need, attr);
+ found = 1;
+ }
+ }
+ if (!found) {
flt_puts(base, need, Ident_attr);
}
#ifdef NO_LEAKS
Index: filters/ecrypt.c
Prereq: 1.8
--- vile-9.5p+/filters/ecrypt.c 2004-10-27 19:17:57.000000000 +0000
+++ vile-9.5q/filters/ecrypt.c 2007-05-05 15:24:46.000000000 +0000
@@ -1,7 +1,7 @@
/* Crypt: Encryption routines for MicroEMACS
* written by Dana Hoggatt and Paul Fox.
*
- * $Header: /usr/build/vile/vile/filters/RCS/ecrypt.c,v 1.8 2004/10/27 19:17:57 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/ecrypt.c,v 1.9 2007/05/05 15:24:46 tom Exp $
*
*/
@@ -218,7 +218,7 @@
ue_crypt(key, strlen(key));
while (1) {
- p = fgets(buf, sizeof(buf), ifp);
+ p = vl_fgets(buf, sizeof(buf), ifp);
if (!p) {
if (ferror(ifp))
failed("reading file");
@@ -231,7 +231,7 @@
}
if (!mailmode)
ue_crypt(buf, strlen(buf));
- if (fputs(buf, stdout) == EOF)
+ if (vl_fputs(buf, stdout) == EOF)
failed("writing stdout");
}
Index: filters/filterio.c
Prereq: 1.29
--- vile-9.5p+/filters/filterio.c 2006-06-12 00:05:34.000000000 +0000
+++ vile-9.5q/filters/filterio.c 2007-05-26 14:16:34.000000000 +0000
@@ -1,7 +1,7 @@
/*
* Main program and I/O for external vile syntax/highlighter programs
*
- * $Header: /usr/build/vile/vile/filters/RCS/filterio.c,v 1.29 2006/06/12 00:05:34 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/filterio.c,v 1.31 2007/05/26 14:16:34 tom Exp $
*
*/
@@ -124,7 +124,7 @@
void
flt_putc(int ch)
{
- fputc(ch, my_out);
+ vl_putc(ch, my_out);
if (ch == '\n') {
++my_line;
@@ -135,17 +135,26 @@
/* markers come out in flt_puts */
if (ch == CTL_A)
- fputc('?', my_out);
+ vl_putc('?', my_out);
}
void
flt_puts(const char *string, int length, const char *marker)
{
if (length > 0) {
+ int ch;
+
if (marker != 0 && *marker != 0 && *marker != 'N')
fprintf(my_out, "%c%i%s:", CTL_A, length, marker);
- while (length-- > 0)
- flt_putc(*string++);
+
+ while (length-- > 0) {
+ if (string != 0) {
+ ch = *string++;
+ } else {
+ ch = '?';
+ }
+ flt_putc(ch);
+ }
}
}
Index: filters/filters.c
Prereq: 1.99
--- vile-9.5p+/filters/filters.c 2005-09-30 00:59:45.000000000 +0000
+++ vile-9.5q/filters/filters.c 2007-05-26 15:49:21.000000000 +0000
@@ -1,7 +1,7 @@
/*
* Common utility functions for vile syntax/highlighter programs
*
- * $Header: /usr/build/vile/vile/filters/RCS/filters.c,v 1.99 2005/09/30 00:59:45 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/filters.c,v 1.105 2007/05/26 15:49:21 tom Exp $
*
*/
@@ -23,23 +23,34 @@
#define VERBOSE(level,params) if (FltOptions('v') >= level) mlforce params
+#if defined(HAVE_TSEARCH) && defined(HAVE_SEARCH_H)
+#define USE_TSEARCH 1
+#include <search.h>
+#else
+#define USE_TSEARCH 0
+#endif
+
#define HASH_LENGTH 256
struct _keyword {
+ KEYWORD *next;
char *kw_name;
char *kw_attr;
unsigned kw_size; /* strlen(kw_name) */
unsigned short kw_flag; /* nonzero for classes */
unsigned short kw_used; /* nonzero for classes */
- KEYWORD *next;
};
typedef struct _classes CLASS;
struct _classes {
+ CLASS *next;
char *name;
+#if USE_TSEARCH
+ void *data;
+#else
KEYWORD **data;
- CLASS *next;
+#endif
};
char *default_attr;
@@ -50,8 +61,14 @@
int vile_keywords;
int flt_options[256];
-static KEYWORD **hashtable;
+#if USE_TSEARCH
+static void *my_table;
+#else
+static KEYWORD **my_table;
+#endif
+
static CLASS *classes;
+static CLASS *current_class;
/*
* flt_bfr_*() function data
@@ -73,6 +90,48 @@
* Private functions *
******************************************************************************/
+#define KW_FLAG(p) ((p) ? ((p)->kw_flag ? "class" : "keyword") : "?")
+
+/* FIXME */
+static void
+init_data(KEYWORD * data, const char *name, const char *attribute, int classflag)
+{
+ data->kw_name = strmalloc(name);
+ data->kw_size = strlen(data->kw_name);
+ data->kw_attr = strmalloc(attribute);
+ data->kw_flag = classflag;
+ data->kw_used = 2;
+}
+
+static void
+free_data(KEYWORD * data)
+{
+ if (data != 0) {
+ if (data->kw_name)
+ free(data->kw_name);
+ if (data->kw_attr)
+ free(data->kw_attr);
+ free(data);
+ }
+}
+
+#if USE_TSEARCH
+static void
+free_node(void *p)
+{
+ free_data((KEYWORD *) p);
+}
+
+static int
+compare_data(const void *a, const void *b)
+{
+ const KEYWORD *p = (const KEYWORD *) a;
+ const KEYWORD *q = (const KEYWORD *) b;
+
+ return strcmp(p->kw_name, q->kw_name);
+}
+#endif
+
static void
CannotAllocate(const char *where)
{
@@ -168,21 +227,31 @@
FindIdentifier(const char *name)
{
unsigned size;
- int Index;
- KEYWORD *hash_id = 0;
+ KEYWORD *result = 0;
if (name != 0 && (size = strlen(name)) != 0) {
- Index = hash_function(name);
- hash_id = hashtable[Index];
- while (hash_id != NULL) {
- if (hash_id->kw_size == size
- && strcmp(hash_id->kw_name, name) == 0) {
+#if USE_TSEARCH
+ KEYWORD find;
+ void *pp;
+
+ find.kw_name = (char *) name;
+ if ((pp = tfind(&find, &(current_class->data), compare_data)) != 0) {
+ result = *(KEYWORD **) pp;
+ }
+#else
+ int Index = hash_function(name);
+
+ result = my_table[Index];
+ while (result != NULL) {
+ if (result->kw_size == size
+ && strcmp(result->kw_name, name) == 0) {
break;
}
- hash_id = hash_id->next;
+ result = result->next;
}
+#endif /* TSEARCH */
}
- return hash_id;
+ return result;
}
static void
@@ -215,7 +284,7 @@
FILE *fp;
char *path;
unsigned need;
- char leaf[20];
+ char myLeaf[20];
need = sizeof(suffix) + strlen(classname) + 2;
str_keyword_file = do_alloc(str_keyword_file, need, &len_keyword_file);
@@ -244,9 +313,9 @@
FIND_IT((str_keyword_name, "%s%c%s%s", PATHDOT, PATHSEP, DOT_TO_HIDE_IT, str_keyword_file));
FIND_IT((str_keyword_name, "%s%c%s%s", path, PATHSEP, DOT_TO_HIDE_IT, str_keyword_file));
- sprintf(leaf, "%s%s%c", DOT_TO_HIDE_IT, MY_NAME, PATHSEP);
+ sprintf(myLeaf, "%s%s%c", DOT_TO_HIDE_IT, MY_NAME, PATHSEP);
- FIND_IT((str_keyword_name, "%s%c%s%s", path, PATHSEP, leaf, str_keyword_file));
+ FIND_IT((str_keyword_name, "%s%c%s%s", path, PATHSEP, myLeaf, str_keyword_file));
path = vile_getenv("VILE_STARTUP_PATH");
#ifdef VILE_STARTUP_PATH
@@ -348,13 +417,13 @@
char *
class_attr(char *name)
{
- KEYWORD *hash_id;
+ KEYWORD *data;
char *result = 0;
- while ((hash_id = is_class(name)) != 0) {
- VERBOSE(hash_id->kw_used, ("class_attr(%s) = %s",
- name, AttrsOnce(hash_id)));
- name = result = hash_id->kw_attr;
+ while ((data = is_class(name)) != 0) {
+ VERBOSE(data->kw_used, ("class_attr(%s) = %s",
+ name, AttrsOnce(data)));
+ name = result = data->kw_attr;
VERBOSE(1, ("-> %p\n", result));
}
return result;
@@ -364,7 +433,7 @@
flt_alloc(void *ptr, unsigned need, unsigned *have, unsigned size)
{
need += (2 * size); /* allow for trailing null, etc */
- if (need > *have) {
+ if ((need > *have) || (ptr == 0)) {
need *= 2;
if (ptr != 0)
ptr = realloc(ptr, need);
@@ -446,24 +515,28 @@
flt_free_keywords(char *classname)
{
CLASS *p, *q;
+#if !USE_TSEARCH
KEYWORD *ptr;
int i;
+#endif
+ VERBOSE(1, ("flt_free_keywords(%s)", classname));
for (p = classes, q = 0; p != 0; q = p, p = p->next) {
if (!strcmp(classname, p->name)) {
- hashtable = p->data;
-
+#if USE_TSEARCH
+ tdestroy(p->data, free_node);
+#else
+ my_table = p->data;
for (i = 0; i < HASH_LENGTH; i++) {
- while ((ptr = hashtable[i]) != 0) {
- hashtable[i] = ptr->next;
- free(ptr->kw_name);
- free(ptr->kw_attr);
- free(ptr);
+ while ((ptr = my_table[i]) != 0) {
+ my_table[i] = ptr->next;
+ free_data(ptr);
}
}
+ free(p->data);
+#endif
free(p->name);
- free(p->data);
if (q != 0)
q->next = p->next;
else
@@ -472,7 +545,8 @@
break;
}
}
- hashtable = (classes != 0) ? classes->data : 0;
+ my_table = (classes != 0) ? classes->data : 0;
+ current_class = classes;
}
void
@@ -515,18 +589,25 @@
}
p->name = strmalloc(classname);
+ if (p->name == 0) {
+ free(p);
+ CannotAllocate("flt_make_symtab");
+ return;
+ }
+#if !USE_TSEARCH
p->data = typecallocn(KEYWORD *, HASH_LENGTH);
- if (p->name == 0 || p->data == 0) {
- if (p->name != 0)
- free(p->name);
+ if (p->data == 0) {
+ free(p->name);
free(p);
CannotAllocate("flt_make_symtab");
return;
}
+#endif
p->next = classes;
classes = p;
- hashtable = p->data;
+ my_table = p->data;
+ current_class = p;
VERBOSE(1, ("flt_make_symtab(%s)", classname));
@@ -577,33 +658,20 @@
Free(line);
}
-/*
- * Iterate over the names in the hash table, not ordered. This assumes that
- * the called function does not remove any entries from the table. It is okay
- * to add names, since that will not alter the hash links.
- */
-void
-for_each_keyword(EachKeyword func)
-{
- int i;
- KEYWORD *ptr;
-
- for (i = 0; i < HASH_LENGTH; i++) {
- for (ptr = hashtable[i]; ptr != 0; ptr = ptr->next) {
- (*func) (ptr->kw_name, ptr->kw_size, ptr->kw_attr);
- }
- }
-}
-
char *
get_symbol_table(void)
{
+#if USE_TSEARCH
+ if (current_class != 0)
+ return current_class->name;
+#else
CLASS *p;
for (p = classes; p != 0; p = p->next) {
- if (hashtable == p->data) {
+ if (my_table == p->data) {
return p->name;
}
}
+#endif
return "?";
}
@@ -622,7 +690,6 @@
static KEYWORD *
alloc_keyword(const char *ident, const char *attribute, int classflag)
{
- KEYWORD *first;
KEYWORD *nxt;
int Index;
@@ -633,23 +700,27 @@
nxt = 0;
}
} else {
- nxt = first = NULL;
+ nxt = NULL;
Index = hash_function(ident);
- first = hashtable[Index];
if ((nxt = typecallocn(KEYWORD, 1)) != NULL) {
- nxt->kw_name = strmalloc(ident);
- nxt->kw_size = strlen(nxt->kw_name);
- nxt->kw_attr = strmalloc(attribute);
- nxt->kw_flag = classflag;
- nxt->kw_used = 2;
- nxt->next = first;
+ init_data(nxt, ident, attribute, classflag);
+
if (nxt->kw_name != 0
&& nxt->kw_attr != 0) {
- hashtable[Index] = nxt;
+#if USE_TSEARCH
+ void **pp;
+ pp = tsearch(nxt, &(current_class->data), compare_data);
+ if (pp != 0) {
+ nxt = *(KEYWORD **) pp;
+ } else {
+ nxt = 0;
+ }
+#else
+ nxt->next = my_table[Index];
+ my_table[Index] = nxt;
+#endif
} else {
- if (nxt->kw_name != 0)
- free(nxt->kw_name);
- free(nxt);
+ free_data(nxt);
nxt = 0;
}
}
@@ -713,21 +784,22 @@
KEYWORD *
is_class(char *name)
{
- KEYWORD *hash_id;
- if ((hash_id = FindIdentifier(name)) != 0
- && hash_id->kw_flag != 0) {
- return hash_id;
+ KEYWORD *result = FindIdentifier(name);
+ if (result != 0) {
+ if (result->kw_flag == 0) {
+ result = 0;
+ }
}
- return 0;
+ return result;
}
KEYWORD *
is_keyword(char *name)
{
- KEYWORD *hash_id;
- if ((hash_id = FindIdentifier(name)) != 0
- && hash_id->kw_flag == 0) {
- return hash_id;
+ KEYWORD *result;
+ if ((result = FindIdentifier(name)) != 0
+ && result->kw_flag == 0) {
+ return result;
}
return 0;
}
@@ -735,13 +807,13 @@
char *
keyword_attr(char *name)
{
- KEYWORD *hash_id = is_keyword(name);
+ KEYWORD *data = is_keyword(name);
char *result = 0;
- if (hash_id != 0) {
- result = hash_id->kw_attr;
- while ((hash_id = is_class(result)) != 0)
- result = hash_id->kw_attr;
+ if (data != 0) {
+ result = data->kw_attr;
+ while ((data = is_class(result)) != 0)
+ result = data->kw_attr;
}
VERBOSE(1, ("keyword_attr(%s) = %p %s\n", name, result, NONNULL(result)));
return result;
@@ -753,16 +825,22 @@
static char *name;
static unsigned used;
unsigned n;
+ char *result;
- name = do_alloc(name, strlen(text), &used);
- for (n = 0; text[n] != 0; n++) {
- if (isalpha(CharOf(text[n])) && isupper(CharOf(text[n])))
- name[n] = tolower(CharOf(text[n]));
- else
- name[n] = text[n];
+ if ((name = do_alloc(name, strlen(text), &used)) != 0) {
+ for (n = 0; text[n] != 0; n++) {
+ if (isalpha(CharOf(text[n])) && isupper(CharOf(text[n])))
+ name[n] = tolower(CharOf(text[n]));
+ else
+ name[n] = text[n];
+ }
+ name[n] = 0;
+ result = name;
+ } else {
+ result = text; /* not good, but nonfatal */
+ CannotAllocate("lowercase_of");
}
- name[n] = 0;
- return (name);
+ return result;
}
void
@@ -807,14 +885,14 @@
if (*name && args) {
insert_keyword(name, args, classflag);
} else if (*name) {
- KEYWORD *hash_id;
+ KEYWORD *data;
if (args == 0) {
args = default_attr;
VERBOSE(2, ("using attr \"%s\"", args));
}
- if ((hash_id = FindIdentifier(args)) != 0) {
+ if ((data = FindIdentifier(args)) != 0) {
/*
- * Insert the classname rather than the hash_id->kw_attr value,
+ * Insert the classname rather than the data->kw_attr value,
* since insert_keyword makes a copy of the string we pass to it.
* Retrieving the attribute from the copy will give the unique
* attribute string belonging to the class, so it is possible at
@@ -837,7 +915,7 @@
buf = typeallocn(char, *len);
}
while (!feof(fp)) {
- int ch = fgetc(fp);
+ int ch = vl_getc(fp);
if (ch == EOF || feof(fp) || ferror(fp)) {
break;
}
@@ -852,7 +930,8 @@
break;
}
buf[used] = '\0';
- return used ? (*ptr = buf) : 0;
+ *ptr = buf;
+ return used ? *ptr : 0;
}
int
@@ -861,7 +940,8 @@
CLASS *p;
for (p = classes; p != 0; p = p->next) {
if (!strcmp(classname, p->name)) {
- hashtable = p->data;
+ my_table = p->data;
+ current_class = p;
VERBOSE(3, ("set_symbol_table:%s", classname));
return 1;
}
Index: filters/filters.h
Prereq: 1.98
--- vile-9.5p+/filters/filters.h 2007-04-23 22:44:14.000000000 +0000
+++ vile-9.5q/filters/filters.h 2007-05-06 21:58:19.000000000 +0000
@@ -1,5 +1,5 @@
/*
- * $Header: /usr/build/vile/vile/filters/RCS/filters.h,v 1.98 2007/04/23 22:44:14 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/filters.h,v 1.99 2007/05/06 21:58:19 tom Exp $
*/
#ifndef FILTERS_H
@@ -212,7 +212,6 @@
extern void flt_initialize(void);
extern void flt_make_symtab(char *classname);
extern void flt_read_keywords(char *classname);
-extern void for_each_keyword(EachKeyword func);
extern void insert_keyword(const char *ident, const char *attribute, int classflag);
extern void parse_keyword(char *name, int classflag);
Index: filters/flt_defs.h
Prereq: 1.3
--- vile-9.5p+/filters/flt_defs.h 2006-06-12 22:25:55.000000000 +0000
+++ vile-9.5q/filters/flt_defs.h 2007-05-05 15:36:19.000000000 +0000
@@ -1,5 +1,5 @@
/*
- * $Header: /usr/build/vile/vile/filters/RCS/flt_defs.h,v 1.3 2006/06/12 22:25:55 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/flt_defs.h,v 1.4 2007/05/05 15:36:19 tom Exp $
*/
#ifndef FLT_DEFS_H
@@ -62,7 +62,7 @@
#include <unistd.h>
#endif
-#include <stdio.h>
+#include <vl_stdio.h>
#ifdef HAVE_STRING_H
#include <string.h>
Index: filters/fltstack.h
Prereq: 1.9
--- vile-9.5p+/filters/fltstack.h 2005-01-19 22:08:11.000000000 +0000
+++ vile-9.5q/filters/fltstack.h 2007-05-26 15:23:46.000000000 +0000
@@ -1,5 +1,5 @@
/*
- * $Header: /usr/build/vile/vile/filters/RCS/fltstack.h,v 1.9 2005/01/19 22:08:11 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/fltstack.h,v 1.10 2007/05/26 15:23:46 tom Exp $
* A simple stack for lex states
*/
typedef struct {
@@ -43,7 +43,7 @@
static void
push_state(int state)
{
- if (++stk_level >= stk_limit) {
+ if ((++stk_level >= stk_limit) || (stk_state == 0)) {
unsigned have = sizeof(STACK) * stk_limit;
unsigned want = sizeof(STACK) * (stk_limit += (20 + stk_level));
stk_state = type_alloc(STACK, (void *) stk_state, want, &have);
Index: filters/genmake.mak
Prereq: 1.31
--- vile-9.5p+/filters/genmake.mak 2006-08-08 21:42:27.000000000 +0000
+++ vile-9.5q/filters/genmake.mak 2007-05-04 23:33:17.000000000 +0000
@@ -1,4 +1,4 @@
-# $Header: /usr/build/vile/vile/filters/RCS/genmake.mak,v 1.31 2006/08/08 21:42:27 tom Exp $
+# $Header: /usr/build/vile/vile/filters/RCS/genmake.mak,v 1.32 2007/05/04 23:33:17 tom Exp $
# This is a list of filter root names and whether .c or .l files define the
# filter. Except for vile-crypt and vile-manfilt (which do not correspond to
# majormodes), the filter names are constructed as vile-{root}-filt.
@@ -55,6 +55,7 @@
rcs rcs-filt l
rexx rexxfilt l
rpm rpm-filt l
+rtf rtf-filt l
sccs sccsfilt l
sh sh-filt l
sml sml-filt l
Index: filters/htmlfilt.l
Prereq: 1.38
--- vile-9.5p+/filters/htmlfilt.l 2006-05-21 19:50:19.000000000 +0000
+++ vile-9.5q/filters/htmlfilt.l 2007-05-08 23:38:55.000000000 +0000
@@ -2,7 +2,7 @@
%{
/*
- * $Header: /usr/build/vile/vile/filters/RCS/htmlfilt.l,v 1.38 2006/05/21 19:50:19 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/htmlfilt.l,v 1.40 2007/05/08 23:38:55 tom Exp $
*
* Filter to add vile "attribution" sequences to selected bits of HTML input
* text.
@@ -12,6 +12,7 @@
#include <filters.h>
#include <fltstack.h>
+#undef YY_NO_UNPUT
DefineOptFilter("html", "j");
@@ -86,7 +87,27 @@
<JS_CODE>{IDENT} { WriteToken(keyword_attr(yytext)); }
<JS_CODE>{STRINGS} { WriteToken(String_attr); }
<JS_CODE>{INTEGER} { WriteToken(Number_attr); }
-<JS_CODE>"//"[^\r\n]* { WriteToken(Comment_attr); }
+<JS_CODE>"<!--"[^\r\n]* { WriteToken(Comment_attr); }
+<JS_CODE>"//"[^\r\n]* {
+ char *last = strstr(yytext, "-->");
+ char *next = 0;
+ if (last != 0) {
+ last += 3;
+ if (*last != '\0') {
+ next = strdup(last);
+ }
+ }
+ if (next != 0) {
+ int used = last - yytext;
+ WriteToken3(Comment_attr, used);
+ used = strlen(next);
+ while (used-- > 0)
+ unput(next[used]);
+ free(next);
+ } else {
+ WriteToken(Comment_attr);
+ }
+ }
<JS_CODE>"<"{SPACE}*(\/)?{IDENT}{SPACE}*">" { may_resume_html(yytext); }
@@ -166,8 +187,7 @@
next_state = INITIAL;
begin_state(INITIAL);
- while (yylex() > 0) {
- }
+ yylex();
flt_bfr_error();
end_state();
}
Index: filters/m4-filt.c
Prereq: 1.28
--- vile-9.5p+/filters/m4-filt.c 2006-12-15 00:18:40.000000000 +0000
+++ vile-9.5q/filters/m4-filt.c 2007-05-26 14:22:23.000000000 +0000
@@ -1,5 +1,5 @@
/*
- * $Header: /usr/build/vile/vile/filters/RCS/m4-filt.c,v 1.28 2006/12/15 00:18:40 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/m4-filt.c,v 1.29 2007/05/26 14:22:23 tom Exp $
*
* Filter to add vile "attribution" sequences to selected bits of m4
* input text. This is in C rather than LEX because M4's quoting delimiters
@@ -77,7 +77,8 @@
{
q->used = strlen(s);
q->text = do_alloc(q->text, q->used, &(q->have));
- strcpy(q->text, s);
+ if (q->text != 0)
+ strcpy(q->text, s);
}
static int
@@ -271,22 +272,25 @@
s++;
if (base != s) {
need = has_cpp + (s - base);
- name = do_alloc(name, need, &have);
- if (has_cpp) {
- name[0] = '#';
- }
- strncpy(name + has_cpp, base, s - base);
- name[(s - base) + has_cpp] = 0;
- if (!strcmp(name, "dnl")) {
- /* FIXME: GNU m4 may accept an argument list here */
- s += strlen(s);
- flt_puts(show, s - show, Comment_attr);
- } else if ((attr = keyword_attr(name)) != 0) {
- flt_puts(show, s - show, attr);
+ if ((name = do_alloc(name, need, &have)) != 0) {
+ if (has_cpp) {
+ name[0] = '#';
+ }
+ strncpy(name + has_cpp, base, s - base);
+ name[(s - base) + has_cpp] = 0;
+ if (!strcmp(name, "dnl")) {
+ /* FIXME: GNU m4 may accept an argument list here */
+ s += strlen(s);
+ flt_puts(show, s - show, Comment_attr);
+ } else if ((attr = keyword_attr(name)) != 0) {
+ flt_puts(show, s - show, attr);
+ } else {
+ flt_puts(show, s - show, Ident_attr);
+ }
+ s = parse_directive(name, s, args, parens);
} else {
flt_puts(show, s - show, Ident_attr);
}
- s = parse_directive(name, s, args, parens);
#if NO_LEAKS
free(name);
name = 0;
@@ -375,9 +379,12 @@
if (*literal == 0) {
if (need > rightquote.used) {
need -= rightquote.used;
- buffer = do_alloc(buffer, used + need + 1, &have);
- strncpy(buffer + used, s, need);
- used += need;
+ if ((buffer = do_alloc(buffer, used + need + 1, &have)) != 0) {
+ strncpy(buffer + used, s, need);
+ used += need;
+ } else {
+ used = 0;
+ }
}
if (used) {
flt_puts(buffer, used, Literal_attr);
@@ -385,9 +392,12 @@
}
write_quote(rightquote);
} else {
- buffer = do_alloc(buffer, used + need + 1, &have);
- strncpy(buffer + used, s, need);
- used += need;
+ if ((buffer = do_alloc(buffer, used + need + 1, &have)) != 0) {
+ strncpy(buffer + used, s, need);
+ used += need;
+ } else {
+ used = 0;
+ }
}
result += c_length;
} else if (used) {
Index: filters/manfilt.c
Prereq: 1.36
--- vile-9.5p+/filters/manfilt.c 2004-10-27 19:18:30.000000000 +0000
+++ vile-9.5q/filters/manfilt.c 2007-05-05 15:00:33.000000000 +0000
@@ -46,7 +46,7 @@
* vile will choose some appropriate fallback (such as underlining) if
* italics are not available.
*
- * $Header: /usr/build/vile/vile/filters/RCS/manfilt.c,v 1.36 2004/10/27 19:18:30 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/manfilt.c,v 1.37 2007/05/05 15:00:33 tom Exp $
*
*/
@@ -139,7 +139,7 @@
static int
ansi_getc(FILE *fp)
{
- return fgetc(fp);
+ return vl_getc(fp);
}
#if OPT_LOCALE
@@ -154,7 +154,7 @@
int utf_char = 0;
do {
- int c = fgetc(fp);
+ int c = vl_getc(fp);
/* Combine UTF-8 into Unicode */
if (c < 0x80) {
/* We received an ASCII character */
Index: filters/perlfilt.l
Prereq: 1.45
--- vile-9.5p+/filters/perlfilt.l 2006-05-21 19:50:19.000000000 +0000
+++ vile-9.5q/filters/perlfilt.l 2007-05-26 14:25:56.000000000 +0000
@@ -2,7 +2,7 @@
%{
/*
- * $Header: /usr/build/vile/vile/filters/RCS/perlfilt.l,v 1.45 2006/05/21 19:50:19 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/perlfilt.l,v 1.46 2007/05/26 14:25:56 tom Exp $
*
* Filter to add vile "attribution" sequences to selected bits of PERL input
* text.
@@ -74,7 +74,7 @@
}
<HERE>^{QIDENT} {
flt_bfr_append(yytext, yyleng);
- if (!strcmp(here_tag, yytext)) {
+ if (here_tag != 0 && !strcmp(here_tag, yytext)) {
flt_bfr_finish();
BEGIN(CODE);
}
@@ -117,17 +117,21 @@
static void
save_here(char *text, int length)
{
- char *s = here_tag = do_alloc(here_tag, length, &here_len);
+ char *s;
+
+ here_tag = do_alloc(here_tag, length, &here_len);
here_exp = 1;
- while (length--) {
- if (isIdent(CharOf(*text))) {
- *s++ = *text;
- } else if (*text == '\'') {
- here_exp = 0;
+ if ((s = here_tag) != 0) {
+ while (length--) {
+ if (isIdent(CharOf(*text))) {
+ *s++ = *text;
+ } else if (*text == '\'') {
+ here_exp = 0;
+ }
+ text++;
}
- text++;
+ *s = 0;
}
- *s = 0;
flt_bfr_begin(String_attr);
}
Index: filters/pl-filt.c
Prereq: 1.83
--- vile-9.5p+/filters/pl-filt.c 2006-05-21 19:47:50.000000000 +0000
+++ vile-9.5q/filters/pl-filt.c 2007-05-27 19:05:46.000000000 +0000
@@ -1,5 +1,5 @@
/*
- * $Header: /usr/build/vile/vile/filters/RCS/pl-filt.c,v 1.83 2006/05/21 19:47:50 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/pl-filt.c,v 1.86 2007/05/27 19:05:46 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.
@@ -14,7 +14,12 @@
DefineFilter("perl");
#endif
-#define QUOTE_DELIMS "#:/?|!:%',{}[]()@;="
+/*
+ * Punctuation that might be quote-delimiters (it is undocumented whether we
+ * should consider '$' and '&', but reading the parser hints that might work
+ * too).
+ */
+#define QUOTE_DELIMS "#:/?|!:%',{}[]()@;=~"
/* from Perl's S_scan_str() */
#define LOOKUP_TERM "([{< )]}> )]}>"
@@ -94,6 +99,23 @@
}
#endif
+/*
+ * Count consecutive blanks at the current position.
+ */
+static int
+count_blanks(char *s)
+{
+ char *base = s;
+
+ while (MORE(s)) {
+ if (!isspace(CharOf(*s))) {
+ break;
+ }
+ ++s;
+ }
+ return s - base;
+}
+
/******************************************************************************
* Lexical functions that match a particular token type *
******************************************************************************/
@@ -571,21 +593,28 @@
&& s[0] == '<'
&& s[1] == '<') {
s += 2;
+ s += count_blanks(s);
base = s;
if ((ok = is_QIDENT(s)) != 0) {
unsigned temp = 0;
char *marker = do_alloc((char *) 0, ok + 1, &temp);
char *d = marker;
+
s += ok;
*quoted = 0;
- while (base != s) {
- if (*base != SQUOTE && *base != DQUOTE && *base != BACKSLASH)
- *d++ = *base;
- else if (*base != DQUOTE)
- *quoted = 1;
- base++;
+
+ if (marker != 0) {
+ while (base != s) {
+ if (*base != SQUOTE
+ && *base != DQUOTE
+ && *base != BACKSLASH)
+ *d++ = *base;
+ else if (*base != DQUOTE)
+ *quoted = 1;
+ base++;
+ }
+ *d = 0;
}
- *d = 0;
return marker;
}
}
@@ -595,25 +624,19 @@
static char *
skip_BLANKS(char *s)
{
- char *base = s;
+ int count = count_blanks(s);
- while (MORE(s)) {
- if (!isspace(CharOf(*s))) {
- break;
- }
- ++s;
+ if (count) {
+ flt_puts(s, count, "");
}
- if (s != base) {
- flt_puts(base, s - base, "");
- }
- return s;
+ return s + count;
}
/*
* Return the first character, skipping optional blanks
*/
static int
-after_blanks(char *s)
+char_after_blanks(char *s)
{
int result = '\0';
@@ -694,7 +717,7 @@
s = base;
if (s != base) {
- int test = after_blanks(s);
+ int test = char_after_blanks(s);
DPRINTF(("is_Quote(%.*s:%c)", (int) (s - base), base, test));
if (test == '#' && isspace(CharOf(*s)))
test = 0;
@@ -862,7 +885,7 @@
} else if (s[n] == BACKSLASH) {
escaped = 1;
} else if (isBlank(s[n]) && !escaped && !comment &&
- (leading || after_blanks(s + n) == '#')) {
+ (leading || char_after_blanks(s + n) == '#')) {
flt_puts(s + first, (n - first - 0), String_attr);
flt_putc(s[n]);
first = n + 1;
@@ -1344,10 +1367,13 @@
state = ePATTERN;
} else {
if (is_FORMAT(s, ok)) {
+ char *try_mark;
quoted = 0;
state = eHERE;
mark_len = 0;
- marker = strcpy(do_alloc(0, 2, &mark_len), ".");
+ try_mark = do_alloc(0, 2, &mark_len);
+ if (try_mark != 0)
+ marker = strcpy(try_mark, ".");
}
save = s[ok];
s[ok] = 0;
Index: filters/rb-filt.l
Prereq: 1.15
--- vile-9.5p+/filters/rb-filt.l 2006-05-21 19:50:19.000000000 +0000
+++ vile-9.5q/filters/rb-filt.l 2007-05-26 14:42:22.000000000 +0000
@@ -5,7 +5,7 @@
%{
/*
- * $Header: /usr/build/vile/vile/filters/RCS/rb-filt.l,v 1.15 2006/05/21 19:50:19 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/rb-filt.l,v 1.16 2007/05/26 14:42:22 tom Exp $
*
* Filter to add vile "attribution" sequences to a Ruby script
* based on the Python filter.
@@ -150,23 +150,28 @@
static int
save_here(char *text, int len)
{
- char *s = here_tag = do_alloc(here_tag, len, &here_len);
+ char *s;
+ int result = 0;
- text += 2; /* skip over "<<" */
- if (*text == '-')
- ++text;
- while (len-- > 0) {
- if (isIdent(CharOf(*text))) {
- *s++ = *text;
- } else if (*text == '\'' || *text == '\"') {
- ;
- } else {
- break;
+ if ((here_tag = do_alloc(here_tag, len, &here_len)) != 0) {
+ s = here_tag;
+ text += 2; /* skip over "<<" */
+ if (*text == '-')
+ ++text;
+ while (len-- > 0) {
+ if (isIdent(CharOf(*text))) {
+ *s++ = *text;
+ } else if (*text == '\'' || *text == '\"') {
+ ;
+ } else {
+ break;
+ }
+ text++;
}
- text++;
+ *s = 0;
+ result = (s != here_tag);
}
- *s = 0;
- return (s - here_tag) != 0;
+ return result;
}
/*
Index: filters/rcs-filt.l
Prereq: 1.11
--- vile-9.5p+/filters/rcs-filt.l 2006-05-21 19:50:19.000000000 +0000
+++ vile-9.5q/filters/rcs-filt.l 2007-05-26 14:49:05.000000000 +0000
@@ -3,7 +3,7 @@
%{
/*
- * $Header: /usr/build/vile/vile/filters/RCS/rcs-filt.l,v 1.11 2006/05/21 19:50:19 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/rcs-filt.l,v 1.12 2007/05/26 14:49:05 tom Exp $
*
* Filter to add vile "attribution" sequences to RCS archives.
*/
@@ -76,9 +76,12 @@
static void
add_to_quoted(char *text, int length)
{
- save_bfr = do_alloc(save_bfr, save_len + length + 1, &save_max);
- strncpy(save_bfr + save_len, text, length + 1);
- save_len += length;
+ if ((save_bfr = do_alloc(save_bfr, save_len + length + 1, &save_max)) != 0) {
+ strncpy(save_bfr + save_len, text, length + 1);
+ save_len += length;
+ } else {
+ save_len = 0;
+ }
}
static void
Index: filters/rpm-filt.l
Prereq: 1.13
--- vile-9.5p+/filters/rpm-filt.l 2006-05-21 19:50:19.000000000 +0000
+++ vile-9.5q/filters/rpm-filt.l 2007-05-26 14:51:13.000000000 +0000
@@ -5,7 +5,7 @@
%{
/*
- * $Header: /usr/build/vile/vile/filters/RCS/rpm-filt.l,v 1.13 2006/05/21 19:50:19 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/rpm-filt.l,v 1.14 2007/05/26 14:51:13 tom Exp $
*
* Filter to add vile "attribution" sequences to selected bits of rpm spec-file.
*/
@@ -181,21 +181,24 @@
static void
save_here(char *text, int length)
{
- char *s = here_tag = do_alloc(here_tag, length, &here_len);
+ char *s;
here_exp = 1;
- while (length--) {
- if (isQuote(*text)) {
- here_exp = 0;
- } else if (strchr(" \t", *text) != 0) {
- if (s != here_tag)
- break;
- } else if (strchr("<->", *text) == 0) {
- *s++ = *text;
+ if ((here_tag = do_alloc(here_tag, length, &here_len)) != 0) {
+ s = here_tag;
+ while (length--) {
+ if (isQuote(*text)) {
+ here_exp = 0;
+ } else if (strchr(" \t", *text) != 0) {
+ if (s != here_tag)
+ break;
+ } else if (strchr("<->", *text) == 0) {
+ *s++ = *text;
+ }
+ text++;
}
- text++;
+ *s = 0;
}
- *s = 0;
}
static int
@@ -222,7 +225,7 @@
flt_bfr_embed(text + j, 1, Error_attr);
}
} else {
- if (text[j] != here_tag[k++])
+ if (here_tag != 0 && (text[j] != here_tag[k++]))
return 0;
if (pass)
flt_bfr_append(text + j, 1);
Index: filters/rtf-filt.l
--- /dev/null 2007-05-28 17:23:42.020552250 +0000
+++ vile-9.5q/filters/rtf-filt.l 2007-05-08 00:35:15.000000000 +0000
@@ -0,0 +1,74 @@
+%{
+/*
+ * $Header: /usr/build/vile/vile/filters/RCS/rtf-filt.l,v 1.3 2007/05/08 00:35:15 tom Exp $
+ *
+ * Filter to add vile "attribution" sequences to selected bits of RTF (rich text format)
+ * input text.
+ */
+
+#include <filters.h>
+
+DefineFilter("rtf");
+
+static char *Comment_attr;
+static char *Error_attr;
+static char *Number_attr;
+static char *String_attr;
+
+static char *control_attr(char *, int);
+
+%}
+
+ESCAPE \\'[[:xdigit:]][[:xdigit:]]
+CTRLWORD \\([[:lower:]])+([[:blank:]]?)
+INTEGER [[:digit:]]+
+
+NUMBER {INTEGER}
+
+%%
+
+{CTRLWORD} { WriteToken(control_attr(yytext, yyleng)); }
+{ESCAPE} { WriteToken(String_attr); }
+{NUMBER} { WriteToken(Number_attr); }
+
+%%
+
+static char *control_attr(char *text, int length)
+{
+ char *attr = 0;
+
+ if (length > 1) {
+ char save = 0;
+
+ if (isBlank(CharOf(text[length-1]))) {
+ save = text[--length];
+ text[length] = '\0';
+ }
+ attr = keyword_attr(text + 1);
+ text[length] = save;
+ }
+ if (attr == 0) {
+ attr = Error_attr;
+ flt_error("Unknown control word: %s", text);
+ }
+ return attr;
+}
+
+static void
+init_filter(int before GCC_UNUSED)
+{
+ (void) before;
+}
+
+static void
+do_filter(FILE *inputs)
+{
+ yyin = inputs;
+
+ Error_attr = class_attr(NAME_ERROR);
+ Comment_attr = class_attr(NAME_COMMENT);
+ Number_attr = class_attr(NAME_NUMBER);
+ String_attr = class_attr(NAME_LITERAL);
+
+ yylex();
+}
Index: filters/rtf.key
--- /dev/null 2007-05-28 17:23:42.020552250 +0000
+++ vile-9.5q/filters/rtf.key 2007-05-08 00:48:54.000000000 +0000
@@ -0,0 +1,1509 @@
+: $Id: rtf.key,v 1.4 2007/05/08 00:48:54 tom Exp $
+: keywords for Rich Text Format 1.8
+ab
+absh
+abslock
+absnoovrlp
+absw
+acaps
+acccircle
+acccomma
+accdot
+accnone
+accunderdot
+acf
+additive
+adjustright
+adn
+aenddoc
+aendnotes
+aexpnd
+af
+affixed
+afs
+aftnbj
+aftncn
+aftnnalc
+aftnnar
+aftnnauc
+aftnnchi
+aftnnchosung
+aftnncnum
+aftnndbar
+aftnndbnum
+aftnndbnumd
+aftnndbnumk
+aftnndbnumt
+aftnnganada
+aftnngbnum
+aftnngbnumd
+aftnngbnumk
+aftnngbnuml
+aftnnrlc
+aftnnruc
+aftnnzodiac
+aftnnzodiacd
+aftnnzodiacl
+aftnrestart
+aftnrstcont
+aftnsep
+aftnsepc
+aftnstart
+aftntj
+ai
+alang
+allowfieldendsel
+allprot
+alntblind
+alt
+animtext
+annotation
+annotprot
+ansi
+ansicpg
+aoutl
+ascaps
+ashad
+asianbrkrule
+aspalpha
+aspnum
+astrike
+atnauthor
+atndate
+atnicn
+atnid
+atnparent
+atnref
+atntime
+atrfend
+atrfstart
+au
+aul
+auld
+auldb
+aulnone
+aulw
+aup
+author
+autofmtoverride
+b
+background
+bdbfhdr
+bdrrlswsix
+bgbdiag
+bgcross
+bgdcross
+bgdkbdiag
+bgdkcross
+bgdkdcross
+bgdkfdiag
+bgdkhoriz
+bgdkvert
+bgfdiag
+bghoriz
+bgvert
+bin
+binfsxn
+binsxn
+bkmkcolf
+bkmkcoll
+bkmkend
+bkmkpub
+bkmkstart
+bl
+bliptag
+blipuid
+blipupi
+blu
+bookfold
+bookfoldrev
+bookfoldsheets
+box
+br
+brdrart
+brdrb
+brdrbar
+brdrbtw
+brdrcf
+brdrdash
+brdrdashd
+brdrdashdd
+brdrdashdotstr
+brdrdashsm
+brdrdb
+brdrdot
+brdremboss
+brdrengrave
+brdrframe
+brdrhair
+brdrinset
+brdrl
+brdrnil
+brdroutset
+brdrr
+brdrs
+brdrsh
+brdrt
+brdrtbl
+brdrth
+brdrthtnlg
+brdrthtnmg
+brdrthtnsg
+brdrtnthlg
+brdrtnthmg
+brdrtnthsg
+brdrtnthtnlg
+brdrtnthtnmg
+brdrtnthtnsg
+brdrtriple
+brdrw
+brdrwavy
+brdrwavydb
+brdth
+brkfrm
+brsp
+bullet
+buptim
+bxe
+caps
+category
+cb
+cbpat
+cchs
+cell
+cells
+cellx
+cellxs
+cf
+cfpat
+cgrid
+charrsid
+charscalex
+chatn
+chbgbdiag
+chbgcross
+chbgdcross
+chbgdkbdiag
+chbgdkcross
+chbgdkdcross
+chbgdkfdiag
+chbgdkhoriz
+chbgdkvert
+chbgfdiag
+chbghoriz
+chbgvert
+chbrdr
+chcbpat
+chcfpat
+chdate
+chdpa
+chdpl
+chftn
+chftnsep
+chftnsepc
+chpgn
+chshdng
+chtime
+cl
+clbgbdiag
+clbgcross
+clbgdcross
+clbgdkbdiag
+clbgdkcross
+clbgdkdcross
+clbgdkfdiag
+clbgdkhor
+clbgdkvert
+clbgfdiag
+clbghoriz
+clbgvert
+clbrdr
+clbrdrb
+clbrdrl
+clbrdrr
+clbrdrt
+clcbpat
+clcbpatraw
+clcfpat
+clcfpatraw
+cldgll
+cldglu
+clfts
+clmgf
+clmrg
+clpadb
+clpadfb
+clpadfl
+clpadfr
+clpadft
+clpadl
+clpadr
+clpadt
+clshdng
+clshdngraw
+clshdrawnil
+cltxbtlr
+cltxlrtb
+cltxlrtbv
+cltxtbrl
+cltxtbrlv
+clvertalb
+clvertalc
+clvertalt
+clvmgf
+clvmrg
+clw
+collapsed
+colno
+colortbl
+cols
+colsr
+colsx
+column
+colw
+comment
+company
+cpg
+crauth
+crdate
+creatim
+cs
+ctrl
+cts
+cufi
+culi
+curi
+cvmme
+d
+datafield
+date
+dbch
+deff
+defformat
+deflang
+deflangfe
+defshp
+deftab
+deleted
+delrsid
+dfr
+dfrauth
+dfrdate
+dfrmtxtx
+dfrmtxty
+dfrstart
+dfrstop
+dfrxst
+dghorigin
+dghshow
+dghspace
+dgmargin
+dgsnap
+dgvorigin
+dgvshow
+dgvspace
+dibitmap
+dn
+dntblnsbdb
+do
+dobxcolumn
+dobxmargin
+dobxpage
+dobymargin
+dobypage
+dobypara
+doccomm
+doctemp
+doctype
+docvar
+dodhgt
+dolock
+donotshowcomments
+donotshowinsdel
+donotshowmarkup
+donotshowprops
+dpaendhol
+dpaendl
+dpaendsol
+dpaendw
+dparc
+dparcflipx
+dparcflipy
+dpastarthol
+dpastartl
+dpastartsol
+dpastartw
+dpcallout
+dpcoa
+dpcoaccent
+dpcobestfit
+dpcoborder
+dpcodabs
+dpcodbottom
+dpcodcenter
+dpcodescent
+dpcodtop
+dpcolength
+dpcominusx
+dpcominusy
+dpcooffset
+dpcosmarta
+dpcotdouble
+dpcotright
+dpcotsingle
+dpcottriple
+dpcount
+dpellipse
+dpendgroup
+dpfillbgcb
+dpfillbgcg
+dpfillbgcr
+dpfillbggray
+dpfillbgpal
+dpfillfgcb
+dpfillfgcg
+dpfillfgcr
+dpfillfggray
+dpfillfgpal
+dpfillpat
+dpgroup
+dpline
+dplinecob
+dplinecog
+dplinecor
+dplinedado
+dplinedadodo
+dplinedash
+dplinedot
+dplinegray
+dplinehollow
+dplinepal
+dplinesolid
+dplinew
+dppolycount
+dppolygon
+dppolyline
+dpptx
+dppty
+dprect
+dproundr
+dpshadow
+dpshadx
+dpshady
+dptxbtlr
+dptxbx
+dptxbxmar
+dptxbxtext
+dptxlrtb
+dptxlrtbv
+dptxtbrl
+dptxtbrlv
+dpx
+dpxsize
+dpy
+dpysize
+dropcapli
+dropcapt
+ds
+dxfrtest
+dxfrtext
+dy
+e
+edmins
+embo
+emdash
+emfblip
+emspace
+endash
+enddoc
+endnhere
+endnotes
+enforceprot
+enspace
+expnd
+expndtw
+expshrtn
+f
+faauto
+facenter
+facingp
+fafixed
+fahang
+falt
+faroman
+favar
+fbias
+fbidi
+fchars
+fcharset
+fcs
+fdecor
+fet
+fetch
+ffdefres
+ffdeftext
+ffentrymcr
+ffexitmcr
+ffformat
+ffhaslistbox
+ffhelptext
+ffhps
+ffl
+ffmaxlen
+ffname
+ffownhelp
+ffownstat
+ffprot
+ffrecalc
+ffres
+ffsize
+ffstattext
+fftype
+fftypetxt
+fi
+fid
+field
+file
+filetbl
+fittext
+fjgothic
+fjminchou
+fldalt
+flddirty
+fldedit
+fldinst
+fldlock
+fldpriv
+fldrslt
+fldtype
+fmodern
+fn
+fname
+fnetwork
+fnil
+fnonfilesys
+fontemb
+fontfile
+fonttbl
+footer
+footerf
+footerl
+footerr
+footery
+footnote
+formdisp
+formfield
+formprot
+formshade
+fosnum
+fprq
+fracwidth
+frelative
+frmtxbtlr
+frmtxlrtb
+frmtxlrtbv
+frmtxtbrl
+frmtxtbrlv
+froman
+fromhtml
+fromtext
+fs
+fscript
+fswiss
+ftech
+ftnalt
+ftnbj
+ftncn
+ftnil
+ftnlytwnine
+ftnnalc
+ftnnar
+ftnnauc
+ftnnchi
+ftnnchosung
+ftnncnum
+ftnndbar
+ftnndbnum
+ftnndbnumd
+ftnndbnumk
+ftnndbnumt
+ftnnganada
+ftnngbnum
+ftnngbnumd
+ftnngbnumk
+ftnngbnuml
+ftnnrlc
+ftnnruc
+ftnnzodiac
+ftnnzodiacd
+ftnnzodiacl
+ftnrestart
+ftnrstcont
+ftnrstpg
+ftnsep
+ftnsepc
+ftnstart
+ftntj
+fttruetype
+fvaliddos
+fvalidhpfs
+fvalidmac
+fvalidntfs
+g
+gcw
+generator
+gridtbl
+gutter
+gutterprl
+guttersxn
+header
+headerf
+headerl
+headerr
+headery
+hich
+highlight
+hl
+hlfr
+hlinkbase
+hlloc
+hlsrc
+horzdoc
+horzsect
+horzvert
+hr
+htmautsp
+htmlbase
+htmlrtf
+htmltag
+hyphauto
+hyphcaps
+hyphconsec
+hyphhotz
+hyphpar
+i
+id
+ilvl
+impr
+info
+insrsid
+intbl
+ipgp
+irow
+irowband
+itap
+ixe
+jclisttab
+jcompress
+jexpand
+jis
+jpegblip
+jsksu
+jsku
+keep
+keepn
+kerning
+keycode
+keywords
+ksulang
+landscape
+lang
+langfe
+langfenp
+langnp
+lastrow
+latentstyles
+lbr
+lchars
+ldblquote
+level
+levelfollow
+levelindent
+leveljc
+leveljcn
+levellegal
+levelnfc
+levelnfcn
+levelnorestart
+levelnumbers
+levelold
+levelpicture
+levelprev
+levelprevspace
+levelspace
+levelstartat
+leveltemplateid
+leveltext
+lfolevel
+li
+lin
+line
+linebetcol
+linecont
+linemod
+lineppage
+linerestart
+linestart
+linestarts
+linex
+linkself
+linkstyles
+linkval
+lisa
+lisb
+list
+listemplateid
+listhybrid
+listid
+listlevel
+listname
+listoverride
+listoverridecount
+listoverrideformat
+listoverrides
+listoverridestart
+listoverridestartat
+listoverridetable
+listpicture
+listrestarthdn
+listsimple
+liststyleid
+liststylename
+listtable
+listtemplateid
+listtext
+lnbrkrule
+lndscpsxn
+lnongrid
+loch
+lquote
+ls
+lsdlockeddef
+lsdlockedexcept
+lsdstimax
+ltrch
+ltrdoc
+ltrmark
+ltrpar
+ltrrow
+ltrsect
+lytcalctblwd
+lytexcttp
+lytprtmet
+lyttblrtgr
+mac
+macpict
+makebackup
+manager
+margb
+margbsxn
+margl
+marglsxn
+margmirror
+margmirsxn
+margr
+margrsxn
+margt
+margtsxn
+mhtmltag
+min
+mo
+msmcap
+n
+nestcell
+nestrow
+nesttableprops
+newtblstyruls
+nextfile
+no
+nobrkwrptbl
+nocolbal
+nocompatoptions
+nocwrap
+noextrasprl
+nofchars
+nofcharsws
+nofpages
+nofwords
+nogrowautofit
+nojkernpunct
+nolead
+noline
+nolnhtadjtbl
+nonesttables
+nonshppict
+nooverflow
+noproof
+nosectexpand
+nosnaplinegrid
+nospaceforul
+nosupersub
+notabind
+noultrlspc
+nowidctlpar
+nowrap
+nowwrap
+noxlattoyen
+objalias
+objalign
+objattph
+objautlink
+objclass
+objcropb
+objcropl
+objcropr
+objcropt
+objdata
+object
+objemb
+objh
+objhtml
+objicemb
+objlink
+objlock
+objname
+objocx
+objpub
+objscalex
+objscaley
+objsect
+objsetsize
+objsub
+objtime
+objtransy
+objupdate
+objw
+oldas
+oldcprops
+oldlinewrap
+oldpprops
+oldsprops
+oldtprops
+operator
+otblrul
+outl
+outlinelevel
+overlay
+page
+pagebb
+panose
+paperh
+paperw
+par
+pararsid
+pard
+pc
+pca
+pgbrdrb
+pgbrdrfoot
+pgbrdrhead
+pgbrdrl
+pgbrdropt
+pgbrdrr
+pgbrdrsnap
+pgbrdrt
+pghsxn
+pgnbidia
+pgnbidib
+pgnchosung
+pgncnum
+pgncont
+pgndbnum
+pgndbnumd
+pgndbnumk
+pgndbnumt
+pgndec
+pgndecd
+pgnganada
+pgngbnum
+pgngbnumd
+pgngbnumk
+pgngbnuml
+pgnhindia
+pgnhindib
+pgnhindic
+pgnhindid
+pgnhn
+pgnhnsc
+pgnhnsh
+pgnhnsm
+pgnhnsn
+pgnhnsp
+pgnid
+pgnlcltr
+pgnlcrm
+pgnrestart
+pgnstart
+pgnstarts
+pgnthaia
+pgnthaib
+pgnthaic
+pgnucltr
+pgnucrm
+pgnvieta
+pgnx
+pgny
+pgnzodiac
+pgnzodiacd
+pgnzodiacl
+pgp
+pgptbl
+pgwsxn
+phcol
+phmrg
+phnthaia
+phpg
+picbmp
+picbpp
+piccropb
+piccropl
+piccropr
+piccropt
+pich
+pichgoal
+picprop
+picscaled
+picscalex
+picscaley
+pict
+picw
+picwgoal
+plain
+pmmetafile
+pn
+pnacross
+pnaiu
+pnaiud
+pnaiueo
+pnaiueod
+pnb
+pnbidia
+pnbidib
+pncaps
+pncard
+pncf
+pnchosung
+pncnum
+pndbnum
+pndbnumd
+pndbnumk
+pndbnuml
+pndbnumt
+pndec
+pndecd
+pnf
+pnfs
+pnganada
+pngblip
+pngbnum
+pngbnumd
+pngbnumk
+pngbnuml
+pnhang
+pni
+pnindent
+pniroha
+pnirohad
+pnlcltr
+pnlcrm
+pnlvl
+pnlvlblt
+pnlvlbody
+pnlvlcont
+pnnumonce
+pnord
+pnordt
+pnprev
+pnqc
+pnql
+pnqr
+pnrauth
+pnrdate
+pnrestart
+pnrnfc
+pnrnot
+pnrpnbr
+pnrrgb
+pnrstart
+pnrstop
+pnrx
+pnrxst
+pnscaps
+pnseclvl
+pnsp
+pnstart
+pnstrike
+pntext
+pntxta
+pntxtb
+pnucltr
+pnucrm
+pnul
+pnuld
+pnuldash
+pnuldashd
+pnuldashdd
+pnuldb
+pnulhair
+pnulnone
+pnulth
+pnulw
+pnulwave
+pnzodiac
+pnzodiacd
+pnzodiacl
+posnegx
+posnegy
+posrelh
+posx
+posxc
+posxi
+posxl
+posxo
+posxr
+posy
+posyb
+posyc
+posyil
+posyin
+posyout
+posyt
+prcolbl
+pri
+printdata
+printim
+private
+propname
+proptype
+protend
+protlevel
+protstart
+protusertbl
+psover
+psz
+pu
+pubauto
+pvmrg
+pvpara
+pvpg
+pwd
+pxe
+qc
+qd
+qj
+qk
+ql
+qmspace
+qr
+qt
+r
+rawbgdkbdiag
+rawclbgbdiag
+rawclbgcross
+rawclbgdcross
+rawclbgdkbdiag
+rawclbgdkcross
+rawclbgdkdcross
+rawclbgdkfdiag
+rawclbgdkhor
+rawclbgdkvert
+rawclbgfdiag
+rawclbghoriz
+rawclbgvert
+rdblquote
+readprot
+rempersonalinfo
+result
+revauth
+revauthdel
+revbar
+revdttm
+revdttmdel
+revised
+revisions
+revprop
+revprot
+revtbl
+revtim
+ri
+rin
+row
+rquote
+rsid
+rsidroot
+rsidtbl
+rsltbmp
+rslthtml
+rsltmerge
+rsltpict
+rsltrtf
+rslttxt
+rtf
+rtlch
+rtldoc
+rtlgutter
+rtlmark
+rtlpar
+rtlrow
+rtlsect
+rxe
+s
+sa
+saauto
+saftnnalc
+saftnnar
+saftnnauc
+saftnnchi
+saftnnchosung
+saftnncnum
+saftnndbar
+saftnndbnum
+saftnndbnumd
+saftnndbnumk
+saftnndbnumt
+saftnnganada
+saftnngbnum
+saftnngbnumd
+saftnngbnumk
+saftnngbnuml
+saftnnrlc
+saftnnruc
+saftnnzodiac
+saftnnzodiacd
+saftnnzodiacl
+saftnrestart
+saftnrstcont
+saftnstart
+sautoupd
+sb
+sbasedon
+sbauto
+sbk
+sbkcol
+sbkeven
+sbknone
+sbkodd
+sbkpage
+sbys
+scaps
+scompose
+sec
+sect
+sectd
+sectdefaultcl
+sectexpand
+sectlinegrid
+sectnum
+sectrsid
+sectspecifycl
+sectspecifygen
+sectspecifyl
+sectunlocked
+sftnbj
+sftnnalc
+sftnnar
+sftnnauc
+sftnnchi
+sftnnchosung
+sftnncnum
+sftnndbar
+sftnndbnum
+sftnndbnumd
+sftnndbnumk
+sftnndbnumt
+sftnnganada
+sftnngbnum
+sftnngbnumd
+sftnngbnumk
+sftnngbnuml
+sftnnrlc
+sftnnruc
+sftnnzodiac
+sftnnzodiacd
+sftnnzodiacl
+sftnrestart
+sftnrstcont
+sftnrstpg
+sftnstart
+sftntj
+shad
+shading
+shidden
+shift
+shp
+shpbottom
+shpbxcolumn
+shpbxignore
+shpbxmargin
+shpbxpage
+shpbxpara
+shpbyignore
+shpbymargin
+shpbypage
+shpbypara
+shpfblwtxt
+shpfhdr
+shpgrp
+shpinst
+shpleft
+shplid
+shplockanchor
+shppict
+shpright
+shprslt
+shptop
+shptxt
+shpwr
+shpwrk
+shpz
+sl
+slink
+slmult
+slocked
+sn
+snapgridtocell
+snaptogridincell
+snext
+softcol
+softlheight
+softline
+softpage
+sp
+spersonal
+splytwnine
+spp
+sprsbsp
+sprslnsp
+sprsspbf
+sprstsm
+sprstsp
+spv
+sreply
+ssemihidden
+staticval
+stextflow
+strike
+striked
+strikedl
+stshfbi
+stshfdbch
+stshfhich
+stshfloch
+stylelock
+stylelockbackcomp
+stylelockenforced
+stylesheet
+styrsid
+sub
+subdocument
+subfontby
+subfontbysize
+subject
+super
+sv
+svb
+swpbdr
+t
+tab
+tabsnoovrlp
+taprtl
+tb
+tbll
+tbllkbestfit
+tbllkborder
+tbllkcolor
+tbllkfont
+tbllkhdrcols
+tbllkhdrrows
+tbllklastcol
+tbllklastrow
+tbllkshading
+tblrsid
+tc
+tcelld
+tcf
+tcl
+tcn
+tdfrmtxt
+template
+time
+title
+titlepg
+tldot
+tleq
+tlhyph
+tlmdot
+tlth
+tlul
+toplinepunct
+tphcol
+tphmrg
+tphpg
+tposnegx
+tposnegy
+tposx
+tposxc
+tposxi
+tposxl
+tposxo
+tposxr
+tposy
+tposyb
+tposyc
+tposyil
+tposyin
+tposyout
+tposyoutv
+tposyt
+tpvmrg
+tpvpara
+tpvpg
+tqc
+tqdec
+tqr
+transmf
+trauth
+trautofit
+trbgbdiag
+trbgcross
+trbgdcross
+trbgdkbdiag
+trbgdkcross
+trbgdkdcross
+trbgdkfdiag
+trbgdkhor
+trbgdkvert
+trbgfdiag
+trbghoriz
+trbgvert
+trbrdrb
+trbrdrh
+trbrdrl
+trbrdrr
+trbrdrt
+trbrdrv
+trcbpat
+trcfpat
+trdate
+trf
+trfts
+trgaph
+trhdr
+trkeep
+trkeepfollow
+trleft
+trowd
+trp
+trpa
+trpaddb
+trpaddfb
+trpaddfl
+trpaddfr
+trpaddft
+trpaddl
+trpaddr
+trpaddt
+trpat
+trqc
+trql
+trqr
+trrh
+trshdng
+trspd
+trspdb
+trspdf
+trspdfb
+trspdfl
+trspdfr
+trspdft
+trspdl
+trspdr
+trspdt
+truncatefont
+truncatefontheight
+truncex
+trw
+ts
+tsb
+tsbgbdiag
+tsbgcross
+tsbgdcross
+tsbgdkbdiag
+tsbgdkcross
+tsbgdkdcross
+tsbgdkfdiag
+tsbgdkhor
+tsbgdkvert
+tsbgfdiag
+tsbghoriz
+tsbgvert
+tsbrd
+tsbrdr
+tsbrdrb
+tsbrdrdgl
+tsbrdrdgr
+tsbrdrh
+tsbrdrl
+tsbrdrr
+tsbrdrt
+tsbrdrv
+tscbandhorzeven
+tscbandhorzodd
+tscbandsh
+tscbandsv
+tscbandverteven
+tscbandvertodd
+tscellcbpat
+tscellcfpat
+tscellpaddb
+tscellpaddfb
+tscellpaddfl
+tscellpaddfr
+tscellpaddft
+tscellpaddl
+tscellpaddr
+tscellpaddt
+tscellpct
+tscellwidth
+tscellwidthfts
+tscfirstcol
+tscfirstrow
+tsclastcol
+tsclastrow
+tscnecell
+tscnwcell
+tscsecell
+tscswcell
+tsd
+tsnowrap
+tsrowd
+tsvertalb
+tsvertalc
+tsvertalt
+twoinone
+twoonone
+tx
+txe
+u
+uc
+ucl
+ud
+ul
+ulc
+uld
+uldash
+uldashd
+uldashdd
+uldb
+ulhair
+ulhwave
+ulldash
+ulnone
+ulth
+ulthd
+ulthdash
+ulthdashd
+ulthdashdd
+ulthldash
+ululdbwave
+ulw
+ulwave
+up
+upr
+urtf
+useltbaln
+userprops
+v
+vern
+version
+vertalb
+vertalc
+vertalj
+vertalt
+vertdoc
+vertsect
+viewbksp
+viewkind
+viewnobound
+viewscale
+viewzk
+wbitmap
+wbmbitspixel
+wbmplanes
+wbmwidthbytes
+webhidden
+widctlpar
+widoctrl
+widowctrl
+windowcaption
+wmetafile
+wpeqn
+wpjst
+wpsp
+wptab
+wraptrsp
+wrppunct
+xe
+xef
+yr
+yts
+yxe
+zwbo
+zwj
+zwnbo
+zwnj
+:
+: for colortbl
+blue:BC4
+green:BC2
+red:BC1
+:
+: undocumented Word 2003
+adeff
+adeflang
+adjustri
+affix
+c
+cltxt
+dgvsp
+donotembedlingdata
+donotembedsysfont
+dps
+factoidname
+fl
+ftnng
+grfdocevents
+h
+ignoremixedcontent
+ilfomacatclnup
+kelbow
+l
+leve
+listst
+ltrp
+lvltentative
+m
+marg
+o
+obj
+password
+revb
+saveinvalidxml
+sft
+showplaceholdtext
+showxmlerrors
+st
+tblind
+tblindtype
+tsbg
+validatexml
+wgrffmtfilter
+wrapdefault
+xmlattr
+xmlattrname
+xmlattrns
+xmlattrvalue
+xmlclose
+xmlns
+xmlnstbl
+xmlopen
Index: filters/rubyfilt.c
Prereq: 1.40
--- vile-9.5p+/filters/rubyfilt.c 2006-05-21 19:48:09.000000000 +0000
+++ vile-9.5q/filters/rubyfilt.c 2007-05-26 14:53:12.000000000 +0000
@@ -1,5 +1,5 @@
/*
- * $Header: /usr/build/vile/vile/filters/RCS/rubyfilt.c,v 1.40 2006/05/21 19:48:09 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/rubyfilt.c,v 1.41 2007/05/26 14:53:12 tom Exp $
*
* Filter to add vile "attribution" sequences to ruby scripts. This is a
* translation into C of an earlier version written for LEX/FLEX.
@@ -521,6 +521,7 @@
begin_HERE(char *s, int *quoted, int *strip_here)
{
char *base;
+ char *marker;
int ok;
int strip = 0;
@@ -536,19 +537,22 @@
}
if ((ok = is_QIDENT(s)) != 0) {
unsigned temp = 0;
- char *marker = do_alloc((char *) 0, ok + 1, &temp);
- char *d = marker;
+
s += ok;
*quoted = 0;
*strip_here = 1;
- while (base != s) {
- if (isIdent(*base))
- *d++ = *base;
- else
- *quoted = (*base != DQUOTE);
- base++;
+
+ if ((marker = do_alloc((char *) 0, ok + 1, &temp)) != 0) {
+ char *d = marker;
+ while (base != s) {
+ if (isIdent(*base))
+ *d++ = *base;
+ else
+ *quoted = (*base != DQUOTE);
+ base++;
+ }
+ *d = 0;
}
- *d = 0;
return marker;
}
}
Index: filters/sh-filt.l
Prereq: 1.68
--- vile-9.5p+/filters/sh-filt.l 2007-01-07 22:57:42.000000000 +0000
+++ vile-9.5q/filters/sh-filt.l 2007-05-26 14:57:11.000000000 +0000
@@ -5,7 +5,7 @@
%{
/*
- * $Header: /usr/build/vile/vile/filters/RCS/sh-filt.l,v 1.68 2007/01/07 22:57:42 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/sh-filt.l,v 1.69 2007/05/26 14:57:11 tom Exp $
*
* Filter to add vile "attribution" sequences to selected bits of Shell script.
*/
@@ -217,21 +217,24 @@
static void
save_here(char *text, int length)
{
- char *s = here_tag = do_alloc(here_tag, length, &here_len);
+ char *s;
here_exp = 1;
- while (length--) {
- if (isQuote(*text)) {
- here_exp = 0;
- } else if (strchr(" \t", *text) != 0) {
- if (s != here_tag)
- break;
- } else if (!here_exp || strchr("<->", *text) == 0) {
- *s++ = *text;
+ if ((here_tag = do_alloc(here_tag, length, &here_len)) != 0) {
+ s = here_tag;
+ while (length--) {
+ if (isQuote(*text)) {
+ here_exp = 0;
+ } else if (strchr(" \t", *text) != 0) {
+ if (s != here_tag)
+ break;
+ } else if (!here_exp || strchr("<->", *text) == 0) {
+ *s++ = *text;
+ }
+ text++;
}
- text++;
+ *s = 0;
}
- *s = 0;
}
static int
@@ -258,7 +261,7 @@
flt_bfr_embed(text + j, 1, Error_attr);
}
} else {
- if (text[j] != here_tag[k++])
+ if (here_tag != 0 && (text[j] != here_tag[k++]))
return 0;
if (pass)
flt_bfr_append(text + j, 1);
Index: filters/spell.rc
Prereq: 1.6
--- vile-9.5p+/filters/spell.rc 2005-02-12 13:15:08.000000000 +0000
+++ vile-9.5q/filters/spell.rc 2007-05-27 16:39:10.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: spell.rc,v 1.6 2005/02/12 13:15:08 tom Exp $
+; $Id: spell.rc,v 1.7 2007/05/27 16:39:10 tom Exp $
store-procedure SpellFilter "Highlight misspelled words in the current buffer"
; The spell filter uses an external program to lookup misspelled words.
@@ -22,10 +22,8 @@
; don't let anyone else write there, e.g., buffer-hooks
set nofiltermsgs
~if &isa buffer '[Filter Messages]'
- ~quiet buffer '[Filter Messages]'
- ~quiet rename-buffer '[Spelling Errors]'
+ ~quiet rename-other-buffer '[Filter Messages]' '[Spelling Errors]'
~quiet error-buffer '[Spelling Errors]'
- ~quiet eval &cat 'buffer ' %original
~endif
~else
~hidden goto-beginning-of-file
Index: filters/spellflt.l
Prereq: 1.33
--- vile-9.5p+/filters/spellflt.l 2007-04-25 00:40:56.000000000 +0000
+++ vile-9.5q/filters/spellflt.l 2007-05-12 14:18:59.000000000 +0000
@@ -1,7 +1,7 @@
%{
/*
- * $Header: /usr/build/vile/vile/filters/RCS/spellflt.l,v 1.33 2007/04/25 00:40:56 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/spellflt.l,v 1.34 2007/05/12 14:18:59 tom Exp $
*
* Filter to add vile "attribution" sequences to misspelled words.
*/
@@ -166,9 +166,10 @@
}
while (len > 0) {
- int ch = CharOf(text[0]);
- int all_upper = isupper(ch);
- int all_lower = islower(ch);
+ int c1 = CharOf(text[0]);
+ int c2;
+ int all_upper = 0;
+ int all_lower = 0;
int n;
/*
@@ -177,21 +178,31 @@
*/
next = len;
for (n = 0; n < len; ++n) {
- ch = CharOf(text[n]);
- if (isalpha(ch)) {
- if (isupper(ch)) {
+ c1 = CharOf(text[n]);
+ if (isalpha(c1)) {
+ if (isupper(c1)) {
if (all_lower) {
next = n;
break;
+ } else if (all_upper) {
+ c2 = ((n + 1) < len) ? CharOf(text[n + 1]) : 0;
+ if (islower(c2)) {
+ next = n;
+ break;
+ }
}
- } else if (all_upper) {
- if (n == 1) {
- all_lower = 1;
- all_upper = 0;
- } else {
- next = n;
- break;
+ ++all_upper;
+ } else {
+ if (all_upper) {
+ if (n == 1) {
+ all_lower = 0;
+ all_upper = 0;
+ } else {
+ next = n;
+ break;
+ }
}
+ ++all_lower;
}
}
}
@@ -288,7 +299,7 @@
* Run the spelling checker, reading the misspelled words from the pipe.
* Record those in the keyword table.
*/
- if ((prog = getenv("VILE_SPELL_FILT")) == 0)
+ if ((prog = vile_getenv("VILE_SPELL_FILT")) == 0)
prog = SPELL_PIPE;
sprintf(buffer, "%s <%s", prog, chop);
if ((fp = pipe_open(buffer)) != 0) {
Index: filters/unfilter.c
Prereq: 1.9
--- vile-9.5p+/filters/unfilter.c 2006-05-21 19:46:51.000000000 +0000
+++ vile-9.5q/filters/unfilter.c 2007-05-05 15:00:33.000000000 +0000
@@ -1,7 +1,7 @@
/*
* Parsing and I/O support for atr2text, etc.
*
- * $Header: /usr/build/vile/vile/filters/RCS/unfilter.c,v 1.9 2006/05/21 19:46:51 tom Exp $
+ * $Header: /usr/build/vile/vile/filters/RCS/unfilter.c,v 1.10 2007/05/05 15:00:33 tom Exp $
*/
#define CAN_TRACE 0
#define CAN_VMS_PATH 0
@@ -40,7 +40,7 @@
unsigned n;
begin_unfilter(dst);
- while ((ch = fgetc(src)) != EOF) {
+ while ((ch = vl_getc(src)) != EOF) {
ch = CharOf(ch);
if (state == Default) {
if (ch == CTL_A) {
Index: line.c
Prereq: 1.177
--- vile-9.5p+/line.c 2006-11-24 01:21:35.000000000 +0000
+++ vile-9.5q/line.c 2007-05-26 12:02:08.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.177 2006/11/24 01:21:35 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/line.c,v 1.178 2007/05/26 12:02:08 tom Exp $
*
*/
@@ -60,6 +60,7 @@
if ((lp = typealloc(LINE)) == NULL) {
(void) no_memory("LINE");
}
+ TRACE2(("alloc_LINE %p\n", lp));
}
return lp;
}
@@ -118,6 +119,7 @@
/* if the buffer doesn't have its own block of LINEs, or this
one isn't in that range, free it */
if (!bp->b_LINEs || lp < bp->b_LINEs || lp >= bp->b_LINEs_end) {
+ TRACE2(("lfree(%p)\n", lp));
poison(lp, sizeof(*lp));
free((char *) lp);
} else {
@@ -1447,7 +1449,7 @@
{
int c;
int i;
- int status, wasnl, suppressnl;
+ int status, wasnl, suppressnl, first;
L_NUM before;
C_NUM col = 0, width = 0;
C_NUM reached = 0;
@@ -1466,6 +1468,7 @@
before = vl_line_count(curbp);
suppressnl = FALSE;
wasnl = FALSE;
+ first = TRUE;
/* for each time.... */
while (n--) {
@@ -1474,83 +1477,11 @@
width = kbs[ukb].kbwidth;
col = getcol(DOT, FALSE);
}
-#define SLOWPUT 0
-#if SLOWPUT
- while (kp != NULL) {
- i = KbSize(ukb, kp);
- sp = (char *) kp->d_chunk;
- while (i--) {
- c = *sp++;
- if (shape == RECTANGLE) {
- if (width == 0 || c == '\n') {
- if (checkpad) {
- status = force_text_at_col(
- col, reached);
- if (status != TRUE)
- break;
- checkpad = FALSE;
- }
- if (width && linsert(width, ' ')
- != TRUE) {
- status = FALSE;
- break;
- }
- if (next_line_at_col(col, &reached)
- != TRUE) {
- status = FALSE;
- break;
- }
- checkpad = TRUE;
- width = kbs[ukb].kbwidth;
- }
- if (c == '\n') {
- continue; /* did it already */
- } else {
- if (checkpad) {
- status = force_text_at_col(
- col, reached);
- if (status != TRUE)
- break;
- checkpad = FALSE;
- }
- width--;
-
- if (is_header_line(DOT, curbp))
- suppressnl = TRUE;
- if (linsert(1, c) != TRUE) {
- status = FALSE;
- break;
- }
- wasnl = FALSE;
- }
- } else { /* not rectangle */
- if (c == '\n') {
- if (lnewline() != TRUE) {
- status = FALSE;
- break;
- }
- wasnl = TRUE;
- } else {
- if (is_header_line(DOT, curbp))
- suppressnl = TRUE;
- if (linsert(1, c) != TRUE) {
- status = FALSE;
- break;
- }
- wasnl = FALSE;
- }
- }
- }
- if (status != TRUE)
- break;
- kp = kp->d_next;
- }
-#else /* SLOWPUT */
while (kp != NULL) {
i = KbSize(ukb, kp);
sp = (char *) kp->d_chunk;
if (shape == RECTANGLE) {
- while (i--) {
+ while (i-- > 0) {
c = *sp++;
if (width == 0 || c == '\n') {
if (checkpad) {
@@ -1577,16 +1508,16 @@
continue; /* did it already */
} else {
if (checkpad) {
- status = force_text_at_col(
- col, reached);
+ status = force_text_at_col(col, reached);
if (status != TRUE)
break;
checkpad = FALSE;
}
width--;
- if (is_header_line(DOT, curbp))
+ if (is_header_line(DOT, curbp)) {
suppressnl = TRUE;
+ }
if (linsert(1, c) != TRUE) {
status = FALSE;
break;
@@ -1596,8 +1527,18 @@
}
} else { /* not rectangle */
while (i-- > 0) {
- if (is_header_line(DOT, curbp))
- suppressnl = TRUE;
+ /*
+ * If we're inserting into a non-empty buffer, will trim
+ * the extra newline. Check for the special case where
+ * we're inserting just a newline - that could be a case
+ * where the current line is already on the undo stack, and
+ * we cannot free it a second time.
+ */
+ if (first && is_header_line(DOT, curbp)) {
+ if ((i > 0) || (*sp != '\n'))
+ suppressnl = TRUE;
+ }
+ first = FALSE;
if (*sp == '\n') {
sp++;
if (lnewline() != TRUE) {
@@ -1631,7 +1572,6 @@
break;
kp = kp->d_next;
}
-#endif /* SLOWPUT */
if (status != TRUE)
break;
if (wasnl) {
Index: macros/modes.rc
Prereq: 1.53
--- vile-9.5p+/macros/modes.rc 2007-01-15 00:38:05.000000000 +0000
+++ vile-9.5q/macros/modes.rc 2007-05-26 15:28:24.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: modes.rc,v 1.53 2007/01/15 00:38:05 tom Exp $
+; $Id: modes.rc,v 1.57 2007/05/26 15:28:24 tom Exp $
; majormodes in this file are ordered alphabetically for convenience - the
; precedence used by vile is strictly alphabetic, counting case. Use the
; before and after qualifiers to override the precedence.
@@ -81,7 +81,7 @@
define-mode awk
~with define-submode awk
suffixes '\.awk$'
- pre '^#!\s*\/.*awk\>\(\s*-[\a]\+\)*\s*$'
+ pre '^#!\s*\(\/.*\)\?awk\>\(\s*-[\a]\+\)*\s*$'
cindent
cindent-chars $fences
comment-prefix '^\s*#'
@@ -159,7 +159,7 @@
define-mode csh
~with define-submode csh
suffixes '\.\(csh.*\|login\|logout\)$'
- pre '^#!\s*\/.*csh\>\(\s*-[\a]\+\)*\s*$'
+ pre '^#!\s*\(\/.*\)\?csh\>\(\s*-[\a]\+\)*\s*$'
comment-prefix '^\s*#'
comments '^\s*#\s*$'
fence-if '^\s*\<if\>.*\<then\>'
@@ -335,7 +335,7 @@
define-mode midl
~with define-submode midl
- suffixes '\.\(idl\)$'
+ suffixes '\.\(idl\|odl\)$'
dos
~endwith
@@ -557,7 +557,7 @@
; very expensive to resolve, we combine it with the similar 'while' group.
define-mode perl
~with define-submode perl
- pre '^#\s*!\s*\.*\/.*perl[0-9]*\>'
+ pre '^#!\s*\(\/.*\)\?perl[0-9]*\>'
suffixes '\.\(pl\|pm\|PL\)$'
before "mail"
cindent
@@ -600,7 +600,7 @@
; Python
define-mode py
~with define-submode py
- pre '^\(\(#!\s*\/.*python[\d_.-]*\>\)\(\(\s*[-]\+[\a]*\s*\)\?\|:\)\)\s*$'
+ pre '^\(\(#!\s*\(\/.*\)\?python[\d_.-]*\>\)\(\(\s*[-]\+[\a]*\s*\)\?\|:\)\)\s*$'
suffixes '\.py$'
comment-prefix '^\s*#'
comments '^\s*#\s\+\s*$'
@@ -611,7 +611,7 @@
; Ruby
define-mode rb
~with define-submode rb
- pre '^#\s*!\s*\.*\/.*ruby[0-9]*\>'
+ pre '^#!\s*\(\/.*\)\?ruby[0-9]*\>'
suffixes '\.rb$'
~endwith
@@ -627,7 +627,7 @@
define-mode rexx
~with define-submode rexx
- pre '^#\s*!\s*\.*\/.*\(rexx\|regina\|rxcurses\)\>'
+ pre '^#!\s*\(\/.*\)\?\(rexx\|regina\|rxcurses\)\>'
suffixes '\.\(cmd\|rexx\)$'
~if ¬ &seq $os "win32"
before "bat"
@@ -650,6 +650,14 @@
suffixes '\.spec$'
~endwith
+define-mode rtf
+~with define-submode rtf
+ preamble '^{\\rtf\d'
+ suffixes '\.rtf$'
+ dos
+ notabinsert
+~endwith
+
; (see RCS)
define-mode SCCS
~with define-submode SCCS
@@ -666,7 +674,7 @@
define-mode sed
~with define-submode sed
suffixes '\.\(sed\)$'
- pre '^#!\s*\/sed\>\(\s*-[\a]*\s*\)\*\s*$'
+ pre '^#!\s*\(\/.*\)\?sed\>\(\s*-[\a]*\s*\)\*\s*$'
comment-prefix '^\s*#'
comments '^\s*#\s*$'
~endwith
@@ -677,7 +685,7 @@
~with define-submode sh
mode-filename '^\(\([a-z.-]*profile\)\|Jamrules\)$'
suffixes '\(\.\(sh\|ksh\|shar\|.*rc\|bash_[a-z]\+\|ebuild\)$\)'
- pre '^\(\(#!\s*\/.*sh\>\(\s*[-]\+[\a]*\s*\)\?\)\|:\)\s*$'
+ pre '^\(\(#!\s*\(\/.*\)\?sh\>\(\s*[-]\+[\a]*\s*\)\?\)\|:\)\s*$'
comment-prefix '^\s*[:#]'
comments '^\s*[:#]\s*$'
fence-if '^\s*\<if\>'
@@ -752,7 +760,7 @@
~with define-submode tcl
before "sh"
suffixes '\.\(tcl\|exp\|psm\)$'
- pre '^#!\s*\/.*\(dcecp\|wish\|wishx\|tclsh\|tcl\|expectk\)[0-9.]*\>\(\s*-[\a]\+\)*\s*$'
+ pre '^#!\s*\(\/.*\)\?\(dcecp\|wish\|wishx\|tclsh\|tcl\|expectk\)[0-9.]*\>\(\s*-[\a]\+\)*\s*$'
comment-prefix '^\s*[:#]'
comments '^\s*[:#]\s*$'
~endwith
Index: macros/vileinit.rc
Prereq: 1.35
--- vile-9.5p+/macros/vileinit.rc 2007-01-08 20:58:36.000000000 +0000
+++ vile-9.5q/macros/vileinit.rc 2007-05-12 14:36:18.000000000 +0000
@@ -1,4 +1,4 @@
-; $Header: /usr/build/vile/vile/macros/RCS/vileinit.rc,v 1.35 2007/01/08 20:58:36 tom Exp $
+; $Header: /usr/build/vile/vile/macros/RCS/vileinit.rc,v 1.36 2007/05/12 14:36:18 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.
@@ -53,7 +53,7 @@
~if &seq $progname xvile
setv $xshell="xterm -e xshell.sh"
setv $xshell-flags=""
-~elseif &seq $progname winvile
+~elseif &sin $progname winvile
bind-key backward-row Shift+#A
bind-key forward-row Shift+#B
bind-key right-arrow Shift+#C
Index: main.c
Prereq: 1.590
--- vile-9.5p+/main.c 2007-01-14 23:57:23.000000000 +0000
+++ vile-9.5q/main.c 2007-05-28 14:07:15.000000000 +0000
@@ -22,7 +22,7 @@
*/
/*
- * $Header: /usr/build/vile/vile/RCS/main.c,v 1.590 2007/01/14 23:57:23 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/main.c,v 1.594 2007/05/28 14:07:15 tom Exp $
*/
#define realdef /* Make global definitions not external */
@@ -199,7 +199,7 @@
if (p1 != param) { /* we found a number */
p2 = skip_blanks(p1);
if (*p2 == '*' || *p2 == ':') {
- b2printf(opts_bp, "%.*s ", p1 - param, param);
+ b2printf(opts_bp, "%.*s ", (int) (p1 - param), param);
param = skip_blanks(p2 + 1);
}
}
@@ -606,11 +606,11 @@
if (new_console) {
if (FreeConsole()) {
if (!AllocConsole()) {
- fputs("unable to allocate new console\n", stderr);
+ vl_fputs("unable to allocate new console\n", stderr);
tidy_exit(BADEXIT);
}
} else {
- fputs("unable to release existing console\n", stderr);
+ vl_fputs("unable to release existing console\n", stderr);
tidy_exit(BADEXIT);
}
}
@@ -769,6 +769,10 @@
*/
VALARGS args;
infer_majormode(curbp);
+#if OPT_MODELINE
+ /* this may override the inferred majormode */
+ do_modelines(curbp);
+#endif
if (find_mode(curbp, "vilemode", FALSE, &args) == TRUE)
run_readhook();
#else
@@ -1441,7 +1445,7 @@
#ifdef VAL_AUTOCOLOR
setINT(VAL_AUTOCOLOR, 0); /* auto syntax coloring timeout */
#endif
-#ifdef VAL_BYTEORDER_MARK
+#ifdef VAL_BYTEORDER_MARK
setINT(VAL_BYTEORDER_MARK, ENUM_UNKNOWN); /* byteorder-mark NONE */
#endif
#ifdef VAL_C_SWIDTH
@@ -1453,7 +1457,7 @@
#ifdef VAL_FENCE_LIMIT
setINT(VAL_FENCE_LIMIT, 10); /* fences iteration timeout */
#endif
-#ifdef VAL_FILE_ENCODING
+#ifdef VAL_FILE_ENCODING
setINT(VAL_FILE_ENCODING, 0); /* file-encoding ASCII */
#endif
#ifdef VAL_HILITEMATCH
@@ -2917,7 +2921,7 @@
if (pid > 0)
ExitProgram(GOODEXIT);
else if (pid < 0) {
- fputs("cannot fork\n", stderr);
+ vl_fputs("cannot fork\n", stderr);
tidy_exit(BADEXIT);
}
}
@@ -2944,6 +2948,8 @@
if (cfp != 0
&& CMD_U_FUNC(cfp) == mouse_motion)
result = TRUE;
+#else
+ (void) cfp;
#endif
return result;
}
Index: makeargv.c
Prereq: 1.1
--- vile-9.5p+/makeargv.c 2007-04-21 00:25:34.000000000 +0000
+++ vile-9.5q/makeargv.c 2007-05-04 20:52:18.000000000 +0000
@@ -1,7 +1,7 @@
/*
* makeargv.c: parse string to argv[]
*
- * $Header: /usr/build/vile/vile/RCS/makeargv.c,v 1.1 2007/04/21 00:25:34 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/makeargv.c,v 1.2 2007/05/04 20:52:18 tom Exp $
*/
#include "w32vile.h"
@@ -18,10 +18,19 @@
//--------------------------------------------------------------
int
+is_option(const char *param)
+{
+ return (*param == '-'
+ || *param == '+'
+ || *param == '@');
+}
+
+int
make_argv(const char *program,
const char *cmdline,
char ***argvp,
- int *argcp)
+ int *argcp,
+ char **argend)
{
int maxargs = 2 + (strlen(cmdline) + 2) / 2;
@@ -49,6 +58,13 @@
while (*ptr == ' ')
ptr++;
+ /*
+ * Save the beginning of non-options in *argend
+ */
+ if (argend != 0
+ && !is_option(ptr))
+ *argend = ptr;
+
if (*ptr == SQUOTE
|| *ptr == DQUOTE
|| *ptr == ' ') {
Index: makeargv.h
Prereq: 1.1
--- vile-9.5p+/makeargv.h 2007-04-20 21:47:44.000000000 +0000
+++ vile-9.5q/makeargv.h 2007-05-04 20:52:07.000000000 +0000
@@ -1,12 +1,13 @@
/*
- * $Header: /usr/build/vile/vile/RCS/makeargv.h,v 1.1 2007/04/20 21:47:44 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/makeargv.h,v 1.2 2007/05/04 20:52:07 tom Exp $
*/
#ifdef __cplusplus
extern "C" {
#endif
-extern int make_argv(const char * /* program */, const char * /*cmdline */, char *** /*argvp */, int * /*argcp */);
+extern int is_option(const char * /* param */);
+extern int make_argv(const char * /* program */, const char * /*cmdline */, char *** /*argvp */, int * /*argcp */, char ** /*argend*/);
#ifdef __cplusplus
}
Index: makefile.in
Prereq: 1.204
--- vile-9.5p+/makefile.in 2006-11-24 01:42:28.000000000 +0000
+++ vile-9.5q/makefile.in 2007-05-26 12:21:02.000000000 +0000
@@ -20,7 +20,7 @@
#
# gnu autoconf support by kevin buettner, 5/94
#
-# $Header: /usr/build/vile/vile/RCS/makefile.in,v 1.204 2006/11/24 01:42:28 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/makefile.in,v 1.205 2007/05/26 12:21:02 tom Exp $
SHELL = /bin/sh
@@ -243,8 +243,6 @@
# these are the files that go to coders
DEV_DISTFILES = $(DISTFILES) $(DEVELOPER_ONLY)
-SRC = $(SCREEN).c $(VILESRC)
-
MKTBLS = ./mktbls$x
# Generated header-files, e.g., nemodes.h
@@ -266,9 +264,10 @@
# select.o
# spawn.o
# statevar.o
+# trace.o
# ucrypt.o
# xterm.o
-OBJ = $(SCREEN)$o \
+OBJ = $(SCREEN)$o \
main$o basic$o bind$o buffer$o csrch$o \
display$o dumbterm$o eval$o exec$o externs$o fences$o file$o \
filec$o fileio$o finderr$o glob$o globals$o \
@@ -278,6 +277,8 @@
tbuff$o termio$o undo$o version$o \
watch$o window$o word$o wordmov$o @EXTRAOBJS@
+SRC = $(OBJ:$o=.c)
+
ALL = $(TARGET)
@MAKE_FILTERS@all \
Index: menu.c
Prereq: 1.49
--- vile-9.5p+/menu.c 2006-10-24 21:57:15.000000000 +0000
+++ vile-9.5q/menu.c 2007-05-05 15:30:54.000000000 +0000
@@ -8,7 +8,7 @@
/************************************************************************/
/*
- * $Header: /usr/build/vile/vile/RCS/menu.c,v 1.49 2006/10/24 21:57:15 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/menu.c,v 1.50 2007/05/05 15:30:54 tom Exp $
*/
/* Vile includes */
@@ -203,7 +203,8 @@
return FALSE;
Nb_Token = 0;
- while (fgets(line, sizeof(line), fp) != NULL && Nb_Token < MAX_TOKEN - 2) {
+ while (vl_fgets(line, sizeof(line), fp) != NULL
+ && Nb_Token < MAX_TOKEN - 2) {
nlig++;
/* Let a tab begin inline comment */
Index: mkdirs.sh
--- vile-9.5p+/mkdirs.sh 2002-06-29 18:52:57.000000000 +0000
+++ vile-9.5q/mkdirs.sh 2007-03-25 22:29:46.000000000 +0000
@@ -1,10 +1,12 @@
#! /bin/sh
+# $Id: mkdirs.sh,v 1.7 2007/03/25 22:29:46 tom Exp $
+# -----------------------------------------------------------------------------
# mkinstalldirs --- make directory hierarchy
# Author: Noah Friedman <friedman@prep.ai.mit.edu>
# Created: 1993-05-16
# Last modified: 1994-03-25
# Public domain
-#
+# -----------------------------------------------------------------------------
errstatus=0
umask 022
@@ -24,8 +26,19 @@
echo "mkdir $pathcomp" 1>&2
case "$pathcomp" in
[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]: )
- ;; # DOSISH systems
- * ) mkdir "$pathcomp" || errstatus=$? ;;
+ ;; # DOSISH systems
+ * )
+ mkdir "$pathcomp"
+ errstatus=$?
+ if test $errstatus != 0
+ then
+ # may have failed if invoked in a parallel "make -j# install"
+ if test -d "$pathcomp"
+ then
+ errstatus=0
+ fi
+ fi
+ ;;
esac
fi
Index: ntwinio.c
Prereq: 1.161
--- vile-9.5p+/ntwinio.c 2007-04-21 00:25:37.000000000 +0000
+++ vile-9.5q/ntwinio.c 2007-05-12 14:47:44.000000000 +0000
@@ -1,7 +1,7 @@
/*
* Uses the Win32 screen API.
*
- * $Header: /usr/build/vile/vile/RCS/ntwinio.c,v 1.161 2007/04/21 00:25:37 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/ntwinio.c,v 1.163 2007/05/12 14:47:44 tom Exp $
* Written by T.E.Dickey for vile (october 1997).
* -- improvements by Clark Morgan (see w32cbrd.c, w32pipe.c).
*/
@@ -107,7 +107,6 @@
static int mouse_captured = 0;
static int nCharWidth = 8;
static int nLineHeight = 10;
-static int vile_in_getfkey = 0;
static int vile_resizing = FALSE; /* rely on repaint_window if true */
static int icursor; /* T -> enable insertion cursor */
static int icursor_style; /* 1 -> cmdmode = block,
@@ -913,13 +912,15 @@
{
TRACE(("fhide_cursor pos %#lx,%#lx (visible:%d, exists:%d)\n", ttrow,
ttcol, caret_visible, caret_exists));
- if (caret_visible) {
- HideCaret(cur_win->text_hwnd);
- caret_visible = 0;
- }
- if (caret_exists) {
- DestroyCaret();
- caret_exists = 0;
+ if (!ac_active) {
+ if (caret_visible) {
+ HideCaret(cur_win->text_hwnd);
+ caret_visible = 0;
+ }
+ if (caret_exists) {
+ DestroyCaret();
+ caret_exists = 0;
+ }
}
return 0;
}
@@ -930,7 +931,8 @@
int x, y, width;
POINT z;
- if (caret_disabled /* reject display during font-dialog */
+ if (ac_active /* reject while repainting autocolor */
+ || caret_disabled /* reject display during font-dialog */
|| ttrow > term.rows /* reject bogus position in init */
|| ttcol > term.cols)
return;
@@ -2003,9 +2005,9 @@
/* talk about copyright */
hwnd = GetDlgItem(hDlg, IDM_ABOUT_COPYRIGHT);
sprintf(buf,
- "\nCopyright \xA9 Thomas Dickey 1997-2005,2006\n\n"
+ "\nCopyright \xA9 Thomas Dickey 1997-2006,2007\n\n"
"%s is free software, distributed under the terms of the GNU "
- "Public License (see COPYING).",
+ "Public License, Version 2 (see COPYING).",
prognam);
SetWindowText(hwnd, buf);
w32_center_window(hDlg, cur_win->main_hwnd);
@@ -2785,7 +2787,6 @@
#ifdef VAL_AUTOCOLOR
orig_milli_ac = global_b_val(VAL_AUTOCOLOR);
#endif
- vile_in_getfkey = 1;
if (GetFocus() == cur_win->main_hwnd) {
fshow_cursor();
} else {
@@ -3161,7 +3162,6 @@
}
}
fhide_cursor();
- vile_in_getfkey = 0;
TRACE(("...ntgetch %#x\n", result));
return result;
@@ -3279,12 +3279,6 @@
EndPaint(hWnd, &ps);
}
-static int
-we_are_at_home(void)
-{
- return TRUE;
-}
-
static void
receive_dropped_files(HDROP hDrop)
{
@@ -3687,6 +3681,43 @@
return (TRUE);
}
+/*
+ * Check for an option and remove it, returning nonzero if found.
+ */
+static int
+had_option(char **argv, int *argc, char *option)
+{
+ int passed = 0;
+ int result = 0;
+ int n;
+
+ for (n = 1; n < *argc; ++n) {
+ if (!passed && is_option(argv[n])) {
+ if (!strcmp(argv[n], option))
+ result++;
+ } else {
+ passed = 1;
+ }
+ if (result)
+ argv[n] = argv[n + result];
+ }
+ *argc -= result;
+ return result;
+}
+
+/*
+ * Skip past options to find beginning of parameters.
+ */
+static int
+after_options(char **argv)
+{
+ int result = 1;
+
+ while (argv[result] != 0 && is_option(argv[result]))
+ ++result;
+ return result;
+}
+
int WINAPI
WinMain(
HINSTANCE hInstance,
@@ -3697,6 +3728,7 @@
int argc;
int n;
char **argv = 0;
+ char *argend = 0;
char *fontstr;
#ifdef VILE_OLE
int oa_invoke, oa_reg;
@@ -3707,35 +3739,33 @@
TRACE(("Starting ntvile, CmdLine:%s\n", lpCmdLine));
- if (make_argv("VILE", lpCmdLine, &argv, &argc) < 0)
+ if (make_argv("VILE", lpCmdLine, &argv, &argc, &argend) < 0)
ExitProgram(BADEXIT);
/*
- * If the command-line really specifies an existing file, override the argv-parser.
- * This makes "Send To" work.
+ * Special case for "Send To". The shortcut for winvile must have a "-i"
+ * after the name of the executable to distinguish this case from running
+ * from the command-line.
*/
- if (argc > 1 && ffaccess(lpCmdLine, FL_READABLE)) {
- argc = 1;
- argv[argc++] = lpCmdLine;
+ if (argend != 0
+ && had_option(argv, &argc, "-i")
+ && ffaccess(argend, FL_READABLE)) {
+
+ argc = after_options(argv);
+ argv[argc++] = argend;
argv[argc] = 0;
+
+ cd_on_open = -1;
}
#if OPT_TRACE
for (n = 0; n < argc; ++n)
TRACE(("argv[%d] %s\n", n, argv[n]));
#endif
- fontstr = 0;
-
/*
- * If our working directory is ${HOMEDRIVE}${HOME} and we're given a
- * filename, try to set the working directory based on the last one.
- * Drag/drop would only do this for us if we registered for each file
- * type; otherwise it's useful when we have the window already open.
+ * Set default values for options that accept parameters.
*/
- if (argc >= 2
- && we_are_at_home()
- && ffaccess(argv[argc - 1], FL_READABLE))
- cd_on_open = -1;
+ fontstr = 0;
SetCols(80);
SetRows(24);
Index: package/winvile.iss
Prereq: 1.9
--- vile-9.5p+/package/winvile.iss 2007-01-16 01:24:16.000000000 +0000
+++ vile-9.5q/package/winvile.iss 2007-05-28 15:46:17.000000000 +0000
@@ -1,4 +1,4 @@
-; $Header: /usr/build/vile/vile/package/RCS/winvile.iss,v 1.9 2007/01/16 01:24:16 tom Exp $
+; $Header: /usr/build/vile/vile/package/RCS/winvile.iss,v 1.11 2007/05/28 15:46:17 tom Exp $
; vile:ts=2 sw=2
;
; This installs winvile as "winvile-ole.exe", since that is the name I use when building the OLE flavor
@@ -381,7 +381,7 @@
#emit 'ExpandConstant(''' + mySendTo + '''),'
#emit '''SendTo link for ' + myAppName + ''','
ExpandConstant(MY_EDITOR_APP), // program
- '', // no params
+ '-i', // option(s) will be followed by pathname
'', // no target directory
'', // no icon filename
-1, // no icon index
Index: patchlev.h
--- vile-9.5p+/patchlev.h 2007-02-11 19:46:45.000000000 +0000
+++ vile-9.5q/patchlev.h 2007-05-04 22:01:56.000000000 +0000
@@ -1,3 +1,3 @@
#define VILE_RELEASE "9"
#define VILE_VERSION "5"
-#define VILE_PATCHLEVEL "p"
+#define VILE_PATCHLEVEL "q"
Index: path.c
Prereq: 1.153
--- vile-9.5p+/path.c 2007-01-08 23:24:37.000000000 +0000
+++ vile-9.5q/path.c 2007-05-05 15:24:46.000000000 +0000
@@ -2,7 +2,7 @@
* The routines in this file handle the conversion of pathname
* strings.
*
- * $Header: /usr/build/vile/vile/RCS/path.c,v 1.153 2007/01/08 23:24:37 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/path.c,v 1.154 2007/05/05 15:24:46 tom Exp $
*
*
*/
@@ -100,7 +100,7 @@
{
static DIRENT dummy;
- if ((fgets(dummy.d_name, NFILEN, dp)) != NULL) {
+ if ((vl_fgets(dummy.d_name, NFILEN, dp)) != NULL) {
/* zap the newline */
dummy.d_name[strlen(dummy.d_name) - 1] = EOS;
return &dummy;
Index: revlist
--- vile-9.5p+/revlist 2007-04-25 20:59:42.000000000 +0000
+++ vile-9.5q/revlist 2007-05-28 17:36:38.000000000 +0000
@@ -1,6 +1,6 @@
-revlist for vile, version v9_5p
+revlist for vile, version v9_5q
--------------------------------------------------------------------------------
-CHANGES 1.985
+CHANGES 1.1005
CHANGES.R3 1.1
CHANGES.R4 1.1
CHANGES.R5 1.1
@@ -13,42 +13,42 @@
README 1.96
README.PC 1.33
README.VMS 1.5
-aclocal.m4 1.169
+aclocal.m4 1.173
ansi.c 1.48
api.c 1.38
api.h 1.13
basic.c 1.126
-bind.c 1.303
+bind.c 1.304
borland.c 1.36
btree.c 1.23
btree.h 1.5
-buffer.c 1.314
+buffer.c 1.316
buglist 1.405
-builtflt.c 1.48
+builtflt.c 1.49
charsets.c 1.8
chgdfunc.h 1.21
-cmdtbl 1.245
-config.guess 1.5
-config.sub 1.6
+cmdtbl 1.247
+config.guess 1.6
+config.sub 1.7
config_h.in 1.2
-configure 1.11
-configure.in 1.228
+configure 1.12
+configure.in 1.233
csrch.c 1.34
-curses.c 1.27
+curses.c 1.29
descrip.mms 1.48
dirstuff.h 1.30
-display.c 1.423
+display.c 1.424
djhandl.c 1.6
dumbterm.c 1.21
edef.h 1.328
-estruct.h 1.609
-eval.c 1.357
-exec.c 1.309
+estruct.h 1.611
+eval.c 1.358
+exec.c 1.310
externs.c 1.10
fences.c 1.84
file.c 1.399
filec.c 1.125
-fileio.c 1.181
+fileio.c 1.182
finderr.c 1.130
glob.c 1.89
globals.c 1.49
@@ -60,18 +60,18 @@
isearch.c 1.60
itbuff.c 1.25
lckfiles.c 1.11
-line.c 1.177
-main.c 1.590
-makeargv.c 1.1
-makeargv.h 1.1
+line.c 1.178
+main.c 1.594
+makeargv.c 1.2
+makeargv.h 1.2
makefile.blc 1.20
makefile.djg 1.35
makefile.icc 1.16
-makefile.in 1.204
+makefile.in 1.205
makefile.wnt 1.93
map.c 1.111
-menu.c 1.49
-mkdirs.sh 1.6
+menu.c 1.50
+mkdirs.sh 1.7
mkprlenv.wnt 1.9
mktbls.c 1.137
modes.c 1.329
@@ -79,15 +79,15 @@
msgs.c 1.28
npopen.c 1.94
ntconio.c 1.87
-ntwinio.c 1.161
+ntwinio.c 1.163
nullterm.c 1.3
oneliner.c 1.109
opers.c 1.92
os2keys.h 1.2
os2pipe.c 1.5
os2vio.c 1.35
-patchlev.h 1.353
-path.c 1.153
+patchlev.h 1.354
+path.c 1.154
perl.xs 1.104
plugin.c 1.1
plugin.h 1.1
@@ -97,57 +97,58 @@
random.c 1.298
regexp.c 1.136
region.c 1.133
-revlist v9_5p
+revlist v9_5q
search.c 1.143
select.c 1.162
sinstall.sh 1.1
-spawn.c 1.191
+spawn.c 1.192
statevar.c 1.112
tags.c 1.135
tbuff.c 1.66
tcap.c 1.170
tcap.h 1.11
-termio.c 1.211
+termio.c 1.212
test_io.c 1.2
-trace.c 1.55
+trace.c 1.57
trace.h 1.24
ucrypt.c 1.15
-undo.c 1.91
-version.c 1.61
-vile-9.5.spec 1.17
+undo.c 1.92
+version.c 1.62
+vile-9.5.spec 1.18
vile.1 1.37
vile.hlp 1.627
vile.wmconfig 1.1
vl_alloc.h 1.1
vl_ctype.h 1.7
vl_regex.h 1.4
+vl_stdio.h 1.4
vms2unix.c 1.42
vmsbuild.com 1.46
vmspipe.c 1.14
vmsvt.c 1.63
w32cbrd.c 1.25
w32cmd.c 1.37
-w32misc.c 1.47
+w32misc.c 1.48
w32ole.cpp 1.25
w32ole.h 1.6
-w32ole.rc 1.2
+w32ole.rc 1.3
w32oo.cpp 1.7
w32pipe.c 1.33
w32reg.c 1.11
w32reg.h 1.1
w32vile.h 1.4
watch.c 1.5
-window.c 1.108
+window.c 1.109
winvile.h 1.11
winvile.odl 1.6
-winvile.rc 1.11
+winvile.rc 1.12
word.c 1.81
wordmov.c 1.23
-wvwrap.cpp 1.12
-x11.c 1.286
+wvwrap.cpp 1.14
+x11.c 1.287
x11menu.c 1.10
xshell.sh 1.4
-xterm.c 1.2
+xterm.c 1.3
xtermkeys.h 1.6
xvile.wmconfig 1.1
doc/Vileserv.doc 1.1
@@ -168,9 +169,9 @@
filters/as386.key 1.2
filters/asm-filt.l 1.6
filters/asm.key 1.1
-filters/atr2ansi.c 1.3
-filters/atr2html.c 1.3
-filters/atr2text.c 1.3
+filters/atr2ansi.c 1.4
+filters/atr2html.c 1.4
+filters/atr2text.c 1.4
filters/au3-filt.l 1.6
filters/au3.key 1.4
filters/awk-filt.l 1.17
@@ -181,7 +182,7 @@
filters/bat.key 1.4
filters/bnf-filt.l 1.9
filters/bnf.key 1.1
-filters/c-filt.c 1.74
+filters/c-filt.c 1.75
filters/c-filt.flx 1.1
filters/c.key 1.11
filters/cfg-filt.l 1.14
@@ -200,23 +201,23 @@
filters/difffilt.l 1.7
filters/ecl-filt.l 1.6
filters/ecl.key 1.1
-filters/ecrypt.c 1.8
+filters/ecrypt.c 1.9
filters/esql.key 1.3
filters/esqlfilt.l 1.16
filters/est-filt.l 1.6
filters/est.key 1.1
filters/fdl-filt.l 1.12
filters/fdl.key 1.4
-filters/filterio.c 1.29
-filters/filters.c 1.99
-filters/filters.h 1.98
+filters/filterio.c 1.31
+filters/filters.c 1.105
+filters/filters.h 1.99
filters/filters.rc 1.205
-filters/flt_defs.h 1.3
-filters/fltstack.h 1.9
+filters/flt_defs.h 1.4
+filters/fltstack.h 1.10
filters/genmake.c 1.4
-filters/genmake.mak 1.31
+filters/genmake.mak 1.32
filters/html.key 1.8
-filters/htmlfilt.l 1.38
+filters/htmlfilt.l 1.40
filters/imake.key 1.4
filters/imakeflt.l 1.16
filters/infofilt.l 1.8
@@ -235,7 +236,7 @@
filters/lispfilt.l 1.13
filters/lua-filt.l 1.6
filters/lua.key 1.2
-filters/m4-filt.c 1.28
+filters/m4-filt.c 1.29
filters/m4.key 1.3
filters/mail.key 1.3
filters/mailfilt.l 1.20
@@ -248,7 +249,7 @@
filters/makefile.wnt 1.32
filters/makefilt.l 1.54
filters/makelist.sh 1.5
-filters/manfilt.c 1.36
+filters/manfilt.c 1.37
filters/mcrl.key 1.1
filters/mcrlfilt.l 1.1
filters/midl.key 1.3
@@ -269,36 +270,38 @@
filters/pas.key 1.4
filters/pc.key 1.1
filters/perl.key 1.8
-filters/perlfilt.l 1.45
+filters/perlfilt.l 1.46
filters/php-filt.l 1.6
filters/php.key 1.3
-filters/pl-filt.c 1.83
+filters/pl-filt.c 1.86
filters/pot-filt.l 1.7
filters/pot.key 1.1
filters/ps-filt.l 1.9
filters/ps.key 1.2
filters/py-filt.l 1.13
filters/py.key 1.3
-filters/rb-filt.l 1.15
+filters/rb-filt.l 1.16
filters/rb.key 1.4
filters/rc-filt.l 1.8
filters/rc.key 1.2
-filters/rcs-filt.l 1.11
+filters/rcs-filt.l 1.12
filters/rcs.key 1.1
filters/rexx.key 1.1
filters/rexxfilt.l 1.9
-filters/rpm-filt.l 1.13
+filters/rpm-filt.l 1.14
filters/rpm.key 1.3
-filters/rubyfilt.c 1.40
+filters/rtf-filt.l 1.3
+filters/rtf.key 1.4
+filters/rubyfilt.c 1.41
filters/sccs.key 1.1
filters/sccsfilt.l 1.14
filters/sed-filt.c 1.22
-filters/sh-filt.l 1.68
+filters/sh-filt.l 1.69
filters/sh.key 1.4
filters/sml-filt.l 1.6
filters/sml.key 1.1
-filters/spell.rc 1.6
-filters/spellflt.l 1.33
+filters/spell.rc 1.7
+filters/spellflt.l 1.34
filters/sql-filt.l 1.31
filters/sql.key 1.9
filters/syntax.key 1.1
@@ -316,7 +319,7 @@
filters/ti-filt.l 1.21
filters/ti.key 1.2
filters/txt-filt.l 1.30
-filters/unfilter.c 1.9
+filters/unfilter.c 1.10
filters/unfilter.h 1.1
filters/vb.key 1.7
filters/vile.key 1.8
@@ -350,18 +353,18 @@
macros/gnugpg.rc 1.3
macros/loaderrs.rc 1.1
macros/manpage.rc 1.22
-macros/modes.rc 1.53
+macros/modes.rc 1.57
macros/palettes.rc 1.7
macros/pictmode.rc 1.4
macros/search.rc 1.3
macros/shifts.rc 1.4
macros/showeach.rc 1.5
macros/vile-pager 1.5
-macros/vileinit.rc 1.35
+macros/vileinit.rc 1.36
macros/vilemenu.rc 1.3
macros/vileperl.rc 1.7
macros/which.rc 1.15
-package/winvile.iss 1.9
+package/winvile.iss 1.11
package/winvile.nsi 1.3
perl/Breadcrumbs.pm 1.4
perl/CaptHook.pm 1.1
Index: spawn.c
Prereq: 1.191
--- vile-9.5p+/spawn.c 2006-04-19 23:51:48.000000000 +0000
+++ vile-9.5q/spawn.c 2007-05-05 15:01:45.000000000 +0000
@@ -1,7 +1,7 @@
/* Spawn: various DOS access commands
* for MicroEMACS
*
- * $Header: /usr/build/vile/vile/RCS/spawn.c,v 1.191 2006/04/19 23:51:48 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/spawn.c,v 1.192 2007/05/05 15:01:45 tom Exp $
*
*/
@@ -617,7 +617,7 @@
while (lp != last) {
fwrite((char *) lp->l_text, sizeof(char), (size_t) llength(lp), fw);
- putc('\n', fw);
+ vl_putc('\n', fw);
lp = lforw(lp);
}
#if SYS_UNIX && ! TEST_DOS_PIPES
Index: termio.c
Prereq: 1.211
--- vile-9.5p+/termio.c 2006-01-13 01:29:15.000000000 +0000
+++ vile-9.5q/termio.c 2007-05-12 15:34:33.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.211 2006/01/13 01:29:15 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/termio.c,v 1.212 2007/05/12 15:34:33 tom Exp $
*
*/
@@ -139,6 +139,10 @@
#include <poll.h>
#endif
+#if !defined(O_NDELAY) && defined(O_NONBLOCK)
+#define O_NDELAY O_NONBLOCK
+#endif
+
#ifndef O_NDELAY
#undef USE_FCNTL
#define USE_FCNTL 0
Index: trace.c
Prereq: 1.55
--- vile-9.5p+/trace.c 2006-11-23 16:06:58.000000000 +0000
+++ vile-9.5q/trace.c 2007-05-27 19:30:56.000000000 +0000
@@ -1,7 +1,7 @@
/*
* debugging support -- tom dickey.
*
- * $Header: /usr/build/vile/vile/RCS/trace.c,v 1.55 2006/11/23 16:06:58 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/trace.c,v 1.57 2007/05/27 19:30:56 tom Exp $
*
*/
@@ -80,12 +80,12 @@
save_err = errno;
va_start(ap, fmt);
- if (fp == NULL)
- fp = fopen("Trace.out", "w");
- if (fp == NULL)
- abort();
-
if (fmt != bad_form) {
+ if (fp == NULL)
+ fp = fopen("Trace.out", "w");
+ if (fp == NULL)
+ abort();
+
fprintf(fp, "%s", trace_indent(trace_depth, '|'));
if (!strncmp(fmt, T_CALLED, T_LENGTH)) {
++trace_depth;
@@ -98,7 +98,7 @@
}
vfprintf(fp, fmt, ap);
(void) fflush(fp);
- } else {
+ } else if (fp != 0) {
(void) fclose(fp);
(void) fflush(stdout);
(void) fflush(stderr);
@@ -748,8 +748,8 @@
#endif
#if NO_LEAKS
-void
-trace_leaks(void)
+static void
+close_me(void)
{
#if DOALLOC
FreeAndNull(area);
@@ -758,5 +758,12 @@
FreeAndNull(visible_indent);
used_visible = 0;
used_indent = 0;
+ Trace(bad_form);
+}
+
+void
+trace_leaks(void)
+{
+ atexit(close_me);
}
#endif
Index: undo.c
Prereq: 1.91
--- vile-9.5p+/undo.c 2006-11-24 01:09:08.000000000 +0000
+++ vile-9.5q/undo.c 2007-05-26 11:31:21.000000000 +0000
@@ -3,7 +3,7 @@
*
* written for vile. Copyright (c) 1990, 1995-2001 by Paul Fox
*
- * $Header: /usr/build/vile/vile/RCS/undo.c,v 1.91 2006/11/24 01:09:08 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/undo.c,v 1.92 2007/05/26 11:31:21 tom Exp $
*
*/
@@ -184,36 +184,38 @@
LINE *prev;
int fc;
- if (!OkUndo())
- return;
+ TRACE2((T_CALLED "toss_to_undo(%p)\n", lp));
+ if (OkUndo()) {
- if (needundocleanup)
- preundocleanup();
+ if (needundocleanup)
+ preundocleanup();
- pushline(lp, BACKSTK(curbp));
+ pushline(lp, BACKSTK(curbp));
- next = lforw(lp);
+ next = lforw(lp);
- /* need to save a dot -- either the next line or
- the previous one */
- if (next == buf_head(curbp)) {
- prev = lback(lp);
- FORWDOT(curbp).l = prev;
- fc = firstchar(prev);
- if (fc < 0) /* all white */
- FORWDOT(curbp).o = llength(prev) - 1;
- else
- FORWDOT(curbp).o = fc;
- } else {
- FORWDOT(curbp).l = next;
- fc = firstchar(next);
- if (fc < 0) /* all white */
- FORWDOT(curbp).o = b_left_margin(curbp);
- else
- FORWDOT(curbp).o = fc;
- }
+ /* need to save a dot -- either the next line or
+ the previous one */
+ if (next == buf_head(curbp)) {
+ prev = lback(lp);
+ FORWDOT(curbp).l = prev;
+ fc = firstchar(prev);
+ if (fc < 0) /* all white */
+ FORWDOT(curbp).o = llength(prev) - 1;
+ else
+ FORWDOT(curbp).o = fc;
+ } else {
+ FORWDOT(curbp).l = next;
+ fc = firstchar(next);
+ if (fc < 0) /* all white */
+ FORWDOT(curbp).o = b_left_margin(curbp);
+ else
+ FORWDOT(curbp).o = fc;
+ }
- dumpuline(lp);
+ dumpuline(lp);
+ }
+ return2Void();
}
/*
@@ -230,6 +232,7 @@
int status = FALSE;
LINE *nlp;
+ TRACE2((T_CALLED "copy_for_undo(%p)\n", lp));
if (OkUndo()) {
if (needundocleanup)
preundocleanup();
@@ -254,7 +257,7 @@
status = TRUE;
}
}
- return status;
+ return2Code(status);
}
/* push an unreal line onto the undo stack
@@ -267,6 +270,7 @@
int status = FALSE;
LINE *nlp;
+ TRACE2((T_CALLED "tag_for_undo(%p)\n", lp));
if (OkUndo()) {
if (needundocleanup)
preundocleanup();
@@ -289,10 +293,10 @@
status = TRUE;
}
}
- return status;
+ return2Code(status);
}
-/* Change all PURESTACKSEPS on the stacks to STACKSEPS, so that undo won't
+/* Change all PURESTACKSEP's on the stacks to STACKSEP's, so that undo won't
* reset the BFCHG bit. This should be called anytime a non-undoable change is
* made to a buffer.
*/
@@ -317,16 +321,19 @@
{
LINE *lp;
+ TRACE((T_CALLED "freeundostacks(%p,%d)\n", bp, both));
while ((lp = popline(FORWSTK(bp), TRUE)) != NULL) {
lfree(lp, bp);
}
if (both) {
- while ((lp = popline(BACKSTK(bp), TRUE)) != NULL)
+ while ((lp = popline(BACKSTK(bp), TRUE)) != NULL) {
lfree(lp, bp);
+ }
bp->b_udtail = 0;
bp->b_udlastsep = 0;
bp->b_udcount = 0;
}
+ returnVoid();
}
int
Index: version.c
Prereq: 1.61
--- vile-9.5p+/version.c 2006-11-04 15:43:59.000000000 +0000
+++ vile-9.5q/version.c 2007-05-28 14:04:33.000000000 +0000
@@ -1,7 +1,7 @@
/*
* version & usage-messages for vile
*
- * $Header: /usr/build/vile/vile/RCS/version.c,v 1.61 2006/11/04 15:43:59 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/version.c,v 1.62 2007/05/28 14:04:33 tom Exp $
*
*/
@@ -219,6 +219,8 @@
(void) docmd(*cmdp, TRUE, FALSE, 1);
cmdp++;
}
+#else
+ (void) n;
#endif
}
Index: vile-9.5.spec
Prereq: 1.17
--- vile-9.5p+/vile-9.5.spec 2007-02-11 19:46:45.000000000 +0000
+++ vile-9.5q/vile-9.5.spec 2007-05-04 22:02:36.000000000 +0000
@@ -1,7 +1,7 @@
Summary: VILE VI Like Emacs editor
-# $Header: /usr/build/vile/vile/RCS/vile-9.5.spec,v 1.17 2007/02/11 19:46:45 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/vile-9.5.spec,v 1.18 2007/05/04 22:02:36 tom Exp $
Name: vile
-Version: 9.5p
+Version: 9.5q
# each patch should update the version
Release: 1
Copyright: GPL
@@ -24,6 +24,7 @@
Patch14: vile-9.5n.patch.gz
Patch15: vile-9.5o.patch.gz
Patch16: vile-9.5p.patch.gz
+Patch17: vile-9.5q.patch.gz
# each patch should add itself to this list
Packager: Thomas Dickey <dickey@invisible-island.net>
BuildRoot: %{_tmppath}/%{name}-root
@@ -52,6 +53,7 @@
%patch14 -p1
%patch15 -p1
%patch16 -p1
+%patch17 -p1
# each patch should add itself to this list
%build
@@ -104,6 +106,9 @@
%changelog
# each patch should add its ChangeLog entries here
+* Fri May 04 2007 Thomas Dickey
+- added patch for 9.5q
+
* Sun Feb 11 2007 Thomas Dickey
- added patch for 9.5p
Index: vl_stdio.h
--- /dev/null 2007-05-28 17:23:42.020552250 +0000
+++ vile-9.5q/vl_stdio.h 2007-05-05 15:24:04.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+ * $Header: /usr/build/vile/vile/RCS/vl_stdio.h,v 1.4 2007/05/05 15:24:04 tom Exp $
+ *
+ * Copyright 2007, Thomas E. Dickey
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, distribute with modifications, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the
+ * sale, use or other dealings in this Software without prior written
+ * authorization.
+ */
+
+#ifndef VL_STDIO_H_incl
+#define VL_STDIO_H_incl 1
+
+#include <stdio.h>
+
+/*
+ * The non-threadsafe versions of getc/putc are generally faster.
+ */
+#ifdef HAVE_GETC_UNLOCKED
+#define vl_getc(fp) getc_unlocked(fp)
+#else
+#define vl_getc(fp) getc(fp)
+#endif
+
+#ifdef HAVE_PUTC_UNLOCKED
+#define vl_putc(c,fp) putc_unlocked(c,fp)
+#else
+#define vl_putc(c,fp) putc(c,fp)
+#endif
+
+#define vl_fputs(s,fp) fputs(s,fp)
+#define vl_fgets(s,n,fp) fgets(s,n,fp)
+
+#endif /* VL_STDIO_H_incl */
Index: w32misc.c
Prereq: 1.47
--- vile-9.5p+/w32misc.c 2006-04-21 11:53:40.000000000 +0000
+++ vile-9.5q/w32misc.c 2007-05-05 15:30:00.000000000 +0000
@@ -2,7 +2,7 @@
* w32misc: collection of unrelated, common win32 functions used by both
* the console and GUI flavors of the editor.
*
- * $Header: /usr/build/vile/vile/RCS/w32misc.c,v 1.47 2006/04/21 11:53:40 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/w32misc.c,v 1.48 2007/05/05 15:30:00 tom Exp $
*/
#include "estruct.h"
@@ -24,9 +24,9 @@
#define SHEXE_LEN (sizeof(SHEXE) - 1)
#define SHELL_C_LEN (sizeof(" -c ") - 1)
-static int host_type = HOST_UNDEF; /* nt or 95? */
+static int host_type = HOST_UNDEF; /* nt or 95? */
#if !DISP_NTWIN
-static char saved_title[256];
+static char saved_title[256];
#endif
/* ------------------------------------------------------------------ */
@@ -36,7 +36,7 @@
stdin_data_available(void)
{
FILE *fp;
- int rc = 0;
+ int rc = 0;
int fd1 = fileno(stdin);
int fd2;
@@ -53,7 +53,7 @@
#define MAX_SIGS 6
-typedef void (*SIGFUNC_TYPE)(int);
+typedef void (*SIGFUNC_TYPE) (int);
static SIGFUNC_TYPE saved_sigs[MAX_SIGS];
@@ -81,7 +81,6 @@
#endif
-
static void
set_host(void)
{
@@ -90,31 +89,25 @@
info.dwOSVersionInfoSize = sizeof(info);
GetVersionEx(&info);
host_type = (info.dwPlatformId == VER_PLATFORM_WIN32_NT) ?
- HOST_NT : HOST_95;
+ HOST_NT : HOST_95;
}
-
-
int
is_winnt(void)
{
if (host_type == HOST_UNDEF)
- set_host();
+ set_host();
return (host_type == HOST_NT);
}
-
-
int
is_win95(void)
{
if (host_type == HOST_UNDEF)
- set_host();
+ set_host();
return (host_type == HOST_95);
}
-
-
/*
* FUNCTION
* mk_shell_cmd_str(char *cmd, int *allocd_mem, int prepend_shc)
@@ -203,114 +196,99 @@
char *
mk_shell_cmd_str(char *cmd, int *allocd_mem, int prepend_shc)
{
- int alloc_len,
- bourne_shell, /* Boolean, T if user's shell has
- * appearances of a Unix lookalike
- * bourne shell (e.g., sh, ksh, bash).
- */
- len;
- char *out_str, *cp, *shell, *shell_c = "/c";
+ int alloc_len, bourne_shell, /* Boolean, T if user's shell has
+ * appearances of a Unix lookalike
+ * bourne shell (e.g., sh, ksh, bash).
+ */
+ len;
+ char *out_str, *cp, *shell, *shell_c = "/c";
- shell = get_shell();
- len = (int) strlen(shell);
+ shell = get_shell();
+ len = (int) strlen(shell);
bourne_shell = (len >= 2 &&
- toLower(shell[len - 2]) == 's' &&
- toLower(shell[len - 1]) == 'h')
- ||
- (len >= SHEXE_LEN &&
- stricmp(shell + len - SHEXE_LEN, SHEXE) == 0);
- if (bourne_shell)
- {
- shell_c = "-c";
-
- /* Now check for csh lookalike. */
- bourne_shell = ! (
- (len >= 3 &&
- toLower(shell[len - 3]) == 'c')
- ||
- (len >= CSHEXE_LEN &&
- stricmp(shell + len - CSHEXE_LEN, CSHEXE) == 0)
- );
- }
- if (! bourne_shell)
- {
- /*
- * MS-DOS shell or csh. Do not bother quoting user's command
- * string, since the former is oblivious to the notion of a unix
- * shell's argument quoting and the latter does not support nested
- * double quotes.
- */
-
- if (prepend_shc)
- {
- alloc_len = (int) (strlen(cmd) + strlen(shell) + SHELL_C_LEN + 1);
- if ((out_str = typeallocn(char, alloc_len)) == NULL)
- return (out_str);
- *allocd_mem = TRUE;
- sprintf(out_str, "%s %s %s", shell, shell_c, cmd);
- return (out_str);
- }
- else
- {
- *allocd_mem = FALSE;
- return (cmd);
- }
+ toLower(shell[len - 2]) == 's' &&
+ toLower(shell[len - 1]) == 'h')
+ ||
+ (len >= SHEXE_LEN &&
+ stricmp(shell + len - SHEXE_LEN, SHEXE) == 0);
+ if (bourne_shell) {
+ shell_c = "-c";
+
+ /* Now check for csh lookalike. */
+ bourne_shell = !(
+ (len >= 3 &&
+ toLower(shell[len - 3]) == 'c')
+ ||
+ (len >= CSHEXE_LEN &&
+ stricmp(shell + len - CSHEXE_LEN, CSHEXE) == 0)
+ );
+ }
+ if (!bourne_shell) {
+ /*
+ * MS-DOS shell or csh. Do not bother quoting user's command
+ * string, since the former is oblivious to the notion of a unix
+ * shell's argument quoting and the latter does not support nested
+ * double quotes.
+ */
+
+ if (prepend_shc) {
+ alloc_len = (int) (strlen(cmd) + strlen(shell) + SHELL_C_LEN + 1);
+ if ((out_str = typeallocn(char, alloc_len)) == NULL)
+ return (out_str);
+ *allocd_mem = TRUE;
+ sprintf(out_str, "%s %s %s", shell, shell_c, cmd);
+ return (out_str);
+ } else {
+ *allocd_mem = FALSE;
+ return (cmd);
+ }
}
/* Else apply solutions 1-2 above. */
- alloc_len = (int) strlen(cmd) * 2; /* worst case -- every cmd byte quoted */
+ alloc_len = (int) strlen(cmd) * 2; /* worst case -- every cmd byte quoted */
if (prepend_shc)
- alloc_len += (int) strlen(shell) + SHELL_C_LEN;
- alloc_len += 3; /* terminating nul + 2 quote chars */
- if ((out_str = typeallocn(char, alloc_len)) == NULL)
- {
- errno = ENOMEM;
- return (out_str);
+ alloc_len += (int) strlen(shell) + SHELL_C_LEN;
+ alloc_len += 3; /* terminating nul + 2 quote chars */
+ if ((out_str = typeallocn(char, alloc_len)) == NULL) {
+ errno = ENOMEM;
+ return (out_str);
}
*allocd_mem = TRUE;
cp = out_str;
if (prepend_shc)
- cp += sprintf(cp, "%s %s ", shell, shell_c);
- if (strchr(cmd, '\'') == NULL)
- {
- /* No single quotes in command string. Solution #1. */
+ cp += sprintf(cp, "%s %s ", shell, shell_c);
+ if (strchr(cmd, '\'') == NULL) {
+ /* No single quotes in command string. Solution #1. */
- sprintf(cp, "'%s'", cmd);
- return (out_str);
+ sprintf(cp, "'%s'", cmd);
+ return (out_str);
}
/* Solution #2. */
*cp++ = '"';
- while (*cmd)
- {
- if (*cmd == '\\')
- {
- *cp++ = *cmd++;
- if (*cmd)
- {
- /* Any quoted char is immune to further quoting. */
-
- *cp++ = *cmd++;
- }
- }
- else if (*cmd != '"')
- *cp++ = *cmd++;
- else
- {
- /* bare '"' */
-
- *cp++ = '\\';
- *cp++ = *cmd++;
- }
+ while (*cmd) {
+ if (*cmd == '\\') {
+ *cp++ = *cmd++;
+ if (*cmd) {
+ /* Any quoted char is immune to further quoting. */
+
+ *cp++ = *cmd++;
+ }
+ } else if (*cmd != '"')
+ *cp++ = *cmd++;
+ else {
+ /* bare '"' */
+
+ *cp++ = '\\';
+ *cp++ = *cmd++;
+ }
}
*cp++ = '"';
- *cp = '\0';
+ *cp = '\0';
return (out_str);
}
-
-
/*
* Semi-generic CreateProcess(). Refer to the w32_system()
* DESCRIPTION below for the rationale behind "no_wait" argument.
@@ -318,53 +296,46 @@
int
w32_CreateProcess(char *cmd, int no_wait)
{
- PROCESS_INFORMATION pi;
- int rc = -1;
- STARTUPINFO si;
+ PROCESS_INFORMATION pi;
+ int rc = -1;
+ STARTUPINFO si;
memset(&si, 0, sizeof(si));
si.cb = sizeof(si);
- if (! no_wait)
- {
- /* command requires a shell, so hookup console I/O */
+ if (!no_wait) {
+ /* command requires a shell, so hookup console I/O */
- si.dwFlags = STARTF_USESTDHANDLES;
- si.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
- si.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
- si.hStdError = GetStdHandle(STD_ERROR_HANDLE);
+ si.dwFlags = STARTF_USESTDHANDLES;
+ si.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
+ si.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
+ si.hStdError = GetStdHandle(STD_ERROR_HANDLE);
}
if (CreateProcess(NULL,
- cmd,
- NULL,
- NULL,
- ! no_wait, /* Inherit handles */
- 0,
- NULL,
- NULL,
- &si,
- &pi))
- {
- /* Success */
- if (! no_wait)
- {
- /* wait for shell process to exit */
-
- (void) cwait(&rc, (CWAIT_PARAM_TYPE) pi.hProcess, 0);
- }
- (void) CloseHandle(pi.hProcess);
- (void) CloseHandle(pi.hThread);
- }
- else
- {
- /* Bummer */
+ cmd,
+ NULL,
+ NULL,
+ !no_wait, /* Inherit handles */
+ 0,
+ NULL,
+ NULL,
+ &si,
+ &pi)) {
+ /* Success */
+ if (!no_wait) {
+ /* wait for shell process to exit */
+
+ (void) cwait(&rc, (CWAIT_PARAM_TYPE) pi.hProcess, 0);
+ }
+ (void) CloseHandle(pi.hProcess);
+ (void) CloseHandle(pi.hThread);
+ } else {
+ /* Bummer */
- mlforce("[unable to create win32 process]");
+ mlforce("[unable to create win32 process]");
}
return (rc);
}
-
-
/*
* FUNCTION
* w32_system(const char *cmd)
@@ -394,63 +365,55 @@
w32_system(const char *cmd)
{
char *cmdstr;
- int no_shell, freestr, rc;
+ int no_shell, freestr, rc;
TRACE(("w32_system(%s)\n", cmd));
no_shell = W32_SKIP_SHELL(cmd);
- if (no_shell)
- {
- /*
- * Must strip off "start " prefix from command because this
- * idiom is supported by Win95, but not by WinNT.
- */
-
- if ((cmdstr = typeallocn(char, strlen(cmd) + 1)) == NULL)
- {
- (void) no_memory("w32_system");
- return (-1);
- }
- strcpy(cmdstr, cmd + W32_START_STR_LEN);
- freestr = TRUE;
- }
- else
- {
- if ((cmdstr = mk_shell_cmd_str((char *) cmd, &freestr, TRUE)) == NULL)
- {
- /* heap exhausted! */
-
- (void) no_memory("w32_system");
- return (-1);
- }
+ if (no_shell) {
+ /*
+ * Must strip off "start " prefix from command because this
+ * idiom is supported by Win95, but not by WinNT.
+ */
+
+ if ((cmdstr = typeallocn(char, strlen(cmd) + 1)) == NULL) {
+ (void) no_memory("w32_system");
+ return (-1);
+ }
+ strcpy(cmdstr, cmd + W32_START_STR_LEN);
+ freestr = TRUE;
+ } else {
+ if ((cmdstr = mk_shell_cmd_str((char *) cmd, &freestr, TRUE)) == NULL) {
+ /* heap exhausted! */
+
+ (void) no_memory("w32_system");
+ return (-1);
+ }
}
set_console_title(cmd);
rc = w32_CreateProcess(cmdstr, no_shell);
if (freestr)
- free(cmdstr);
+ free(cmdstr);
restore_console_title();
return (rc);
}
-
-
#if DISP_NTWIN
static int
-get_console_handles(STARTUPINFO *psi, SECURITY_ATTRIBUTES *psa)
+get_console_handles(STARTUPINFO * psi, SECURITY_ATTRIBUTES * psa)
{
CONSOLE_CURSOR_INFO cci;
- char shell[NFILEN];
+ char shell[NFILEN];
psi->hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
- psi->dwFlags = STARTF_USESTDHANDLES;
+ psi->dwFlags = STARTF_USESTDHANDLES;
/* If it's possible to fetch data via hStdOutput, assume all is well. */
- if (GetConsoleCursorInfo(psi->hStdOutput, &cci))
- {
- psi->hStdInput = GetStdHandle(STD_INPUT_HANDLE);
- psi->hStdError = GetStdHandle(STD_ERROR_HANDLE);
- return (TRUE);
+ if (GetConsoleCursorInfo(psi->hStdOutput, &cci)) {
+ psi->hStdInput = GetStdHandle(STD_INPUT_HANDLE);
+ psi->hStdError = GetStdHandle(STD_ERROR_HANDLE);
+ return (TRUE);
}
/*
@@ -489,26 +452,24 @@
* occur if winvile is launched by windows explorer.
*/
if ((psi->hStdInput = CreateFile("CONIN$",
- GENERIC_READ,
- FILE_SHARE_READ,
- psa,
- OPEN_EXISTING,
- FILE_ATTRIBUTE_NORMAL,
- NULL)) == INVALID_HANDLE_VALUE)
- {
- mlforce("[std input handle creation failed]");
- return (FALSE);
+ GENERIC_READ,
+ FILE_SHARE_READ,
+ psa,
+ OPEN_EXISTING,
+ FILE_ATTRIBUTE_NORMAL,
+ NULL)) == INVALID_HANDLE_VALUE) {
+ mlforce("[std input handle creation failed]");
+ return (FALSE);
}
if ((psi->hStdOutput = CreateFile("CONOUT$",
- GENERIC_WRITE,
- FILE_SHARE_WRITE,
- psa,
- OPEN_EXISTING,
- FILE_ATTRIBUTE_NORMAL,
- NULL)) == INVALID_HANDLE_VALUE)
- {
- mlforce("[std output handle creation failed]");
- return (FALSE);
+ GENERIC_WRITE,
+ FILE_SHARE_WRITE,
+ psa,
+ OPEN_EXISTING,
+ FILE_ATTRIBUTE_NORMAL,
+ NULL)) == INVALID_HANDLE_VALUE) {
+ mlforce("[std output handle creation failed]");
+ return (FALSE);
}
/*
@@ -521,17 +482,15 @@
strcpy(shell, get_shell());
(void) mklower(shell);
if (strstr(shell, "cmd") || strstr(shell, "command"))
- psi->hStdError = psi->hStdOutput;
+ psi->hStdError = psi->hStdOutput;
else
- psi->hStdError = GetStdHandle(STD_ERROR_HANDLE);
+ psi->hStdError = GetStdHandle(STD_ERROR_HANDLE);
- psi->dwFlags |= STARTF_USEFILLATTRIBUTE;
- psi->dwFillAttribute = FOREGROUND_RED|FOREGROUND_GREEN|FOREGROUND_BLUE;
+ psi->dwFlags |= STARTF_USEFILLATTRIBUTE;
+ psi->dwFillAttribute = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
return (TRUE);
}
-
-
/*
* FUNCTION
* w32_system_winvile(const char *cmd, int *pressret)
@@ -568,190 +527,165 @@
{
#define PRESS_ANY_KEY "\n[Press any key to continue]"
- char *cmdstr;
- HWND hwnd;
- int no_shell, freestr, close_disabled = FALSE, rc = -1;
- PROCESS_INFORMATION pi;
- SECURITY_ATTRIBUTES sa;
- STARTUPINFO si;
+ char *cmdstr;
+ HWND hwnd;
+ int no_shell, freestr, close_disabled = FALSE, rc = -1;
+ PROCESS_INFORMATION pi;
+ SECURITY_ATTRIBUTES sa;
+ STARTUPINFO si;
memset(&si, 0, sizeof(si));
- si.cb = sizeof(si);
+ si.cb = sizeof(si);
no_shell = W32_SKIP_SHELL(cmd);
memset(&sa, 0, sizeof(sa));
sa.nLength = sizeof(sa);
- if (no_shell)
- {
- /*
- * Must strip off "start " prefix from command because this
- * idiom is supported by Win95, but not by WinNT.
- */
-
- if ((cmdstr = typeallocn(char, strlen(cmd) + 1)) == NULL)
- {
- (void) no_memory("w32_system_winvile");
- return (-1);
- }
- strcpy(cmdstr, cmd + W32_START_STR_LEN);
- freestr = TRUE;
- *pressret = FALSE; /* Not waiting for the launched cmd to exit. */
- }
- else
- {
- sa.bInheritHandle = TRUE;
- if ((cmdstr = mk_shell_cmd_str((char *) cmd, &freestr, TRUE)) == NULL)
- {
- /* heap exhausted! */
-
- (void) no_memory("w32_system_winvile");
- return (rc);
- }
- if (! AllocConsole())
- {
- if (freestr)
- free(cmdstr);
- mlforce("[console creation failed]");
- return (rc);
- }
- if (! get_console_handles(&si, &sa))
- {
- (void) FreeConsole();
- if (freestr)
- free(cmdstr);
- return (rc);
- }
- SetConsoleTitle(cmd);
-
- /* don't let signal in dynamic console kill winvile */
- ignore_signals();
-
- /*
- * If the spawned console's close button is pressed, both the
- * console _and_ winvile are killed. Not good. Try to disable
- * console close button before shell process is started, while the
- * console title is still intact. Once the shell starts running,
- * it is free to change the console's title, and many will do so
- * (e.g., bash).
- */
- Sleep(0); /* yield processor so GDI can create console frame */
- if ((hwnd = FindWindow(NULL, cmd)) != NULL)
- {
- /*
- * Disable console close button using code borrowed from
- * Charles Petzold.
- */
-
- (void) EnableMenuItem(GetSystemMenu(hwnd, FALSE),
- SC_CLOSE,
- MF_GRAYED);
- close_disabled = TRUE;
-
- /*
- * On a Win2K host, the console is often created as a
- * background window, which means that the user must press
- * ALT+TAB to bring it to the foreground to interact with the
- * shell. Ugh. This call to SetForegroundWindow() should
- * work, even on 2K / 98.
- */
- (void) SetForegroundWindow(hwnd);
- }
- }
- if (CreateProcess(NULL,
- cmdstr,
- &sa,
- &sa,
- ! no_shell, /* Inherit handles */
- 0,
- NULL,
- NULL,
- &si,
- &pi))
- {
- /* Success */
+ if (no_shell) {
+ /*
+ * Must strip off "start " prefix from command because this
+ * idiom is supported by Win95, but not by WinNT.
+ */
+
+ if ((cmdstr = typeallocn(char, strlen(cmd) + 1)) == NULL) {
+ (void) no_memory("w32_system_winvile");
+ return (-1);
+ }
+ strcpy(cmdstr, cmd + W32_START_STR_LEN);
+ freestr = TRUE;
+ *pressret = FALSE; /* Not waiting for the launched cmd to exit. */
+ } else {
+ sa.bInheritHandle = TRUE;
+ if ((cmdstr = mk_shell_cmd_str((char *) cmd, &freestr, TRUE)) == NULL) {
+ /* heap exhausted! */
- DWORD dummy;
- INPUT_RECORD ir;
+ (void) no_memory("w32_system_winvile");
+ return (rc);
+ }
+ if (!AllocConsole()) {
+ if (freestr)
+ free(cmdstr);
+ mlforce("[console creation failed]");
+ return (rc);
+ }
+ if (!get_console_handles(&si, &sa)) {
+ (void) FreeConsole();
+ if (freestr)
+ free(cmdstr);
+ return (rc);
+ }
+ SetConsoleTitle(cmd);
- if (! close_disabled)
- {
- int i;
-
- /*
- * If the spawned console's close button is pressed, both the
- * console _and_ winvile are killed. Not good.
- */
- for (i = 0; i < 5; i++)
- {
- if ((hwnd = FindWindow(NULL, cmd)) != NULL)
- {
- (void) EnableMenuItem(GetSystemMenu(hwnd, FALSE),
- SC_CLOSE,
- MF_GRAYED);
- (void) SetForegroundWindow(hwnd);
- break;
- }
- Sleep(200);
- }
- }
- if (! no_shell)
- {
- (void) cwait(&rc, (CWAIT_PARAM_TYPE) pi.hProcess, 0);
- restore_signals();
- if (*pressret)
- {
- if (! WriteFile(si.hStdOutput,
- PRESS_ANY_KEY,
- sizeof(PRESS_ANY_KEY) - 1,
- &dummy,
- NULL))
- {
- mlforce("[dynamic console write failed]");
- rc = -1;
- }
- else
- {
- for_ever
- {
- /* Wait for a single key of input from user. */
-
- if (! ReadConsoleInput(si.hStdInput, &ir, 1, &dummy))
- {
- mlforce("[dynamic console read failed]");
- rc = -1;
- break;
- }
- if (ir.EventType == KEY_EVENT &&
- ir.Event.KeyEvent.bKeyDown)
- {
- break;
- }
- }
- }
- }
- }
- else
- {
- rc = 0;
- }
- (void) CloseHandle(pi.hProcess);
- (void) CloseHandle(pi.hThread);
+ /* don't let signal in dynamic console kill winvile */
+ ignore_signals();
+
+ /*
+ * If the spawned console's close button is pressed, both the
+ * console _and_ winvile are killed. Not good. Try to disable
+ * console close button before shell process is started, while the
+ * console title is still intact. Once the shell starts running,
+ * it is free to change the console's title, and many will do so
+ * (e.g., bash).
+ */
+ Sleep(0); /* yield processor so GDI can create console frame */
+ if ((hwnd = FindWindow(NULL, cmd)) != NULL) {
+ /*
+ * Disable console close button using code borrowed from
+ * Charles Petzold.
+ */
+
+ (void) EnableMenuItem(GetSystemMenu(hwnd, FALSE),
+ SC_CLOSE,
+ MF_GRAYED);
+ close_disabled = TRUE;
+
+ /*
+ * On a Win2K host, the console is often created as a
+ * background window, which means that the user must press
+ * ALT+TAB to bring it to the foreground to interact with the
+ * shell. Ugh. This call to SetForegroundWindow() should
+ * work, even on 2K / 98.
+ */
+ (void) SetForegroundWindow(hwnd);
+ }
}
- else
- {
- /* Bummer */
+ if (CreateProcess(NULL,
+ cmdstr,
+ &sa,
+ &sa,
+ !no_shell, /* Inherit handles */
+ 0,
+ NULL,
+ NULL,
+ &si,
+ &pi)) {
+ /* Success */
+
+ DWORD dummy;
+ INPUT_RECORD ir;
+
+ if (!close_disabled) {
+ int i;
+
+ /*
+ * If the spawned console's close button is pressed, both the
+ * console _and_ winvile are killed. Not good.
+ */
+ for (i = 0; i < 5; i++) {
+ if ((hwnd = FindWindow(NULL, cmd)) != NULL) {
+ (void) EnableMenuItem(GetSystemMenu(hwnd, FALSE),
+ SC_CLOSE,
+ MF_GRAYED);
+ (void) SetForegroundWindow(hwnd);
+ break;
+ }
+ Sleep(200);
+ }
+ }
+ if (!no_shell) {
+ (void) cwait(&rc, (CWAIT_PARAM_TYPE) pi.hProcess, 0);
+ restore_signals();
+ if (*pressret) {
+ if (!WriteFile(si.hStdOutput,
+ PRESS_ANY_KEY,
+ sizeof(PRESS_ANY_KEY) - 1,
+ &dummy,
+ NULL)) {
+ mlforce("[dynamic console write failed]");
+ rc = -1;
+ } else {
+ for_ever
+ {
+ /* Wait for a single key of input from user. */
+
+ if (!ReadConsoleInput(si.hStdInput, &ir, 1, &dummy)) {
+ mlforce("[dynamic console read failed]");
+ rc = -1;
+ break;
+ }
+ if (ir.EventType == KEY_EVENT &&
+ ir.Event.KeyEvent.bKeyDown) {
+ break;
+ }
+ }
+ }
+ }
+ } else {
+ rc = 0;
+ }
+ (void) CloseHandle(pi.hProcess);
+ (void) CloseHandle(pi.hThread);
+ } else {
+ /* Bummer */
- mlforce("[unable to create Win32 process]");
+ mlforce("[unable to create Win32 process]");
}
if (freestr)
- free(cmdstr);
- if (! no_shell)
- FreeConsole();
+ free(cmdstr);
+ if (!no_shell)
+ FreeConsole();
return (rc);
}
#endif /* DISP_NTWIN */
-
-
/*
* FUNCTION
* w32_keybrd_reopen(int pressret)
@@ -784,32 +718,27 @@
#if DISP_NTCONS
int c;
- if (pressret)
- {
- fputs("[Press return to continue]", stdout);
- fflush(stdout);
-
- /* loop for a CR, a space, or a : to do another named command */
- while ((c = _getch()) != '\r' &&
- c != '\n' &&
- c != ' ' &&
- !ABORTED(c))
- {
- if (DefaultKeyBinding(c) == &f_namedcmd)
- {
- unkeystroke(c);
- break;
- }
- }
- fputc('\n', stdout);
+ if (pressret) {
+ vl_fputs("[Press return to continue]", stdout);
+ fflush(stdout);
+
+ /* loop for a CR, a space, or a : to do another named command */
+ while ((c = _getch()) != '\r' &&
+ c != '\n' &&
+ c != ' ' &&
+ !ABORTED(c)) {
+ if (DefaultKeyBinding(c) == &f_namedcmd) {
+ unkeystroke(c);
+ break;
+ }
+ }
+ vl_putc('\n', stdout);
}
term.kopen();
kbd_erase_to_end(0);
#endif
}
-
-
/*
* The code in ntconio.c that saves and restores console titles
* didn't work reliably for pipe or shell operations. It's moved here
@@ -824,8 +753,6 @@
#endif
}
-
-
void
restore_console_title(void)
{
@@ -834,8 +761,6 @@
#endif
}
-
-
/*
* FUNCTION
* fmt_win32_error(ULONG errcode, char **buf, ULONG buflen)
@@ -862,20 +787,18 @@
{
int flags = FORMAT_MESSAGE_FROM_SYSTEM;
- if (! *buf)
- flags |= FORMAT_MESSAGE_ALLOCATE_BUFFER;
+ if (!*buf)
+ flags |= FORMAT_MESSAGE_ALLOCATE_BUFFER;
FormatMessage(flags,
- NULL,
- errcode == W32_SYS_ERROR ? GetLastError() : errcode,
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* dflt language */
- (*buf) ? *buf : (LPTSTR) buf,
- buflen,
- NULL);
+ NULL,
+ errcode == W32_SYS_ERROR ? GetLastError() : errcode,
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* dflt language */
+ (*buf) ? *buf : (LPTSTR) buf,
+ buflen,
+ NULL);
return (*buf);
}
-
-
/*
* FUNCTION
* disp_win32_error(ULONG errcode, void *hwnd)
@@ -899,12 +822,10 @@
char *buf = NULL;
fmt_win32_error(errcode, &buf, 0);
- MessageBox(hwnd, buf, prognam, MB_OK|MB_ICONSTOP);
+ MessageBox(hwnd, buf, prognam, MB_OK | MB_ICONSTOP);
LocalFree(buf);
}
-
-
#if DISP_NTWIN
/*
* FUNCTION
@@ -937,138 +858,117 @@
*/
int
-parse_font_str(const char *fontstr, FONTSTR_OPTIONS *results)
+parse_font_str(const char *fontstr, FONTSTR_OPTIONS * results)
{
- const char *cp, *tmp;
- char *endnum, *facep;
- ULONG size;
+ const char *cp, *tmp;
+ char *endnum, *facep;
+ ULONG size;
memset(results, 0, sizeof(*results));
- size = 0;
- cp = skip_cblanks(fontstr);
+ size = 0;
+ cp = skip_cblanks(fontstr);
/* Up first is either a font face or font size. */
- if (isDigit(*cp))
- {
- errno = 0;
- size = strtoul(cp, &endnum, 10);
- if (errno != 0)
- return (FALSE);
- tmp = skip_cblanks(endnum);
- if (*tmp != '\0')
- {
- if (*tmp != ',')
- {
- /* Not a 100% integer value, assume this is a font face. */
-
- size = 0;
- }
- else
- cp = tmp; /* Valid point size. */
- }
- else
- cp = tmp; /* Only a point size specified, nothing left. */
- }
- if (size == 0)
- {
- /* this must be a font face */
-
- facep = results->face;
- while (*cp)
- {
- if (*cp == ',')
- {
- cp++;
- break;
- }
- else if (*cp == '\\' && cp[1] == ',')
- {
- *facep++ = ',';
- cp += 2;
- }
- else
- *facep++ = *cp++;
- }
- *facep = '\0';
- if (results->face[0] == '\0' || *cp == '\0')
- return (FALSE);
- else
- {
- /* Now pick up non-optional font size (that follows face). */
-
- errno = 0;
- size = strtoul(cp, &endnum, 10);
- if (errno != 0 || size == 0)
- return (FALSE);
- cp = endnum;
- }
+ if (isDigit(*cp)) {
+ errno = 0;
+ size = strtoul(cp, &endnum, 10);
+ if (errno != 0)
+ return (FALSE);
+ tmp = skip_cblanks(endnum);
+ if (*tmp != '\0') {
+ if (*tmp != ',') {
+ /* Not a 100% integer value, assume this is a font face. */
+ size = 0;
+ } else
+ cp = tmp; /* Valid point size. */
+ } else
+ cp = tmp; /* Only a point size specified, nothing left. */
+ }
+ if (size == 0) {
+ /* this must be a font face */
+
+ facep = results->face;
+ while (*cp) {
+ if (*cp == ',') {
+ cp++;
+ break;
+ } else if (*cp == '\\' && cp[1] == ',') {
+ *facep++ = ',';
+ cp += 2;
+ } else
+ *facep++ = *cp++;
+ }
+ *facep = '\0';
+ if (results->face[0] == '\0' || *cp == '\0')
+ return (FALSE);
+ else {
+ /* Now pick up non-optional font size (that follows face). */
+
+ errno = 0;
+ size = strtoul(cp, &endnum, 10);
+ if (errno != 0 || size == 0)
+ return (FALSE);
+ cp = endnum;
+ }
}
/* Now look for optional font style. */
cp = skip_cblanks(cp);
/* At this point, there are two allowable states: delimiter or EOS. */
- if (*cp)
- {
- if (*cp++ == ',')
- {
- cp = skip_cblanks(cp);
- if (strncmp(cp, "bold-italic", sizeof("bold-italic") - 1) == 0)
- results->bold = results->italic = TRUE;
- else if (strncmp(cp, "italic", sizeof("italic") - 1) == 0)
- results->italic = TRUE;
- else if (strncmp(cp, "bold", sizeof("bold") - 1) == 0)
- results->bold = TRUE;
- else
- return (FALSE);
- }
- else
- return (FALSE);
+ if (*cp) {
+ if (*cp++ == ',') {
+ cp = skip_cblanks(cp);
+ if (strncmp(cp, "bold-italic", sizeof("bold-italic") - 1) == 0)
+ results->bold = results->italic = TRUE;
+ else if (strncmp(cp, "italic", sizeof("italic") - 1) == 0)
+ results->italic = TRUE;
+ else if (strncmp(cp, "bold", sizeof("bold") - 1) == 0)
+ results->bold = TRUE;
+ else
+ return (FALSE);
+ } else
+ return (FALSE);
}
results->size = size;
return (TRUE);
}
-#endif /* DISP_NTWIN */
+#endif /* DISP_NTWIN */
/* return current window title in dynamic buffer */
char *
w32_wdw_title(void)
{
- static char *buf;
- static DWORD bufsize;
- int nchars;
-
- if (! buf)
- {
- bufsize = 128;
- buf = castalloc(char, bufsize);
- if (! buf)
- return (error_val);
+ static char *buf;
+ static DWORD bufsize;
+ int nchars;
+
+ if (!buf) {
+ bufsize = 128;
+ buf = castalloc(char, bufsize);
+ if (!buf)
+ return (error_val);
}
for_ever
{
#if DISP_NTWIN
- nchars = GetWindowText(winvile_hwnd(), buf, bufsize);
+ nchars = GetWindowText(winvile_hwnd(), buf, bufsize);
#else
- nchars = GetConsoleTitle(buf, bufsize);
+ nchars = GetConsoleTitle(buf, bufsize);
#endif
- if (nchars >= ((int) bufsize - 1))
- {
- /* Enlarge buffer and try again. */
-
- bufsize *= 2;
- buf = castalloc(char, bufsize);
- if (! buf)
- return (error_val);
- }
- else
- break;
+ if (nchars >= ((int) bufsize - 1)) {
+ /* Enlarge buffer and try again. */
+
+ bufsize *= 2;
+ buf = castalloc(char, bufsize);
+ if (!buf)
+ return (error_val);
+ } else
+ break;
}
return ((nchars) ? buf : error_val);
}
-
-
/*
* Delete current text selection and optionally copy same to Windows
* clipboard.
@@ -1076,25 +976,24 @@
int
w32_del_selection(int copy_to_cbrd)
{
- AREGION delrp;
- MARK savedot;
+ AREGION delrp;
+ MARK savedot;
REGIONSHAPE shape;
- int status;
+ int status;
/* first, go to beginning of selection, if it exists. */
- if (! sel_motion(FALSE, FALSE))
- return (FALSE);
+ if (!sel_motion(FALSE, FALSE))
+ return (FALSE);
- if (! sel_yank(0)) /* copy selection to unnamed register */
- return (FALSE);
+ if (!sel_yank(0)) /* copy selection to unnamed register */
+ return (FALSE);
- if (! get_selection_buffer_and_region(&delrp))
- {
- /* no selected region. hmmm -- should not happen */
+ if (!get_selection_buffer_and_region(&delrp)) {
+ /* no selected region. hmmm -- should not happen */
- return (FALSE);
+ return (FALSE);
}
- shape = delrp.ar_shape;
+ shape = delrp.ar_shape;
savedot = DOT;
/*
@@ -1102,127 +1001,110 @@
* executed by operdel(). The actual code executed depends upon
* whether or not the region is rectangular.
*/
- if (shape == RECTANGLE)
- {
- DORGNLINES dorgn;
- int save;
-
- save = FALSE;
- dorgn = get_do_lines_rgn();
- DOT = delrp.ar_region.r_orig;
-
- /* setup dorgn() aka do_lines_in_region() */
- haveregion = &delrp.ar_region;
- regionshape = shape;
- status = dorgn(kill_line, &save, FALSE);
- haveregion = NULL;
- }
- else
- {
- lines_deleted = 0;
- DOT = delrp.ar_region.r_orig;
- status = ldelete(delrp.ar_region.r_size, FALSE);
+ if (shape == RECTANGLE) {
+ DORGNLINES dorgn;
+ int save;
+
+ save = FALSE;
+ dorgn = get_do_lines_rgn();
+ DOT = delrp.ar_region.r_orig;
+
+ /* setup dorgn() aka do_lines_in_region() */
+ haveregion = &delrp.ar_region;
+ regionshape = shape;
+ status = dorgn(kill_line, &save, FALSE);
+ haveregion = NULL;
+ } else {
+ lines_deleted = 0;
+ DOT = delrp.ar_region.r_orig;
+ status = ldelete(delrp.ar_region.r_size, FALSE);
#if OPT_SELECTIONS
- find_release_attr(curbp, &delrp.ar_region);
+ find_release_attr(curbp, &delrp.ar_region);
#endif
}
restore_dot(savedot);
- if (status)
- {
- if (copy_to_cbrd)
- {
- /*
- * cbrdcpy_unnamed() reports number of lines copied, which is
- * same as number of lines deleted.
- */
-
- status = cbrdcpy_unnamed(FALSE, FALSE);
- }
- else
- {
- /* No data copied to clipboard, report number of lines deleted. */
-
- status = TRUE;
- if (shape == RECTANGLE)
- {
- if (do_report(klines + (kchars != 0)))
- {
- mlwrite("[%d line%s, %d character%s killed]",
- klines,
- PLURAL(klines),
- kchars,
- PLURAL(kchars));
- }
- }
- else
- {
- if (do_report(lines_deleted))
- mlwrite("[%d lines deleted]", lines_deleted);
- }
- }
+ if (status) {
+ if (copy_to_cbrd) {
+ /*
+ * cbrdcpy_unnamed() reports number of lines copied, which is
+ * same as number of lines deleted.
+ */
+ status = cbrdcpy_unnamed(FALSE, FALSE);
+ } else {
+ /* No data copied to clipboard, report number of lines deleted. */
+
+ status = TRUE;
+ if (shape == RECTANGLE) {
+ if (do_report(klines + (kchars != 0))) {
+ mlwrite("[%d line%s, %d character%s killed]",
+ klines,
+ PLURAL(klines),
+ kchars,
+ PLURAL(kchars));
+ }
+ } else {
+ if (do_report(lines_deleted))
+ mlwrite("[%d lines deleted]", lines_deleted);
+ }
+ }
}
return (status);
}
-
-
/* slam a string into the editor's input buffer */
int
w32_keybrd_write(char *data)
{
#if DISP_NTCONS
- HANDLE hstdin;
- INPUT_RECORD ir;
- DWORD unused;
+ HANDLE hstdin;
+ INPUT_RECORD ir;
+ DWORD unused;
#else
- HANDLE hwvile;
+ HANDLE hwvile;
#endif
- int rc;
+ int rc;
rc = TRUE;
#if DISP_NTCONS
hstdin = GetStdHandle(STD_INPUT_HANDLE);
memset(&ir, 0, sizeof(ir));
- ir.EventType = KEY_EVENT;
+ ir.EventType = KEY_EVENT;
ir.Event.KeyEvent.bKeyDown = TRUE;
#else
hwvile = winvile_hwnd();
#endif
- while (*data && rc)
- {
+ while (*data && rc) {
#if DISP_NTCONS
- ir.Event.KeyEvent.uChar.AsciiChar = *data;
- rc = WriteConsoleInput(hstdin, &ir, 1, &unused);
+ ir.Event.KeyEvent.uChar.AsciiChar = *data;
+ rc = WriteConsoleInput(hstdin, &ir, 1, &unused);
#else
- rc = PostMessage(hwvile, WM_CHAR, *data, 0);
+ rc = PostMessage(hwvile, WM_CHAR, *data, 0);
#endif
- data++;
+ data++;
}
return (rc);
}
-
-
#if DISP_NTWIN
/* Center a child window (usually a dialog box) over a parent. */
void
w32_center_window(HWND child_hwnd, HWND parent_hwnd)
{
- int w, h;
- RECT crect, /* child rect */
- prect; /* parent rect */
+ int w, h;
+ RECT crect, /* child rect */
+ prect; /* parent rect */
GetWindowRect(parent_hwnd, &prect);
GetWindowRect(child_hwnd, &crect);
w = crect.right - crect.left;
h = crect.bottom - crect.top;
MoveWindow(child_hwnd,
- prect.left + ((prect.right - prect.left) / 2 - w / 2),
- prect.top + ((prect.bottom - prect.top) / 2 - h / 2),
- w,
- h,
- TRUE);
+ prect.left + ((prect.right - prect.left) / 2 - w / 2),
+ prect.top + ((prect.bottom - prect.top) / 2 - h / 2),
+ w,
+ h,
+ TRUE);
}
#endif
@@ -1243,156 +1125,140 @@
* the purpose at hand.
*/
static int
-add_remove_write_acl(const char *filename, int add_acl, DWORD *prev_access_mask)
+add_remove_write_acl(const char *filename, int add_acl, DWORD * prev_access_mask)
{
#define WRITABLE_MASK (FILE_WRITE_DATA | FILE_APPEND_DATA)
- BOOL bDaclPresent, bDaclDefaulted;
- char *bslfn, *msg = NULL;
- DWORD dwSizeNeeded;
- int i, rc = FALSE;
- PSID pAceSID, pWorldSID;
- PACL pacl;
+ BOOL bDaclPresent, bDaclDefaulted;
+ char *bslfn, *msg = NULL;
+ DWORD dwSizeNeeded;
+ int i, rc = FALSE;
+ PSID pAceSID, pWorldSID;
+ PACL pacl;
ACCESS_ALLOWED_ACE *pAllowed;
- BYTE *pSecDescriptorBuf;
+ BYTE *pSecDescriptorBuf;
SID_IDENTIFIER_AUTHORITY SIDAuthWorld = SECURITY_WORLD_SID_AUTHORITY;
/* does the file exist? */
bslfn = sl_to_bsl(filename);
if (access(bslfn, 0) != 0)
- return (rc);
+ return (rc);
dwSizeNeeded = 0;
(void) GetFileSecurity(bslfn,
- DACL_SECURITY_INFORMATION,
- NULL,
- 0,
- &dwSizeNeeded);
- if (dwSizeNeeded == 0)
- {
- fmt_win32_error(W32_SYS_ERROR, &msg, 0);
- mlforce("[GetFileSecurity: %s]", mktrimmed(msg));
- LocalFree(msg);
- return (rc);
+ DACL_SECURITY_INFORMATION,
+ NULL,
+ 0,
+ &dwSizeNeeded);
+ if (dwSizeNeeded == 0) {
+ fmt_win32_error(W32_SYS_ERROR, &msg, 0);
+ mlforce("[GetFileSecurity: %s]", mktrimmed(msg));
+ LocalFree(msg);
+ return (rc);
}
if ((pSecDescriptorBuf = malloc(sizeof(BYTE) * dwSizeNeeded)) == NULL)
- return (no_memory("add_remove_write_acl"));
- if (! GetFileSecurity(bslfn,
- DACL_SECURITY_INFORMATION,
- pSecDescriptorBuf,
- dwSizeNeeded,
- &dwSizeNeeded))
- {
- fmt_win32_error(W32_SYS_ERROR, &msg, 0);
- mlforce("[GetFileSecurity: %s]", mktrimmed(msg));
- LocalFree(msg);
- free(pSecDescriptorBuf);
- return (rc);
+ return (no_memory("add_remove_write_acl"));
+ if (!GetFileSecurity(bslfn,
+ DACL_SECURITY_INFORMATION,
+ pSecDescriptorBuf,
+ dwSizeNeeded,
+ &dwSizeNeeded)) {
+ fmt_win32_error(W32_SYS_ERROR, &msg, 0);
+ mlforce("[GetFileSecurity: %s]", mktrimmed(msg));
+ LocalFree(msg);
+ free(pSecDescriptorBuf);
+ return (rc);
}
/* Get DACL from Security Descriptor */
pacl = NULL;
- if (! GetSecurityDescriptorDacl((SECURITY_DESCRIPTOR*) pSecDescriptorBuf,
- &bDaclPresent,
- &pacl,
- &bDaclDefaulted))
- {
- fmt_win32_error(W32_SYS_ERROR, &msg, 0);
- mlforce("[GetSecurityDescriptorDacl: %s]", mktrimmed(msg));
- LocalFree(msg);
- free(pSecDescriptorBuf);
- return (rc);
+ if (!GetSecurityDescriptorDacl((SECURITY_DESCRIPTOR *) pSecDescriptorBuf,
+ &bDaclPresent,
+ &pacl,
+ &bDaclDefaulted)) {
+ fmt_win32_error(W32_SYS_ERROR, &msg, 0);
+ mlforce("[GetSecurityDescriptorDacl: %s]", mktrimmed(msg));
+ LocalFree(msg);
+ free(pSecDescriptorBuf);
+ return (rc);
}
/* Check if DACL present in security descriptor */
- if (! bDaclPresent || pacl == NULL)
- {
- /*
- * Nothing to manipulate, perhaps a non-NTFS file. Regardless, a
- * NULL discretionary ACL implicitly allows all access to an object
- * (sez docu for GetSecurityDescriptorDacl).
- */
-
- free(pSecDescriptorBuf);
- return (rc);
- }
-
- /* Create a well-known SID for "Everyone/World" (code courtesy of MSDN).*/
- if(! AllocateAndInitializeSid(&SIDAuthWorld,
- 1,
- SECURITY_WORLD_RID,
- 0, 0, 0, 0, 0, 0, 0,
- &pWorldSID))
- {
- fmt_win32_error(W32_SYS_ERROR, &msg, 0);
- mlforce("[AllocateAndInitializeSid: %s]", mktrimmed(msg));
- LocalFree(msg);
- free(pSecDescriptorBuf);
- return (rc);
+ if (!bDaclPresent || pacl == NULL) {
+ /*
+ * Nothing to manipulate, perhaps a non-NTFS file. Regardless, a
+ * NULL discretionary ACL implicitly allows all access to an object
+ * (sez docu for GetSecurityDescriptorDacl).
+ */
+
+ free(pSecDescriptorBuf);
+ return (rc);
+ }
+
+ /* Create a well-known SID for "Everyone/World" (code courtesy of MSDN). */
+ if (!AllocateAndInitializeSid(&SIDAuthWorld,
+ 1,
+ SECURITY_WORLD_RID,
+ 0, 0, 0, 0, 0, 0, 0,
+ &pWorldSID)) {
+ fmt_win32_error(W32_SYS_ERROR, &msg, 0);
+ mlforce("[AllocateAndInitializeSid: %s]", mktrimmed(msg));
+ LocalFree(msg);
+ free(pSecDescriptorBuf);
+ return (rc);
+ }
+ for (i = 0, pAllowed = NULL; i < pacl->AceCount; i++) {
+ ACE_HEADER *phdr;
+
+ if (GetAce(pacl, i, (LPVOID *) & phdr)) {
+ if (phdr->AceType == ACCESS_ALLOWED_ACE_TYPE) {
+ pAllowed = (ACCESS_ALLOWED_ACE *) phdr;
+ pAceSID = (SID *) & (pAllowed->SidStart);
+ if (EqualSid(pWorldSID, pAceSID))
+ break;
+ }
+ }
}
- for (i = 0, pAllowed = NULL; i < pacl->AceCount; i++)
- {
- ACE_HEADER *phdr;
+ if (i < pacl->AceCount) {
+ /* success */
- if (GetAce(pacl, i, (LPVOID *) &phdr))
- {
- if (phdr->AceType == ACCESS_ALLOWED_ACE_TYPE)
- {
- pAllowed = (ACCESS_ALLOWED_ACE *) phdr;
- pAceSID = (SID *) &(pAllowed->SidStart);
- if (EqualSid(pWorldSID, pAceSID))
- break;
- }
- }
- }
- if (i < pacl->AceCount)
- {
- /* success */
+ int mkchange = FALSE;
- int mkchange = FALSE;
+ if (add_acl) {
+ if ((pAllowed->Mask & WRITABLE_MASK) != WRITABLE_MASK) {
+ /* world ACE does not have "write" permissions...add them */
+
+ *prev_access_mask = pAllowed->Mask;
+ mkchange = TRUE;
+ pAllowed->Mask |= FILE_GENERIC_WRITE;
+ }
+ } else {
+ /* restore previous world ACE mask for this file */
- if (add_acl)
- {
- if ((pAllowed->Mask & WRITABLE_MASK) != WRITABLE_MASK)
- {
- /* world ACE does not have "write" permissions...add them */
-
- *prev_access_mask = pAllowed->Mask;
- mkchange = TRUE;
- pAllowed->Mask |= FILE_GENERIC_WRITE;
- }
- }
- else
- {
- /* restore previous world ACE mask for this file */
-
- pAllowed->Mask = *prev_access_mask;
- mkchange = TRUE;
- }
- if (mkchange)
- {
- rc = SetFileSecurity(bslfn,
- DACL_SECURITY_INFORMATION,
- pSecDescriptorBuf);
-
- if (! rc)
- {
- DWORD err = GetLastError();
- if (! (add_acl && err == ERROR_ACCESS_DENIED))
- {
- fmt_win32_error(err, &msg, 0);
- mlforce("[SetFileSecurity: %s]", mktrimmed(msg));
- LocalFree(msg);
- }
- /*
- * Else tried adding write permissions and privs are
- * insufficient. Report no error...whatever action the
- * client is attempting will soon fail and an error
- * will be reported at that time.
- */
- }
- }
+ pAllowed->Mask = *prev_access_mask;
+ mkchange = TRUE;
+ }
+ if (mkchange) {
+ rc = SetFileSecurity(bslfn,
+ DACL_SECURITY_INFORMATION,
+ pSecDescriptorBuf);
+
+ if (!rc) {
+ DWORD err = GetLastError();
+ if (!(add_acl && err == ERROR_ACCESS_DENIED)) {
+ fmt_win32_error(err, &msg, 0);
+ mlforce("[SetFileSecurity: %s]", mktrimmed(msg));
+ LocalFree(msg);
+ }
+ /*
+ * Else tried adding write permissions and privs are
+ * insufficient. Report no error...whatever action the
+ * client is attempting will soon fail and an error
+ * will be reported at that time.
+ */
+ }
+ }
}
/* Else no World ACE, so add it...someday...maybe...when really bored? */
@@ -1411,12 +1277,12 @@
* by w32_remove_write_acl() to restore the file's original ACCESS_MASK.
*/
int
-w32_add_write_acl(const char *filename, ULONG *old_access_mask)
+w32_add_write_acl(const char *filename, ULONG * old_access_mask)
{
if (is_win95())
- return (FALSE); /* no such win9x feature */
+ return (FALSE); /* no such win9x feature */
else
- return (add_remove_write_acl(filename, TRUE, old_access_mask));
+ return (add_remove_write_acl(filename, TRUE, old_access_mask));
}
/*
@@ -1427,7 +1293,7 @@
w32_remove_write_acl(const char *filename, ULONG orig_access_mask)
{
if (is_win95())
- return (FALSE); /* no such win9x feature */
+ return (FALSE); /* no such win9x feature */
else
- return (add_remove_write_acl(filename, FALSE, &orig_access_mask));
+ return (add_remove_write_acl(filename, FALSE, &orig_access_mask));
}
Index: w32ole.rc
--- vile-9.5p+/w32ole.rc 1998-11-05 00:42:52.000000000 +0000
+++ vile-9.5q/w32ole.rc 2007-05-26 15:41:52.000000000 +0000
@@ -1,3 +1,5 @@
+// $Id: w32ole.rc,v 1.3 2007/05/26 15:41:52 tom Exp $
+// vile:rcmode
1 typelib winvile.tlb
#include "winvile.rc"
Index: window.c
Prereq: 1.108
--- vile-9.5p+/window.c 2007-01-08 00:40:21.000000000 +0000
+++ vile-9.5q/window.c 2007-05-25 23:36:22.000000000 +0000
@@ -2,7 +2,7 @@
* Window management. Some of the functions are internal, and some are
* attached to keys that the user actually types.
*
- * $Header: /usr/build/vile/vile/RCS/window.c,v 1.108 2007/01/08 00:40:21 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/window.c,v 1.109 2007/05/25 23:36:22 tom Exp $
*
*/
@@ -1118,6 +1118,8 @@
{
WINDOW *wp;
+ TRACE((T_CALLED "winit(%d)\n", screen));
+
wp = typecalloc(WINDOW); /* First window */
if (wp == NULL)
ExitProgram(BADEXIT);
@@ -1163,6 +1165,7 @@
set_w_val(wminip, WMDLINEWRAP, FALSE);
#endif
}
+ returnVoid();
}
#if OPT_SEL_YANK || OPT_PERL || OPT_COLOR || OPT_EVAL || OPT_DEBUGMACROS
Index: winvile.rc
--- vile-9.5p+/winvile.rc 2005-01-26 19:17:55.000000000 +0000
+++ vile-9.5q/winvile.rc 2007-05-26 15:43:02.000000000 +0000
@@ -1,3 +1,6 @@
+// $Id: winvile.rc,v 1.12 2007/05/26 15:43:02 tom Exp $
+// vile:rcmode
+
#include <windows.h>
#include "winvile.h"
Index: wvwrap.cpp
Prereq: 1.12
--- vile-9.5p+/wvwrap.cpp 2007-04-22 23:35:12.000000000 +0000
+++ vile-9.5q/wvwrap.cpp 2007-05-28 15:24:04.000000000 +0000
@@ -12,7 +12,7 @@
* Note: A great deal of the code included in this file is copied
* (almost verbatim) from other vile modules.
*
- * $Header: /usr/build/vile/vile/RCS/wvwrap.cpp,v 1.12 2007/04/22 23:35:12 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/wvwrap.cpp,v 1.14 2007/05/28 15:24:04 tom Exp $
*/
#include "w32vile.h"
@@ -136,6 +136,7 @@
static char *
escape_quotes(const char *src)
{
+ const char *must_quote = "${}";
size_t len = 4 * strlen(src) + 1;
char *result = typeallocn(char, len);
@@ -143,7 +144,7 @@
exit (nomem());
char *dst = result;
- bool escape = (strchr(src, '$') != 0);
+ bool escape = (strcspn(src, must_quote) != strlen(src));
while (*src != '\0')
{
if (*src == SQUOTE)
@@ -152,7 +153,7 @@
*dst++ = SQUOTE;
*dst++ = SQUOTE;
}
- else if (*src == '$')
+ else if (strchr(must_quote, *src) != 0)
{
*dst++ = '\\';
}
@@ -200,7 +201,7 @@
char **argv;
int argc;
- if (make_argv(0, lpCmdLine, &argv, &argc) < 0)
+ if (make_argv(0, lpCmdLine, &argv, &argc, NULL) < 0)
return (nomem());
#if OPT_TRACE
Index: x11.c
Prereq: 1.286
--- vile-9.5p+/x11.c 2006-05-30 00:43:52.000000000 +0000
+++ vile-9.5q/x11.c 2007-05-27 22:10:14.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.286 2006/05/30 00:43:52 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/x11.c,v 1.287 2007/05/27 22:10:14 tom Exp $
*
*/
@@ -388,6 +388,7 @@
Time lasttime; /* for multi-click */
Time click_timeout;
int numclicks;
+ int last_getc;
Bool have_selection;
Bool wipe_permitted;
Bool was_on_msgline;
@@ -6085,10 +6086,18 @@
/*
* Set the default position for new pasting to just past the newly
* inserted text.
+ *
+ * Except - when the insert ended with a newline and is at the
+ * beginning of a line. That makes whole-line select/paste
+ * behave "normally".
*/
- if (DOT.o < llength(DOT.l) && !insertmode)
+ if (DOT.o < llength(DOT.l)
+ && !insertmode
+ && !(DOT.o == 0
+ && cur_win->last_getc == (NOREMAP | '\n'))) {
DOT.o++; /* Advance DOT so that consecutive
pastes come out right */
+ }
cur_win->pasting = False;
update(TRUE); /* make sure ttrow & ttcol are valid */
}
@@ -6116,6 +6125,8 @@
x_stop_autocolor_timer();
+ if (c != (NOREMAP | esc_c))
+ cur_win->last_getc = c;
return c;
}
Index: xterm.c
Prereq: 1.2
--- vile-9.5p+/xterm.c 2005-11-23 17:13:51.000000000 +0000
+++ vile-9.5q/xterm.c 2007-05-05 15:23:03.000000000 +0000
@@ -1,5 +1,5 @@
/*
- * $Header: /usr/build/vile/vile/RCS/xterm.c,v 1.2 2005/11/23 17:13:51 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/xterm.c,v 1.3 2007/05/05 15:23:03 tom Exp $
*
* xterm-specific code for vi-like-emacs.
*/
@@ -9,7 +9,7 @@
#if DISP_TERMCAP || DISP_CURSES
-#define putpad(s) fputs(s, stdout)
+#define putpad(s) vl_fputs(s, stdout)
#define XtermPos() ((unsigned)(keystroke() - 040))
#if OPT_XTERM >= 3
