diffstat for xterm-287 xterm-293 INSTALL | 42 Imakefile | 32 MANIFEST | 5 Makefile.in | 163 - aclocal.m4 | 222 + button.c | 197 + charproc.c | 133 - configure | 4027 +++++++++++++++++++-------------- configure.in | 40 ctlseqs.ms | 137 - ctlseqs.txt | 368 +-- debian/changelog | 44 debian/compat | 2 debian/control | 8 debian/patches/100_manpage_whatis.diff | 13 debian/patches/904_fontops.diff | 13 debian/patches/series | 2 fontutils.c | 45 input.c | 38 koi8rxterm.man | 37 linedata.c | 6 main.c | 247 +- main.h | 8 menu.c | 7 minstall.in | 32 misc.c | 314 +- os2main.c | 2230 ------------------ package/debian/changelog | 37 package/debian/rules | 1 package/freebsd/Makefile | 2 package/xterm.spec | 69 precompose.c | 7 print.c | 57 proto.h | 62 ptydata.c | 12 ptyx.h | 37 resize.c | 281 +- resize.man | 167 + screen.c | 32 scrollback.c | 16 scrollbar.c | 16 trace.c | 30 trace.h | 14 util.c | 33 uxterm.man | 35 version.c | 74 version.h | 18 wcwidth.c | 148 - xstrings.c | 117 xstrings.h | 3 xterm.h | 42 xterm.log.html | 489 +++- xterm.man | 119 xterm_io.h | 88 xtermcfg.hin | 8 55 files changed, 4911 insertions(+), 5515 deletions(-) diff -Nru xterm-287/INSTALL xterm-293/INSTALL --- xterm-287/INSTALL 2012-10-10 23:33:29.000000000 +0000 +++ xterm-293/INSTALL 2013-05-27 22:19:09.000000000 +0000 @@ -1,6 +1,6 @@ --- $XTermId: INSTALL,v 1.139 2012/10/10 23:33:29 tom Exp $ +-- $XTermId: INSTALL,v 1.147 2013/05/27 22:19:09 tom Exp $ ------------------------------------------------------------------------------- --- Copyright 1997-2011,2012 by Thomas E. Dickey +-- Copyright 1997-2012,2013 by Thomas E. Dickey -- -- All Rights Reserved -- @@ -215,7 +215,7 @@ type. If you do not need input method (and are troubled by the warning messages), it is safe to disable this option. - --disable-leaks test: set to test memory leaks + --disable-leaks test: free permanent memory, analyze leaks Compile-in code which frees memory which might confuse a leak-testing tool. Normally these chunks of memory are retained as long as xterm @@ -240,6 +240,12 @@ (The same ifdef controls the metaSendsEscape support). + --disable-openpty disable openpty, prefer other interfaces + + Do not check for, or use openpty(). Instead, use other interfaces such + as posix_openpt(). Modern (sic) BSD systems should have a workable + openpty() interface. Older systems may not. + --disable-paste64 disable support for bracketed paste mode Do not compile-in code to support experimental bracketed paste mode, @@ -565,13 +571,23 @@ Use --without-app-defaults or --with-app-defaults=no to disable the feature. + --with-dmalloc test: use Gray Watson's dmalloc library + + Check for and link with dmalloc. + + --with-dbmalloc test: use Conor Cahill's dbmalloc library + + Check for and link with dbmalloc. + --with-desktop-category=XXX one or more desktop catgories or auto This is a list of names. The configure script maps blanks and commas to semicolons (";") which are used by the desktop utils as a separator. The default value "auto" tells the configure script to look at existing ".desktop" files for xterm and common terminal - emulators, to use those. + emulators, to use those. If none are found, the script uses this + default: + System;TerminalEmulator;Utility; --with-freetype-config configure script to use for FreeType @@ -609,6 +625,19 @@ small sizes. This is used for window decoration, e.g., the icon at the upper left corner in many window managers. + --with-icon-symlink=NAME create symbolic links to icon name (default: NONE) + + This is a workaround for certain systems which translate icon names + containing "xterm", e.g., "xterm-color" into the single icon "xterm". + The option should also be harmless on a properly configured system. + + If the option is used, its default value is "xterm". For each icon, + the makefile will strip the suffix (e.g., ".png"), as well as the part + of the filename which denotes the size (e.g., "_32x32" in an xpm file), + and constructs a link with that name to the icon. + + If the option is unused, its default value is "NONE" (no link is made). + --with-icondir=DIR directory in which to install icon files (default: no) The X libraries may automatically search these locations: @@ -704,6 +733,11 @@ If xterm is not installed setuid'd to root, this option is not needed, since it cannot change the tty device's ownership. + --with-valgrind test: use valgrind + + Activate the --disable-leaks option, and ensure that "-g" is added to + CFLAGS. + --with-xpm=DIR use Xpm library for colored icon, may specify path Use Xpm library to show colored icon in window decoration, e.g., diff -Nru xterm-287/Imakefile xterm-293/Imakefile --- xterm-287/Imakefile 2011-11-29 10:19:20.000000000 +0000 +++ xterm-293/Imakefile 2013-01-01 12:16:40.000000000 +0000 @@ -1,4 +1,4 @@ -XCOMM $XTermId: Imakefile,v 1.105 2011/11/29 10:19:20 Thorsten.Glaser Exp $ +XCOMM $XTermId: Imakefile,v 1.107 2013/01/01 12:16:40 tom Exp $ XCOMM XCOMM Attention xterm porters XCOMM @@ -126,19 +126,6 @@ LOCAL_LDFLAGS = -Wl,-bind_at_load #endif -#ifdef OS2Architecture -/* - * Only used in os2main.c, see ptyx.h for OPT_I18N_SUPPORT - * - */ -#if XtermWithI18N - I18NDEF = -DI18N - FEATURE_DEFINES = -DDEBUG -DALLOWLOGGING $(I18NDEF) -#else - FEATURE_DEFINES = -DDEBUG -DALLOWLOGGING -#endif -#endif - OSMAJORVERSION = OSMajorVersion OSMINORVERSION = OSMinorVersion @@ -190,13 +177,8 @@ DEFINES = $(XKB_DEFINES) $(TERMCAPDEFINES) $(FEATURE_DEFINES) $(SCROLLBAR_RIGHT) $(UTF8_OPTION) $(XRFDEF) $(PATH_DEFINES) $(PUTENVDEF) $(IMAKEDEFINES) $(TRACEDEF) INCLUDES = -I. $(XRFINCLUDES) -#ifdef OS2Architecture - MAINSRC = os2main.c - MAINOBJ = os2main.o -#else MAINSRC = main.c MAINOBJ = main.o -#endif #ifdef TraceXTerm TRACESRC = trace.c TRACEOBJ = trace.o @@ -204,17 +186,17 @@ SRCS1 = button.c cachedGCs.c charproc.c charsets.c cursor.c \ data.c doublechr.c fontutils.c input.c \ linedata.c menu.c misc.c print.c ptydata.c scrollback.c \ - screen.c scrollbar.c tabs.c util.c xstrings.c xtermcap.c \ - TekPrsTbl.c Tekproc.c VTPrsTbl.c \ + screen.c scrollbar.c tabs.c util.c version.c xstrings.c \ + xtermcap.c TekPrsTbl.c Tekproc.c VTPrsTbl.c \ $(MAINSRC) $(EXTRASRC) $(UTF8SRC) $(TRACESRC) OBJS1 = button.o cachedGCs.o charproc.o charsets.o cursor.o \ data.o doublechr.o fontutils.o input.o \ linedata.o menu.o misc.o print.o ptydata.o scrollback.o \ - screen.o scrollbar.o tabs.o util.o xstrings.o xtermcap.o \ - TekPrsTbl.o Tekproc.o VTPrsTbl.o \ + screen.o scrollbar.o tabs.o util.o version.o xstrings.o \ + xtermcap.o TekPrsTbl.o Tekproc.o VTPrsTbl.o \ $(MAINOBJ) $(EXTRAOBJ) $(UTF8OBJ) $(TRACEOBJ) - SRCS2 = resize.c xstrings.c - OBJS2 = resize.o xstrings.o + SRCS2 = resize.c version.c xstrings.c + OBJS2 = resize.o version.o xstrings.o SRCS = $(SRCS1) $(SRCS2) OBJS = $(OBJS1) $(OBJS2) PROGRAMS = ProgramTargetName(resize) ProgramTargetName(xterm) diff -Nru xterm-287/MANIFEST xterm-293/MANIFEST --- xterm-287/MANIFEST 2012-11-19 09:54:44.000000000 +0000 +++ xterm-293/MANIFEST 2013-05-08 22:28:46.000000000 +0000 @@ -1,4 +1,4 @@ -MANIFEST for xterm-287, version xterm-287 +MANIFEST for xterm-293, version xterm-293 -------------------------------------------------------------------------------- MANIFEST this file 256colres.h resource-definitions for 256-color mode @@ -62,12 +62,10 @@ menu.h interface of menu.c minstall.in script for installing manpages misc.c miscellaneous utility functions for 'xterm' -os2main.c main program for OS/2 EMX port of 'xterm' plink.sh script to prune unneeded libraries from link precompose.c table of precompose sequences precompose.h interface of precompose.c print.c VT100+ print support functions -proto.h macros to simplify function prototypes ptydata.c functions to manipulate data read from pty ptyx.h structure-definitions for 'xterm' resize.c program to compute/modify xterm's window size @@ -87,6 +85,7 @@ uxterm wrapper script to make unicode-xterm uxterm.desktop sample desktop file for uxterm uxterm.man manpage for uxterm, from Debian +version.c xterm package version, used also in resize version.h version of xterm vms.c VMS version of xterm's spawn(), etc. vms.h system headers and definitions for vms.c diff -Nru xterm-287/Makefile.in xterm-293/Makefile.in --- xterm-287/Makefile.in 2012-10-29 09:17:12.000000000 +0000 +++ xterm-293/Makefile.in 2013-05-27 19:39:59.000000000 +0000 @@ -1,8 +1,8 @@ -## $XTermId: Makefile.in,v 1.206 2012/10/29 09:17:12 tom Exp $ +## $XTermId: Makefile.in,v 1.219 2013/05/27 19:39:59 tom Exp $ # ----------------------------------------------------------------------------- # this file is part of xterm # -# Copyright 1997-2011,2012 by Thomas E. Dickey +# Copyright 1997-2012,2013 by Thomas E. Dickey # # All Rights Reserved # @@ -83,11 +83,15 @@ #### End of system configuration section. #### +ICON_NAME = @ICON_NAME@ +ICON_SYMLINK = @ICON_SYMLINK@ + DESTDIR = BINDIR = $(DESTDIR)$(bindir) LIBDIR = $(DESTDIR)$(libdir) MANDIR = $(DESTDIR)$(mandir) APPSDIR = $(DESTDIR)$(appsdir) + @no_icondir@ICONDIR = $(DESTDIR)$(icondir) @no_pixmapdir@PIXMAPDIR = $(DESTDIR)$(pixmapdir) @@ -102,25 +106,25 @@ data.c doublechr.c fontutils.c input.c \ linedata.c main.c menu.c misc.c \ print.c ptydata.c scrollback.c \ - screen.c scrollbar.c tabs.c util.c xstrings.c xtermcap.c \ - VTPrsTbl.c $(EXTRASRC) + screen.c scrollbar.c tabs.c util.c version.c xstrings.c \ + xtermcap.c VTPrsTbl.c $(EXTRASRC) OBJS1 = button$o cachedGCs$o charproc$o charsets$o cursor$o \ data$o doublechr$o fontutils$o input$o \ linedata$o main$o menu$o misc$o \ print$o ptydata$o scrollback$o \ - screen$o scrollbar$o tabs$o util$o xstrings$o xtermcap$o \ - VTPrsTbl$o $(EXTRAOBJ) - SRCS2 = resize.c xstrings.c - OBJS2 = resize$o xstrings$o + screen$o scrollbar$o tabs$o util$o version$o xstrings$o \ + xtermcap$o VTPrsTbl$o $(EXTRAOBJ) + SRCS2 = resize.c version.c xstrings.c + OBJS2 = resize$o version$o xstrings$o SRCS = $(SRCS1) $(SRCS2) OBJS = $(OBJS1) $(OBJS2) - HDRS = VTparse.h data.h error.h main.h menu.h proto.h \ + HDRS = VTparse.h data.h error.h main.h menu.h \ ptyx.h version.h xstrings.h xterm.h xtermcap.h $(EXTRAHDR) PROGRAMS = xterm$x resize$x all : $(PROGRAMS) ################################################################################ -.SUFFIXES : .i .def .hin .html .$(manext) .ms .man .ps .pdf .txt +.SUFFIXES : .i .def .hin .$(manext) .ms .man .txt @GROFF_NOTE@ .html .ps .pdf .c$o : @RULE_CC@ @@ -134,28 +138,35 @@ grep '^CASE_' $< | $(AWK) '{printf "#define %s %d\n", $$1, n++}' >$@ .man.$(manext) : - $(SHELL) ./minstall "$(INSTALL_DATA)" $< $@ $(appsdir) $(CLASS) $(actual_xterm) $(pixmapdir) - -.$(manext).html : - GROFF_NO_SGR=stupid $(SHELL) -c "tbl $*.$(manext) | groff -Thtml -man" >$@ - -.$(manext).ps : - $(SHELL) -c "tbl $*.$(manext) | groff -man" >$@ - -.$(manext).txt : - GROFF_NO_SGR=stupid $(SHELL) -c "tbl $*.$(manext) | nroff -Tascii -man | col -bx" >$@ - -.ms.html : - GROFF_NO_SGR=stupid $(SHELL) -c "tbl $< | groff -Thtml -ms" >$@ - -.ms.ps : - $(SHELL) -c "tbl $< | groff -ms" >$@ + $(SHELL) ./minstall "$(INSTALL_DATA)" $< $@ $(appsdir) $(CLASS) $* $* $(pixmapdir) -.ms.txt : - GROFF_NO_SGR=stupid $(SHELL) -c "tbl $< | nroff -Tascii -ms | col -bx" >$@ - -.ps.pdf : - ps2pdf $*.ps +@NROFF_NOTE@.$(manext).txt : +@NROFF_NOTE@ $(SHELL) -c "tbl $*.$(manext) | nroff -man | col -bx" >$@ +@NROFF_NOTE@ +@NROFF_NOTE@.ms.txt : +@NROFF_NOTE@ $(SHELL) -c "tbl $*.$(manext) | nroff -ms | col -bx" >$@ +@NROFF_NOTE@ + +@GROFF_NOTE@.$(manext).html : +@GROFF_NOTE@ GROFF_NO_SGR=stupid $(SHELL) -c "tbl $*.$(manext) | groff -P -o0 -I$*_ -Thtml -man" >$@ +@GROFF_NOTE@ +@GROFF_NOTE@.$(manext).ps : +@GROFF_NOTE@ $(SHELL) -c "tbl $*.$(manext) | groff -man" >$@ +@GROFF_NOTE@ +@GROFF_NOTE@.$(manext).txt : +@GROFF_NOTE@ GROFF_NO_SGR=stupid $(SHELL) -c "tbl $*.$(manext) | groff -Tascii -man | col -bx" >$@ +@GROFF_NOTE@ +@GROFF_NOTE@.ms.html : +@GROFF_NOTE@ GROFF_NO_SGR=stupid $(SHELL) -c "tbl $< | groff -P -o0 -I$*_ -Thtml -ms" >$@ +@GROFF_NOTE@ +@GROFF_NOTE@.ms.ps : +@GROFF_NOTE@ $(SHELL) -c "tbl $< | groff -ms" >$@ +@GROFF_NOTE@ +@GROFF_NOTE@.ms.txt : +@GROFF_NOTE@ GROFF_NO_SGR=stupid $(SHELL) -c "tbl $< | groff -Tascii -ms | col -bx" >$@ +@GROFF_NOTE@ +@GROFF_NOTE@.ps.pdf : +@GROFF_NOTE@ ps2pdf $*.ps ################################################################################ main$o : main.h misc$o : version.h @@ -223,14 +234,14 @@ ls -l \$$name @XTERM_SYMLINK@ ) ; \ fi" -MINSTALL_ARGS = $(appsdir) $(CLASS) $(actual_xterm) $(pixmapdir) install \ install-man \ install-full :: $(MANDIR) - $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/xterm.man $(MANDIR)/$(actual_xterm).$(manext) $(MINSTALL_ARGS) - $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/resize.man $(MANDIR)/$(actual_resize).$(manext) $(MINSTALL_ARGS) - $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/uxterm.man $(MANDIR)/$(actual_uxterm).$(manext) $(MINSTALL_ARGS) - $(SHELL) ./minstall "$(INSTALL_DATA)" $(srcdir)/koi8rxterm.man $(MANDIR)/$(actual_k8term).$(manext) $(MINSTALL_ARGS) + @-$(SHELL) -c "for app in xterm resize uxterm koi8rxterm ; \ + do \ + actual=\`echo \"\$$app\" | sed '@program_transform_name@'\`; \ + $(SHELL) ./minstall \"$(INSTALL_DATA)\" $(srcdir)/\$$app.man $(MANDIR)/\$$actual.$(manext) $(appsdir) $(CLASS) \$$app \$$actual $(pixmapdir); \ + done" @-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(MANDIR) && rm -f @XTERM_SYMLINK@.$(manext) ; fi" @-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(MANDIR) && $(LN_S) $(actual_xterm).$(manext) @XTERM_SYMLINK@.$(manext) ; fi" @-$(SHELL) -c "if test @XTERM_SYMLINK@ != NONE ; then cd $(MANDIR) && echo '... created symbolic link:' && ls -l $(actual_xterm).$(manext) @XTERM_SYMLINK@.$(manext) ; fi" @@ -260,17 +271,29 @@ @no_icondir@install-icon \ @no_icondir@install-full :: $(ICONDIR) @no_icondir@ ACTUAL_XTERM=$(actual_xterm) \ -@no_icondir@ $(SHELL) -c 'for n in $(ICON_LIST); \ -@no_icondir@ do \ -@no_icondir@ x=$$ACTUAL_XTERM; \ -@no_icondir@ l=`echo "$$n" | cut -f1 -d:`; \ -@no_icondir@ r=`echo "$$n" | cut -f2 -d: |sed -e s,@ICON_NAME@,$$x-color,`; \ -@no_icondir@ test -z "$$r" && continue; \ +@no_icondir@ $(SHELL) -c '\ @no_icondir@ h=$(ICONDIR)/$(ICON_THEME); \ -@no_icondir@ d=$$h/`echo "$$r" | sed -e "s,/[^/]*$$,,"`; \ -@no_icondir@ test -d "$$d" || mkdir -p "$$d"; \ -@no_icondir@ echo installing icon $$h/$$r; \ -@no_icondir@ $(INSTALL_DATA) $$l $$h/$$r; \ +@no_icondir@ for n in $(ICON_LIST); \ +@no_icondir@ do \ +@no_icondir@ x=$$ACTUAL_XTERM; \ +@no_icondir@ l=`echo "$$n" | cut -f1 -d:`; \ +@no_icondir@ r=`echo "$$n" | cut -f2 -d: |sed -e s,$(ICON_NAME),$$x-color,`; \ +@no_icondir@ test -z "$$r" && continue; \ +@no_icondir@ d=$$h/`echo "$$r" | sed -e "s,/[^/]*$$,,"`; \ +@no_icondir@ test -d "$$d" || mkdir -p "$$d"; \ +@no_icondir@ echo "installing icon $$h/$$r"; \ +@no_icondir@ $(INSTALL_DATA) $$l $$h/$$r; \ +@no_icondir@ s=`echo "$$r" | sed -e '"'s,^.*\.,.,'"'`; \ +@no_icondir@ t=$(ICON_SYMLINK)$$s; \ +@no_icondir@ b=`basename $$n $$s | sed -e "s,_[1-9][0-9]*x.*,,"`; \ +@no_icondir@ if test "$(ICON_SYMLINK)" != NONE ; then \ +@no_icondir@ if test "$$r" != "$$t" ; then \ +@no_icondir@ if test "x$$b" = "x$(ICON_NAME)" ; then \ +@no_icondir@ echo "linking $$r -> $$t"; \ +@no_icondir@ ( cd $$h; rm -f $$t; $(LN_S) $$r $$t; ) \ +@no_icondir@ fi \ +@no_icondir@ fi \ +@no_icondir@ fi \ @no_icondir@ done' @no_icondir@ @echo "... installed icons" @@ -278,11 +301,25 @@ @no_pixmapdir@install-icon \ @no_pixmapdir@install-full :: $(PIXMAPDIR) @no_pixmapdir@ ACTUAL_XTERM=$(actual_xterm) \ -@no_pixmapdir@ $(SHELL) -c 'for n in $(srcdir)/icons/*xterm*_32x32.xpm $(srcdir)/icons/*xterm*_48x48.xpm; \ +@no_pixmapdir@ $(SHELL) -c '\ +@no_pixmapdir@ h=$(PIXMAPDIR); \ +@no_pixmapdir@ for n in $(srcdir)/icons/*xterm*_32x32.xpm $(srcdir)/icons/*xterm*_48x48.xpm; \ @no_pixmapdir@ do \ @no_pixmapdir@ l=`basename $$n`; \ @no_pixmapdir@ r=`echo "$$l" | sed -e "s,xterm,$$ACTUAL_XTERM,"`; \ -@no_pixmapdir@ $(INSTALL_DATA) $(srcdir)/icons/$$l $(PIXMAPDIR)/$$r; \ +@no_pixmapdir@ echo "installing pixmap $$h/$$r"; \ +@no_pixmapdir@ $(INSTALL_DATA) $(srcdir)/icons/$$l $$h/$$r; \ +@no_pixmapdir@ s=`echo "$$r" | sed -e '"'s,^.*\.,.,'"'`; \ +@no_pixmapdir@ t=$(ICON_SYMLINK)$$s; \ +@no_pixmapdir@ b=`basename $$n $$s | sed -e "s,_[1-9][0-9]*x.*,,"`; \ +@no_pixmapdir@ if test "$(ICON_SYMLINK)" != NONE ; then \ +@no_pixmapdir@ if test "x$$r" != "$$t" ; then \ +@no_pixmapdir@ if test "x$$b" = "x$(ICON_NAME)" ; then \ +@no_pixmapdir@ echo "linking $$r -> $$t"; \ +@no_pixmapdir@ ( cd $$h; rm -f $$t; $(LN_S) $$r $$t; ) \ +@no_pixmapdir@ fi \ +@no_pixmapdir@ fi \ +@no_pixmapdir@ fi \ @no_pixmapdir@ done' @no_pixmapdir@ @echo "... installed icons" @@ -406,50 +443,40 @@ termcap.out : termcap ; tic -a -C -U termcap >$@ ################################################################################ docs-ctlseqs \ -docs :: ctlseqs.html \ - ctlseqs.pdf \ - ctlseqs.ps \ - $(srcdir)/ctlseqs.txt +docs :: \ + $(srcdir)/ctlseqs.txt \ +@GROFF_NOTE@ ctlseqs.html \ +@GROFF_NOTE@ ctlseqs.pdf \ +@GROFF_NOTE@ ctlseqs.ps + ctlseqs.html : $(srcdir)/ctlseqs.ms ctlseqs.pdf : ctlseqs.ps ctlseqs.ps : $(srcdir)/ctlseqs.ms ctlseqs.txt : $(srcdir)/ctlseqs.ms ################################################################################ docs-resize \ -docs :: resize.html \ - resize.pdf \ - resize.ps \ - resize.txt +docs :: resize.txt @GROFF_NOTE@ resize.html resize.pdf resize.ps resize.html : resize.$(manext) resize.pdf : resize.ps resize.ps : resize.$(manext) resize.txt : resize.$(manext) ################################################################################ docs-xterm \ -docs :: xterm.html \ - xterm.pdf \ - xterm.ps \ - xterm.txt +docs :: xterm.txt @GROFF_NOTE@ xterm.html xterm.pdf xterm.ps xterm.html : xterm.$(manext) xterm.pdf : xterm.ps xterm.ps : xterm.$(manext) xterm.txt : xterm.$(manext) ################################################################################ docs-uxterm \ -docs :: uxterm.html \ - uxterm.pdf \ - uxterm.ps \ - uxterm.txt +docs :: uxterm.txt @GROFF_NOTE@ uxterm.html uxterm.pdf uxterm.ps uxterm.html : uxterm.$(manext) uxterm.pdf : uxterm.ps uxterm.ps : uxterm.$(manext) uxterm.txt : uxterm.$(manext) ################################################################################ docs-koi8rxterm \ -docs :: koi8rxterm.html \ - koi8rxterm.pdf \ - koi8rxterm.ps \ - koi8rxterm.txt +docs :: koi8rxterm.txt @GROFF_NOTE@ koi8rxterm.html koi8rxterm.pdf koi8rxterm.ps koi8rxterm.html : koi8rxterm.$(manext) koi8rxterm.pdf : koi8rxterm.ps koi8rxterm.ps : koi8rxterm.$(manext) diff -Nru xterm-287/aclocal.m4 xterm-293/aclocal.m4 --- xterm-287/aclocal.m4 2012-10-07 20:40:26.000000000 +0000 +++ xterm-293/aclocal.m4 2013-05-27 22:36:25.000000000 +0000 @@ -1,8 +1,8 @@ -dnl $XTermId: aclocal.m4,v 1.355 2012/10/07 20:40:26 tom Exp $ +dnl $XTermId: aclocal.m4,v 1.365 2013/05/27 22:36:25 tom Exp $ dnl dnl --------------------------------------------------------------------------- dnl -dnl Copyright 1997-2011,2012 by Thomas E. Dickey +dnl Copyright 1997-2012,2013 by Thomas E. Dickey dnl dnl All Rights Reserved dnl @@ -58,7 +58,7 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ACVERSION_CHECK version: 3 updated: 2012/10/03 18:39:53 +dnl CF_ACVERSION_CHECK version: 4 updated: 2013/03/04 19:52:56 dnl ------------------ dnl Conditionally generate script according to whether we're using a given autoconf. dnl @@ -67,37 +67,13 @@ dnl $3 = code to use if AC_ACVERSION is older than $1. define([CF_ACVERSION_CHECK], [ +ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl ifdef([m4_version_compare], [m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])], [CF_ACVERSION_COMPARE( AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl dnl --------------------------------------------------------------------------- -dnl CF_ACVERSION_CHECK version: 3 updated: 2012/10/03 18:39:53 -dnl ------------------ -dnl Conditionally generate script according to whether we're using a given autoconf. -dnl -dnl $1 = version to compare against -dnl $2 = code to use if AC_ACVERSION is at least as high as $1. -dnl $3 = code to use if AC_ACVERSION is older than $1. -define([CF_ACVERSION_CHECK], -[ -ifdef([m4_version_compare], -[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])], -[CF_ACVERSION_COMPARE( -AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), -AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl -dnl --------------------------------------------------------------------------- -dnl CF_ACVERSION_COMPARE version: 3 updated: 2012/10/03 18:39:53 -dnl -------------------- -dnl CF_ACVERSION_COMPARE(MAJOR1, MINOR1, TERNARY1, -dnl MAJOR2, MINOR2, TERNARY2, -dnl PRINTABLE2, not FOUND, FOUND) -define([CF_ACVERSION_COMPARE], -[ifelse(builtin([eval], [$2 < $5]), 1, -[ifelse([$8], , ,[$8])], -[ifelse([$9], , ,[$9])])])dnl -dnl --------------------------------------------------------------------------- dnl CF_ACVERSION_COMPARE version: 3 updated: 2012/10/03 18:39:53 dnl -------------------- dnl CF_ACVERSION_COMPARE(MAJOR1, MINOR1, TERNARY1, @@ -500,6 +476,29 @@ AC_SUBST(ECHO_CC) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_DISABLE_LEAKS version: 7 updated: 2012/10/02 20:55:03 +dnl ---------------- +dnl Combine no-leak checks with the libraries or tools that are used for the +dnl checks. +AC_DEFUN([CF_DISABLE_LEAKS],[ + +AC_REQUIRE([CF_WITH_DMALLOC]) +AC_REQUIRE([CF_WITH_DBMALLOC]) +AC_REQUIRE([CF_WITH_VALGRIND]) + +AC_MSG_CHECKING(if you want to perform memory-leak testing) +AC_ARG_ENABLE(leaks, + [ --disable-leaks test: free permanent memory, analyze leaks], + [if test "x$enableval" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi], + : ${with_no_leaks:=no}) +AC_MSG_RESULT($with_no_leaks) + +if test "$with_no_leaks" = yes ; then + AC_DEFINE(NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.]) + AC_DEFINE(YY_NO_LEAKS,1,[Define to 1 if you want to perform memory-leak testing.]) +fi +])dnl +dnl --------------------------------------------------------------------------- dnl CF_DISABLE_RPATH_HACK version: 2 updated: 2011/02/13 13:31:33 dnl --------------------- dnl The rpath-hack makes it simpler to build programs, particularly with the @@ -554,7 +553,7 @@ CF_CHECK_ERRNO(errno) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FUNC_GRANTPT version: 9 updated: 2012/10/04 05:24:07 +dnl CF_FUNC_GRANTPT version: 10 updated: 2013/04/17 05:31:24 dnl --------------- dnl Check for grantpt versus openpty, as well as functions that "should" be dnl available if grantpt is available. @@ -666,9 +665,10 @@ dnl able to use tcsetattr, then give openpty a try. In particular, Darwin 10.7 dnl has a more functional openpty than posix_openpt. dnl -dnl There is no configure run-test for openpty, since its implementations do -dnl not always run properly as a non-root user. -if test "x$ac_cv_func_grantpt" != "xyes" || test -z "$cf_grantpt_opts" ; then +dnl There is no configure run-test for openpty, since older implementations do +dnl not always run properly as a non-root user. For that reason, we also allow +dnl the configure script to suppress this check entirely with $disable_openpty. +if test "x$disable_openpty" != "xyes" || test -z "$cf_grantpt_opts" ; then AC_CHECK_LIB(util, openpty, [cf_have_openpty=yes],[cf_have_openpty=no]) if test "$cf_have_openpty" = yes ; then ac_cv_func_grantpt=no @@ -685,6 +685,7 @@ dnl If we did not settle on using openpty, fill in the definitions for grantpt. if test "x$ac_cv_func_grantpt" != xno then + CF_VERBOSE(will rely upon grantpt) AC_DEFINE(HAVE_WORKING_GRANTPT,1,[Define to 1 if the grantpt function seems to work]) for cf_feature in $cf_grantpt_opts do @@ -695,6 +696,8 @@ elif test "x$cf_have_openpty" = xno then CF_VERBOSE(will rely upon BSD-pseudoterminals) +else + CF_VERBOSE(will rely upon openpty) fi ])dnl dnl --------------------------------------------------------------------------- @@ -933,7 +936,7 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_VERSION version: 6 updated: 2012/10/06 18:38:34 +dnl CF_GCC_VERSION version: 7 updated: 2012/10/18 06:46:33 dnl -------------- dnl Find version of gcc AC_DEFUN([CF_GCC_VERSION],[ @@ -941,7 +944,7 @@ GCC_VERSION=none if test "$GCC" = yes ; then AC_MSG_CHECKING(version of $CC) - GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(\(GCC\|Debian\)[[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[[^)]]*) //' -e 's/^.*(Debian[[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown AC_MSG_RESULT($GCC_VERSION) fi @@ -1287,7 +1290,7 @@ [cf_cv_input_method=no])]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_INTEL_COMPILER version: 4 updated: 2010/05/26 05:38:42 +dnl CF_INTEL_COMPILER version: 5 updated: 2013/02/10 10:41:05 dnl ----------------- dnl Check if the given compiler is really the Intel compiler for Linux. It dnl tries to imitate gcc, but does not return an error when it finds a mismatch @@ -1301,6 +1304,7 @@ dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS dnl $3 = CFLAGS (default) or CXXFLAGS AC_DEFUN([CF_INTEL_COMPILER],[ +AC_REQUIRE([AC_CANONICAL_HOST]) ifelse([$2],,INTEL_COMPILER,[$2])=no if test "$ifelse([$1],,[$1],GCC)" = yes ; then @@ -1480,6 +1484,35 @@ echo "${as_me:-configure}:__oline__: testing $* ..." 1>&AC_FD_CC ])dnl dnl --------------------------------------------------------------------------- +dnl CF_NO_LEAKS_OPTION version: 5 updated: 2012/10/02 20:55:03 +dnl ------------------ +dnl see CF_WITH_NO_LEAKS +AC_DEFUN([CF_NO_LEAKS_OPTION],[ +AC_MSG_CHECKING(if you want to use $1 for testing) +AC_ARG_WITH($1, + [$2], + [AC_DEFINE_UNQUOTED($3,1,"Define to 1 if you want to use $1 for testing.")ifelse([$4],,[ + $4 +]) + : ${with_cflags:=-g} + : ${with_no_leaks:=yes} + with_$1=yes], + [with_$1=]) +AC_MSG_RESULT(${with_$1:-no}) + +case .$with_cflags in #(vi +.*-g*) + case .$CFLAGS in #(vi + .*-g*) #(vi + ;; + *) + CF_ADD_CFLAGS([-g]) + ;; + esac + ;; +esac +])dnl +dnl --------------------------------------------------------------------------- dnl CF_PATHSEP version: 6 updated: 2012/09/29 18:38:12 dnl ---------- dnl Provide a value for the $PATH and similar separator (or amend the value @@ -1793,6 +1826,25 @@ CF_CC_ENV_FLAGS ])dnl dnl --------------------------------------------------------------------------- +dnl CF_PROG_GROFF version: 1 updated: 2013/01/02 20:37:18 +dnl ------------- +dnl Check if groff is available, for cases (such as html output) where nroff +dnl is not enough. +AC_DEFUN([CF_PROG_GROFF],[ +AC_PATH_PROG(GROFF_PATH,groff,no) +if test "x$GROFF_PATH" = xno +then + NROFF_NOTE= + GROFF_NOTE="#" +else + NROFF_NOTE="#" + GROFF_NOTE= +fi +AC_SUBST(GROFF_PATH) +AC_SUBST(GROFF_NOTE) +AC_SUBST(NROFF_NOTE) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_REGEX version: 10 updated: 2012/10/04 20:12:20 dnl -------- dnl Attempt to determine if we've got one of the flavors of regular-expression @@ -2968,7 +3020,22 @@ AC_SUBST(no_appsdir) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_DESKTOP_CATEGORY version: 2 updated: 2011/07/02 10:22:07 +dnl CF_WITH_DBMALLOC version: 7 updated: 2010/06/21 17:26:47 +dnl ---------------- +dnl Configure-option for dbmalloc. The optional parameter is used to override +dnl the updating of $LIBS, e.g., to avoid conflict with subsequent tests. +AC_DEFUN([CF_WITH_DBMALLOC],[ +CF_NO_LEAKS_OPTION(dbmalloc, + [ --with-dbmalloc test: use Conor Cahill's dbmalloc library], + [USE_DBMALLOC]) + +if test "$with_dbmalloc" = yes ; then + AC_CHECK_HEADER(dbmalloc.h, + [AC_CHECK_LIB(dbmalloc,[debug_malloc]ifelse([$1],,[],[,$1]))]) +fi +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_WITH_DESKTOP_CATEGORY version: 4 updated: 2013/01/01 10:50:14 dnl ------------------------ dnl Taking into account the absence of standardization of desktop categories dnl take a look to see whether other applications on the current system are @@ -2978,7 +3045,9 @@ dnl $2 = case-pattern to match comparable desktop files to obtain category dnl This pattern may contain wildcards. dnl $3 = suggested categories, also a case-pattern but without wildcards, -dnl since it doubles as a default value. +dnl since it doubles as a default value for a shell case-statement. +dnl $4 = categories to use if no match is found on the build-machine for the +dnl --with-desktop-category "auto" setting. dnl dnl The macro tells the configure script to substitute the $DESKTOP_CATEGORY dnl value. @@ -3040,13 +3109,46 @@ done cf_desktop_want=`cat conftest.2 | tr '\n' ';'` fi + if test -n "$cf_desktop_want" + then + if test "$cf_desktop_want" = auto + then + cf_desktop_want= + else + # do a sanity check on the semicolon-separated list, ignore on failure + cf_desktop_test=`echo "$cf_desktop_want" | sed -e 's/[[^;]]//g'` + test -z "$cf_desktop_test" && cf_desktop_want= + cf_desktop_test=`echo "$cf_desktop_want" | sed -e 's/^.*;$/./g'` + test -z "$cf_desktop_test" && cf_desktop_want= + fi + fi + if test -z "$cf_desktop_want" + then + cf_desktop_want="ifelse([$4],,ifelse([$3],,[Application;],[`echo "$3" | sed -e 's/\*//g' -e 's/|/;/g' -e 's/[[;]]*$/;/g'`]),[$4])" + CF_VERBOSE(no usable value found for desktop category, using $cf_desktop_want) + fi fi DESKTOP_CATEGORY=`echo "$cf_desktop_want" | sed -e 's/[[ ,]]/;/g'` - CF_VERBOSE(resulting category=$DESKTOP_CATEGORY) + CF_VERBOSE(will use Categories=$DESKTOP_CATEGORY) AC_SUBST(DESKTOP_CATEGORY) fi ]) dnl --------------------------------------------------------------------------- +dnl CF_WITH_DMALLOC version: 7 updated: 2010/06/21 17:26:47 +dnl --------------- +dnl Configure-option for dmalloc. The optional parameter is used to override +dnl the updating of $LIBS, e.g., to avoid conflict with subsequent tests. +AC_DEFUN([CF_WITH_DMALLOC],[ +CF_NO_LEAKS_OPTION(dmalloc, + [ --with-dmalloc test: use Gray Watson's dmalloc library], + [USE_DMALLOC]) + +if test "$with_dmalloc" = yes ; then + AC_CHECK_HEADER(dmalloc.h, + [AC_CHECK_LIB(dmalloc,[dmalloc_debug]ifelse([$1],,[],[,$1]))]) +fi +])dnl +dnl --------------------------------------------------------------------------- dnl CF_WITH_ICONDIR version: 5 updated: 2012/07/22 09:18:02 dnl --------------- dnl Handle configure option "--with-icondir", setting these shell variables: @@ -3089,7 +3191,7 @@ AC_SUBST(no_icondir) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_ICON_NAME version: 1 updated: 2012/08/25 19:05:08 +dnl CF_WITH_ICON_NAME version: 2 updated: 2013/05/27 18:34:42 dnl ----------------- dnl Allow a default icon-name to be overridden. dnl $1 = default icon name @@ -3104,10 +3206,37 @@ ICON_NAME=$1 ;; esac +AC_SUBST(ICON_NAME) AC_MSG_RESULT($ICON_NAME) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_ICON_THEME version: 8 updated: 2012/08/07 20:14:58 +dnl CF_WITH_ICON_SYMLINK version: 1 updated: 2013/05/27 18:34:42 +dnl -------------------- +dnl Workaround for systems which are (mis)configured to map all icon references +dnl for xterm into "xterm" name. For instance, recent (2013) KDE ignores both +dnl the name given in the .desktop file (xterm-color) and the application name +dnl (xterm-dev). +dnl +dnl $1 = default icon name to use if symlink is wanted +AC_DEFUN([CF_WITH_ICON_SYMLINK],[ +AC_MSG_CHECKING(for icon symlink to use) +AC_ARG_WITH(icon-symlink, + [ --with-icon-symlink=XXX make symbolic link for icon name (default: $1)], + [ICON_SYMLINK="$withval"], + [ICON_SYMLINK=NONE]) +case "x$ICON_SYMLINK" in +xyes) + ICON_SYMLINK=$1 + ;; +xno|x) + ICON_SYMLINK=NONE + ;; +esac +AC_SUBST(ICON_SYMLINK) +AC_MSG_RESULT($ICON_SYMLINK) +])dnl +dnl --------------------------------------------------------------------------- +dnl CF_WITH_ICON_THEME version: 9 updated: 2013/04/17 05:31:24 dnl ------------------ dnl If asked, check for prerequisites and setup symbols to permit installing dnl one or more application icons in the Red Hat icon-theme directory @@ -3156,7 +3285,7 @@ then if test "x$ICONDIR" != xno then - AC_MSG_WARN(ignoring icondir without theme) + CF_VERBOSE(ignoring icondir without theme) no_icondir="#" fi else @@ -3424,6 +3553,14 @@ AC_SUBST(no_pixmapdir) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_WITH_VALGRIND version: 1 updated: 2006/12/14 18:00:21 +dnl ---------------- +AC_DEFUN([CF_WITH_VALGRIND],[ +CF_NO_LEAKS_OPTION(valgrind, + [ --with-valgrind test: use valgrind], + [USE_VALGRIND]) +])dnl +dnl --------------------------------------------------------------------------- dnl CF_WITH_XPM version: 3 updated: 2012/10/04 06:57:36 dnl ----------- dnl Test for Xpm library, update compiler/loader flags if it is wanted and @@ -3566,7 +3703,7 @@ fi ]) dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 42 updated: 2012/01/07 08:26:49 +dnl CF_XOPEN_SOURCE version: 43 updated: 2013/02/10 10:41:05 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, @@ -3576,6 +3713,7 @@ dnl $1 is the nominal value for _XOPEN_SOURCE dnl $2 is the nominal value for _POSIX_C_SOURCE AC_DEFUN([CF_XOPEN_SOURCE],[ +AC_REQUIRE([AC_CANONICAL_HOST]) cf_XOPEN_SOURCE=ifelse([$1],,500,[$1]) cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2]) diff -Nru xterm-287/button.c xterm-293/button.c --- xterm-287/button.c 2012-11-20 01:15:57.000000000 +0000 +++ xterm-293/button.c 2013-05-12 22:16:26.000000000 +0000 @@ -1,7 +1,7 @@ -/* $XTermId: button.c,v 1.435 2012/11/20 01:15:57 tom Exp $ */ +/* $XTermId: button.c,v 1.456 2013/05/12 22:16:26 tom Exp $ */ /* - * Copyright 1999-2011,2012 by Thomas E. Dickey + * Copyright 1999-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -1320,10 +1320,11 @@ for (i = 0; i < (*text_list_count); ++i) { data = (Char *) (*text_list)[i]; size = strlen((*text_list)[i]) + 1; - data = UTF8toLatin1(screen, data, size, &size); - memcpy(tmp, data, size + 1); - new_text_list[i] = tmp; - tmp += size + 1; + if ((data = UTF8toLatin1(screen, data, size, &size)) != 0) { + memcpy(tmp, data, size + 1); + new_text_list[i] = tmp; + tmp += size + 1; + } } XFreeStringList((*text_list)); *text_list = new_text_list; @@ -1345,7 +1346,6 @@ } *nextc = *nextp; *nextp = '\0'; - x_strtrim(value); return nextp; } @@ -1404,30 +1404,32 @@ count = 0; do { char *nextp = parseItem(listp, &nextc); - size_t len = strlen(listp); + char *item = x_strtrim(listp); + size_t len = (item ? strlen(item) : 0); if (len == 0) { /* EMPTY */ ; } #if OPT_WIDE_CHARS - else if (sameItem(listp, "UTF8")) { + else if (sameItem(item, "UTF8")) { result[count++] = XA_UTF8_STRING(XtDisplay(w)); } #endif - else if (sameItem(listp, "I18N")) { + else if (sameItem(item, "I18N")) { if (screen->i18nSelections) { result[count++] = XA_TEXT(XtDisplay(w)); result[count++] = XA_COMPOUND_TEXT(XtDisplay(w)); } - } else if (sameItem(listp, "TEXT")) { + } else if (sameItem(item, "TEXT")) { result[count++] = XA_TEXT(XtDisplay(w)); - } else if (sameItem(listp, "COMPOUND_TEXT")) { + } else if (sameItem(item, "COMPOUND_TEXT")) { result[count++] = XA_COMPOUND_TEXT(XtDisplay(w)); - } else if (sameItem(listp, "STRING")) { + } else if (sameItem(item, "STRING")) { result[count++] = XA_STRING; } *nextp++ = nextc; listp = nextp; + free(item); } while (nextc != '\0'); if (count) { result[count] = None; @@ -1437,6 +1439,7 @@ XtFree((char *) result); } } + free(copied); } else { TRACE(("Couldn't allocate copy of selection types\n")); } @@ -1597,6 +1600,10 @@ : params[j])); if (result[j] == 0) { UnmapSelections(xw); + while (j != 0) { + free((void *) result[--j]); + } + free(result); result = 0; break; } @@ -1645,6 +1652,7 @@ cutbuffer = -1; break; } + TRACE(("CutBuffer(%d) = %d\n", (int) code, cutbuffer)); return cutbuffer; } @@ -1706,10 +1714,10 @@ line = XFetchBuffer(XtDisplay(w), &inbytes, cutbuffer); nbytes = (unsigned long) inbytes; - if (nbytes > 0) + if (nbytes > 0) { SelectionReceived(w, NULL, &selection, &type, (XtPointer) line, &nbytes, &fmt8); - else if (num_params > 1) { + } else if (num_params > 1) { xtermGetSelection(w, ev_time, params + 1, num_params - 1, NULL); } #if OPT_PASTE64 @@ -1717,7 +1725,6 @@ FinishPaste64(xw); } #endif - return; } else { struct _SelectionList *list; @@ -1956,6 +1963,50 @@ } #endif /* OPT_READLINE */ +/* + * Unless enabled by the user, strip control characters other than formatting. + */ +static size_t +removeControls(XtermWidget xw, char *value) +{ + TScreen *screen = TScreenOf(xw); + size_t dst = 0; + size_t src = 0; + + if (screen->allowPasteControls) { + dst = strlen(value); + } else { + while ((value[dst] = value[src]) != '\0') { + int ch = CharOf(value[src++]); + if (ch < 32) { + switch (ch) { + case '\b': + case '\t': + case '\n': + case '\r': + ++dst; + break; + default: + continue; + } + } +#if OPT_WIDE_CHARS + else if (screen->utf8_inparse) + ++dst; +#endif +#if OPT_C1_PRINT || OPT_WIDE_CHARS + else if (screen->c1_printable) + ++dst; +#endif + else if (ch >= 128 && ch < 160) + continue; + else + ++dst; + } + } + return dst; +} + /* SelectionReceived: stuff received selection text into pty */ /* ARGSUSED */ @@ -2061,7 +2112,7 @@ } #endif for (i = 0; i < text_list_count; i++) { - size_t len = strlen(text_list[i]); + size_t len = removeControls(xw, text_list[i]); if (screen->selectToBuffer) { size_t have = (screen->internal_select ? strlen(screen->internal_select) @@ -2826,15 +2877,16 @@ class_of(LineData * ld, CELL * cell) { CELL temp = *cell; + int result = 0; #if OPT_DEC_CHRSET if (CSET_DOUBLE(GetLineDblCS(ld))) { temp.col /= 2; } #endif - - assert(temp.col < (int) ld->lineSize); - return CharacterClass((int) (ld->charData[temp.col])); + if (temp.col < (int) ld->lineSize) + result = CharacterClass((int) (ld->charData[temp.col])); + return result; } #if OPT_WIDE_CHARS @@ -3294,6 +3346,13 @@ screen->endSel.col = 0; NextRow(endSel); } + /* Clicking on right edge will make endSel.col == screen->max_col, + * so clamp it. Otherwise XTERM_CELL and friends will fail assertion + */ + if (screen->endSel.col > screen->max_col) { + screen->endSel.col = screen->max_col; + TRACE(("Select_WORD endSel.col clamped to %d\n", screen->endSel.col)); + } } #if OPT_WIDE_CHARS if (screen->endSel.col @@ -3771,8 +3830,10 @@ *value = (XtPointer) targetP; - while (*my_targets != None) { - *targetP++ = *my_targets++; + if (my_targets != 0) { + while (*my_targets != None) { + *targetP++ = *my_targets++; + } } *targetP++ = XA_LENGTH(dpy); *targetP++ = XA_LIST_LENGTH(dpy); @@ -4180,15 +4241,21 @@ { int result = (int) (32 + (KeyState(event->state) << 2)); + if (event->type == MotionNotify) + result += 32; + if (button < 0 || button > 5) { result += 3; } else { if (button > 3) result += (64 - 4); - if (event->type == MotionNotify) - result += 32; result += button; } + TRACE(("BtnCode button %d, %s state " FMT_MODIFIER_NAMES " ->%#x\n", + button, + visibleEventType(event->type), + ARG_MODIFIER_NAMES(event->state), + result)); return result; } @@ -4229,6 +4296,22 @@ return count; } +static int +FirstBitN(int bits) +{ + int result = -1; + if (bits > 0) { + result = 0; + while (!(bits & 1)) { + bits /= 2; + ++result; + } + } + return result; +} + +#define ButtonBit(button) ((button >= 0) ? (1 << (button)) : 0) + #define EMIT_BUTTON(button) EmitButtonCode(screen, line, count, event, button) static void @@ -4305,7 +4388,7 @@ /* Button-Motion events */ switch (event->type) { case ButtonPress: - screen->mouse_button = button; + screen->mouse_button |= ButtonBit(button); count = EMIT_BUTTON(button); break; case ButtonRelease: @@ -4315,6 +4398,7 @@ * release for buttons 1..3 to a -1, which will be later mapped * into a "0" (some button was released). */ + screen->mouse_button &= ~ButtonBit(button); if (button < 3) { switch (screen->extend_coords) { case SET_SGR_EXT_MODE_MOUSE: @@ -4325,7 +4409,6 @@ break; } } - screen->mouse_button = button; count = EMIT_BUTTON(button); break; case MotionNotify: @@ -4336,7 +4419,7 @@ && (col == screen->mouse_col)) { changed = False; } else { - count = EMIT_BUTTON(screen->mouse_button); + count = EMIT_BUTTON(FirstBitN(screen->mouse_button)); } break; default: @@ -4502,6 +4585,7 @@ lookupSelectUnit(xw, 0, method); screen->selectUnit = screen->selectMap[0]; + memset(start, 0, sizeof(*start)); start->row = screen->cur_row; start->col = screen->cur_col; *finish = *start; @@ -4617,6 +4701,7 @@ if (!pass) { result = TypeCallocN(char *, argc + 1); if (result == 0) { + free(blob); break; } } @@ -4805,9 +4890,11 @@ static void executeCommand(char **argv) { - if (fork() == 0) { - execvp(argv[0], argv); - exit(EXIT_FAILURE); + if (argv != 0 && argv[0] != 0) { + if (fork() == 0) { + execvp(argv[0], argv); + exit(EXIT_FAILURE); + } } } @@ -4846,13 +4933,14 @@ data = getSelectionString(xw, w, event, params, num_params, &start, &finish); - argv = tokenizeFormat(params[0]); - blob = argv[0]; - for (argc = 0; argv[argc] != 0; ++argc) { - argv[argc] = expandFormat(xw, argv[argc], data, &start, &finish); + if ((argv = tokenizeFormat(params[0])) != 0) { + blob = argv[0]; + for (argc = 0; argv[argc] != 0; ++argc) { + argv[argc] = expandFormat(xw, argv[argc], data, &start, &finish); + } + executeCommand(argv); + freeArgv(blob, argv); } - executeCommand(argv); - freeArgv(blob, argv); } } } @@ -4876,14 +4964,18 @@ int argc; data = getDataFromScreen(xw, params[1], &start, &finish); - argv = tokenizeFormat(params[0]); - blob = argv[0]; - for (argc = 0; argv[argc] != 0; ++argc) { - argv[argc] = expandFormat(xw, argv[argc], data, &start, &finish); + if (data != 0) { + if ((argv = tokenizeFormat(params[0])) != 0) { + blob = argv[0]; + for (argc = 0; argv[argc] != 0; ++argc) { + argv[argc] = expandFormat(xw, argv[argc], data, + &start, &finish); + } + executeCommand(argv); + freeArgv(blob, argv); + free(data); + } } - executeCommand(argv); - freeArgv(blob, argv); - free(data); } } } @@ -4903,11 +4995,14 @@ CELL start, finish; char *data; char *temp = x_strdup(params[0]); + char *exps; data = getSelectionString(xw, w, event, params, num_params, &start, &finish); - temp = expandFormat(xw, temp, data, &start, &finish); - unparseputs(xw, temp); + if ((exps = expandFormat(xw, temp, data, &start, &finish)) != 0) { + unparseputs(xw, exps); + free(exps); + } free(data); free(temp); } @@ -4929,11 +5024,17 @@ CELL start, finish; char *data; char *temp = x_strdup(params[0]); + char *exps; data = getDataFromScreen(xw, params[1], &start, &finish); - temp = expandFormat(xw, temp, data, &start, &finish); - unparseputs(xw, temp); - free(data); + if (data != 0) { + exps = expandFormat(xw, temp, data, &start, &finish); + if (exps != 0) { + unparseputs(xw, exps); + free(exps); + } + free(data); + } free(temp); } } diff -Nru xterm-287/charproc.c xterm-293/charproc.c --- xterm-287/charproc.c 2012-11-25 19:25:10.000000000 +0000 +++ xterm-293/charproc.c 2013-05-26 21:18:52.000000000 +0000 @@ -1,7 +1,7 @@ -/* $XTermId: charproc.c,v 1.1270 2012/11/25 19:25:10 Balazs.Kezes Exp $ */ +/* $XTermId: charproc.c,v 1.1289 2013/05/26 21:18:52 tom Exp $ */ /* - * Copyright 1999-2011,2012 by Thomas E. Dickey + * Copyright 1999-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -390,6 +390,8 @@ static XtResource xterm_resources[] = { + Bres(XtNallowPasteControls, XtCAllowPasteControls, + screen.allowPasteControls, False), Bres(XtNallowSendEvents, XtCAllowSendEvents, screen.allowSendEvent0, False), Bres(XtNallowColorOps, XtCAllowColorOps, screen.allowColorOp0, DEF_ALLOW_COLOR), Bres(XtNallowFontOps, XtCAllowFontOps, screen.allowFontOp0, DEF_ALLOW_FONT), @@ -407,7 +409,7 @@ Bres(XtNautoWrap, XtCAutoWrap, misc.autoWrap, True), Bres(XtNawaitInput, XtCAwaitInput, screen.awaitInput, False), Bres(XtNfreeBoldBox, XtCFreeBoldBox, screen.free_bold_box, False), - Bres(XtNbackarrowKey, XtCBackarrowKey, screen.backarrow_key, DEF_BACKARO_DEL), + Bres(XtNbackarrowKey, XtCBackarrowKey, screen.backarrow_key, DEF_BACKARO_BS), Bres(XtNbellIsUrgent, XtCBellIsUrgent, screen.bellIsUrgent, False), Bres(XtNbellOnReset, XtCBellOnReset, screen.bellOnReset, True), Bres(XtNboldMode, XtCBoldMode, screen.bold_mode, True), @@ -1768,7 +1770,7 @@ */ #if OPT_VT52_MODE if (sp->vt52_cup) { - if (nparam < NPARAM) { + if (nparam < NPARAM - 1) { SetParam(nparam++, (int) (c & 0x7f) - 32); parms.is_sub[nparam] = 0; } @@ -3932,21 +3934,24 @@ int riten; TRACE2(("v_write(%d:%s)\n", len, visibleChars(data, len))); - if (v_bufstr == NULL && len > 0) { - v_buffer = (Char *) XtMalloc((Cardinal) len); - v_bufstr = v_buffer; - v_bufptr = v_buffer; - v_bufend = v_buffer + len; - } -#ifdef DEBUG - if (debug) { - fprintf(stderr, "v_write called with %d bytes (%d left over)", - len, v_bufptr - v_bufstr); + if (v_bufstr == NULL) { + if (len > 0) { + v_buffer = (Char *) XtMalloc((Cardinal) len); + v_bufstr = v_buffer; + v_bufptr = v_buffer; + v_bufend = v_buffer + len; + } + if (v_bufstr == NULL) { + return; + } + } + if_DEBUG({ + fprintf(stderr, "v_write called with %d bytes (%ld left over)", + len, (long) (v_bufptr - v_bufstr)); if (len > 1 && len < 10) fprintf(stderr, " \"%.*s\"", len, (const char *) data); fprintf(stderr, "\n"); - } -#endif + }); #ifdef VMS if ((1 << f) != pty_mask) { @@ -3977,11 +3982,10 @@ if (v_bufstr != v_buffer) { /* there is unused space, move everything down */ /* possibly overlapping memmove here */ -#ifdef DEBUG - if (debug) - fprintf(stderr, "moving data down %d\n", - v_bufstr - v_buffer); -#endif + if_DEBUG({ + fprintf(stderr, "moving data down %ld\n", + (long) (v_bufstr - v_buffer)); + }); memmove(v_buffer, v_bufstr, (size_t) (v_bufptr - v_bufstr)); v_bufptr -= v_bufstr - v_buffer; v_bufstr = v_buffer; @@ -3992,11 +3996,10 @@ unsigned size = (unsigned) (v_bufptr - v_buffer); v_buffer = TypeRealloc(Char, size + len, v_buffer); if (v_buffer) { -#ifdef DEBUG - if (debug) + if_DEBUG({ fprintf(stderr, "expanded buffer to %d\n", size + len); -#endif + }); v_bufstr = v_buffer; v_bufptr = v_buffer + size; v_bufend = v_bufptr + len; @@ -4047,19 +4050,18 @@ if (riten < 0) #endif /* VMS */ { -#ifdef DEBUG - if (debug) + if_DEBUG({ perror("write"); -#endif + }); riten = 0; } -#ifdef DEBUG - if (debug) - fprintf(stderr, "write called with %d, wrote %d\n", - v_bufptr - v_bufstr <= MAX_PTY_WRITE ? - v_bufptr - v_bufstr : MAX_PTY_WRITE, + if_DEBUG({ + fprintf(stderr, "write called with %ld, wrote %d\n", + ((long) ((v_bufptr - v_bufstr) <= MAX_PTY_WRITE) + ? (long) (v_bufptr - v_bufstr) + : MAX_PTY_WRITE), riten); -#endif + }); v_bufstr += riten; if (v_bufstr >= v_bufptr) /* we wrote it all */ v_bufstr = v_bufptr = v_buffer; @@ -4079,10 +4081,9 @@ v_bufstr = v_buffer + start; v_bufptr = v_buffer + size; v_bufend = v_buffer + allocsize; -#ifdef DEBUG - if (debug) + if_DEBUG({ fprintf(stderr, "shrunk buffer to %d\n", allocsize); -#endif + }); } else { /* should we print a warning if couldn't return memory? */ v_buffer = v_bufstr - start; /* restore clobbered pointer */ @@ -4347,7 +4348,7 @@ #endif } if (need_cleanup) - Cleanup(0); + NormalExit(); #if OPT_DOUBLE_BUFFER if (screen->needSwap) { XdbeSwapInfo swap; @@ -5937,6 +5938,7 @@ unsigned root_height; #endif int code = zero_if_default(0); + char *label; TRACE(("window_ops %d\n", code)); switch (code) { @@ -6106,14 +6108,16 @@ case ewGetIconTitle: /* Report the icon's label */ if (AllowWindowOps(xw, ewGetIconTitle)) { TRACE(("...get icon's label\n")); - report_win_label(xw, 'L', get_icon_label(xw)); + report_win_label(xw, 'L', label = get_icon_label(xw)); + free(label); } break; case ewGetWinTitle: /* Report the window's title */ if (AllowWindowOps(xw, ewGetWinTitle)) { TRACE(("...get window's label\n")); - report_win_label(xw, 'l', get_window_label(xw)); + report_win_label(xw, 'l', label = get_window_label(xw)); + free(label); } break; @@ -6309,7 +6313,7 @@ IChar *buf = screen->unparse_bfr; unsigned len; - if ((screen->unparse_len + 2) >= sizeof(screen->unparse_bfr)) + if ((screen->unparse_len + 2) >= sizeof(screen->unparse_bfr) / sizeof(IChar)) unparse_end(xw); len = screen->unparse_len; @@ -6521,10 +6525,7 @@ XEvent * event, Region region GCC_UNUSED) { -#ifdef DEBUG - if (debug) - fputs("Expose\n", stderr); -#endif /* DEBUG */ + DEBUG_MSG("Expose\n"); if (event->type == Expose) HandleExposure(term, event); } @@ -7021,7 +7022,7 @@ Cardinal n; int value = -1; - while (*source != '\0') { + while (!IsEmpty(source)) { char *next = ParseList(&source); Boolean found = False; @@ -7253,7 +7254,7 @@ TRACE((" Actual foreground 0x%06lx\n", wnew->old_foreground)); TRACE((" Actual background 0x%06lx\n", wnew->old_background)); - TScreenOf(wnew)->mouse_button = -1; + TScreenOf(wnew)->mouse_button = 0; TScreenOf(wnew)->mouse_row = -1; TScreenOf(wnew)->mouse_col = -1; @@ -7419,6 +7420,7 @@ init_Bres(screen.alt_sends_esc); init_Bres(screen.meta_sends_esc); + init_Bres(screen.allowPasteControls); init_Bres(screen.allowSendEvent0); init_Bres(screen.allowColorOp0); init_Bres(screen.allowFontOp0); @@ -7963,8 +7965,8 @@ #define TRACE_FREE_LEAK(name) \ if (name) { \ - free((void *) name); \ TRACE(("freed " #name ": %p\n", (const void *) name)); \ + free((void *) name); \ name = 0; \ } @@ -8003,8 +8005,8 @@ XtDestroyWidget(screen->scrollWidget); } #if OPT_FIFO_LINES - while (screen->saved_fifo-- > 0) { - deleteScrollback(screen, 0); + while (screen->saved_fifo > 0) { + deleteScrollback(screen); } #endif while (screen->save_title != 0) { @@ -9228,7 +9230,7 @@ * If the cursor happens to be on blanks, and the foreground color is set * but not the background, do not treat it as a colored cell. */ - if ((flags & TERM_COLOR_FLAGS(xw)) == BG_COLOR + if ((flags & TERM_COLOR_FLAGS(xw)) == FG_COLOR && base == ' ') { flags &= ~TERM_COLOR_FLAGS(xw); } @@ -9246,6 +9248,24 @@ fg_pix = getXtermForeground(xw, flags, extract_fg(xw, fg_bg, flags)); bg_pix = getXtermBackground(xw, flags, extract_bg(xw, fg_bg, flags)); + /* + * If we happen to have the same foreground/background colors, choose + * a workable foreground color from which we can obtain a visible cursor. + */ + if (fg_pix == bg_pix) { + long bg_diff = (long) (bg_pix - T_COLOR(TScreenOf(xw), TEXT_BG)); + long fg_diff = (long) (bg_pix - T_COLOR(TScreenOf(xw), TEXT_FG)); + if (bg_diff < 0) + bg_diff = -bg_diff; + if (fg_diff < 0) + fg_diff = -fg_diff; + if (bg_diff < fg_diff) { + fg_pix = T_COLOR(TScreenOf(xw), TEXT_FG); + } else { + fg_pix = T_COLOR(TScreenOf(xw), TEXT_BG); + } + } + if (OutsideSelection(screen, screen->cur_row, screen->cur_col)) in_selection = False; else @@ -10095,7 +10115,9 @@ { XtermWidget xw = getXtermWidget(w); - if ((xw == 0) || *type != XA_STRING || *format != 8) { + if (xw == 0) { + xtermWarning("unexpected widget in DoSetSelectedFont\n"); + } else if (*type != XA_STRING || *format != 8) { Bell(xw, XkbBI_MinorError, 0); } else { Boolean failed = False; @@ -10127,6 +10149,7 @@ XLFD allows up to 255 characters and no control characters; we are a little more liberal here. */ if (len < 1000 + && used != 0 && !strchr(used, '\n') && (test = x_strdup(used)) != 0) { TScreenOf(xw)->MenuFontName(fontMenu_fontsel) = test; @@ -10159,7 +10182,7 @@ { TScreen *screen = TScreenOf(xw); static AtomPtr *atoms; - unsigned int atomCount = 0; + static unsigned int atomCount = 0; AtomPtr *pAtom; unsigned a; Atom target; @@ -10171,12 +10194,16 @@ TRACE(("FindFontSelection(%s)\n", atom_name)); for (pAtom = atoms, a = atomCount; a; a--, pAtom++) { - if (strcmp(atom_name, XmuNameOfAtom(*pAtom)) == 0) + if (strcmp(atom_name, XmuNameOfAtom(*pAtom)) == 0) { + TRACE(("...found atom %d:%s\n", a + 1, atom_name)); break; + } } if (!a) { atoms = TypeXtReallocN(AtomPtr, atoms, atomCount + 1); *(pAtom = &atoms[atomCount]) = XmuMakeAtom(atom_name); + ++atomCount; + TRACE(("...added atom %d:%s\n", atomCount, atom_name)); } target = XmuInternAtom(XtDisplay(xw), *pAtom); diff -Nru xterm-287/configure xterm-293/configure --- xterm-287/configure 2012-10-10 22:16:12.000000000 +0000 +++ xterm-293/configure 2013-05-27 21:04:20.000000000 +0000 @@ -695,6 +695,7 @@ --with-app-class=XXX override X applications class (default XTerm) --with-app-defaults=DIR directory in which to install resource files (EPREFIX/lib/X11/app-defaults) --with-icon-name=XXXX override icon name (default: xterm-color) + --with-icon-symlink=XXX make symbolic link for icon name (default: xterm) --with-pixmapdir=DIR directory in which to install pixmaps (DATADIR/pixmaps) --with-icondir=DIR directory in which to install icons for desktop --with-icon-theme=XXX install icons into desktop theme (hicolor) @@ -702,6 +703,7 @@ --with-desktop-category=XXX one or more desktop catgories or auto --with-reference=XXX program to use as permissions-reference --with-xterm-symlink=XXX make symbolic link to installed xterm + --disable-openpty disable openpty, prefer other interfaces --disable-setuid disable setuid in xterm, do not install setuid/setgid --disable-setgid disable setgid in xterm, do not install setuid/setgid --with-setuid=XXX use the given setuid user @@ -717,9 +719,9 @@ --enable-narrowproto enable narrow prototypes for X libraries --disable-imake disable use of imake for definitions Terminal Configuration: - --with-terminal-id=V set default decTerminalID (default: vt100) + --with-terminal-id=V set default decTerminalID (default: vt420) --with-terminal-type=T set default $TERM (default: xterm) - --enable-backarrow-is-del set default backarrowKey resource (default: true) + --enable-backarrow-key set default backarrowKey resource (default: true) --enable-backarrow-is-erase set default backarrowKeyIsErase resource (default: false) --enable-delete-is-del set default deleteIsDEL resource (default: maybe) --enable-alt-sends-esc set default altSendsEscape resource (default: no) @@ -783,7 +785,10 @@ --disable-ziconbeep disable -ziconbeep option Testing/development Options: --enable-trace test: set to enable debugging traces - --disable-leaks test: set to test memory leaks + --with-dmalloc test: use Gray Watson's dmalloc library + --with-dbmalloc test: use Conor Cahill's dbmalloc library + --with-valgrind test: use valgrind + --disable-leaks test: free permanent memory, analyze leaks --disable-echo do not display "compiling" commands --enable-xmc-glitch test: enable xmc magic-cookie emulation --enable-warnings test: turn on GCC compiler warnings @@ -981,7 +986,7 @@ fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:984: loading site script $ac_site_file" >&5 + { echo "$as_me:989: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} cat "$ac_site_file" >&5 . "$ac_site_file" @@ -992,7 +997,7 @@ # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:995: loading cache $cache_file" >&5 + { echo "$as_me:1000: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -1000,7 +1005,7 @@ esac fi else - { echo "$as_me:1003: creating cache $cache_file" >&5 + { echo "$as_me:1008: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1016,21 +1021,21 @@ eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:1019: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:1024: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:1023: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:1028: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:1029: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:1034: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:1031: former value: $ac_old_val" >&5 + { echo "$as_me:1036: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:1033: current value: $ac_new_val" >&5 + { echo "$as_me:1038: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; @@ -1049,9 +1054,9 @@ fi done if $ac_cache_corrupted; then - { echo "$as_me:1052: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:1057: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:1054: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:1059: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1072,10 +1077,10 @@ echo "#! $SHELL" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh -if { (echo "$as_me:1075: PATH=\".;.\"; conftest.sh") >&5 +if { (echo "$as_me:1080: PATH=\".;.\"; conftest.sh") >&5 (PATH=".;."; conftest.sh) 2>&5 ac_status=$? - echo "$as_me:1078: \$? = $ac_status" >&5 + echo "$as_me:1083: \$? = $ac_status" >&5 (exit $ac_status); }; then ac_path_separator=';' else @@ -1103,7 +1108,7 @@ fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1106: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1111: 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 @@ -1113,11 +1118,11 @@ # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:1116: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1121: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1120: checking build system type" >&5 +echo "$as_me:1125: 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 @@ -1126,16 +1131,16 @@ test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1129: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1134: 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:1133: error: $ac_config_sub $ac_cv_build_alias failed." >&5 + { { echo "$as_me:1138: 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:1138: result: $ac_cv_build" >&5 +echo "$as_me:1143: 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/'` @@ -1143,7 +1148,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:1146: checking host system type" >&5 + echo "$as_me:1151: 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 @@ -1152,12 +1157,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:1155: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1160: 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:1160: result: $ac_cv_host" >&5 +echo "$as_me:1165: 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/'` @@ -1183,13 +1188,13 @@ fi test -z "$system_name" && system_name="$cf_cv_system_name" -test -n "$cf_cv_system_name" && echo "$as_me:1186: result: Configuring for $cf_cv_system_name" >&5 +test -n "$cf_cv_system_name" && echo "$as_me:1191: 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:1190: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5 + echo "$as_me:1195: 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:1192: error: \"Please remove config.cache and try again.\"" >&5 + { { echo "$as_me:1197: 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 @@ -1214,7 +1219,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1217: checking for $ac_word" >&5 +echo "$as_me:1222: 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 +1234,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:1232: found $ac_dir/$ac_word" >&5 +echo "$as_me:1237: found $ac_dir/$ac_word" >&5 break done @@ -1237,10 +1242,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1240: result: $CC" >&5 + echo "$as_me:1245: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1243: result: no" >&5 + echo "$as_me:1248: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1249,7 +1254,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:1252: checking for $ac_word" >&5 +echo "$as_me:1257: 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 +1269,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:1267: found $ac_dir/$ac_word" >&5 +echo "$as_me:1272: found $ac_dir/$ac_word" >&5 break done @@ -1272,10 +1277,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:1280: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1278: result: no" >&5 + echo "$as_me:1283: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1288,7 +1293,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:1291: checking for $ac_word" >&5 +echo "$as_me:1296: 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 @@ -1303,7 +1308,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:1306: found $ac_dir/$ac_word" >&5 +echo "$as_me:1311: found $ac_dir/$ac_word" >&5 break done @@ -1311,10 +1316,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1314: result: $CC" >&5 + echo "$as_me:1319: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1317: result: no" >&5 + echo "$as_me:1322: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1323,7 +1328,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:1326: checking for $ac_word" >&5 +echo "$as_me:1331: 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 @@ -1338,7 +1343,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:1341: found $ac_dir/$ac_word" >&5 +echo "$as_me:1346: found $ac_dir/$ac_word" >&5 break done @@ -1346,10 +1351,10 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1349: result: $ac_ct_CC" >&5 + echo "$as_me:1354: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1352: result: no" >&5 + echo "$as_me:1357: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1362,7 +1367,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:1365: checking for $ac_word" >&5 +echo "$as_me:1370: 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 @@ -1382,7 +1387,7 @@ continue fi ac_cv_prog_CC="cc" -echo "$as_me:1385: found $ac_dir/$ac_word" >&5 +echo "$as_me:1390: found $ac_dir/$ac_word" >&5 break done @@ -1404,10 +1409,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1407: result: $CC" >&5 + echo "$as_me:1412: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1410: result: no" >&5 + echo "$as_me:1415: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1418,7 +1423,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:1421: checking for $ac_word" >&5 +echo "$as_me:1426: 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 @@ -1433,7 +1438,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:1436: found $ac_dir/$ac_word" >&5 +echo "$as_me:1441: found $ac_dir/$ac_word" >&5 break done @@ -1441,10 +1446,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1444: result: $CC" >&5 + echo "$as_me:1449: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1447: result: no" >&5 + echo "$as_me:1452: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1457,7 +1462,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:1460: checking for $ac_word" >&5 +echo "$as_me:1465: 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 @@ -1472,7 +1477,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:1475: found $ac_dir/$ac_word" >&5 +echo "$as_me:1480: found $ac_dir/$ac_word" >&5 break done @@ -1480,10 +1485,10 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1483: result: $ac_ct_CC" >&5 + echo "$as_me:1488: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1486: result: no" >&5 + echo "$as_me:1491: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1495,32 +1500,32 @@ fi -test -z "$CC" && { { echo "$as_me:1498: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1503: 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:1503:" \ +echo "$as_me:1508:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1506: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:1511: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1509: \$? = $ac_status" >&5 + echo "$as_me:1514: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1511: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:1516: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1514: \$? = $ac_status" >&5 + echo "$as_me:1519: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1516: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:1521: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1519: \$? = $ac_status" >&5 + echo "$as_me:1524: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1523 "configure" +#line 1528 "configure" #include "confdefs.h" int @@ -1536,13 +1541,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:1539: checking for C compiler default output" >&5 +echo "$as_me:1544: 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:1542: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1547: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1545: \$? = $ac_status" >&5 + echo "$as_me:1550: \$? = $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 @@ -1565,34 +1570,34 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1568: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1573: 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:1574: result: $ac_file" >&5 +echo "$as_me:1579: 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:1579: checking whether the C compiler works" >&5 +echo "$as_me:1584: 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:1585: \"$ac_try\"") >&5 + { (eval echo "$as_me:1590: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1588: \$? = $ac_status" >&5 + echo "$as_me:1593: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1595: error: cannot run C compiled programs. + { { echo "$as_me:1600: 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;} @@ -1600,24 +1605,24 @@ fi fi fi -echo "$as_me:1603: result: yes" >&5 +echo "$as_me:1608: 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:1610: checking whether we are cross compiling" >&5 +echo "$as_me:1615: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1612: result: $cross_compiling" >&5 +echo "$as_me:1617: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1615: checking for executable suffix" >&5 +echo "$as_me:1620: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1617: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1622: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1620: \$? = $ac_status" >&5 + echo "$as_me:1625: \$? = $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 @@ -1633,25 +1638,25 @@ esac done else - { { echo "$as_me:1636: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1641: 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:1642: result: $ac_cv_exeext" >&5 +echo "$as_me:1647: 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:1648: checking for object suffix" >&5 +echo "$as_me:1653: 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 1654 "configure" +#line 1659 "configure" #include "confdefs.h" int @@ -1663,10 +1668,10 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1666: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1671: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1669: \$? = $ac_status" >&5 + echo "$as_me:1674: \$? = $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 @@ -1678,24 +1683,24 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1681: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1686: 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:1688: result: $ac_cv_objext" >&5 +echo "$as_me:1693: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1692: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1697: 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 1698 "configure" +#line 1703 "configure" #include "confdefs.h" int @@ -1710,16 +1715,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1713: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1718: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1716: \$? = $ac_status" >&5 + echo "$as_me:1721: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1719: \"$ac_try\"") >&5 + { (eval echo "$as_me:1724: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1722: \$? = $ac_status" >&5 + echo "$as_me:1727: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1731,19 +1736,19 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1734: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1739: 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:1740: checking whether $CC accepts -g" >&5 +echo "$as_me:1745: 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 1746 "configure" +#line 1751 "configure" #include "confdefs.h" int @@ -1755,16 +1760,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1758: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1763: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1761: \$? = $ac_status" >&5 + echo "$as_me:1766: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1764: \"$ac_try\"") >&5 + { (eval echo "$as_me:1769: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1767: \$? = $ac_status" >&5 + echo "$as_me:1772: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1774,7 +1779,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1777: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1782: 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 @@ -1801,16 +1806,16 @@ #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1804: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1809: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1807: \$? = $ac_status" >&5 + echo "$as_me:1812: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1810: \"$ac_try\"") >&5 + { (eval echo "$as_me:1815: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1813: \$? = $ac_status" >&5 + echo "$as_me:1818: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1822,7 +1827,7 @@ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1825 "configure" +#line 1830 "configure" #include "confdefs.h" #include $ac_declaration @@ -1835,16 +1840,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1838: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1843: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1841: \$? = $ac_status" >&5 + echo "$as_me:1846: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1844: \"$ac_try\"") >&5 + { (eval echo "$as_me:1849: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1847: \$? = $ac_status" >&5 + echo "$as_me:1852: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -1854,7 +1859,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1857 "configure" +#line 1862 "configure" #include "confdefs.h" $ac_declaration int @@ -1866,16 +1871,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1869: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1874: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1872: \$? = $ac_status" >&5 + echo "$as_me:1877: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1875: \"$ac_try\"") >&5 + { (eval echo "$as_me:1880: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1878: \$? = $ac_status" >&5 + echo "$as_me:1883: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -1905,15 +1910,15 @@ GCC_VERSION=none if test "$GCC" = yes ; then - echo "$as_me:1908: checking version of $CC" >&5 + echo "$as_me:1913: checking version of $CC" >&5 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6 - GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(\(GCC\|Debian\)[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$as_me:1912: result: $GCC_VERSION" >&5 + echo "$as_me:1917: result: $GCC_VERSION" >&5 echo "${ECHO_T}$GCC_VERSION" >&6 fi -echo "$as_me:1916: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:1921: 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 @@ -1921,7 +1926,7 @@ ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 1924 "configure" +#line 1929 "configure" #include "confdefs.h" #include #include @@ -1970,16 +1975,16 @@ do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:1973: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1978: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1976: \$? = $ac_status" >&5 + echo "$as_me:1981: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1979: \"$ac_try\"") >&5 + { (eval echo "$as_me:1984: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1982: \$? = $ac_status" >&5 + echo "$as_me:1987: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -1996,10 +2001,10 @@ case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:1999: result: none needed" >&5 + echo "$as_me:2004: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2002: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2007: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac @@ -2007,13 +2012,13 @@ # This should have been defined by AC_PROG_CC : ${CC:=cc} -echo "$as_me:2010: checking \$CC variable" >&5 +echo "$as_me:2015: checking \$CC variable" >&5 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6 case "$CC" in #(vi *[\ \ ]-[IUD]*) - echo "$as_me:2014: result: broken" >&5 + echo "$as_me:2019: result: broken" >&5 echo "${ECHO_T}broken" >&6 - { echo "$as_me:2016: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 + { echo "$as_me:2021: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5 echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;} # humor him... cf_flags=`echo "$CC" | sed -e 's/^[^ ]*[ ]//'` @@ -2099,7 +2104,7 @@ ;; *) - echo "$as_me:2102: result: ok" >&5 + echo "$as_me:2107: result: ok" >&5 echo "${ECHO_T}ok" >&6 ;; esac @@ -2110,7 +2115,7 @@ 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:2113: checking how to run the C preprocessor" >&5 +echo "$as_me:2118: 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 @@ -2131,18 +2136,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 2134 "configure" +#line 2139 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2139: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2144: \"$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:2145: \$? = $ac_status" >&5 + echo "$as_me:2150: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2165,17 +2170,17 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 2168 "configure" +#line 2173 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2172: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2177: \"$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:2178: \$? = $ac_status" >&5 + echo "$as_me:2183: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2212,7 +2217,7 @@ else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2215: result: $CPP" >&5 +echo "$as_me:2220: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2222,18 +2227,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 2225 "configure" +#line 2230 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:2230: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2235: \"$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:2236: \$? = $ac_status" >&5 + echo "$as_me:2241: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2256,17 +2261,17 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 2259 "configure" +#line 2264 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:2263: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2268: \"$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:2269: \$? = $ac_status" >&5 + echo "$as_me:2274: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2294,7 +2299,7 @@ if $ac_preproc_ok; then : else - { { echo "$as_me:2297: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2302: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2306,54 +2311,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_main_return=return -if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:2310: 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 2317 "configure" -#include "confdefs.h" -#include -int Autoconf = TIOCGETP; -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "$ac_pattern" >/dev/null 2>&1; then - ac_cv_prog_gcc_traditional=yes -else - ac_cv_prog_gcc_traditional=no -fi -rm -rf conftest* - - if test $ac_cv_prog_gcc_traditional = no; then - cat >conftest.$ac_ext <<_ACEOF -#line 2332 "configure" -#include "confdefs.h" -#include -int Autoconf = TCGETA; -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "$ac_pattern" >/dev/null 2>&1; then - ac_cv_prog_gcc_traditional=yes -fi -rm -rf conftest* - - fi -fi -echo "$as_me:2345: result: $ac_cv_prog_gcc_traditional" >&5 -echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 - if test $ac_cv_prog_gcc_traditional = yes; then - CC="$CC -traditional" - fi -fi - for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:2356: checking for $ac_word" >&5 +echo "$as_me:2318: 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 @@ -2368,7 +2330,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_AWK="$ac_prog" -echo "$as_me:2371: found $ac_dir/$ac_word" >&5 +echo "$as_me:2333: found $ac_dir/$ac_word" >&5 break done @@ -2376,16 +2338,63 @@ fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:2379: result: $AWK" >&5 + echo "$as_me:2341: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "$as_me:2382: result: no" >&5 + echo "$as_me:2344: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$AWK" && break done +# Extract the first word of "groff", so it can be a program name with args. +set dummy groff; ac_word=$2 +echo "$as_me:2353: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_GROFF_PATH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $GROFF_PATH in + [\\/]* | ?:[\\/]*) + ac_cv_path_GROFF_PATH="$GROFF_PATH" # Let the user override the test with a path. + ;; + *) + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_GROFF_PATH="$ac_dir/$ac_word" + echo "$as_me:2370: found $ac_dir/$ac_word" >&5 + break +fi +done + + test -z "$ac_cv_path_GROFF_PATH" && ac_cv_path_GROFF_PATH="no" + ;; +esac +fi +GROFF_PATH=$ac_cv_path_GROFF_PATH + +if test -n "$GROFF_PATH"; then + echo "$as_me:2382: result: $GROFF_PATH" >&5 +echo "${ECHO_T}$GROFF_PATH" >&6 +else + echo "$as_me:2385: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +if test "x$GROFF_PATH" = xno +then + NROFF_NOTE= + GROFF_NOTE="#" +else + NROFF_NOTE="#" + GROFF_NOTE= +fi + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -2398,7 +2407,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:2401: checking for a BSD compatible install" >&5 +echo "$as_me:2410: 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 @@ -2447,7 +2456,7 @@ INSTALL=$ac_install_sh fi fi -echo "$as_me:2450: result: $INSTALL" >&5 +echo "$as_me:2459: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2458,14 +2467,14 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:2461: checking whether ln -s works" >&5 +echo "$as_me:2470: checking whether ln -s works" >&5 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:2465: result: yes" >&5 + echo "$as_me:2474: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:2468: result: no, using $LN_S" >&5 + echo "$as_me:2477: result: no, using $LN_S" >&5 echo "${ECHO_T}no, using $LN_S" >&6 fi @@ -2486,7 +2495,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:2489: checking for $ac_word" >&5 +echo "$as_me:2498: 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 @@ -2501,7 +2510,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_LINT="$ac_prog" -echo "$as_me:2504: found $ac_dir/$ac_word" >&5 +echo "$as_me:2513: found $ac_dir/$ac_word" >&5 break done @@ -2509,10 +2518,10 @@ fi LINT=$ac_cv_prog_LINT if test -n "$LINT"; then - echo "$as_me:2512: result: $LINT" >&5 + echo "$as_me:2521: result: $LINT" >&5 echo "${ECHO_T}$LINT" >&6 else - echo "$as_me:2515: result: no" >&5 + echo "$as_me:2524: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2559,14 +2568,14 @@ ;; linux*|gnu*|mint*|k*bsd*-gnu) #(vi -echo "$as_me:2562: checking if we must define _GNU_SOURCE" >&5 +echo "$as_me:2571: 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 2569 "configure" +#line 2578 "configure" #include "confdefs.h" #include int @@ -2581,16 +2590,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2584: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2593: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2587: \$? = $ac_status" >&5 + echo "$as_me:2596: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2590: \"$ac_try\"") >&5 + { (eval echo "$as_me:2599: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2593: \$? = $ac_status" >&5 + echo "$as_me:2602: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -2599,7 +2608,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 2602 "configure" +#line 2611 "configure" #include "confdefs.h" #include int @@ -2614,16 +2623,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2617: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2626: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2620: \$? = $ac_status" >&5 + echo "$as_me:2629: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2623: \"$ac_try\"") >&5 + { (eval echo "$as_me:2632: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2626: \$? = $ac_status" >&5 + echo "$as_me:2635: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_gnu_source=no else @@ -2638,7 +2647,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2641: result: $cf_cv_gnu_source" >&5 +echo "$as_me:2650: 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" @@ -2660,16 +2669,16 @@ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:2663: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:2672: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:2669: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:2678: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 2672 "configure" +#line 2681 "configure" #include "confdefs.h" #include int @@ -2684,16 +2693,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2687: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2696: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2690: \$? = $ac_status" >&5 + echo "$as_me:2699: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2693: \"$ac_try\"") >&5 + { (eval echo "$as_me:2702: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2696: \$? = $ac_status" >&5 + echo "$as_me:2705: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -2714,7 +2723,7 @@ esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 2717 "configure" +#line 2726 "configure" #include "confdefs.h" #include int @@ -2729,16 +2738,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2732: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2741: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2735: \$? = $ac_status" >&5 + echo "$as_me:2744: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2738: \"$ac_try\"") >&5 + { (eval echo "$as_me:2747: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2741: \$? = $ac_status" >&5 + echo "$as_me:2750: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -2749,15 +2758,15 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:2752: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:2761: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "${as_me:-configure}:2757: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:2766: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 2760 "configure" +#line 2769 "configure" #include "confdefs.h" #include int @@ -2772,16 +2781,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2775: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2784: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2778: \$? = $ac_status" >&5 + echo "$as_me:2787: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2781: \"$ac_try\"") >&5 + { (eval echo "$as_me:2790: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2784: \$? = $ac_status" >&5 + echo "$as_me:2793: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -2797,7 +2806,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2800: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:2809: 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 @@ -2910,14 +2919,14 @@ ;; *) -echo "$as_me:2913: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:2922: 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 2920 "configure" +#line 2929 "configure" #include "confdefs.h" #include @@ -2936,16 +2945,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2939: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2948: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2942: \$? = $ac_status" >&5 + echo "$as_me:2951: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2945: \"$ac_try\"") >&5 + { (eval echo "$as_me:2954: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2948: \$? = $ac_status" >&5 + echo "$as_me:2957: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -2954,7 +2963,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 2957 "configure" +#line 2966 "configure" #include "confdefs.h" #include @@ -2973,16 +2982,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2976: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2985: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2979: \$? = $ac_status" >&5 + echo "$as_me:2988: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2982: \"$ac_try\"") >&5 + { (eval echo "$as_me:2991: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2985: \$? = $ac_status" >&5 + echo "$as_me:2994: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -2997,7 +3006,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3000: result: $cf_cv_xopen_source" >&5 +echo "$as_me:3009: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -3105,16 +3114,16 @@ sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` -echo "$as_me:3108: checking if we should define _POSIX_C_SOURCE" >&5 +echo "$as_me:3117: checking if we should define _POSIX_C_SOURCE" >&5 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6 if test "${cf_cv_posix_c_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:3114: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:3123: testing if the symbol is already defined go no further ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3117 "configure" +#line 3126 "configure" #include "confdefs.h" #include int @@ -3129,16 +3138,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3132: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3141: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3135: \$? = $ac_status" >&5 + echo "$as_me:3144: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3138: \"$ac_try\"") >&5 + { (eval echo "$as_me:3147: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3141: \$? = $ac_status" >&5 + echo "$as_me:3150: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_c_source=no else @@ -3159,7 +3168,7 @@ esac if test "$cf_want_posix_source" = yes ; then cat >conftest.$ac_ext <<_ACEOF -#line 3162 "configure" +#line 3171 "configure" #include "confdefs.h" #include int @@ -3174,16 +3183,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3177: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3186: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3180: \$? = $ac_status" >&5 + echo "$as_me:3189: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3183: \"$ac_try\"") >&5 + { (eval echo "$as_me:3192: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3186: \$? = $ac_status" >&5 + echo "$as_me:3195: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3194,15 +3203,15 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "${as_me:-configure}:3197: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:3206: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "${as_me:-configure}:3202: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:3211: testing if the second compile does not leave our definition intact error ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 3205 "configure" +#line 3214 "configure" #include "confdefs.h" #include int @@ -3217,16 +3226,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3220: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3229: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3223: \$? = $ac_status" >&5 + echo "$as_me:3232: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3226: \"$ac_try\"") >&5 + { (eval echo "$as_me:3235: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3229: \$? = $ac_status" >&5 + echo "$as_me:3238: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3242,7 +3251,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3245: result: $cf_cv_posix_c_source" >&5 +echo "$as_me:3254: 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 @@ -3415,10 +3424,10 @@ fi if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then - echo "$as_me:3418: checking if _XOPEN_SOURCE really is set" >&5 + echo "$as_me:3427: checking if _XOPEN_SOURCE really is set" >&5 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 3421 "configure" +#line 3430 "configure" #include "confdefs.h" #include int @@ -3433,16 +3442,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3436: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3445: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3439: \$? = $ac_status" >&5 + echo "$as_me:3448: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3442: \"$ac_try\"") >&5 + { (eval echo "$as_me:3451: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3445: \$? = $ac_status" >&5 + echo "$as_me:3454: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set=yes else @@ -3451,12 +3460,12 @@ cf_XOPEN_SOURCE_set=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:3454: result: $cf_XOPEN_SOURCE_set" >&5 + echo "$as_me:3463: result: $cf_XOPEN_SOURCE_set" >&5 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6 if test $cf_XOPEN_SOURCE_set = yes then cat >conftest.$ac_ext <<_ACEOF -#line 3459 "configure" +#line 3468 "configure" #include "confdefs.h" #include int @@ -3471,16 +3480,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3474: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3483: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3477: \$? = $ac_status" >&5 + echo "$as_me:3486: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3480: \"$ac_try\"") >&5 + { (eval echo "$as_me:3489: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3483: \$? = $ac_status" >&5 + echo "$as_me:3492: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_XOPEN_SOURCE_set_ok=yes else @@ -3491,19 +3500,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test $cf_XOPEN_SOURCE_set_ok = no then - { echo "$as_me:3494: WARNING: _XOPEN_SOURCE is lower than requested" >&5 + { echo "$as_me:3503: WARNING: _XOPEN_SOURCE is lower than requested" >&5 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;} fi else -echo "$as_me:3499: checking if we should define _XOPEN_SOURCE" >&5 +echo "$as_me:3508: 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 3506 "configure" +#line 3515 "configure" #include "confdefs.h" #include @@ -3522,16 +3531,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3525: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3534: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3528: \$? = $ac_status" >&5 + echo "$as_me:3537: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3531: \"$ac_try\"") >&5 + { (eval echo "$as_me:3540: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3534: \$? = $ac_status" >&5 + echo "$as_me:3543: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3540,7 +3549,7 @@ cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat >conftest.$ac_ext <<_ACEOF -#line 3543 "configure" +#line 3552 "configure" #include "confdefs.h" #include @@ -3559,16 +3568,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3562: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3571: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3565: \$? = $ac_status" >&5 + echo "$as_me:3574: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3568: \"$ac_try\"") >&5 + { (eval echo "$as_me:3577: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3571: \$? = $ac_status" >&5 + echo "$as_me:3580: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xopen_source=no else @@ -3583,7 +3592,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3586: result: $cf_cv_xopen_source" >&5 +echo "$as_me:3595: result: $cf_cv_xopen_source" >&5 echo "${ECHO_T}$cf_cv_xopen_source" >&6 if test "$cf_cv_xopen_source" != no ; then @@ -3681,14 +3690,14 @@ fi fi -echo "$as_me:3684: checking if SIGWINCH is defined" >&5 +echo "$as_me:3693: checking if SIGWINCH is defined" >&5 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6 if test "${cf_cv_define_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3691 "configure" +#line 3700 "configure" #include "confdefs.h" #include @@ -3703,23 +3712,23 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3706: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3715: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3709: \$? = $ac_status" >&5 + echo "$as_me:3718: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3712: \"$ac_try\"") >&5 + { (eval echo "$as_me:3721: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3715: \$? = $ac_status" >&5 + echo "$as_me:3724: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_define_sigwinch=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 3722 "configure" +#line 3731 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -3737,16 +3746,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3740: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3749: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3743: \$? = $ac_status" >&5 + echo "$as_me:3752: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3746: \"$ac_try\"") >&5 + { (eval echo "$as_me:3755: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3749: \$? = $ac_status" >&5 + echo "$as_me:3758: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_define_sigwinch=maybe else @@ -3760,11 +3769,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3763: result: $cf_cv_define_sigwinch" >&5 +echo "$as_me:3772: result: $cf_cv_define_sigwinch" >&5 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6 if test "$cf_cv_define_sigwinch" = maybe ; then -echo "$as_me:3767: checking for actual SIGWINCH definition" >&5 +echo "$as_me:3776: checking for actual SIGWINCH definition" >&5 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6 if test "${cf_cv_fixup_sigwinch+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3775,7 +3784,7 @@ while test $cf_sigwinch != 1 do cat >conftest.$ac_ext <<_ACEOF -#line 3778 "configure" +#line 3787 "configure" #include "confdefs.h" #undef _XOPEN_SOURCE @@ -3797,16 +3806,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3800: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3809: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3803: \$? = $ac_status" >&5 + echo "$as_me:3812: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3806: \"$ac_try\"") >&5 + { (eval echo "$as_me:3815: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3809: \$? = $ac_status" >&5 + echo "$as_me:3818: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_fixup_sigwinch=$cf_sigwinch break @@ -3820,7 +3829,7 @@ done fi -echo "$as_me:3823: result: $cf_cv_fixup_sigwinch" >&5 +echo "$as_me:3832: result: $cf_cv_fixup_sigwinch" >&5 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6 if test "$cf_cv_fixup_sigwinch" != unknown ; then @@ -3842,23 +3851,23 @@ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3845: checking for $ac_header" >&5 +echo "$as_me:3854: 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 3851 "configure" +#line 3860 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3855: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3864: \"$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:3861: \$? = $ac_status" >&5 + echo "$as_me:3870: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3877,7 +3886,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:3880: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:3889: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:3899: 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 3896 "configure" +#line 3905 "configure" #include "confdefs.h" #include #include @@ -3909,16 +3918,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3912: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3921: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3915: \$? = $ac_status" >&5 + echo "$as_me:3924: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3918: \"$ac_try\"") >&5 + { (eval echo "$as_me:3927: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3921: \$? = $ac_status" >&5 + echo "$as_me:3930: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -3928,7 +3937,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3931: result: $ac_cv_header_time" >&5 +echo "$as_me:3940: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then @@ -3938,13 +3947,13 @@ fi - echo "$as_me:3941: checking for nl_langinfo and CODESET" >&5 + echo "$as_me:3950: 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 3947 "configure" +#line 3956 "configure" #include "confdefs.h" #include int @@ -3956,16 +3965,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3959: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3968: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3962: \$? = $ac_status" >&5 + echo "$as_me:3971: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3965: \"$ac_try\"") >&5 + { (eval echo "$as_me:3974: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3968: \$? = $ac_status" >&5 + echo "$as_me:3977: \$? = $ac_status" >&5 (exit $ac_status); }; }; then am_cv_langinfo_codeset=yes else @@ -3976,7 +3985,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:3979: result: $am_cv_langinfo_codeset" >&5 +echo "$as_me:3988: result: $am_cv_langinfo_codeset" >&5 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6 if test $am_cv_langinfo_codeset = yes; then @@ -3988,7 +3997,7 @@ ### checks for typedefs -echo "$as_me:3991: checking for signal global datatype" >&5 +echo "$as_me:4000: checking for signal global datatype" >&5 echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6 if test "${cf_cv_sig_atomic_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4000,7 +4009,7 @@ "int" do cat >conftest.$ac_ext <<_ACEOF -#line 4003 "configure" +#line 4012 "configure" #include "confdefs.h" #include @@ -4023,16 +4032,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4026: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4035: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4029: \$? = $ac_status" >&5 + echo "$as_me:4038: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4032: \"$ac_try\"") >&5 + { (eval echo "$as_me:4041: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4035: \$? = $ac_status" >&5 + echo "$as_me:4044: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sig_atomic_t=$cf_type else @@ -4046,20 +4055,20 @@ fi -echo "$as_me:4049: result: $cf_cv_sig_atomic_t" >&5 +echo "$as_me:4058: result: $cf_cv_sig_atomic_t" >&5 echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6 test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <&5 +echo "$as_me:4065: 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 4062 "configure" +#line 4071 "configure" #include "confdefs.h" #include #include @@ -4067,13 +4076,13 @@ #include _ACEOF -if { (eval echo "$as_me:4070: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4079: \"$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:4076: \$? = $ac_status" >&5 + echo "$as_me:4085: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4095,7 +4104,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 4098 "configure" +#line 4107 "configure" #include "confdefs.h" #include @@ -4113,7 +4122,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 4116 "configure" +#line 4125 "configure" #include "confdefs.h" #include @@ -4134,7 +4143,7 @@ : else cat >conftest.$ac_ext <<_ACEOF -#line 4137 "configure" +#line 4146 "configure" #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) @@ -4160,15 +4169,15 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:4163: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4172: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4166: \$? = $ac_status" >&5 + echo "$as_me:4175: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4168: \"$ac_try\"") >&5 + { (eval echo "$as_me:4177: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4171: \$? = $ac_status" >&5 + echo "$as_me:4180: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -4181,7 +4190,7 @@ fi fi fi -echo "$as_me:4184: result: $ac_cv_header_stdc" >&5 +echo "$as_me:4193: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -4197,28 +4206,28 @@ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:4200: checking for $ac_header" >&5 +echo "$as_me:4209: 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 4206 "configure" +#line 4215 "configure" #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4212: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4221: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4215: \$? = $ac_status" >&5 + echo "$as_me:4224: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4218: \"$ac_try\"") >&5 + { (eval echo "$as_me:4227: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4221: \$? = $ac_status" >&5 + echo "$as_me:4230: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -4228,7 +4237,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4231: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4240: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:4250: 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 4247 "configure" +#line 4256 "configure" #include "confdefs.h" $ac_includes_default int @@ -4259,16 +4268,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4262: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4271: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4265: \$? = $ac_status" >&5 + echo "$as_me:4274: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4268: \"$ac_try\"") >&5 + { (eval echo "$as_me:4277: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4271: \$? = $ac_status" >&5 + echo "$as_me:4280: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_time_t=yes else @@ -4278,7 +4287,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4281: result: $ac_cv_type_time_t" >&5 +echo "$as_me:4290: 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 : @@ -4290,14 +4299,14 @@ fi -echo "$as_me:4293: checking for cc_t in or " >&5 +echo "$as_me:4302: checking for cc_t in or " >&5 echo $ECHO_N "checking for cc_t in or ... $ECHO_C" >&6 if test "${cf_cv_type_cc_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4300 "configure" +#line 4309 "configure" #include "confdefs.h" #include @@ -4317,16 +4326,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4320: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4329: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4323: \$? = $ac_status" >&5 + echo "$as_me:4332: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4326: \"$ac_try\"") >&5 + { (eval echo "$as_me:4335: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4329: \$? = $ac_status" >&5 + echo "$as_me:4338: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_cc_t=yes else @@ -4338,20 +4347,20 @@ fi -echo "$as_me:4341: result: $cf_cv_type_cc_t" >&5 +echo "$as_me:4350: result: $cf_cv_type_cc_t" >&5 echo "${ECHO_T}$cf_cv_type_cc_t" >&6 test $cf_cv_type_cc_t = no && cat >>confdefs.h <<\EOF #define cc_t unsigned char EOF -echo "$as_me:4348: checking for mode_t" >&5 +echo "$as_me:4357: checking for mode_t" >&5 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 if test "${ac_cv_type_mode_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4354 "configure" +#line 4363 "configure" #include "confdefs.h" $ac_includes_default int @@ -4366,16 +4375,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4369: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4378: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4372: \$? = $ac_status" >&5 + echo "$as_me:4381: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4375: \"$ac_try\"") >&5 + { (eval echo "$as_me:4384: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4378: \$? = $ac_status" >&5 + echo "$as_me:4387: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_mode_t=yes else @@ -4385,7 +4394,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4388: result: $ac_cv_type_mode_t" >&5 +echo "$as_me:4397: result: $ac_cv_type_mode_t" >&5 echo "${ECHO_T}$ac_cv_type_mode_t" >&6 if test $ac_cv_type_mode_t = yes; then : @@ -4397,13 +4406,13 @@ fi -echo "$as_me:4400: checking for pid_t" >&5 +echo "$as_me:4409: 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 4406 "configure" +#line 4415 "configure" #include "confdefs.h" $ac_includes_default int @@ -4418,16 +4427,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4421: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4430: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4424: \$? = $ac_status" >&5 + echo "$as_me:4433: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4427: \"$ac_try\"") >&5 + { (eval echo "$as_me:4436: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4430: \$? = $ac_status" >&5 + echo "$as_me:4439: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else @@ -4437,7 +4446,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4440: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:4449: 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 : @@ -4449,13 +4458,13 @@ fi -echo "$as_me:4452: checking for uid_t in sys/types.h" >&5 +echo "$as_me:4461: 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 4458 "configure" +#line 4467 "configure" #include "confdefs.h" #include @@ -4469,7 +4478,7 @@ rm -rf conftest* fi -echo "$as_me:4472: result: $ac_cv_type_uid_t" >&5 +echo "$as_me:4481: 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 @@ -4483,13 +4492,13 @@ fi -echo "$as_me:4486: checking for off_t" >&5 +echo "$as_me:4495: checking for off_t" >&5 echo $ECHO_N "checking for off_t... $ECHO_C" >&6 if test "${ac_cv_type_off_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4492 "configure" +#line 4501 "configure" #include "confdefs.h" $ac_includes_default int @@ -4504,16 +4513,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4507: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4516: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4510: \$? = $ac_status" >&5 + echo "$as_me:4519: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4513: \"$ac_try\"") >&5 + { (eval echo "$as_me:4522: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4516: \$? = $ac_status" >&5 + echo "$as_me:4525: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_off_t=yes else @@ -4523,7 +4532,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4526: result: $ac_cv_type_off_t" >&5 +echo "$as_me:4535: result: $ac_cv_type_off_t" >&5 echo "${ECHO_T}$ac_cv_type_off_t" >&6 if test $ac_cv_type_off_t = yes; then : @@ -4551,13 +4560,13 @@ wcwidth do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:4554: checking for $ac_func" >&5 +echo "$as_me:4563: 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 4560 "configure" +#line 4569 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -4588,16 +4597,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4591: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4600: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4594: \$? = $ac_status" >&5 + echo "$as_me:4603: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4597: \"$ac_try\"") >&5 + { (eval echo "$as_me:4606: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4600: \$? = $ac_status" >&5 + echo "$as_me:4609: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -4607,7 +4616,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4610: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:4619: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:4632: 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 4629 "configure" +#line 4638 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:4633: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4642: \"$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:4639: \$? = $ac_status" >&5 + echo "$as_me:4648: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4655,7 +4664,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:4658: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4667: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:4677: checking for lastlog path" >&5 echo $ECHO_N "checking for lastlog path... $ECHO_C" >&6 if test "${cf_cv_path_lastlog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4675 "configure" +#line 4684 "configure" #include "confdefs.h" #include @@ -4692,16 +4701,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4695: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4704: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4698: \$? = $ac_status" >&5 + echo "$as_me:4707: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4701: \"$ac_try\"") >&5 + { (eval echo "$as_me:4710: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4704: \$? = $ac_status" >&5 + echo "$as_me:4713: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_path_lastlog="_PATH_LASTLOG" else @@ -4716,14 +4725,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4719: result: $cf_cv_path_lastlog" >&5 +echo "$as_me:4728: result: $cf_cv_path_lastlog" >&5 echo "${ECHO_T}$cf_cv_path_lastlog" >&6 test $cf_cv_path_lastlog != no && cat >>confdefs.h <<\EOF #define USE_LASTLOG 1 EOF -echo "$as_me:4726: checking for utmp implementation" >&5 +echo "$as_me:4735: checking for utmp implementation" >&5 echo $ECHO_N "checking for utmp implementation... $ECHO_C" >&6 if test "${cf_cv_have_utmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4740,7 +4749,7 @@ #endif " cat >conftest.$ac_ext <<_ACEOF -#line 4743 "configure" +#line 4752 "configure" #include "confdefs.h" $cf_utmp_includes int @@ -4754,16 +4763,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4757: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4766: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4760: \$? = $ac_status" >&5 + echo "$as_me:4769: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4763: \"$ac_try\"") >&5 + { (eval echo "$as_me:4772: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4766: \$? = $ac_status" >&5 + echo "$as_me:4775: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp=$cf_header break @@ -4772,7 +4781,7 @@ cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 4775 "configure" +#line 4784 "configure" #include "confdefs.h" $cf_utmp_includes int @@ -4786,16 +4795,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4789: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4798: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4792: \$? = $ac_status" >&5 + echo "$as_me:4801: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4795: \"$ac_try\"") >&5 + { (eval echo "$as_me:4804: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4798: \$? = $ac_status" >&5 + echo "$as_me:4807: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp=$cf_header break @@ -4810,7 +4819,7 @@ done fi -echo "$as_me:4813: result: $cf_cv_have_utmp" >&5 +echo "$as_me:4822: result: $cf_cv_have_utmp" >&5 echo "${ECHO_T}$cf_cv_have_utmp" >&6 if test $cf_cv_have_utmp != no ; then @@ -4825,14 +4834,14 @@ EOF if test $cf_cv_have_utmp != no ; then -echo "$as_me:4828: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5 +echo "$as_me:4837: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_host is declared... $ECHO_C" >&6 if test "${cf_cv_have_utmp_ut_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4835 "configure" +#line 4844 "configure" #include "confdefs.h" #include @@ -4846,16 +4855,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4849: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4858: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4852: \$? = $ac_status" >&5 + echo "$as_me:4861: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4855: \"$ac_try\"") >&5 + { (eval echo "$as_me:4864: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4858: \$? = $ac_status" >&5 + echo "$as_me:4867: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp_ut_host=yes else @@ -4867,7 +4876,7 @@ fi -echo "$as_me:4870: result: $cf_cv_have_utmp_ut_host" >&5 +echo "$as_me:4879: result: $cf_cv_have_utmp_ut_host" >&5 echo "${ECHO_T}$cf_cv_have_utmp_ut_host" >&6 test $cf_cv_have_utmp_ut_host != no && cat >>confdefs.h <<\EOF @@ -4877,14 +4886,14 @@ fi if test $cf_cv_have_utmp != no ; then -echo "$as_me:4880: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5 +echo "$as_me:4889: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_syslen is declared... $ECHO_C" >&6 if test "${cf_cv_have_utmp_ut_syslen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4887 "configure" +#line 4896 "configure" #include "confdefs.h" #include @@ -4898,16 +4907,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4901: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4910: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4904: \$? = $ac_status" >&5 + echo "$as_me:4913: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4907: \"$ac_try\"") >&5 + { (eval echo "$as_me:4916: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4910: \$? = $ac_status" >&5 + echo "$as_me:4919: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp_ut_syslen=yes else @@ -4919,7 +4928,7 @@ fi -echo "$as_me:4922: result: $cf_cv_have_utmp_ut_syslen" >&5 +echo "$as_me:4931: result: $cf_cv_have_utmp_ut_syslen" >&5 echo "${ECHO_T}$cf_cv_have_utmp_ut_syslen" >&6 test $cf_cv_have_utmp_ut_syslen != no && cat >>confdefs.h <<\EOF @@ -4929,7 +4938,7 @@ fi if test $cf_cv_have_utmp != no ; then -echo "$as_me:4932: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5 +echo "$as_me:4941: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_name is declared... $ECHO_C" >&6 if test "${cf_cv_have_utmp_ut_name+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4946,7 +4955,7 @@ " for cf_header in ut_name ut_user ; do cat >conftest.$ac_ext <<_ACEOF -#line 4949 "configure" +#line 4958 "configure" #include "confdefs.h" $cf_utmp_includes int @@ -4960,16 +4969,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4963: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4972: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4966: \$? = $ac_status" >&5 + echo "$as_me:4975: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4969: \"$ac_try\"") >&5 + { (eval echo "$as_me:4978: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4972: \$? = $ac_status" >&5 + echo "$as_me:4981: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp_ut_name=$cf_header break @@ -4981,12 +4990,12 @@ done fi -echo "$as_me:4984: result: $cf_cv_have_utmp_ut_name" >&5 +echo "$as_me:4993: result: $cf_cv_have_utmp_ut_name" >&5 echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6 case $cf_cv_have_utmp_ut_name in #(vi no) #(vi - { { echo "$as_me:4989: error: Cannot find declaration for ut.ut_name" >&5 + { { echo "$as_me:4998: error: Cannot find declaration for ut.ut_name" >&5 echo "$as_me: error: Cannot find declaration for ut.ut_name" >&2;} { (exit 1); exit 1; }; } ;; @@ -5001,7 +5010,7 @@ fi if test $cf_cv_have_utmp != no ; then -echo "$as_me:5004: checking for exit-status in $cf_cv_have_utmp" >&5 +echo "$as_me:5013: checking for exit-status in $cf_cv_have_utmp" >&5 echo $ECHO_N "checking for exit-status in $cf_cv_have_utmp... $ECHO_C" >&6 if test "${cf_cv_have_utmp_ut_xstatus+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5014,7 +5023,7 @@ ut_exit.ut_exit do cat >conftest.$ac_ext <<_ACEOF -#line 5017 "configure" +#line 5026 "configure" #include "confdefs.h" #include @@ -5028,16 +5037,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5031: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5040: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5034: \$? = $ac_status" >&5 + echo "$as_me:5043: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5037: \"$ac_try\"") >&5 + { (eval echo "$as_me:5046: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5040: \$? = $ac_status" >&5 + echo "$as_me:5049: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp_ut_xstatus=$cf_result break @@ -5050,7 +5059,7 @@ done fi -echo "$as_me:5053: result: $cf_cv_have_utmp_ut_xstatus" >&5 +echo "$as_me:5062: result: $cf_cv_have_utmp_ut_xstatus" >&5 echo "${ECHO_T}$cf_cv_have_utmp_ut_xstatus" >&6 if test $cf_cv_have_utmp_ut_xstatus != no ; then @@ -5066,14 +5075,14 @@ fi if test $cf_cv_have_utmp != no ; then -echo "$as_me:5069: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5 +echo "$as_me:5078: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_xtime is declared... $ECHO_C" >&6 if test "${cf_cv_have_utmp_ut_xtime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5076 "configure" +#line 5085 "configure" #include "confdefs.h" #include @@ -5087,23 +5096,23 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5090: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5099: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5093: \$? = $ac_status" >&5 + echo "$as_me:5102: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5096: \"$ac_try\"") >&5 + { (eval echo "$as_me:5105: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5099: \$? = $ac_status" >&5 + echo "$as_me:5108: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp_ut_xtime=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line 5106 "configure" +#line 5115 "configure" #include "confdefs.h" #include @@ -5117,16 +5126,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5120: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5129: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5123: \$? = $ac_status" >&5 + echo "$as_me:5132: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5126: \"$ac_try\"") >&5 + { (eval echo "$as_me:5135: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5129: \$? = $ac_status" >&5 + echo "$as_me:5138: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp_ut_xtime=define else @@ -5140,7 +5149,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5143: result: $cf_cv_have_utmp_ut_xtime" >&5 +echo "$as_me:5152: result: $cf_cv_have_utmp_ut_xtime" >&5 echo "${ECHO_T}$cf_cv_have_utmp_ut_xtime" >&6 if test $cf_cv_have_utmp_ut_xtime != no ; then @@ -5159,14 +5168,14 @@ fi if test $cf_cv_have_utmp != no ; then -echo "$as_me:5162: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5 +echo "$as_me:5171: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_session is declared... $ECHO_C" >&6 if test "${cf_cv_have_utmp_ut_session+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5169 "configure" +#line 5178 "configure" #include "confdefs.h" #include @@ -5180,16 +5189,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5183: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5192: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5186: \$? = $ac_status" >&5 + echo "$as_me:5195: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5189: \"$ac_try\"") >&5 + { (eval echo "$as_me:5198: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5192: \$? = $ac_status" >&5 + echo "$as_me:5201: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utmp_ut_session=yes else @@ -5200,7 +5209,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5203: result: $cf_cv_have_utmp_ut_session" >&5 +echo "$as_me:5212: result: $cf_cv_have_utmp_ut_session" >&5 echo "${ECHO_T}$cf_cv_have_utmp_ut_session" >&6 if test $cf_cv_have_utmp_ut_session != no ; then @@ -5211,7 +5220,7 @@ fi fi -echo "$as_me:5214: checking if $cf_cv_have_utmp is SYSV flavor" >&5 +echo "$as_me:5223: checking if $cf_cv_have_utmp is SYSV flavor" >&5 echo $ECHO_N "checking if $cf_cv_have_utmp is SYSV flavor... $ECHO_C" >&6 if test "${cf_cv_sysv_utmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5219,7 +5228,7 @@ test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx" cat >conftest.$ac_ext <<_ACEOF -#line 5222 "configure" +#line 5231 "configure" #include "confdefs.h" #include @@ -5238,16 +5247,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5241: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5250: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5244: \$? = $ac_status" >&5 + echo "$as_me:5253: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5247: \"$ac_try\"") >&5 + { (eval echo "$as_me:5256: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5250: \$? = $ac_status" >&5 + echo "$as_me:5259: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sysv_utmp=yes else @@ -5258,7 +5267,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5261: result: $cf_cv_sysv_utmp" >&5 +echo "$as_me:5270: result: $cf_cv_sysv_utmp" >&5 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6 test $cf_cv_sysv_utmp = yes && cat >>confdefs.h <<\EOF @@ -5270,23 +5279,23 @@ for ac_header in lastlog.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5273: checking for $ac_header" >&5 +echo "$as_me:5282: 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 5279 "configure" +#line 5288 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5283: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5292: \"$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:5289: \$? = $ac_status" >&5 + echo "$as_me:5298: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5305,7 +5314,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5308: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:5317: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:5327: checking for struct lastlog" >&5 echo $ECHO_N "checking for struct lastlog... $ECHO_C" >&6 if test "${cf_cv_struct_lastlog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5326,7 +5335,7 @@ cf_cv_struct_lastlog=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 5329 "configure" +#line 5338 "configure" #include "confdefs.h" #include @@ -5340,15 +5349,15 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:5343: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5352: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5346: \$? = $ac_status" >&5 + echo "$as_me:5355: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5348: \"$ac_try\"") >&5 + { (eval echo "$as_me:5357: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5351: \$? = $ac_status" >&5 + echo "$as_me:5360: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_struct_lastlog=yes @@ -5362,7 +5371,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:5365: result: $cf_cv_struct_lastlog" >&5 +echo "$as_me:5374: result: $cf_cv_struct_lastlog" >&5 echo "${ECHO_T}$cf_cv_struct_lastlog" >&6 test $cf_cv_struct_lastlog != no && @@ -5375,23 +5384,23 @@ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5378: checking for $ac_header" >&5 +echo "$as_me:5387: 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 5384 "configure" +#line 5393 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5388: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5397: \"$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:5394: \$? = $ac_status" >&5 + echo "$as_me:5403: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5410,7 +5419,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5413: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:5422: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:5432: checking if POSIX saved-ids are supported" >&5 echo $ECHO_N "checking if POSIX saved-ids are supported... $ECHO_C" >&6 if test "${cf_cv_posix_saved_ids+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5430 "configure" +#line 5439 "configure" #include "confdefs.h" #include @@ -5455,16 +5464,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5458: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5467: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5461: \$? = $ac_status" >&5 + echo "$as_me:5470: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5464: \"$ac_try\"") >&5 + { (eval echo "$as_me:5473: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5467: \$? = $ac_status" >&5 + echo "$as_me:5476: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_saved_ids=yes @@ -5476,7 +5485,7 @@ cf_cv_posix_saved_ids=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 5479 "configure" +#line 5488 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -5491,15 +5500,15 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:5494: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5503: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5497: \$? = $ac_status" >&5 + echo "$as_me:5506: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5499: \"$ac_try\"") >&5 + { (eval echo "$as_me:5508: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5502: \$? = $ac_status" >&5 + echo "$as_me:5511: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_saved_ids=yes else @@ -5515,7 +5524,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5518: result: $cf_cv_posix_saved_ids" >&5 +echo "$as_me:5527: result: $cf_cv_posix_saved_ids" >&5 echo "${ECHO_T}$cf_cv_posix_saved_ids" >&6 test "$cf_cv_posix_saved_ids" = yes && @@ -5541,7 +5550,7 @@ fi test -z "$cf_TERMVAR" && cf_TERMVAR=vt100 -echo "$as_me:5544: checking if we want full tgetent function" >&5 +echo "$as_me:5553: checking if we want full tgetent function" >&5 echo $ECHO_N "checking if we want full tgetent function... $ECHO_C" >&6 # Check whether --enable-full-tgetent or --disable-full-tgetent was given. @@ -5558,7 +5567,7 @@ cf_full_tgetent=yes fi; -echo "$as_me:5561: result: $cf_full_tgetent" >&5 +echo "$as_me:5570: result: $cf_full_tgetent" >&5 echo "${ECHO_T}$cf_full_tgetent" >&6 if test "$cf_full_tgetent" = yes ; then @@ -5567,7 +5576,7 @@ cf_test_message="tgetent" fi -echo "$as_me:5570: checking for $cf_test_message function" >&5 +echo "$as_me:5579: checking for $cf_test_message function" >&5 echo $ECHO_N "checking for $cf_test_message function... $ECHO_C" >&6 if test "${cf_cv_lib_tgetent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5589,7 +5598,7 @@ echo "cross-compiling, cannot verify if a termcap/tgetent is present in $cf_termlib" 1>&5 else cat >conftest.$ac_ext <<_ACEOF -#line 5592 "configure" +#line 5601 "configure" #include "confdefs.h" /* terminfo implementations ignore the buffer argument, making it useless for @@ -5604,15 +5613,15 @@ ${cf_cv_main_return:-return} ($cf_TERMTST); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:5607: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5616: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5610: \$? = $ac_status" >&5 + echo "$as_me:5619: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:5612: \"$ac_try\"") >&5 + { (eval echo "$as_me:5621: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5615: \$? = $ac_status" >&5 + echo "$as_me:5624: \$? = $ac_status" >&5 (exit $ac_status); }; }; then echo "yes, there is a termcap/tgetent in $cf_termlib" 1>&5 if test -n "$cf_termlib" ; then @@ -5633,7 +5642,7 @@ LIBS="$cf_save_LIBS" fi -echo "$as_me:5636: result: $cf_cv_lib_tgetent" >&5 +echo "$as_me:5645: result: $cf_cv_lib_tgetent" >&5 echo "${ECHO_T}$cf_cv_lib_tgetent" >&6 # If we found a working tgetent(), set LIBS and check for termcap.h. @@ -5649,7 +5658,7 @@ if test "$cf_full_tgetent" = no ; then cat >conftest.$ac_ext <<_ACEOF -#line 5652 "configure" +#line 5661 "configure" #include "confdefs.h" #include @@ -5665,16 +5674,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5668: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:5677: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5671: \$? = $ac_status" >&5 + echo "$as_me:5680: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5674: \"$ac_try\"") >&5 + { (eval echo "$as_me:5683: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5677: \$? = $ac_status" >&5 + echo "$as_me:5686: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cat >>confdefs.h <<\EOF #define HAVE_TERMCAP_H 1 @@ -5690,23 +5699,23 @@ for ac_header in termcap.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5693: checking for $ac_header" >&5 +echo "$as_me:5702: 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 5699 "configure" +#line 5708 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5703: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5712: \"$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:5709: \$? = $ac_status" >&5 + echo "$as_me:5718: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5725,7 +5734,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5728: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:5737: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 + echo "$as_me:5754: checking for partial tgetent function" >&5 echo $ECHO_N "checking for partial tgetent function... $ECHO_C" >&6 if test "${cf_cv_lib_part_tgetent+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5752,7 +5761,7 @@ for cf_termlib in $cf_TERMLIB ; do LIBS="$cf_save_LIBS -l$cf_termlib" cat >conftest.$ac_ext <<_ACEOF -#line 5755 "configure" +#line 5764 "configure" #include "confdefs.h" int @@ -5764,16 +5773,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5767: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5776: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5770: \$? = $ac_status" >&5 + echo "$as_me:5779: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5773: \"$ac_try\"") >&5 + { (eval echo "$as_me:5782: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5776: \$? = $ac_status" >&5 + echo "$as_me:5785: \$? = $ac_status" >&5 (exit $ac_status); }; }; then echo "there is a terminfo/tgetent in $cf_termlib" 1>&5 cf_cv_lib_part_tgetent="-l$cf_termlib" @@ -5787,7 +5796,7 @@ LIBS="$cf_save_LIBS" fi -echo "$as_me:5790: result: $cf_cv_lib_part_tgetent" >&5 +echo "$as_me:5799: result: $cf_cv_lib_part_tgetent" >&5 echo "${ECHO_T}$cf_cv_lib_part_tgetent" >&6 if test "$cf_cv_lib_part_tgetent" != no ; then @@ -5796,23 +5805,23 @@ for ac_header in termcap.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:5799: checking for $ac_header" >&5 +echo "$as_me:5808: 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 5805 "configure" +#line 5814 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:5809: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5818: \"$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:5815: \$? = $ac_status" >&5 + echo "$as_me:5824: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5831,7 +5840,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:5834: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:5843: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:5863: checking for X applications class" >&5 echo $ECHO_N "checking for X applications class... $ECHO_C" >&6 # Check whether --with-app-class or --without-app-class was given. @@ -5864,23 +5873,23 @@ case x$APP_CLASS in #(vi *[/@,%]*) #(vi - { echo "$as_me:5867: WARNING: X applications class cannot contain punctuation" >&5 + { echo "$as_me:5876: WARNING: X applications class cannot contain punctuation" >&5 echo "$as_me: WARNING: X applications class cannot contain punctuation" >&2;} APP_CLASS=XTerm ;; x[A-Z]*) #(vi ;; *) - { echo "$as_me:5874: WARNING: X applications class must start with capital, ignoring $APP_CLASS" >&5 + { echo "$as_me:5883: WARNING: X applications class must start with capital, ignoring $APP_CLASS" >&5 echo "$as_me: WARNING: X applications class must start with capital, ignoring $APP_CLASS" >&2;} APP_CLASS=XTerm ;; esac -echo "$as_me:5880: result: $APP_CLASS" >&5 +echo "$as_me:5889: result: $APP_CLASS" >&5 echo "${ECHO_T}$APP_CLASS" >&6 -echo "$as_me:5883: checking for directory to install resource files" >&5 +echo "$as_me:5892: checking for directory to install resource files" >&5 echo $ECHO_N "checking for directory to install resource files... $ECHO_C" >&6 # Check whether --with-app-defaults or --without-app-defaults was given. @@ -5942,7 +5951,7 @@ cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:5945: error: expected a pathname, not \"$cf_path\"" >&5 + { { echo "$as_me:5954: error: expected a pathname, not \"$cf_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -5950,7 +5959,7 @@ fi -echo "$as_me:5953: result: $APPSDIR" >&5 +echo "$as_me:5962: result: $APPSDIR" >&5 echo "${ECHO_T}$APPSDIR" >&6 no_appsdir= @@ -5961,7 +5970,7 @@ EXTRA_INSTALL_DIRS="$EXTRA_INSTALL_DIRS \$(APPSDIR)" fi -echo "$as_me:5964: checking for the icon name" >&5 +echo "$as_me:5973: checking for the icon name" >&5 echo $ECHO_N "checking for the icon name... $ECHO_C" >&6 # Check whether --with-icon-name or --without-icon-name was given. @@ -5976,10 +5985,33 @@ ICON_NAME=xterm-color ;; esac -echo "$as_me:5979: result: $ICON_NAME" >&5 + +echo "$as_me:5989: result: $ICON_NAME" >&5 echo "${ECHO_T}$ICON_NAME" >&6 -echo "$as_me:5982: checking for directory to install pixmaps" >&5 +echo "$as_me:5992: checking for icon symlink to use" >&5 +echo $ECHO_N "checking for icon symlink to use... $ECHO_C" >&6 + +# Check whether --with-icon-symlink or --without-icon-symlink was given. +if test "${with_icon_symlink+set}" = set; then + withval="$with_icon_symlink" + ICON_SYMLINK="$withval" +else + ICON_SYMLINK=NONE +fi; +case "x$ICON_SYMLINK" in +xyes) + ICON_SYMLINK=xterm + ;; +xno|x) + ICON_SYMLINK=NONE + ;; +esac + +echo "$as_me:6011: result: $ICON_SYMLINK" >&5 +echo "${ECHO_T}$ICON_SYMLINK" >&6 + +echo "$as_me:6014: checking for directory to install pixmaps" >&5 echo $ECHO_N "checking for directory to install pixmaps... $ECHO_C" >&6 # Check whether --with-pixmapdir or --without-pixmapdir was given. @@ -6030,14 +6062,14 @@ cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:6033: error: expected a pathname, not \"$cf_path\"" >&5 + { { echo "$as_me:6065: error: expected a pathname, not \"$cf_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} { (exit 1); exit 1; }; } ;; esac fi -echo "$as_me:6040: result: $PIXMAPDIR" >&5 +echo "$as_me:6072: result: $PIXMAPDIR" >&5 echo "${ECHO_T}$PIXMAPDIR" >&6 no_pixmapdir= @@ -6048,7 +6080,7 @@ EXTRA_INSTALL_DIRS="$EXTRA_INSTALL_DIRS \$(PIXMAPDIR)" fi -echo "$as_me:6051: checking for directory to install icons" >&5 +echo "$as_me:6083: checking for directory to install icons" >&5 echo $ECHO_N "checking for directory to install icons... $ECHO_C" >&6 # Check whether --with-icondir or --without-icondir was given. @@ -6099,14 +6131,14 @@ cf_path=`echo $cf_path | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:6102: error: expected a pathname, not \"$cf_path\"" >&5 + { { echo "$as_me:6134: error: expected a pathname, not \"$cf_path\"" >&5 echo "$as_me: error: expected a pathname, not \"$cf_path\"" >&2;} { (exit 1); exit 1; }; } ;; esac fi -echo "$as_me:6109: result: $ICONDIR" >&5 +echo "$as_me:6141: result: $ICONDIR" >&5 echo "${ECHO_T}$ICONDIR" >&6 no_icondir= @@ -6117,7 +6149,7 @@ EXTRA_INSTALL_DIRS="$EXTRA_INSTALL_DIRS \$(ICONDIR)" fi -echo "$as_me:6120: checking if icon theme should be used" >&5 +echo "$as_me:6152: checking if icon theme should be used" >&5 echo $ECHO_N "checking if icon theme should be used... $ECHO_C" >&6 # Check whether --with-icon-theme or --without-icon-theme was given. @@ -6135,21 +6167,23 @@ ICON_THEME=hicolor ;; esac -echo "$as_me:6138: result: $ICON_THEME" >&5 +echo "$as_me:6170: result: $ICON_THEME" >&5 echo "${ECHO_T}$ICON_THEME" >&6 if test "x$ICON_THEME" = xno then if test "x$ICONDIR" != xno then - { echo "$as_me:6145: WARNING: ignoring icondir without theme" >&5 -echo "$as_me: WARNING: ignoring icondir without theme" >&2;} + test -n "$verbose" && echo " ignoring icondir without theme" 1>&6 + +echo "${as_me:-configure}:6179: testing ignoring icondir without theme ..." 1>&5 + no_icondir="#" fi else if test "x$ICONDIR" = xno then - { { echo "$as_me:6152: error: icondir must be set for icon theme" >&5 + { { echo "$as_me:6186: error: icondir must be set for icon theme" >&5 echo "$as_me: error: icondir must be set for icon theme" >&2;} { (exit 1); exit 1; }; } fi @@ -6167,13 +6201,13 @@ cf_icon_list="icons/${ICON_NAME}_48x48" fi -echo "$as_me:6170: checking for icon(s) to install" >&5 +echo "$as_me:6204: checking for icon(s) to install" >&5 echo $ECHO_N "checking for icon(s) to install... $ECHO_C" >&6 for cf_name in $cf_icon_list do test -n "$verbose" && echo " using $ICON_FORMAT" 1>&6 -echo "${as_me:-configure}:6176: testing using $ICON_FORMAT ..." 1>&5 +echo "${as_me:-configure}:6210: testing using $ICON_FORMAT ..." 1>&5 for cf_suffix in $ICON_FORMAT do @@ -6206,7 +6240,7 @@ cf_size=`file "$cf_left"|sed -e 's/^[^:]*://' -e 's/^.*[^0-9]\([0-9][0-9]* x [0-9][0-9]*\)[^0-9].*$/\1/' -e 's/ //g'` if test -z "$cf_size" then - { echo "$as_me:6209: WARNING: cannot determine size of $cf_left" >&5 + { echo "$as_me:6243: WARNING: cannot determine size of $cf_left" >&5 echo "$as_me: WARNING: cannot determine size of $cf_left" >&2;} continue fi @@ -6218,7 +6252,7 @@ *.xpm) test -n "$verbose" && echo " ignored XPM file in icon theme" 1>&6 -echo "${as_me:-configure}:6221: testing ignored XPM file in icon theme ..." 1>&5 +echo "${as_me:-configure}:6255: testing ignored XPM file in icon theme ..." 1>&5 continue ;; @@ -6230,7 +6264,7 @@ esac test -n "$verbose" && echo " adding $cf_next" 1>&6 -echo "${as_me:-configure}:6233: testing adding $cf_next ..." 1>&5 +echo "${as_me:-configure}:6267: testing adding $cf_next ..." 1>&5 cf_icon="${cf_icon}:${cf_next}" fi @@ -6245,26 +6279,26 @@ if test -n "$verbose" then - echo "$as_me:6248: checking result" >&5 + echo "$as_me:6282: checking result" >&5 echo $ECHO_N "checking result... $ECHO_C" >&6 fi -echo "$as_me:6251: result: $ICON_LIST" >&5 +echo "$as_me:6285: result: $ICON_LIST" >&5 echo "${ECHO_T}$ICON_LIST" >&6 if test -z "$ICON_LIST" then - { { echo "$as_me:6256: error: no icons found" >&5 + { { echo "$as_me:6290: error: no icons found" >&5 echo "$as_me: error: no icons found" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:6261: checking for icon name" >&5 +echo "$as_me:6295: checking for icon name" >&5 echo $ECHO_N "checking for icon name... $ECHO_C" >&6 -echo "$as_me:6263: result: $ICON_NAME" >&5 +echo "$as_me:6297: result: $ICON_NAME" >&5 echo "${ECHO_T}$ICON_NAME" >&6 # Comment-out the install-desktop rule if the desktop-utils are not found. -echo "$as_me:6267: checking if you want to install desktop files" >&5 +echo "$as_me:6301: checking if you want to install desktop files" >&5 echo $ECHO_N "checking if you want to install desktop files... $ECHO_C" >&6 # Check whether --enable-desktop or --disable-desktop was given. @@ -6281,14 +6315,14 @@ enable_desktop=$enableval fi; -echo "$as_me:6284: result: $enable_desktop" >&5 +echo "$as_me:6318: result: $enable_desktop" >&5 echo "${ECHO_T}$enable_desktop" >&6 desktop_utils= if test "$enable_desktop" = yes ; then # Extract the first word of "desktop-file-install", so it can be a program name with args. set dummy desktop-file-install; ac_word=$2 -echo "$as_me:6291: checking for $ac_word" >&5 +echo "$as_me:6325: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_desktop_utils+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6303,7 +6337,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_desktop_utils="yes" -echo "$as_me:6306: found $ac_dir/$ac_word" >&5 +echo "$as_me:6340: found $ac_dir/$ac_word" >&5 break done @@ -6312,10 +6346,10 @@ fi desktop_utils=$ac_cv_prog_desktop_utils if test -n "$desktop_utils"; then - echo "$as_me:6315: result: $desktop_utils" >&5 + echo "$as_me:6349: result: $desktop_utils" >&5 echo "${ECHO_T}$desktop_utils" >&6 else - echo "$as_me:6318: result: no" >&5 + echo "$as_me:6352: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6325,7 +6359,7 @@ if test -z "$desktop_utils" then - echo "$as_me:6328: checking for requested desktop-category" >&5 + echo "$as_me:6362: checking for requested desktop-category" >&5 echo $ECHO_N "checking for requested desktop-category... $ECHO_C" >&6 # Check whether --with-desktop-category or --without-desktop-category was given. @@ -6335,7 +6369,7 @@ else cf_desktop_want=auto fi; - echo "$as_me:6338: result: $cf_desktop_want" >&5 + echo "$as_me:6372: result: $cf_desktop_want" >&5 echo "${ECHO_T}$cf_desktop_want" >&6 if test "$cf_desktop_want" = auto @@ -6358,7 +6392,7 @@ xterm|*-xterm|*rxvt*|konsole|*-terminal) test -n "$verbose" && echo " inspect $cf_desktop_path" 1>&6 -echo "${as_me:-configure}:6361: testing inspect $cf_desktop_path ..." 1>&5 +echo "${as_me:-configure}:6395: testing inspect $cf_desktop_path ..." 1>&5 egrep '^Categories=' $cf_desktop_path | \ tr ';' '\n' | \ @@ -6387,15 +6421,36 @@ done cf_desktop_want=`cat conftest.2 | tr '\n' ';'` fi + if test -n "$cf_desktop_want" + then + if test "$cf_desktop_want" = auto + then + cf_desktop_want= + else + # do a sanity check on the semicolon-separated list, ignore on failure + cf_desktop_test=`echo "$cf_desktop_want" | sed -e 's/[^;]//g'` + test -z "$cf_desktop_test" && cf_desktop_want= + cf_desktop_test=`echo "$cf_desktop_want" | sed -e 's/^.*;$/./g'` + test -z "$cf_desktop_test" && cf_desktop_want= + fi + fi + if test -z "$cf_desktop_want" + then + cf_desktop_want="`echo "System|TerminalEmulator|Utility|*" | sed -e 's/\*//g' -e 's/|/;/g' -e 's/;*$/;/g'`" + test -n "$verbose" && echo " no usable value found for desktop category" 1>&6 + +echo "${as_me:-configure}:6442: testing no usable value found for desktop category ..." 1>&5 + + fi fi DESKTOP_CATEGORY=`echo "$cf_desktop_want" | sed -e 's/[ ,]/;/g'` - test -n "$verbose" && echo " resulting category=$DESKTOP_CATEGORY" 1>&6 + test -n "$verbose" && echo " will use Categories=$DESKTOP_CATEGORY" 1>&6 -echo "${as_me:-configure}:6394: testing resulting category=$DESKTOP_CATEGORY ..." 1>&5 +echo "${as_me:-configure}:6449: testing will use Categories=$DESKTOP_CATEGORY ..." 1>&5 fi -echo "$as_me:6398: checking for install-permissions reference" >&5 +echo "$as_me:6453: checking for install-permissions reference" >&5 echo $ECHO_N "checking for install-permissions reference... $ECHO_C" >&6 # Check whether --with-reference or --without-reference was given. @@ -6405,19 +6460,19 @@ else with_reference=xterm fi; -echo "$as_me:6408: result: $with_reference" >&5 +echo "$as_me:6463: result: $with_reference" >&5 echo "${ECHO_T}$with_reference" >&6 with_full_paths=yes - echo "$as_me:6413: checking for PATH separator" >&5 + echo "$as_me:6468: checking for PATH separator" >&5 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6 case $cf_cv_system_name in os2*) PATH_SEPARATOR=';' ;; *) ${PATH_SEPARATOR:=':'} ;; esac - echo "$as_me:6420: result: $PATH_SEPARATOR" >&5 + echo "$as_me:6475: result: $PATH_SEPARATOR" >&5 echo "${ECHO_T}$PATH_SEPARATOR" >&6 test -z "$XTERM_PATH" && XTERM_PATH=$with_reference @@ -6425,7 +6480,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:6428: checking for $ac_word" >&5 +echo "$as_me:6483: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_XTERM_PATH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6442,7 +6497,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_XTERM_PATH="$ac_dir/$ac_word" - echo "$as_me:6445: found $ac_dir/$ac_word" >&5 + echo "$as_me:6500: found $ac_dir/$ac_word" >&5 break fi done @@ -6453,10 +6508,10 @@ XTERM_PATH=$ac_cv_path_XTERM_PATH if test -n "$XTERM_PATH"; then - echo "$as_me:6456: result: $XTERM_PATH" >&5 + echo "$as_me:6511: result: $XTERM_PATH" >&5 echo "${ECHO_T}$XTERM_PATH" >&6 else - echo "$as_me:6459: result: no" >&5 + echo "$as_me:6514: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6515,7 +6570,7 @@ if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:6518: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:6573: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:6594: checking for symbolic link to create to $cf_name" >&5 echo $ECHO_N "checking for symbolic link to create to $cf_name... $ECHO_C" >&6 # Check whether --with-xterm-symlink or --without-xterm-symlink was given. @@ -6546,7 +6601,7 @@ else with_symlink=xterm fi; -echo "$as_me:6549: result: $with_symlink" >&5 +echo "$as_me:6604: result: $with_symlink" >&5 echo "${ECHO_T}$with_symlink" >&6 test "$with_symlink" = yes && with_symlink=xterm test -n "$with_symlink" && \ @@ -6555,7 +6610,27 @@ XTERM_SYMLINK="$with_symlink" fi -echo "$as_me:6558: checking if you want to disable setuid" >&5 +echo "$as_me:6613: checking if you want to disable openpty" >&5 +echo $ECHO_N "checking if you want to disable openpty... $ECHO_C" >&6 + +# Check whether --enable-openpty or --disable-openpty was given. +if test "${enable_openpty+set}" = set; then + enableval="$enable_openpty" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + disable_openpty=yes + else + disable_openpty=no + fi +else + enableval=yes + disable_openpty=no + +fi; +echo "$as_me:6630: result: $disable_openpty" >&5 +echo "${ECHO_T}$disable_openpty" >&6 + +echo "$as_me:6633: checking if you want to disable setuid" >&5 echo $ECHO_N "checking if you want to disable setuid... $ECHO_C" >&6 # Check whether --enable-setuid or --disable-setuid was given. @@ -6572,10 +6647,10 @@ disable_setuid=no fi; -echo "$as_me:6575: result: $disable_setuid" >&5 +echo "$as_me:6650: result: $disable_setuid" >&5 echo "${ECHO_T}$disable_setuid" >&6 -echo "$as_me:6578: checking if you want to disable setgid" >&5 +echo "$as_me:6653: checking if you want to disable setgid" >&5 echo $ECHO_N "checking if you want to disable setgid... $ECHO_C" >&6 # Check whether --enable-setgid or --disable-setgid was given. @@ -6592,10 +6667,10 @@ disable_setgid=no fi; -echo "$as_me:6595: result: $disable_setgid" >&5 +echo "$as_me:6670: result: $disable_setgid" >&5 echo "${ECHO_T}$disable_setgid" >&6 -echo "$as_me:6598: checking if you want to run xterm setuid to a given user" >&5 +echo "$as_me:6673: checking if you want to run xterm setuid to a given user" >&5 echo $ECHO_N "checking if you want to run xterm setuid to a given user... $ECHO_C" >&6 # Check whether --with-setuid or --without-setuid was given. @@ -6605,7 +6680,7 @@ else use_given_setuid=no fi; -echo "$as_me:6608: result: $use_given_setuid" >&5 +echo "$as_me:6683: result: $use_given_setuid" >&5 echo "${ECHO_T}$use_given_setuid" >&6 if test "$use_given_setuid" != no ; then @@ -6618,7 +6693,7 @@ SINSTALL_OPTS="$SINSTALL_OPTS u+s -u $cf_cv_given_setuid" fi -echo "$as_me:6621: checking if you want to run xterm setgid to match utmp/utmpx file" >&5 +echo "$as_me:6696: checking if you want to run xterm setgid to match utmp/utmpx file" >&5 echo $ECHO_N "checking if you want to run xterm setgid to match utmp/utmpx file... $ECHO_C" >&6 # Check whether --with-utmp-setgid or --without-utmp-setgid was given. @@ -6628,14 +6703,14 @@ else use_utmp_setgid=no fi; -echo "$as_me:6631: result: $use_utmp_setgid" >&5 +echo "$as_me:6706: result: $use_utmp_setgid" >&5 echo "${ECHO_T}$use_utmp_setgid" >&6 if test "$use_utmp_setgid" != no ; then if test "$use_utmp_setgid" = yes ; then if test $cf_cv_have_utmp != no ; then -echo "$as_me:6638: checking for utmp/utmpx group" >&5 +echo "$as_me:6713: checking for utmp/utmpx group" >&5 echo $ECHO_N "checking for utmp/utmpx group... $ECHO_C" >&6 if test "${cf_cv_utmp_group+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6677,10 +6752,10 @@ done fi -echo "$as_me:6680: result: $cf_cv_utmp_group" >&5 +echo "$as_me:6755: result: $cf_cv_utmp_group" >&5 echo "${ECHO_T}$cf_cv_utmp_group" >&6 else - { { echo "$as_me:6683: error: cannot find utmp group" >&5 + { { echo "$as_me:6758: error: cannot find utmp group" >&5 echo "$as_me: error: cannot find utmp group" >&2;} { (exit 1); exit 1; }; } fi @@ -6689,7 +6764,7 @@ cf_cv_utmp_group=$use_utmp_setgid fi if test "$cf_cv_posix_saved_ids" != yes ; then - { { echo "$as_me:6692: error: Your system does not support POSIX saved-ids" >&5 + { { echo "$as_me:6767: error: Your system does not support POSIX saved-ids" >&5 echo "$as_me: error: Your system does not support POSIX saved-ids" >&2;} { (exit 1); exit 1; }; } fi @@ -6701,7 +6776,7 @@ SINSTALL_OPTS="$SINSTALL_OPTS g+s -g $cf_cv_utmp_group" fi -echo "$as_me:6704: checking if you want to link with utempter" >&5 +echo "$as_me:6779: checking if you want to link with utempter" >&5 echo $ECHO_N "checking if you want to link with utempter... $ECHO_C" >&6 # Check whether --with-utempter or --without-utempter was given. @@ -6711,12 +6786,12 @@ else use_utempter=no fi; -echo "$as_me:6714: result: $use_utempter" >&5 +echo "$as_me:6789: result: $use_utempter" >&5 echo "${ECHO_T}$use_utempter" >&6 if test "$use_utempter" = yes ; then -echo "$as_me:6719: checking if we can link with utempter library" >&5 +echo "$as_me:6794: checking if we can link with utempter library" >&5 echo $ECHO_N "checking if we can link with utempter library... $ECHO_C" >&6 if test "${cf_cv_have_utempter+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6725,7 +6800,7 @@ cf_save_LIBS="$LIBS" LIBS="-lutempter $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6728 "configure" +#line 6803 "configure" #include "confdefs.h" #include @@ -6742,16 +6817,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6745: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6820: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6748: \$? = $ac_status" >&5 + echo "$as_me:6823: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6751: \"$ac_try\"") >&5 + { (eval echo "$as_me:6826: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6754: \$? = $ac_status" >&5 + echo "$as_me:6829: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_utempter=yes @@ -6765,7 +6840,7 @@ LIBS="$cf_save_LIBS" fi -echo "$as_me:6768: result: $cf_cv_have_utempter" >&5 +echo "$as_me:6843: result: $cf_cv_have_utempter" >&5 echo "${ECHO_T}$cf_cv_have_utempter" >&6 if test "$cf_cv_have_utempter" = yes ; then @@ -6788,21 +6863,21 @@ disable_setuid=yes test -n "$verbose" && echo " No --disable-setuid option given, force to yes" 1>&6 -echo "${as_me:-configure}:6791: testing No --disable-setuid option given, force to yes ..." 1>&5 +echo "${as_me:-configure}:6866: testing No --disable-setuid option given, force to yes ..." 1>&5 fi fi ### checks for external data -echo "$as_me:6798: checking if external errno is declared" >&5 +echo "$as_me:6873: 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 6805 "configure" +#line 6880 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -6820,16 +6895,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6823: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:6898: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6826: \$? = $ac_status" >&5 + echo "$as_me:6901: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6829: \"$ac_try\"") >&5 + { (eval echo "$as_me:6904: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6832: \$? = $ac_status" >&5 + echo "$as_me:6907: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_errno=yes else @@ -6840,7 +6915,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6843: result: $cf_cv_dcl_errno" >&5 +echo "$as_me:6918: result: $cf_cv_dcl_errno" >&5 echo "${ECHO_T}$cf_cv_dcl_errno" >&6 if test "$cf_cv_dcl_errno" = no ; then @@ -6855,14 +6930,14 @@ # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:6858: checking if external errno exists" >&5 +echo "$as_me:6933: 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 6865 "configure" +#line 6940 "configure" #include "confdefs.h" #undef errno @@ -6877,16 +6952,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6880: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6955: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6883: \$? = $ac_status" >&5 + echo "$as_me:6958: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6886: \"$ac_try\"") >&5 + { (eval echo "$as_me:6961: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6889: \$? = $ac_status" >&5 + echo "$as_me:6964: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_errno=yes else @@ -6897,7 +6972,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6900: result: $cf_cv_have_errno" >&5 +echo "$as_me:6975: result: $cf_cv_have_errno" >&5 echo "${ECHO_T}$cf_cv_have_errno" >&6 if test "$cf_cv_have_errno" = yes ; then @@ -6910,7 +6985,7 @@ fi -echo "$as_me:6913: checking for explicit tty group name" >&5 +echo "$as_me:6988: checking for explicit tty group name" >&5 echo $ECHO_N "checking for explicit tty group name... $ECHO_C" >&6 # Check whether --with-tty-group or --without-tty-group was given. @@ -6922,11 +6997,11 @@ fi; test -z "$cf_tty_group" && cf_tty_group=auto... test "$cf_tty_group" = yes && cf_tty_group=auto... -echo "$as_me:6925: result: $cf_tty_group" >&5 +echo "$as_me:7000: result: $cf_tty_group" >&5 echo "${ECHO_T}$cf_tty_group" >&6 if test "$cf_tty_group" = "auto..." ; then -echo "$as_me:6929: checking for tty group name" >&5 +echo "$as_me:7004: checking for tty group name" >&5 echo $ECHO_N "checking for tty group name... $ECHO_C" >&6 if test "${cf_cv_tty_group_name+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6979,7 +7054,7 @@ fi fi -echo "$as_me:6982: result: $cf_cv_tty_group_name" >&5 +echo "$as_me:7057: result: $cf_cv_tty_group_name" >&5 echo "${ECHO_T}$cf_cv_tty_group_name" >&6 cf_tty_group="$cf_cv_tty_group_name" else @@ -6999,7 +7074,7 @@ # does apply to the device. We cannot perform this test if we are in batch # mode, or if we are cross-compiling. -echo "$as_me:7002: checking if we may use the $cf_tty_group group" >&5 +echo "$as_me:7077: checking if we may use the $cf_tty_group group" >&5 echo $ECHO_N "checking if we may use the $cf_tty_group group... $ECHO_C" >&6 if test "${cf_cv_tty_group+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7012,7 +7087,7 @@ cf_cv_tty_group=unknown else cat >conftest.$ac_ext <<_ACEOF -#line 7015 "configure" +#line 7090 "configure" #include "confdefs.h" #include @@ -7038,15 +7113,15 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:7041: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7116: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7044: \$? = $ac_status" >&5 + echo "$as_me:7119: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7046: \"$ac_try\"") >&5 + { (eval echo "$as_me:7121: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7049: \$? = $ac_status" >&5 + echo "$as_me:7124: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_tty_group=yes else @@ -7064,11 +7139,11 @@ fi fi -echo "$as_me:7067: result: $cf_cv_tty_group" >&5 +echo "$as_me:7142: result: $cf_cv_tty_group" >&5 echo "${ECHO_T}$cf_cv_tty_group" >&6 if test $cf_cv_tty_group = no ; then - { echo "$as_me:7071: WARNING: Cannot use $cf_tty_group group" >&5 + { echo "$as_me:7146: WARNING: Cannot use $cf_tty_group group" >&5 echo "$as_me: WARNING: Cannot use $cf_tty_group group" >&2;} else cat >>confdefs.h <<\EOF @@ -7079,13 +7154,13 @@ ### checks for system services and user specified options -echo "$as_me:7082: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "$as_me:7157: checking for sys/wait.h that is POSIX.1 compatible" >&5 echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 if test "${ac_cv_header_sys_wait_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7088 "configure" +#line 7163 "configure" #include "confdefs.h" #include #include @@ -7107,16 +7182,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7110: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7185: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7113: \$? = $ac_status" >&5 + echo "$as_me:7188: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7116: \"$ac_try\"") >&5 + { (eval echo "$as_me:7191: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7119: \$? = $ac_status" >&5 + echo "$as_me:7194: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_sys_wait_h=yes else @@ -7126,7 +7201,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7129: result: $ac_cv_header_sys_wait_h" >&5 +echo "$as_me:7204: result: $ac_cv_header_sys_wait_h" >&5 echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 if test $ac_cv_header_sys_wait_h = yes; then @@ -7136,14 +7211,14 @@ fi -echo "$as_me:7139: checking for POSIX wait functions" >&5 +echo "$as_me:7214: checking for POSIX wait functions" >&5 echo $ECHO_N "checking for POSIX wait functions... $ECHO_C" >&6 if test "${cf_cv_posix_wait+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7146 "configure" +#line 7221 "configure" #include "confdefs.h" #include @@ -7166,16 +7241,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7169: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7244: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7172: \$? = $ac_status" >&5 + echo "$as_me:7247: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7175: \"$ac_try\"") >&5 + { (eval echo "$as_me:7250: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7178: \$? = $ac_status" >&5 + echo "$as_me:7253: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_posix_wait=yes else @@ -7186,21 +7261,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7189: result: $cf_cv_posix_wait" >&5 +echo "$as_me:7264: result: $cf_cv_posix_wait" >&5 echo "${ECHO_T}$cf_cv_posix_wait" >&6 test "$cf_cv_posix_wait" = yes && cat >>confdefs.h <<\EOF #define USE_POSIX_WAIT 1 EOF -echo "$as_me:7196: checking if external sys_nerr is declared" >&5 +echo "$as_me:7271: 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 7203 "configure" +#line 7278 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -7218,16 +7293,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7221: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7296: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7224: \$? = $ac_status" >&5 + echo "$as_me:7299: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7227: \"$ac_try\"") >&5 + { (eval echo "$as_me:7302: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7230: \$? = $ac_status" >&5 + echo "$as_me:7305: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_sys_nerr=yes else @@ -7238,7 +7313,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7241: result: $cf_cv_dcl_sys_nerr" >&5 +echo "$as_me:7316: 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 @@ -7253,14 +7328,14 @@ # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:7256: checking if external sys_nerr exists" >&5 +echo "$as_me:7331: 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 7263 "configure" +#line 7338 "configure" #include "confdefs.h" #undef sys_nerr @@ -7275,16 +7350,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7278: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7353: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7281: \$? = $ac_status" >&5 + echo "$as_me:7356: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7284: \"$ac_try\"") >&5 + { (eval echo "$as_me:7359: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7287: \$? = $ac_status" >&5 + echo "$as_me:7362: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_sys_nerr=yes else @@ -7295,7 +7370,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7298: result: $cf_cv_have_sys_nerr" >&5 +echo "$as_me:7373: 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 @@ -7308,14 +7383,14 @@ fi -echo "$as_me:7311: checking if external sys_errlist is declared" >&5 +echo "$as_me:7386: 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 7318 "configure" +#line 7393 "configure" #include "confdefs.h" #ifdef HAVE_STDLIB_H @@ -7333,16 +7408,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7336: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7411: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7339: \$? = $ac_status" >&5 + echo "$as_me:7414: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7342: \"$ac_try\"") >&5 + { (eval echo "$as_me:7417: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7345: \$? = $ac_status" >&5 + echo "$as_me:7420: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_dcl_sys_errlist=yes else @@ -7353,7 +7428,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7356: result: $cf_cv_dcl_sys_errlist" >&5 +echo "$as_me:7431: 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 @@ -7368,14 +7443,14 @@ # It's possible (for near-UNIX clones) that the data doesn't exist -echo "$as_me:7371: checking if external sys_errlist exists" >&5 +echo "$as_me:7446: 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 7378 "configure" +#line 7453 "configure" #include "confdefs.h" #undef sys_errlist @@ -7390,16 +7465,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7393: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7468: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7396: \$? = $ac_status" >&5 + echo "$as_me:7471: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7399: \"$ac_try\"") >&5 + { (eval echo "$as_me:7474: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7402: \$? = $ac_status" >&5 + echo "$as_me:7477: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_have_sys_errlist=yes else @@ -7410,7 +7485,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:7413: result: $cf_cv_have_sys_errlist" >&5 +echo "$as_me:7488: 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 @@ -7430,23 +7505,23 @@ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:7433: checking for $ac_header" >&5 +echo "$as_me:7508: 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 7439 "configure" +#line 7514 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:7443: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:7518: \"$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:7449: \$? = $ac_status" >&5 + echo "$as_me:7524: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -7465,7 +7540,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:7468: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:7543: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:7553: checking if we should define SYSV" >&5 echo $ECHO_N "checking if we should define SYSV... $ECHO_C" >&6 if test "${cf_cv_sysv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7485 "configure" +#line 7560 "configure" #include "confdefs.h" #undef SYSV @@ -7526,16 +7601,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7529: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7604: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7532: \$? = $ac_status" >&5 + echo "$as_me:7607: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7535: \"$ac_try\"") >&5 + { (eval echo "$as_me:7610: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7538: \$? = $ac_status" >&5 + echo "$as_me:7613: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_sysv=yes else @@ -7546,14 +7621,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7549: result: $cf_cv_sysv" >&5 +echo "$as_me:7624: result: $cf_cv_sysv" >&5 echo "${ECHO_T}$cf_cv_sysv" >&6 test "$cf_cv_sysv" = yes && cat >>confdefs.h <<\EOF #define SYSV 1 EOF -echo "$as_me:7556: checking for elf_begin in -lelf" >&5 +echo "$as_me:7631: checking for elf_begin in -lelf" >&5 echo $ECHO_N "checking for elf_begin in -lelf... $ECHO_C" >&6 if test "${ac_cv_lib_elf_elf_begin+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7561,7 +7636,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lelf $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7564 "configure" +#line 7639 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7580,16 +7655,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7583: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7658: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7586: \$? = $ac_status" >&5 + echo "$as_me:7661: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7589: \"$ac_try\"") >&5 + { (eval echo "$as_me:7664: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7592: \$? = $ac_status" >&5 + echo "$as_me:7667: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_elf_elf_begin=yes else @@ -7600,18 +7675,18 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:7603: result: $ac_cv_lib_elf_elf_begin" >&5 +echo "$as_me:7678: result: $ac_cv_lib_elf_elf_begin" >&5 echo "${ECHO_T}$ac_cv_lib_elf_elf_begin" >&6 if test $ac_cv_lib_elf_elf_begin = yes; then -echo "$as_me:7607: checking if this is an SVR4 system" >&5 +echo "$as_me:7682: checking if this is an SVR4 system" >&5 echo $ECHO_N "checking if this is an SVR4 system... $ECHO_C" >&6 if test "${cf_cv_svr4+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 7614 "configure" +#line 7689 "configure" #include "confdefs.h" #if defined(__CYGWIN__) @@ -7640,16 +7715,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:7643: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7718: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:7646: \$? = $ac_status" >&5 + echo "$as_me:7721: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7649: \"$ac_try\"") >&5 + { (eval echo "$as_me:7724: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7652: \$? = $ac_status" >&5 + echo "$as_me:7727: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_svr4=yes else @@ -7660,7 +7735,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:7663: result: $cf_cv_svr4" >&5 +echo "$as_me:7738: result: $cf_cv_svr4" >&5 echo "${ECHO_T}$cf_cv_svr4" >&6 fi @@ -7670,7 +7745,7 @@ #define SVR4 1 EOF -echo "$as_me:7673: checking for X" >&5 +echo "$as_me:7748: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -7767,17 +7842,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 7770 "configure" +#line 7845 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:7774: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:7849: \"$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:7780: \$? = $ac_status" >&5 + echo "$as_me:7855: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -7810,7 +7885,7 @@ ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 7813 "configure" +#line 7888 "configure" #include "confdefs.h" #include int @@ -7822,16 +7897,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7825: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7900: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7828: \$? = $ac_status" >&5 + echo "$as_me:7903: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7831: \"$ac_try\"") >&5 + { (eval echo "$as_me:7906: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7834: \$? = $ac_status" >&5 + echo "$as_me:7909: \$? = $ac_status" >&5 (exit $ac_status); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. @@ -7869,7 +7944,7 @@ fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:7872: result: $have_x" >&5 + echo "$as_me:7947: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -7879,7 +7954,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:7882: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:7957: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -7903,11 +7978,11 @@ # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:7906: checking whether -R must be followed by a space" >&5 + echo "$as_me:7981: 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 7910 "configure" +#line 7985 "configure" #include "confdefs.h" int @@ -7919,16 +7994,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7922: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7997: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7925: \$? = $ac_status" >&5 + echo "$as_me:8000: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7928: \"$ac_try\"") >&5 + { (eval echo "$as_me:8003: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7931: \$? = $ac_status" >&5 + echo "$as_me:8006: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_R_nospace=yes else @@ -7938,13 +8013,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_nospace = yes; then - echo "$as_me:7941: result: no" >&5 + echo "$as_me:8016: 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 7947 "configure" +#line 8022 "configure" #include "confdefs.h" int @@ -7956,16 +8031,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:7959: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8034: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7962: \$? = $ac_status" >&5 + echo "$as_me:8037: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:7965: \"$ac_try\"") >&5 + { (eval echo "$as_me:8040: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7968: \$? = $ac_status" >&5 + echo "$as_me:8043: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_R_space=yes else @@ -7975,11 +8050,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_space = yes; then - echo "$as_me:7978: result: yes" >&5 + echo "$as_me:8053: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:7982: result: neither works" >&5 + echo "$as_me:8057: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -7999,7 +8074,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 8002 "configure" +#line 8077 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8018,22 +8093,22 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8021: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8096: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8024: \$? = $ac_status" >&5 + echo "$as_me:8099: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8027: \"$ac_try\"") >&5 + { (eval echo "$as_me:8102: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8030: \$? = $ac_status" >&5 + echo "$as_me:8105: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:8036: checking for dnet_ntoa in -ldnet" >&5 +echo "$as_me:8111: 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 @@ -8041,7 +8116,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8044 "configure" +#line 8119 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8060,16 +8135,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8063: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8138: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8066: \$? = $ac_status" >&5 + echo "$as_me:8141: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8069: \"$ac_try\"") >&5 + { (eval echo "$as_me:8144: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8072: \$? = $ac_status" >&5 + echo "$as_me:8147: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else @@ -8080,14 +8155,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8083: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:8158: 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:8090: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:8165: 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 @@ -8095,7 +8170,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8098 "configure" +#line 8173 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8114,16 +8189,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8117: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8192: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8120: \$? = $ac_status" >&5 + echo "$as_me:8195: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8123: \"$ac_try\"") >&5 + { (eval echo "$as_me:8198: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8126: \$? = $ac_status" >&5 + echo "$as_me:8201: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -8134,7 +8209,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8137: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:8212: 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" @@ -8153,13 +8228,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:8156: checking for gethostbyname" >&5 + echo "$as_me:8231: 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 8162 "configure" +#line 8237 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname (); below. */ @@ -8190,16 +8265,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8193: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8268: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8196: \$? = $ac_status" >&5 + echo "$as_me:8271: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8199: \"$ac_try\"") >&5 + { (eval echo "$as_me:8274: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8202: \$? = $ac_status" >&5 + echo "$as_me:8277: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gethostbyname=yes else @@ -8209,11 +8284,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8212: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:8287: 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:8216: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:8291: 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 @@ -8221,7 +8296,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8224 "configure" +#line 8299 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8240,16 +8315,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8243: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8318: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8246: \$? = $ac_status" >&5 + echo "$as_me:8321: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8249: \"$ac_try\"") >&5 + { (eval echo "$as_me:8324: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8252: \$? = $ac_status" >&5 + echo "$as_me:8327: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -8260,14 +8335,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8263: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:8338: 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:8270: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:8345: 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 @@ -8275,7 +8350,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8278 "configure" +#line 8353 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8294,16 +8369,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8297: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8372: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8300: \$? = $ac_status" >&5 + echo "$as_me:8375: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8303: \"$ac_try\"") >&5 + { (eval echo "$as_me:8378: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8306: \$? = $ac_status" >&5 + echo "$as_me:8381: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gethostbyname=yes else @@ -8314,7 +8389,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8317: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:8392: 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" @@ -8330,13 +8405,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:8333: checking for connect" >&5 + echo "$as_me:8408: 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 8339 "configure" +#line 8414 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect (); below. */ @@ -8367,16 +8442,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8370: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8445: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8373: \$? = $ac_status" >&5 + echo "$as_me:8448: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8376: \"$ac_try\"") >&5 + { (eval echo "$as_me:8451: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8379: \$? = $ac_status" >&5 + echo "$as_me:8454: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_connect=yes else @@ -8386,11 +8461,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8389: result: $ac_cv_func_connect" >&5 +echo "$as_me:8464: 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:8393: checking for connect in -lsocket" >&5 + echo "$as_me:8468: 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 @@ -8398,7 +8473,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8401 "configure" +#line 8476 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8417,16 +8492,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8420: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8495: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8423: \$? = $ac_status" >&5 + echo "$as_me:8498: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8426: \"$ac_try\"") >&5 + { (eval echo "$as_me:8501: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8429: \$? = $ac_status" >&5 + echo "$as_me:8504: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_socket_connect=yes else @@ -8437,7 +8512,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8440: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:8515: 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" @@ -8446,13 +8521,13 @@ fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:8449: checking for remove" >&5 + echo "$as_me:8524: 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 8455 "configure" +#line 8530 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove (); below. */ @@ -8483,16 +8558,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8486: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8561: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8489: \$? = $ac_status" >&5 + echo "$as_me:8564: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8492: \"$ac_try\"") >&5 + { (eval echo "$as_me:8567: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8495: \$? = $ac_status" >&5 + echo "$as_me:8570: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_remove=yes else @@ -8502,11 +8577,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8505: result: $ac_cv_func_remove" >&5 +echo "$as_me:8580: 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:8509: checking for remove in -lposix" >&5 + echo "$as_me:8584: 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 @@ -8514,7 +8589,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8517 "configure" +#line 8592 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8533,16 +8608,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8536: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8611: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8539: \$? = $ac_status" >&5 + echo "$as_me:8614: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8542: \"$ac_try\"") >&5 + { (eval echo "$as_me:8617: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8545: \$? = $ac_status" >&5 + echo "$as_me:8620: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_posix_remove=yes else @@ -8553,7 +8628,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8556: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:8631: 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" @@ -8562,13 +8637,13 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:8565: checking for shmat" >&5 + echo "$as_me:8640: 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 8571 "configure" +#line 8646 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat (); below. */ @@ -8599,16 +8674,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8602: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8677: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8605: \$? = $ac_status" >&5 + echo "$as_me:8680: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8608: \"$ac_try\"") >&5 + { (eval echo "$as_me:8683: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8611: \$? = $ac_status" >&5 + echo "$as_me:8686: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_shmat=yes else @@ -8618,11 +8693,11 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:8621: result: $ac_cv_func_shmat" >&5 +echo "$as_me:8696: 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:8625: checking for shmat in -lipc" >&5 + echo "$as_me:8700: 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 @@ -8630,7 +8705,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8633 "configure" +#line 8708 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8649,16 +8724,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8652: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8727: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8655: \$? = $ac_status" >&5 + echo "$as_me:8730: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8658: \"$ac_try\"") >&5 + { (eval echo "$as_me:8733: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8661: \$? = $ac_status" >&5 + echo "$as_me:8736: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ipc_shmat=yes else @@ -8669,7 +8744,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8672: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:8747: 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" @@ -8687,7 +8762,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:8690: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:8765: 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 @@ -8695,7 +8770,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 8698 "configure" +#line 8773 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8714,16 +8789,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8717: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8792: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:8720: \$? = $ac_status" >&5 + echo "$as_me:8795: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8723: \"$ac_try\"") >&5 + { (eval echo "$as_me:8798: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:8726: \$? = $ac_status" >&5 + echo "$as_me:8801: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -8734,7 +8809,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:8737: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:8812: 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" @@ -8744,7 +8819,7 @@ fi -echo "$as_me:8747: checking if you want to use pkg-config" >&5 +echo "$as_me:8822: checking if you want to use pkg-config" >&5 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6 # Check whether --with-pkg-config or --without-pkg-config was given. @@ -8754,7 +8829,7 @@ else cf_pkg_config=yes fi; -echo "$as_me:8757: result: $cf_pkg_config" >&5 +echo "$as_me:8832: result: $cf_pkg_config" >&5 echo "${ECHO_T}$cf_pkg_config" >&6 case $cf_pkg_config in #(vi @@ -8766,7 +8841,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -echo "$as_me:8769: checking for $ac_word" >&5 +echo "$as_me:8844: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8783,7 +8858,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:8786: found $ac_dir/$ac_word" >&5 + echo "$as_me:8861: found $ac_dir/$ac_word" >&5 break fi done @@ -8794,10 +8869,10 @@ PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:8797: result: $PKG_CONFIG" >&5 + echo "$as_me:8872: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:8800: result: no" >&5 + echo "$as_me:8875: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8806,7 +8881,7 @@ ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:8809: checking for $ac_word" >&5 +echo "$as_me:8884: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8823,7 +8898,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_ac_pt_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:8826: found $ac_dir/$ac_word" >&5 + echo "$as_me:8901: found $ac_dir/$ac_word" >&5 break fi done @@ -8835,10 +8910,10 @@ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - echo "$as_me:8838: result: $ac_pt_PKG_CONFIG" >&5 + echo "$as_me:8913: result: $ac_pt_PKG_CONFIG" >&5 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 else - echo "$as_me:8841: result: no" >&5 + echo "$as_me:8916: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8881,7 +8956,7 @@ PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` ;; *) - { { echo "$as_me:8884: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 + { { echo "$as_me:8959: error: expected a pathname, not \"$PKG_CONFIG\"" >&5 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -8894,17 +8969,17 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:8897: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:8972: testing found package xt ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs xt 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:8903: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:8978: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:8907: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:8982: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -8991,14 +9066,14 @@ ;; *) # we have an "xt" package, but it may omit Xt's dependency on X11 -echo "$as_me:8994: checking for usable X dependency" >&5 +echo "$as_me:9069: checking for usable X dependency" >&5 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6 if test "${cf_cv_xt_x11_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9001 "configure" +#line 9076 "configure" #include "confdefs.h" #include @@ -9017,16 +9092,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9020: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9095: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9023: \$? = $ac_status" >&5 + echo "$as_me:9098: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9026: \"$ac_try\"") >&5 + { (eval echo "$as_me:9101: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9029: \$? = $ac_status" >&5 + echo "$as_me:9104: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xt_x11_compat=yes else @@ -9036,30 +9111,30 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9039: result: $cf_cv_xt_x11_compat" >&5 +echo "$as_me:9114: result: $cf_cv_xt_x11_compat" >&5 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6 if test "$cf_cv_xt_x11_compat" = no then test -n "$verbose" && echo " work around broken X11 dependency" 1>&6 -echo "${as_me:-configure}:9045: testing work around broken X11 dependency ..." 1>&5 +echo "${as_me:-configure}:9120: testing work around broken X11 dependency ..." 1>&5 # 2010/11/19 - good enough until a working Xt on Xcb is delivered. if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:9052: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:9127: testing found package x11 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs x11 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:9058: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:9133: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:9062: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:9137: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -9145,12 +9220,12 @@ test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:9148: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:9223: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt -lX11 ," -e 's/ / /g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:9153: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:9228: testing ...after $LIBS ..." 1>&5 fi @@ -9158,14 +9233,14 @@ ;; esac -echo "$as_me:9161: checking for usable X Toolkit package" >&5 +echo "$as_me:9236: checking for usable X Toolkit package" >&5 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6 if test "${cf_cv_xt_ice_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 9168 "configure" +#line 9243 "configure" #include "confdefs.h" #include @@ -9180,16 +9255,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9183: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9258: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9186: \$? = $ac_status" >&5 + echo "$as_me:9261: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9189: \"$ac_try\"") >&5 + { (eval echo "$as_me:9264: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9192: \$? = $ac_status" >&5 + echo "$as_me:9267: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xt_ice_compat=yes else @@ -9199,7 +9274,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9202: result: $cf_cv_xt_ice_compat" >&5 +echo "$as_me:9277: result: $cf_cv_xt_ice_compat" >&5 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 if test "$cf_cv_xt_ice_compat" = no @@ -9213,22 +9288,22 @@ *) test -n "$verbose" && echo " work around broken ICE dependency" 1>&6 -echo "${as_me:-configure}:9216: testing work around broken ICE dependency ..." 1>&5 +echo "${as_me:-configure}:9291: testing work around broken ICE dependency ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:9221: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:9296: testing found package ice ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs ice 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:9227: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:9302: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:9231: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:9306: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -9313,17 +9388,17 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:9316: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:9391: testing found package sm ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs sm 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:9322: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:9397: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:9326: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:9401: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -9413,12 +9488,12 @@ test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:9416: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:9491: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt $X_PRE_LIBS ," -e 's/ / /g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:9421: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:9496: testing ...after $LIBS ..." 1>&5 fi @@ -9436,7 +9511,7 @@ test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:9439: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:9514: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -9507,7 +9582,7 @@ if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:9510: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:9585: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 CFLAGS="$CFLAGS $cf_new_cflags" fi @@ -9515,7 +9590,7 @@ if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:9518: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:9593: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 CPPFLAGS="$CPPFLAGS $cf_new_cppflags" fi @@ -9523,14 +9598,14 @@ if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:9526: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:9601: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat >conftest.$ac_ext <<_ACEOF -#line 9533 "configure" +#line 9608 "configure" #include "confdefs.h" #include int @@ -9542,16 +9617,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9545: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9620: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9548: \$? = $ac_status" >&5 + echo "$as_me:9623: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9551: \"$ac_try\"") >&5 + { (eval echo "$as_me:9626: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9554: \$? = $ac_status" >&5 + echo "$as_me:9629: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -9559,12 +9634,12 @@ cat conftest.$ac_ext >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:9562: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:9637: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:9567: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:9642: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_flags" @@ -9572,13 +9647,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - echo "$as_me:9575: checking for XOpenDisplay" >&5 + echo "$as_me:9650: 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 9581 "configure" +#line 9656 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char XOpenDisplay (); below. */ @@ -9609,16 +9684,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9612: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9687: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9615: \$? = $ac_status" >&5 + echo "$as_me:9690: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9618: \"$ac_try\"") >&5 + { (eval echo "$as_me:9693: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9621: \$? = $ac_status" >&5 + echo "$as_me:9696: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_XOpenDisplay=yes else @@ -9628,13 +9703,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9631: result: $ac_cv_func_XOpenDisplay" >&5 +echo "$as_me:9706: 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:9637: checking for XOpenDisplay in -lX11" >&5 + echo "$as_me:9712: 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 @@ -9642,7 +9717,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9645 "configure" +#line 9720 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9661,16 +9736,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9664: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9739: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9667: \$? = $ac_status" >&5 + echo "$as_me:9742: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9670: \"$ac_try\"") >&5 + { (eval echo "$as_me:9745: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9673: \$? = $ac_status" >&5 + echo "$as_me:9748: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -9681,7 +9756,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9684: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:9759: 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" @@ -9689,13 +9764,13 @@ fi - echo "$as_me:9692: checking for XtAppInitialize" >&5 + echo "$as_me:9767: 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 9698 "configure" +#line 9773 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char XtAppInitialize (); below. */ @@ -9726,16 +9801,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9729: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9804: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9732: \$? = $ac_status" >&5 + echo "$as_me:9807: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9735: \"$ac_try\"") >&5 + { (eval echo "$as_me:9810: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9738: \$? = $ac_status" >&5 + echo "$as_me:9813: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_XtAppInitialize=yes else @@ -9745,13 +9820,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:9748: result: $ac_cv_func_XtAppInitialize" >&5 +echo "$as_me:9823: 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:9754: checking for XtAppInitialize in -lXt" >&5 + echo "$as_me:9829: 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 @@ -9759,7 +9834,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9762 "configure" +#line 9837 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9778,16 +9853,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9781: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9856: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9784: \$? = $ac_status" >&5 + echo "$as_me:9859: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9787: \"$ac_try\"") >&5 + { (eval echo "$as_me:9862: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9790: \$? = $ac_status" >&5 + echo "$as_me:9865: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xt_XtAppInitialize=yes else @@ -9798,7 +9873,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9801: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 +echo "$as_me:9876: 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 @@ -9815,7 +9890,7 @@ fi if test $cf_have_X_LIBS = no ; then - { echo "$as_me:9818: WARNING: Unable to successfully link X Toolkit library (-lXt) with + { echo "$as_me:9893: 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 @@ -9833,23 +9908,23 @@ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:9836: checking for $ac_header" >&5 +echo "$as_me:9911: 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 9842 "configure" +#line 9917 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:9846: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:9921: \"$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:9852: \$? = $ac_status" >&5 + echo "$as_me:9927: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9868,7 +9943,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:9871: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:9946: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:9961: 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. @@ -9893,7 +9968,7 @@ else cf_Xpm_library=yes fi; -echo "$as_me:9896: result: $cf_Xpm_library" >&5 +echo "$as_me:9971: result: $cf_Xpm_library" >&5 echo "${ECHO_T}$cf_Xpm_library" >&6 if test "$cf_Xpm_library" != no ; then @@ -9901,23 +9976,23 @@ CPPFLAGS="$CPPFLAGS -I$withval/include" LDFLAGS="$LDFLAGS -L$withval/lib" fi - echo "$as_me:9904: checking for X11/xpm.h" >&5 + echo "$as_me:9979: 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 9910 "configure" +#line 9985 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:9914: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:9989: \"$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:9920: \$? = $ac_status" >&5 + echo "$as_me:9995: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -9936,11 +10011,11 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:9939: result: $ac_cv_header_X11_xpm_h" >&5 +echo "$as_me:10014: 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:9943: checking for XpmCreatePixmapFromData in -lXpm" >&5 + echo "$as_me:10018: 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 @@ -9948,7 +10023,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXpm -lX11 $X_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 9951 "configure" +#line 10026 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -9967,16 +10042,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9970: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10045: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:9973: \$? = $ac_status" >&5 + echo "$as_me:10048: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9976: \"$ac_try\"") >&5 + { (eval echo "$as_me:10051: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:9979: \$? = $ac_status" >&5 + echo "$as_me:10054: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xpm_XpmCreatePixmapFromData=yes else @@ -9987,7 +10062,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:9990: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5 +echo "$as_me:10065: 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 @@ -10009,7 +10084,7 @@ cf_x_athena=${cf_x_athena:-Xaw} -echo "$as_me:10012: checking if you want to link with Xaw 3d library" >&5 +echo "$as_me:10087: 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= @@ -10020,14 +10095,14 @@ fi; if test "$withval" = yes ; then cf_x_athena=Xaw3d - echo "$as_me:10023: result: yes" >&5 + echo "$as_me:10098: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:10026: result: no" >&5 + echo "$as_me:10101: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:10030: checking if you want to link with neXT Athena library" >&5 +echo "$as_me:10105: 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= @@ -10038,14 +10113,14 @@ fi; if test "$withval" = yes ; then cf_x_athena=neXtaw - echo "$as_me:10041: result: yes" >&5 + echo "$as_me:10116: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:10044: result: no" >&5 + echo "$as_me:10119: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:10048: checking if you want to link with Athena-Plus library" >&5 +echo "$as_me:10123: 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= @@ -10056,10 +10131,10 @@ fi; if test "$withval" = yes ; then cf_x_athena=XawPlus - echo "$as_me:10059: result: yes" >&5 + echo "$as_me:10134: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:10062: result: no" >&5 + echo "$as_me:10137: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -10079,17 +10154,17 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then test -n "$verbose" && echo " found package $cf_athena_pkg" 1>&6 -echo "${as_me:-configure}:10082: testing found package $cf_athena_pkg ..." 1>&5 +echo "${as_me:-configure}:10157: testing found package $cf_athena_pkg ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs $cf_athena_pkg 2>/dev/null`" test -n "$verbose" && echo " package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:10088: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:10163: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:10092: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:10167: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -10179,14 +10254,14 @@ #define $cf_x_athena_LIBS 1 EOF -echo "$as_me:10182: checking for usable $cf_x_athena/Xmu package" >&5 +echo "$as_me:10257: checking for usable $cf_x_athena/Xmu package" >&5 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6 if test "${cf_cv_xaw_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10189 "configure" +#line 10264 "configure" #include "confdefs.h" #include @@ -10202,16 +10277,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10205: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10280: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10208: \$? = $ac_status" >&5 + echo "$as_me:10283: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10211: \"$ac_try\"") >&5 + { (eval echo "$as_me:10286: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10214: \$? = $ac_status" >&5 + echo "$as_me:10289: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xaw_compat=yes else @@ -10221,7 +10296,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10224: result: $cf_cv_xaw_compat" >&5 +echo "$as_me:10299: result: $cf_cv_xaw_compat" >&5 echo "${ECHO_T}$cf_cv_xaw_compat" >&6 if test "$cf_cv_xaw_compat" = no @@ -10233,22 +10308,22 @@ *) test -n "$verbose" && echo " work around broken package" 1>&6 -echo "${as_me:-configure}:10236: testing work around broken package ..." 1>&5 +echo "${as_me:-configure}:10311: testing work around broken package ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then test -n "$verbose" && echo " found package xmu" 1>&6 -echo "${as_me:-configure}:10241: testing found package xmu ..." 1>&5 +echo "${as_me:-configure}:10316: testing found package xmu ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs xmu 2>/dev/null`" test -n "$verbose" && echo " package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:10247: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:10322: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xmu LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:10251: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:10326: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -10334,12 +10409,12 @@ test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:10337: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:10412: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt -lXmu ," -e 's/ / /g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:10342: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:10417: testing ...after $LIBS ..." 1>&5 fi @@ -10360,17 +10435,17 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then test -n "$verbose" && echo " found package Xext" 1>&6 -echo "${as_me:-configure}:10363: testing found package Xext ..." 1>&5 +echo "${as_me:-configure}:10438: testing found package Xext ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs Xext 2>/dev/null`" test -n "$verbose" && echo " package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:10369: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:10444: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package Xext LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:10373: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:10448: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -10454,7 +10529,7 @@ : else - echo "$as_me:10457: checking for XextCreateExtension in -lXext" >&5 + echo "$as_me:10532: 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 @@ -10462,7 +10537,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 10465 "configure" +#line 10540 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -10481,16 +10556,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10484: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10559: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10487: \$? = $ac_status" >&5 + echo "$as_me:10562: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10490: \"$ac_try\"") >&5 + { (eval echo "$as_me:10565: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10493: \$? = $ac_status" >&5 + echo "$as_me:10568: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xext_XextCreateExtension=yes else @@ -10501,7 +10576,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:10504: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "$as_me:10579: 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" @@ -10514,17 +10589,17 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:10517: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:10592: testing found package xt ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs xt 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:10523: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:10598: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:10527: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:10602: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -10611,14 +10686,14 @@ ;; *) # we have an "xt" package, but it may omit Xt's dependency on X11 -echo "$as_me:10614: checking for usable X dependency" >&5 +echo "$as_me:10689: checking for usable X dependency" >&5 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6 if test "${cf_cv_xt_x11_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10621 "configure" +#line 10696 "configure" #include "confdefs.h" #include @@ -10637,16 +10712,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10640: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10715: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10643: \$? = $ac_status" >&5 + echo "$as_me:10718: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10646: \"$ac_try\"") >&5 + { (eval echo "$as_me:10721: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10649: \$? = $ac_status" >&5 + echo "$as_me:10724: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xt_x11_compat=yes else @@ -10656,30 +10731,30 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10659: result: $cf_cv_xt_x11_compat" >&5 +echo "$as_me:10734: result: $cf_cv_xt_x11_compat" >&5 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6 if test "$cf_cv_xt_x11_compat" = no then test -n "$verbose" && echo " work around broken X11 dependency" 1>&6 -echo "${as_me:-configure}:10665: testing work around broken X11 dependency ..." 1>&5 +echo "${as_me:-configure}:10740: testing work around broken X11 dependency ..." 1>&5 # 2010/11/19 - good enough until a working Xt on Xcb is delivered. if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:10672: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:10747: testing found package x11 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs x11 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:10678: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:10753: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:10682: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:10757: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -10765,12 +10840,12 @@ test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:10768: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:10843: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt -lX11 ," -e 's/ / /g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:10773: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:10848: testing ...after $LIBS ..." 1>&5 fi @@ -10778,14 +10853,14 @@ ;; esac -echo "$as_me:10781: checking for usable X Toolkit package" >&5 +echo "$as_me:10856: checking for usable X Toolkit package" >&5 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6 if test "${cf_cv_xt_ice_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 10788 "configure" +#line 10863 "configure" #include "confdefs.h" #include @@ -10800,16 +10875,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10803: \"$ac_link\"") >&5 +if { (eval echo "$as_me:10878: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:10806: \$? = $ac_status" >&5 + echo "$as_me:10881: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10809: \"$ac_try\"") >&5 + { (eval echo "$as_me:10884: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:10812: \$? = $ac_status" >&5 + echo "$as_me:10887: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xt_ice_compat=yes else @@ -10819,7 +10894,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:10822: result: $cf_cv_xt_ice_compat" >&5 +echo "$as_me:10897: result: $cf_cv_xt_ice_compat" >&5 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6 if test "$cf_cv_xt_ice_compat" = no @@ -10833,22 +10908,22 @@ *) test -n "$verbose" && echo " work around broken ICE dependency" 1>&6 -echo "${as_me:-configure}:10836: testing work around broken ICE dependency ..." 1>&5 +echo "${as_me:-configure}:10911: testing work around broken ICE dependency ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:10841: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:10916: testing found package ice ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs ice 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:10847: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:10922: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:10851: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:10926: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -10933,17 +11008,17 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:10936: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:11011: testing found package sm ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs sm 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:10942: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:11017: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:10946: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:11021: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -11033,12 +11108,12 @@ test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:11036: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:11111: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt $X_PRE_LIBS ," -e 's/ / /g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:11041: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:11116: testing ...after $LIBS ..." 1>&5 fi @@ -11056,7 +11131,7 @@ test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:11059: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:11134: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" @@ -11127,7 +11202,7 @@ if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:11130: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:11205: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 CFLAGS="$CFLAGS $cf_new_cflags" fi @@ -11135,7 +11210,7 @@ if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:11138: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:11213: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 CPPFLAGS="$CPPFLAGS $cf_new_cppflags" fi @@ -11143,14 +11218,14 @@ if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:11146: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:11221: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat >conftest.$ac_ext <<_ACEOF -#line 11153 "configure" +#line 11228 "configure" #include "confdefs.h" #include int @@ -11162,16 +11237,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11165: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11240: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11168: \$? = $ac_status" >&5 + echo "$as_me:11243: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11171: \"$ac_try\"") >&5 + { (eval echo "$as_me:11246: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11174: \$? = $ac_status" >&5 + echo "$as_me:11249: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -11179,12 +11254,12 @@ cat conftest.$ac_ext >&5 test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:11182: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:11257: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:11187: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:11262: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi CFLAGS="$cf_check_flags" @@ -11192,13 +11267,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi - echo "$as_me:11195: checking for XOpenDisplay" >&5 + echo "$as_me:11270: 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 11201 "configure" +#line 11276 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char XOpenDisplay (); below. */ @@ -11229,16 +11304,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11232: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11307: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11235: \$? = $ac_status" >&5 + echo "$as_me:11310: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11238: \"$ac_try\"") >&5 + { (eval echo "$as_me:11313: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11241: \$? = $ac_status" >&5 + echo "$as_me:11316: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_XOpenDisplay=yes else @@ -11248,13 +11323,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11251: result: $ac_cv_func_XOpenDisplay" >&5 +echo "$as_me:11326: 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:11257: checking for XOpenDisplay in -lX11" >&5 + echo "$as_me:11332: 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 @@ -11262,7 +11337,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11265 "configure" +#line 11340 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11281,16 +11356,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11284: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11359: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11287: \$? = $ac_status" >&5 + echo "$as_me:11362: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11290: \"$ac_try\"") >&5 + { (eval echo "$as_me:11365: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11293: \$? = $ac_status" >&5 + echo "$as_me:11368: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else @@ -11301,7 +11376,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11304: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "$as_me:11379: 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" @@ -11309,13 +11384,13 @@ fi - echo "$as_me:11312: checking for XtAppInitialize" >&5 + echo "$as_me:11387: 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 11318 "configure" +#line 11393 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char XtAppInitialize (); below. */ @@ -11346,16 +11421,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11349: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11424: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11352: \$? = $ac_status" >&5 + echo "$as_me:11427: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11355: \"$ac_try\"") >&5 + { (eval echo "$as_me:11430: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11358: \$? = $ac_status" >&5 + echo "$as_me:11433: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_XtAppInitialize=yes else @@ -11365,13 +11440,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:11368: result: $ac_cv_func_XtAppInitialize" >&5 +echo "$as_me:11443: 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:11374: checking for XtAppInitialize in -lXt" >&5 + echo "$as_me:11449: 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 @@ -11379,7 +11454,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 11382 "configure" +#line 11457 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -11398,16 +11473,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11401: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11476: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11404: \$? = $ac_status" >&5 + echo "$as_me:11479: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11407: \"$ac_try\"") >&5 + { (eval echo "$as_me:11482: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11410: \$? = $ac_status" >&5 + echo "$as_me:11485: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xt_XtAppInitialize=yes else @@ -11418,7 +11493,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:11421: result: $ac_cv_lib_Xt_XtAppInitialize" >&5 +echo "$as_me:11496: 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 @@ -11435,7 +11510,7 @@ fi if test $cf_have_X_LIBS = no ; then - { echo "$as_me:11438: WARNING: Unable to successfully link X Toolkit library (-lXt) with + { echo "$as_me:11513: 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 @@ -11457,14 +11532,14 @@ cf_test=X11/$cf_x_athena_root/SimpleMenu.h if test $cf_path != default ; then CPPFLAGS="$cf_save -I$cf_path/include" - echo "$as_me:11460: checking for $cf_test in $cf_path" >&5 + echo "$as_me:11535: 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:11463: checking for $cf_test" >&5 + echo "$as_me:11538: checking for $cf_test" >&5 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6 fi cat >conftest.$ac_ext <<_ACEOF -#line 11467 "configure" +#line 11542 "configure" #include "confdefs.h" #include @@ -11478,16 +11553,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11481: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11556: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11484: \$? = $ac_status" >&5 + echo "$as_me:11559: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11487: \"$ac_try\"") >&5 + { (eval echo "$as_me:11562: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11490: \$? = $ac_status" >&5 + echo "$as_me:11565: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -11496,7 +11571,7 @@ cf_result=no fi rm -f conftest.$ac_objext conftest.$ac_ext - echo "$as_me:11499: result: $cf_result" >&5 + echo "$as_me:11574: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_x_athena_inc=$cf_path @@ -11508,7 +11583,7 @@ done if test -z "$cf_x_athena_inc" ; then - { echo "$as_me:11511: WARNING: Unable to successfully find Athena header files with test program" >&5 + { echo "$as_me:11586: WARNING: Unable to successfully find Athena header files with test program" >&5 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;} elif test "$cf_x_athena_inc" != default ; then CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc" @@ -11538,15 +11613,15 @@ cf_test=XawSimpleMenuAddGlobalActions if test $cf_path != default ; then LIBS="-L$cf_path/lib $cf_libs $LIBS" - echo "$as_me:11541: checking for $cf_libs in $cf_path" >&5 + echo "$as_me:11616: checking for $cf_libs in $cf_path" >&5 echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6 else LIBS="$cf_libs $LIBS" - echo "$as_me:11545: checking for $cf_test in $cf_libs" >&5 + echo "$as_me:11620: checking for $cf_test in $cf_libs" >&5 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6 fi cat >conftest.$ac_ext <<_ACEOF -#line 11549 "configure" +#line 11624 "configure" #include "confdefs.h" #include @@ -11562,16 +11637,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:11565: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11640: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:11568: \$? = $ac_status" >&5 + echo "$as_me:11643: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11571: \"$ac_try\"") >&5 + { (eval echo "$as_me:11646: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11574: \$? = $ac_status" >&5 + echo "$as_me:11649: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_result=yes else @@ -11580,7 +11655,7 @@ cf_result=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:11583: result: $cf_result" >&5 + echo "$as_me:11658: result: $cf_result" >&5 echo "${ECHO_T}$cf_result" >&6 if test "$cf_result" = yes ; then cf_x_athena_lib="$cf_libs" @@ -11594,7 +11669,7 @@ done if test -z "$cf_x_athena_lib" ; then - { { echo "$as_me:11597: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5 + { { echo "$as_me:11672: 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 @@ -11610,23 +11685,23 @@ for ac_header in X11/Xpoll.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:11613: checking for $ac_header" >&5 +echo "$as_me:11688: 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 11619 "configure" +#line 11694 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:11623: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:11698: \"$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:11629: \$? = $ac_status" >&5 + echo "$as_me:11704: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11645,7 +11720,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:11648: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:11723: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:11733: checking for declaration of fd_set" >&5 echo $ECHO_N "checking for declaration of fd_set... $ECHO_C" >&6 if test "${cf_cv_type_fd_set+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else -echo "${as_me:-configure}:11664: testing sys/types alone ..." 1>&5 +echo "${as_me:-configure}:11739: testing sys/types alone ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 11667 "configure" +#line 11742 "configure" #include "confdefs.h" #include @@ -11677,26 +11752,26 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11680: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11755: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11683: \$? = $ac_status" >&5 + echo "$as_me:11758: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11686: \"$ac_try\"") >&5 + { (eval echo "$as_me:11761: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11689: \$? = $ac_status" >&5 + echo "$as_me:11764: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_fd_set=sys/types.h else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "${as_me:-configure}:11696: testing X11/Xpoll.h ..." 1>&5 +echo "${as_me:-configure}:11771: testing X11/Xpoll.h ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 11699 "configure" +#line 11774 "configure" #include "confdefs.h" #ifdef HAVE_X11_XPOLL_H @@ -11711,26 +11786,26 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11714: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11789: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11717: \$? = $ac_status" >&5 + echo "$as_me:11792: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11720: \"$ac_try\"") >&5 + { (eval echo "$as_me:11795: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11723: \$? = $ac_status" >&5 + echo "$as_me:11798: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_fd_set=X11/Xpoll.h else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "${as_me:-configure}:11730: testing sys/select.h ..." 1>&5 +echo "${as_me:-configure}:11805: testing sys/select.h ..." 1>&5 cat >conftest.$ac_ext <<_ACEOF -#line 11733 "configure" +#line 11808 "configure" #include "confdefs.h" #include @@ -11744,16 +11819,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11747: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11822: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11750: \$? = $ac_status" >&5 + echo "$as_me:11825: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11753: \"$ac_try\"") >&5 + { (eval echo "$as_me:11828: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11756: \$? = $ac_status" >&5 + echo "$as_me:11831: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_fd_set=sys/select.h else @@ -11767,7 +11842,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11770: result: $cf_cv_type_fd_set" >&5 +echo "$as_me:11845: 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 @@ -11777,7 +11852,7 @@ fi -echo "$as_me:11780: checking for declaration of fd_mask" >&5 +echo "$as_me:11855: checking for declaration of fd_mask" >&5 echo $ECHO_N "checking for declaration of fd_mask... $ECHO_C" >&6 if test "${cf_cv_type_fd_mask+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11785,7 +11860,7 @@ if test x$cf_cv_type_fd_set = xX11/Xpoll.h ; then cat >conftest.$ac_ext <<_ACEOF -#line 11788 "configure" +#line 11863 "configure" #include "confdefs.h" #include @@ -11798,27 +11873,27 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11801: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11876: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11804: \$? = $ac_status" >&5 + echo "$as_me:11879: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11807: \"$ac_try\"") >&5 + { (eval echo "$as_me:11882: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11810: \$? = $ac_status" >&5 + echo "$as_me:11885: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "${as_me:-configure}:11817: testing if we must define CSRG_BASED ..." 1>&5 +echo "${as_me:-configure}:11892: testing if we must define CSRG_BASED ..." 1>&5 # Xosdefs.h on Mac OS X may not define this (but it should). cat >conftest.$ac_ext <<_ACEOF -#line 11821 "configure" +#line 11896 "configure" #include "confdefs.h" #define CSRG_BASED @@ -11832,16 +11907,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11835: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11910: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11838: \$? = $ac_status" >&5 + echo "$as_me:11913: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11841: \"$ac_try\"") >&5 + { (eval echo "$as_me:11916: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11844: \$? = $ac_status" >&5 + echo "$as_me:11919: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_type_fd_mask=CSRG_BASED else @@ -11856,7 +11931,7 @@ fi fi -echo "$as_me:11859: result: $cf_cv_type_fd_mask" >&5 +echo "$as_me:11934: result: $cf_cv_type_fd_mask" >&5 echo "${ECHO_T}$cf_cv_type_fd_mask" >&6 if test x$cf_cv_type_fd_mask = xCSRG_BASED ; then @@ -11866,14 +11941,14 @@ fi -echo "$as_me:11869: checking for IRIX 6.5 baud-rate redefinitions" >&5 +echo "$as_me:11944: checking for IRIX 6.5 baud-rate redefinitions" >&5 echo $ECHO_N "checking for IRIX 6.5 baud-rate redefinitions... $ECHO_C" >&6 if test "${cf_cv_termio_c_ispeed+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 11876 "configure" +#line 11951 "configure" #include "confdefs.h" #include @@ -11891,16 +11966,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:11894: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11969: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:11897: \$? = $ac_status" >&5 + echo "$as_me:11972: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11900: \"$ac_try\"") >&5 + { (eval echo "$as_me:11975: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:11903: \$? = $ac_status" >&5 + echo "$as_me:11978: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_termio_c_ispeed=yes @@ -11912,7 +11987,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:11915: result: $cf_cv_termio_c_ispeed" >&5 +echo "$as_me:11990: result: $cf_cv_termio_c_ispeed" >&5 echo "${ECHO_T}$cf_cv_termio_c_ispeed" >&6 test "$cf_cv_termio_c_ispeed" = yes && cat >>confdefs.h <<\EOF @@ -11926,23 +12001,23 @@ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:11929: checking for $ac_header" >&5 +echo "$as_me:12004: 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 11935 "configure" +#line 12010 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:11939: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:12014: \"$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:11945: \$? = $ac_status" >&5 + echo "$as_me:12020: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -11961,7 +12036,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:11964: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:12039: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:12061: 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 11992 "configure" +#line 12067 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -12020,16 +12095,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12023: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12098: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12026: \$? = $ac_status" >&5 + echo "$as_me:12101: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12029: \"$ac_try\"") >&5 + { (eval echo "$as_me:12104: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12032: \$? = $ac_status" >&5 + echo "$as_me:12107: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -12039,7 +12114,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12042: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:12117: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 + echo "$as_me:12129: checking if grantpt really works" >&5 echo $ECHO_N "checking if grantpt really works... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 12057 "configure" +#line 12132 "configure" #include "confdefs.h" #include @@ -12152,23 +12227,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12155: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12230: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12158: \$? = $ac_status" >&5 + echo "$as_me:12233: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12161: \"$ac_try\"") >&5 + { (eval echo "$as_me:12236: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12164: \$? = $ac_status" >&5 + echo "$as_me:12239: \$? = $ac_status" >&5 (exit $ac_status); }; }; then if test "$cross_compiling" = yes; then ac_cv_func_grantpt=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 12171 "configure" +#line 12246 "configure" #include "confdefs.h" #include @@ -12264,15 +12339,15 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:12267: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12342: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12270: \$? = $ac_status" >&5 + echo "$as_me:12345: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:12272: \"$ac_try\"") >&5 + { (eval echo "$as_me:12347: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12275: \$? = $ac_status" >&5 + echo "$as_me:12350: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -12291,13 +12366,13 @@ ac_cv_func_grantpt=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - echo "$as_me:12294: result: $ac_cv_func_grantpt" >&5 + echo "$as_me:12369: result: $ac_cv_func_grantpt" >&5 echo "${ECHO_T}$ac_cv_func_grantpt" >&6 if test "x$ac_cv_func_grantpt" != "xno" ; then if test "x$ac_cv_func_grantpt" = "xyes" ; then - echo "$as_me:12300: checking for pty features" >&5 + echo "$as_me:12375: checking for pty features" >&5 echo $ECHO_N "checking for pty features... $ECHO_C" >&6 if test "x$ac_cv_header_stropts_h" = xyes then @@ -12313,15 +12388,15 @@ cf_pty_feature= cf_pty_next=`expr $cf_pty_this + 1` -echo "${as_me:-configure}:12316: testing pty feature test $cf_pty_next:5 ..." 1>&5 +echo "${as_me:-configure}:12391: testing pty feature test $cf_pty_next:5 ..." 1>&5 if test "$cross_compiling" = yes; then - { { echo "$as_me:12319: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:12394: 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 12324 "configure" +#line 12399 "configure" #include "confdefs.h" #define CONFTEST $cf_pty_this $cf_pty_defines @@ -12419,15 +12494,15 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:12422: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12497: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12425: \$? = $ac_status" >&5 + echo "$as_me:12500: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:12427: \"$ac_try\"") >&5 + { (eval echo "$as_me:12502: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12430: \$? = $ac_status" >&5 + echo "$as_me:12505: \$? = $ac_status" >&5 (exit $ac_status); }; }; then case $cf_pty_next in #(vi @@ -12459,7 +12534,7 @@ case $cf_pty_next in #(vi 1|2|3) -echo "${as_me:-configure}:12462: testing skipping remaining streams features $cf_pty_this..2 ..." 1>&5 +echo "${as_me:-configure}:12537: testing skipping remaining streams features $cf_pty_this..2 ..." 1>&5 cf_pty_next=3 ;; @@ -12478,15 +12553,15 @@ cf_pty_this=$cf_pty_next done - echo "$as_me:12481: result: $cf_grantpt_opts" >&5 + echo "$as_me:12556: result: $cf_grantpt_opts" >&5 echo "${ECHO_T}$cf_grantpt_opts" >&6 cf_grantpt_opts=`echo "$cf_grantpt_opts" | sed -e 's/ isatty//'` fi fi fi -if test "x$ac_cv_func_grantpt" != "xyes" || test -z "$cf_grantpt_opts" ; then - echo "$as_me:12489: checking for openpty in -lutil" >&5 +if test "x$disable_openpty" != "xyes" || test -z "$cf_grantpt_opts" ; then + echo "$as_me:12564: checking for openpty in -lutil" >&5 echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6 if test "${ac_cv_lib_util_openpty+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12494,7 +12569,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lutil $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 12497 "configure" +#line 12572 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -12513,16 +12588,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12516: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12591: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12519: \$? = $ac_status" >&5 + echo "$as_me:12594: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12522: \"$ac_try\"") >&5 + { (eval echo "$as_me:12597: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12525: \$? = $ac_status" >&5 + echo "$as_me:12600: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_util_openpty=yes else @@ -12533,7 +12608,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:12536: result: $ac_cv_lib_util_openpty" >&5 +echo "$as_me:12611: result: $ac_cv_lib_util_openpty" >&5 echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6 if test $ac_cv_lib_util_openpty = yes; then cf_have_openpty=yes @@ -12556,23 +12631,23 @@ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:12559: checking for $ac_header" >&5 +echo "$as_me:12634: 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 12565 "configure" +#line 12640 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:12569: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:12644: \"$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:12575: \$? = $ac_status" >&5 + echo "$as_me:12650: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -12591,7 +12666,7 @@ fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:12594: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:12669: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <&6 + +echo "${as_me:-configure}:12686: testing will rely upon grantpt ..." 1>&5 cat >>confdefs.h <<\EOF #define HAVE_WORKING_GRANTPT 1 @@ -12626,18 +12704,23 @@ then test -n "$verbose" && echo " will rely upon BSD-pseudoterminals" 1>&6 -echo "${as_me:-configure}:12629: testing will rely upon BSD-pseudoterminals ..." 1>&5 +echo "${as_me:-configure}:12707: testing will rely upon BSD-pseudoterminals ..." 1>&5 + +else + test -n "$verbose" && echo " will rely upon openpty" 1>&6 + +echo "${as_me:-configure}:12712: testing will rely upon openpty ..." 1>&5 fi -echo "$as_me:12633: checking if we can use XkbQueryExtension" >&5 +echo "$as_me:12716: checking if we can use XkbQueryExtension" >&5 echo $ECHO_N "checking if we can use XkbQueryExtension... $ECHO_C" >&6 if test "${cf_cv_xkb_query_extension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12640 "configure" +#line 12723 "configure" #include "confdefs.h" #include @@ -12666,16 +12749,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12669: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12752: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12672: \$? = $ac_status" >&5 + echo "$as_me:12755: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12675: \"$ac_try\"") >&5 + { (eval echo "$as_me:12758: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12678: \$? = $ac_status" >&5 + echo "$as_me:12761: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xkb_query_extension=yes @@ -12690,7 +12773,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12693: result: $cf_cv_xkb_query_extension" >&5 +echo "$as_me:12776: result: $cf_cv_xkb_query_extension" >&5 echo "${ECHO_T}$cf_cv_xkb_query_extension" >&6 if test $cf_cv_xkb_query_extension = yes @@ -12699,13 +12782,13 @@ for ac_func in XkbQueryExtension do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:12702: checking for $ac_func" >&5 +echo "$as_me:12785: 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 12708 "configure" +#line 12791 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -12736,16 +12819,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12739: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12822: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12742: \$? = $ac_status" >&5 + echo "$as_me:12825: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12745: \"$ac_try\"") >&5 + { (eval echo "$as_me:12828: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12748: \$? = $ac_status" >&5 + echo "$as_me:12831: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -12755,7 +12838,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12758: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:12841: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:12853: checking if we can use XkbKeycodeToKeysym" >&5 echo $ECHO_N "checking if we can use XkbKeycodeToKeysym... $ECHO_C" >&6 if test "${cf_cv_xkb_keycode_to_keysym+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12777 "configure" +#line 12860 "configure" #include "confdefs.h" #include @@ -12791,16 +12874,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:12794: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12877: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:12797: \$? = $ac_status" >&5 + echo "$as_me:12880: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12800: \"$ac_try\"") >&5 + { (eval echo "$as_me:12883: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12803: \$? = $ac_status" >&5 + echo "$as_me:12886: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xkb_keycode_to_keysym=yes @@ -12815,7 +12898,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:12818: result: $cf_cv_xkb_keycode_to_keysym" >&5 +echo "$as_me:12901: result: $cf_cv_xkb_keycode_to_keysym" >&5 echo "${ECHO_T}$cf_cv_xkb_keycode_to_keysym" >&6 if test $cf_cv_xkb_keycode_to_keysym = yes @@ -12824,13 +12907,13 @@ for ac_func in XkbKeycodeToKeysym do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:12827: checking for $ac_func" >&5 +echo "$as_me:12910: 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 12833 "configure" +#line 12916 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -12861,16 +12944,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12864: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12947: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12867: \$? = $ac_status" >&5 + echo "$as_me:12950: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12870: \"$ac_try\"") >&5 + { (eval echo "$as_me:12953: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12873: \$? = $ac_status" >&5 + echo "$as_me:12956: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -12880,7 +12963,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12883: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:12966: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:12978: checking for XKB Bell extension" >&5 echo $ECHO_N "checking for XKB Bell extension... $ECHO_C" >&6 if test "${cf_cv_xkb_bell_ext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 12902 "configure" +#line 12985 "configure" #include "confdefs.h" #include @@ -12919,16 +13002,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12922: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13005: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12925: \$? = $ac_status" >&5 + echo "$as_me:13008: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12928: \"$ac_try\"") >&5 + { (eval echo "$as_me:13011: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12931: \$? = $ac_status" >&5 + echo "$as_me:13014: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xkb_bell_ext=yes else @@ -12939,7 +13022,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:12942: result: $cf_cv_xkb_bell_ext" >&5 +echo "$as_me:13025: result: $cf_cv_xkb_bell_ext" >&5 echo "${ECHO_T}$cf_cv_xkb_bell_ext" >&6 test "$cf_cv_xkb_bell_ext" = yes && cat >>confdefs.h <<\EOF @@ -12949,13 +13032,13 @@ for ac_func in Xutf8LookupString do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:12952: checking for $ac_func" >&5 +echo "$as_me:13035: 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 12958 "configure" +#line 13041 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -12986,16 +13069,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:12989: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13072: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:12992: \$? = $ac_status" >&5 + echo "$as_me:13075: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:12995: \"$ac_try\"") >&5 + { (eval echo "$as_me:13078: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:12998: \$? = $ac_status" >&5 + echo "$as_me:13081: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -13005,7 +13088,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:13008: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:13091: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:13107: 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 @@ -13047,10 +13130,10 @@ enable_narrowproto=$cf_default_narrowproto fi; -echo "$as_me:13050: result: $enable_narrowproto" >&5 +echo "$as_me:13133: result: $enable_narrowproto" >&5 echo "${ECHO_T}$enable_narrowproto" >&6 -echo "$as_me:13053: checking if we should use imake to help" >&5 +echo "$as_me:13136: 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. @@ -13067,7 +13150,7 @@ enable_imake=yes fi; -echo "$as_me:13070: result: $enable_imake" >&5 +echo "$as_me:13153: result: $enable_imake" >&5 echo "${ECHO_T}$enable_imake" >&6 if test "$enable_imake" = yes ; then @@ -13076,7 +13159,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:13079: checking for $ac_word" >&5 +echo "$as_me:13162: 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 @@ -13093,7 +13176,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:13096: found $ac_dir/$ac_word" >&5 + echo "$as_me:13179: found $ac_dir/$ac_word" >&5 break fi done @@ -13104,10 +13187,10 @@ IMAKE=$ac_cv_path_IMAKE if test -n "$IMAKE"; then - echo "$as_me:13107: result: $IMAKE" >&5 + echo "$as_me:13190: result: $IMAKE" >&5 echo "${ECHO_T}$IMAKE" >&6 else - echo "$as_me:13110: result: no" >&5 + echo "$as_me:13193: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -13167,7 +13250,7 @@ then test -n "$verbose" && echo " Using $IMAKE $cf_imake_opts" 1>&6 -echo "${as_me:-configure}:13170: testing Using $IMAKE $cf_imake_opts ..." 1>&5 +echo "${as_me:-configure}:13253: testing Using $IMAKE $cf_imake_opts ..." 1>&5 else # sometimes imake doesn't have the config path compiled in. Find it. @@ -13185,7 +13268,7 @@ esac done if test -z "$cf_config" ; then - { echo "$as_me:13188: WARNING: Could not find imake config-directory" >&5 + { echo "$as_me:13271: 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" @@ -13193,10 +13276,10 @@ then test -n "$verbose" && echo " Using $IMAKE $cf_config" 1>&6 -echo "${as_me:-configure}:13196: testing Using $IMAKE $cf_config ..." 1>&5 +echo "${as_me:-configure}:13279: testing Using $IMAKE $cf_config ..." 1>&5 else - { echo "$as_me:13199: WARNING: Cannot run $IMAKE" >&5 + { echo "$as_me:13282: WARNING: Cannot run $IMAKE" >&5 echo "$as_me: WARNING: Cannot run $IMAKE" >&2;} fi fi @@ -13240,7 +13323,7 @@ else test -n "$verbose" && echo " suppressed \"$cf_nostdinc\" and \"$cf_std_incl\"" 1>&6 -echo "${as_me:-configure}:13243: testing suppressed \"$cf_nostdinc\" and \"$cf_std_incl\" ..." 1>&5 +echo "${as_me:-configure}:13326: testing suppressed \"$cf_nostdinc\" and \"$cf_std_incl\" ..." 1>&5 IMAKE_CFLAGS="$cf_cpp_opts" fi @@ -13262,11 +13345,11 @@ test -n "$verbose" && echo " IMAKE_CFLAGS $IMAKE_CFLAGS" 1>&6 -echo "${as_me:-configure}:13265: testing IMAKE_CFLAGS $IMAKE_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:13348: testing IMAKE_CFLAGS $IMAKE_CFLAGS ..." 1>&5 test -n "$verbose" && echo " IMAKE_LOADFLAGS $IMAKE_LOADFLAGS" 1>&6 -echo "${as_me:-configure}:13269: testing IMAKE_LOADFLAGS $IMAKE_LOADFLAGS ..." 1>&5 +echo "${as_me:-configure}:13352: testing IMAKE_LOADFLAGS $IMAKE_LOADFLAGS ..." 1>&5 fi @@ -13355,7 +13438,7 @@ IMAKE_LOADFLAGS= test -n "$verbose" && echo " make fallback definitions" 1>&6 -echo "${as_me:-configure}:13358: testing make fallback definitions ..." 1>&5 +echo "${as_me:-configure}:13441: testing make fallback definitions ..." 1>&5 # We prefer config.guess' values when we can get them, to avoid # inconsistent results with uname (AIX for instance). However, @@ -13489,27 +13572,27 @@ test -n "$verbose" && echo " removing terminfo flags from IMAKE_CFLAGS" 1>&6 -echo "${as_me:-configure}:13492: testing removing terminfo flags from IMAKE_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:13575: testing removing terminfo flags from IMAKE_CFLAGS ..." 1>&5 IMAKE_CFLAGS=`echo "$IMAKE_CFLAGS" | sed -e 's/-DUSE_TERMINFO[ ]*-DHAVE_TIGETSTR[ ]*//'` test -n "$verbose" && echo " ...result $IMAKE_CFLAGS" 1>&6 -echo "${as_me:-configure}:13497: testing ...result $IMAKE_CFLAGS ..." 1>&5 +echo "${as_me:-configure}:13580: testing ...result $IMAKE_CFLAGS ..." 1>&5 test -n "$verbose" && echo " removing terminfo flags from CPPFLAGS" 1>&6 -echo "${as_me:-configure}:13501: testing removing terminfo flags from CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:13584: testing removing terminfo flags from CPPFLAGS ..." 1>&5 CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/-DUSE_TERMINFO[ ]*-DHAVE_TIGETSTR[ ]*//'` test -n "$verbose" && echo " ...result $CPPFLAGS" 1>&6 -echo "${as_me:-configure}:13506: testing ...result $CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:13589: testing ...result $CPPFLAGS ..." 1>&5 ;; esac fi -echo "$as_me:13512: checking for default terminal-id" >&5 +echo "$as_me:13595: checking for default terminal-id" >&5 echo $ECHO_N "checking for default terminal-id... $ECHO_C" >&6 # Check whether --with-terminal-id or --without-terminal-id was given. @@ -13519,7 +13602,7 @@ else default_termid=vt420 fi; -echo "$as_me:13522: result: $default_termid" >&5 +echo "$as_me:13605: result: $default_termid" >&5 echo "${ECHO_T}$default_termid" >&6 case $default_termid in vt*) default_termid=`echo $default_termid | sed -e 's/^..//'` @@ -13530,7 +13613,7 @@ #define DFT_DECID "$default_termid" EOF -echo "$as_me:13533: checking for default terminal-type" >&5 +echo "$as_me:13616: checking for default terminal-type" >&5 echo $ECHO_N "checking for default terminal-type... $ECHO_C" >&6 # Check whether --with-terminal-type or --without-terminal-type was given. @@ -13540,7 +13623,7 @@ else default_TERM=xterm fi; -echo "$as_me:13543: result: $default_TERM" >&5 +echo "$as_me:13626: result: $default_TERM" >&5 echo "${ECHO_T}$default_TERM" >&6 cat >>confdefs.h <&5 -echo $ECHO_N "checking if backarrow-key should be DEL... $ECHO_C" >&6 +echo "$as_me:13634: checking if backarrow-key should be BS" >&5 +echo $ECHO_N "checking if backarrow-key should be BS... $ECHO_C" >&6 # Check whether --enable-backarrow-key or --disable-backarrow-key was given. if test "${enable_backarrow_key+set}" = set; then enableval="$enable_backarrow_key" test "$enableval" != no && enableval=yes if test "$enableval" != "yes" ; then - backarrow_is_del=$enableval + backarrow_is_bs=$enableval else - backarrow_is_del=yes + backarrow_is_bs=yes fi else enableval=yes - backarrow_is_del=yes + backarrow_is_bs=yes fi; -echo "$as_me:13569: result: $backarrow_is_del" >&5 -echo "${ECHO_T}$backarrow_is_del" >&6 -case $backarrow_is_del in #(vi +echo "$as_me:13652: result: $backarrow_is_bs" >&5 +echo "${ECHO_T}$backarrow_is_bs" >&6 +case $backarrow_is_bs in #(vi yes) #(vi - backarrow_is_del=true + backarrow_is_bs=true ;; no) #(vi - backarrow_is_del=false + backarrow_is_bs=false ;; esac -cf_xbool1=`echo "$backarrow_is_del"|sed -e 's/^\(.\).*/\1/'` +cf_xbool1=`echo "$backarrow_is_bs"|sed -e 's/^\(.\).*/\1/'` cf_xbool1=`echo "$cf_xbool1" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -cf_xbool2=`echo "$backarrow_is_del"|sed -e 's/^.//'` -backarrow_is_del=${cf_xbool1}${cf_xbool2} +cf_xbool2=`echo "$backarrow_is_bs"|sed -e 's/^.//'` +backarrow_is_bs=${cf_xbool1}${cf_xbool2} cat >>confdefs.h <&5 +echo "$as_me:13673: checking if backarrow-key should be treated as erase" >&5 echo $ECHO_N "checking if backarrow-key should be treated as erase... $ECHO_C" >&6 # Check whether --enable-backarrow-is-erase or --disable-backarrow-is-erase was given. @@ -13605,7 +13688,7 @@ fi; -echo "$as_me:13608: result: $backarrow_is_erase" >&5 +echo "$as_me:13691: result: $backarrow_is_erase" >&5 echo "${ECHO_T}$backarrow_is_erase" >&6 case $backarrow_is_erase in #(vi yes) #(vi @@ -13626,7 +13709,7 @@ #define DEF_BACKARO_ERASE $backarrow_is_erase EOF -echo "$as_me:13629: checking for default backspace/DEL setting" >&5 +echo "$as_me:13712: checking for default backspace/DEL setting" >&5 echo $ECHO_N "checking for default backspace/DEL setting... $ECHO_C" >&6 # Check whether --enable-delete-is-del or --disable-delete-is-del was given. @@ -13637,7 +13720,7 @@ delete_is_del=maybe fi; -echo "$as_me:13640: result: $delete_is_del" >&5 +echo "$as_me:13723: result: $delete_is_del" >&5 echo "${ECHO_T}$delete_is_del" >&6 case $delete_is_del in #(vi yes) #(vi @@ -13658,7 +13741,7 @@ #define DEFDELETE_DEL $delete_is_del EOF -echo "$as_me:13661: checking if alt should send ESC" >&5 +echo "$as_me:13744: checking if alt should send ESC" >&5 echo $ECHO_N "checking if alt should send ESC... $ECHO_C" >&6 # Check whether --enable-alt-sends-esc or --disable-alt-sends-esc was given. @@ -13676,7 +13759,7 @@ fi; -echo "$as_me:13679: result: $alt_sends_esc" >&5 +echo "$as_me:13762: result: $alt_sends_esc" >&5 echo "${ECHO_T}$alt_sends_esc" >&6 case $alt_sends_esc in #(vi yes) #(vi @@ -13697,7 +13780,7 @@ #define DEF_ALT_SENDS_ESC $alt_sends_esc EOF -echo "$as_me:13700: checking if meta should send ESC" >&5 +echo "$as_me:13783: checking if meta should send ESC" >&5 echo $ECHO_N "checking if meta should send ESC... $ECHO_C" >&6 # Check whether --enable-meta-sends-esc or --disable-meta-sends-esc was given. @@ -13715,7 +13798,7 @@ fi; -echo "$as_me:13718: result: $meta_sends_esc" >&5 +echo "$as_me:13801: result: $meta_sends_esc" >&5 echo "${ECHO_T}$meta_sends_esc" >&6 case $meta_sends_esc in #(vi yes) #(vi @@ -13739,7 +13822,7 @@ ############################################################################### # Extract the first word of "tic", so it can be a program name with args. set dummy tic; ac_word=$2 -echo "$as_me:13742: checking for $ac_word" >&5 +echo "$as_me:13825: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_cf_tic_prog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -13754,7 +13837,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_cf_tic_prog="yes" -echo "$as_me:13757: found $ac_dir/$ac_word" >&5 +echo "$as_me:13840: found $ac_dir/$ac_word" >&5 break done @@ -13763,15 +13846,15 @@ fi cf_tic_prog=$ac_cv_prog_cf_tic_prog if test -n "$cf_tic_prog"; then - echo "$as_me:13766: result: $cf_tic_prog" >&5 + echo "$as_me:13849: result: $cf_tic_prog" >&5 echo "${ECHO_T}$cf_tic_prog" >&6 else - echo "$as_me:13769: result: no" >&5 + echo "$as_me:13852: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$cf_tic_prog" = yes ; then - echo "$as_me:13774: checking for private terminfo-directory" >&5 + echo "$as_me:13857: checking for private terminfo-directory" >&5 echo $ECHO_N "checking for private terminfo-directory... $ECHO_C" >&6 # Check whether --with-own-terminfo or --without-own-terminfo was given. @@ -13781,10 +13864,10 @@ else TERMINFO_DIR=${TERMINFO-none} fi; - echo "$as_me:13784: result: $TERMINFO_DIR" >&5 + echo "$as_me:13867: result: $TERMINFO_DIR" >&5 echo "${ECHO_T}$TERMINFO_DIR" >&6 if test "$TERMINFO_DIR" = yes ; then - { echo "$as_me:13787: WARNING: no value given" >&5 + { echo "$as_me:13870: WARNING: no value given" >&5 echo "$as_me: WARNING: no value given" >&2;} elif test "$TERMINFO_DIR" != none ; then if test -d $TERMINFO_DIR ; then @@ -13794,7 +13877,7 @@ EOF else - { echo "$as_me:13797: WARNING: not a directory" >&5 + { echo "$as_me:13880: WARNING: not a directory" >&5 echo "$as_me: WARNING: not a directory" >&2;} fi elif test "$prefix" != NONE ; then @@ -13818,7 +13901,7 @@ ############################################################################### -echo "$as_me:13821: checking if you want active-icons" >&5 +echo "$as_me:13904: checking if you want active-icons" >&5 echo $ECHO_N "checking if you want active-icons... $ECHO_C" >&6 # Check whether --enable-active-icon or --disable-active-icon was given. @@ -13835,7 +13918,7 @@ enable_active_icon=yes fi; -echo "$as_me:13838: result: $enable_active_icon" >&5 +echo "$as_me:13921: result: $enable_active_icon" >&5 echo "${ECHO_T}$enable_active_icon" >&6 if test "$enable_active_icon" = no ; then @@ -13845,7 +13928,7 @@ fi -echo "$as_me:13848: checking if you want ANSI color" >&5 +echo "$as_me:13931: checking if you want ANSI color" >&5 echo $ECHO_N "checking if you want ANSI color... $ECHO_C" >&6 # Check whether --enable-ansi-color or --disable-ansi-color was given. @@ -13862,7 +13945,7 @@ enable_ansi_color=yes fi; -echo "$as_me:13865: result: $enable_ansi_color" >&5 +echo "$as_me:13948: result: $enable_ansi_color" >&5 echo "${ECHO_T}$enable_ansi_color" >&6 test "$enable_ansi_color" = no && cat >>confdefs.h <<\EOF @@ -13871,7 +13954,7 @@ if test "$enable_ansi_color" = yes ; then - echo "$as_me:13874: checking if you want 16 colors like aixterm" >&5 + echo "$as_me:13957: checking if you want 16 colors like aixterm" >&5 echo $ECHO_N "checking if you want 16 colors like aixterm... $ECHO_C" >&6 # Check whether --enable-16-color or --disable-16-color was given. @@ -13888,14 +13971,14 @@ enable_16_color=yes fi; - echo "$as_me:13891: result: $enable_16_color" >&5 + echo "$as_me:13974: result: $enable_16_color" >&5 echo "${ECHO_T}$enable_16_color" >&6 test "$enable_16_color" = no && cat >>confdefs.h <<\EOF #define OPT_AIX_COLORS 0 EOF - echo "$as_me:13898: checking if you want 256 colors" >&5 + echo "$as_me:13981: checking if you want 256 colors" >&5 echo $ECHO_N "checking if you want 256 colors... $ECHO_C" >&6 # Check whether --enable-256-color or --disable-256-color was given. @@ -13912,7 +13995,7 @@ enable_256_color=no fi; - echo "$as_me:13915: result: $enable_256_color" >&5 + echo "$as_me:13998: result: $enable_256_color" >&5 echo "${ECHO_T}$enable_256_color" >&6 if test "$enable_256_color" = yes ; then CHARPROC_DEPS="$CHARPROC_DEPS 256colres.h" @@ -13923,7 +14006,7 @@ EOF else - echo "$as_me:13926: checking if you want 88 colors" >&5 + echo "$as_me:14009: checking if you want 88 colors" >&5 echo $ECHO_N "checking if you want 88 colors... $ECHO_C" >&6 # Check whether --enable-88-color or --disable-88-color was given. @@ -13940,7 +14023,7 @@ enable_88_color=no fi; - echo "$as_me:13943: result: $enable_88_color" >&5 + echo "$as_me:14026: result: $enable_88_color" >&5 echo "${ECHO_T}$enable_88_color" >&6 if test "$enable_88_color" = yes ; then CHARPROC_DEPS="$CHARPROC_DEPS 88colres.h" @@ -13955,7 +14038,7 @@ fi -echo "$as_me:13958: checking if you want blinking cursor" >&5 +echo "$as_me:14041: checking if you want blinking cursor" >&5 echo $ECHO_N "checking if you want blinking cursor... $ECHO_C" >&6 # Check whether --enable-blink-cursor or --disable-blink-cursor was given. @@ -13972,14 +14055,14 @@ enable_blink_curs=yes fi; -echo "$as_me:13975: result: $enable_blink_curs" >&5 +echo "$as_me:14058: result: $enable_blink_curs" >&5 echo "${ECHO_T}$enable_blink_curs" >&6 test "$enable_blink_curs" = no && cat >>confdefs.h <<\EOF #define OPT_BLINK_CURS 0 EOF -echo "$as_me:13982: checking if you want to ignore Linux's broken palette-strings" >&5 +echo "$as_me:14065: checking if you want to ignore Linux's broken palette-strings" >&5 echo $ECHO_N "checking if you want to ignore Linux's broken palette-strings... $ECHO_C" >&6 case $host_os in #(vi @@ -14003,7 +14086,7 @@ enable_broken_osc=$enableval fi; -echo "$as_me:14006: result: $enable_broken_osc" >&5 +echo "$as_me:14089: result: $enable_broken_osc" >&5 echo "${ECHO_T}$enable_broken_osc" >&6 if test "$enable_broken_osc" = yes ; then @@ -14019,7 +14102,7 @@ fi -echo "$as_me:14022: checking if you want to allow broken string-terminators" >&5 +echo "$as_me:14105: checking if you want to allow broken string-terminators" >&5 echo $ECHO_N "checking if you want to allow broken string-terminators... $ECHO_C" >&6 # Check whether --enable-broken-st or --disable-broken-st was given. @@ -14036,14 +14119,14 @@ enable_broken_st=yes fi; -echo "$as_me:14039: result: $enable_broken_st" >&5 +echo "$as_me:14122: result: $enable_broken_st" >&5 echo "${ECHO_T}$enable_broken_st" >&6 test "$enable_broken_st" = no && cat >>confdefs.h <<\EOF #define OPT_BROKEN_ST 0 EOF -echo "$as_me:14046: checking if you want printable 128-159" >&5 +echo "$as_me:14129: checking if you want printable 128-159" >&5 echo $ECHO_N "checking if you want printable 128-159... $ECHO_C" >&6 # Check whether --enable-c1-print or --disable-c1-print was given. @@ -14060,7 +14143,7 @@ enable_c1_print=yes fi; -echo "$as_me:14063: result: $enable_c1_print" >&5 +echo "$as_me:14146: result: $enable_c1_print" >&5 echo "${ECHO_T}$enable_c1_print" >&6 test "$enable_c1_print" = no && cat >>confdefs.h <<\EOF @@ -14069,7 +14152,7 @@ if test "$enable_ansi_color" = yes ; then - echo "$as_me:14072: checking if you want bold colors mapped like IBM PC" >&5 + echo "$as_me:14155: checking if you want bold colors mapped like IBM PC" >&5 echo $ECHO_N "checking if you want bold colors mapped like IBM PC... $ECHO_C" >&6 # Check whether --enable-bold-color or --disable-bold-color was given. @@ -14086,14 +14169,14 @@ enable_pc_color=yes fi; - echo "$as_me:14089: result: $enable_pc_color" >&5 + echo "$as_me:14172: result: $enable_pc_color" >&5 echo "${ECHO_T}$enable_pc_color" >&6 test "$enable_pc_color" = no && cat >>confdefs.h <<\EOF #define OPT_PC_COLORS 0 EOF - echo "$as_me:14096: checking if you want separate color-classes" >&5 + echo "$as_me:14179: checking if you want separate color-classes" >&5 echo $ECHO_N "checking if you want separate color-classes... $ECHO_C" >&6 # Check whether --enable-color-class or --disable-color-class was given. @@ -14110,14 +14193,14 @@ enable_color_class=yes fi; - echo "$as_me:14113: result: $enable_color_class" >&5 + echo "$as_me:14196: result: $enable_color_class" >&5 echo "${ECHO_T}$enable_color_class" >&6 test "$enable_color_class" = no && cat >>confdefs.h <<\EOF #define OPT_COLOR_CLASS 0 EOF - echo "$as_me:14120: checking if you want color-mode enabled by default" >&5 + echo "$as_me:14203: checking if you want color-mode enabled by default" >&5 echo $ECHO_N "checking if you want color-mode enabled by default... $ECHO_C" >&6 # Check whether --enable-color-mode or --disable-color-mode was given. @@ -14134,7 +14217,7 @@ default_colormode=yes fi; - echo "$as_me:14137: result: $default_colormode" >&5 + echo "$as_me:14220: result: $default_colormode" >&5 echo "${ECHO_T}$default_colormode" >&6 test "$default_colormode" = no && cat >>confdefs.h <<\EOF @@ -14143,7 +14226,7 @@ fi -echo "$as_me:14146: checking if you want support for color highlighting" >&5 +echo "$as_me:14229: checking if you want support for color highlighting" >&5 echo $ECHO_N "checking if you want support for color highlighting... $ECHO_C" >&6 # Check whether --enable-highlighting or --disable-highlighting was given. @@ -14160,14 +14243,14 @@ default_highlight=yes fi; -echo "$as_me:14163: result: $default_highlight" >&5 +echo "$as_me:14246: result: $default_highlight" >&5 echo "${ECHO_T}$default_highlight" >&6 test "$default_highlight" = no && cat >>confdefs.h <<\EOF #define OPT_HIGHLIGHT_COLOR 0 EOF -echo "$as_me:14170: checking if you want support for doublesize characters" >&5 +echo "$as_me:14253: checking if you want support for doublesize characters" >&5 echo $ECHO_N "checking if you want support for doublesize characters... $ECHO_C" >&6 # Check whether --enable-doublechars or --disable-doublechars was given. @@ -14184,14 +14267,14 @@ enable_doublechars=yes fi; -echo "$as_me:14187: result: $enable_doublechars" >&5 +echo "$as_me:14270: result: $enable_doublechars" >&5 echo "${ECHO_T}$enable_doublechars" >&6 test "$enable_doublechars" = no && cat >>confdefs.h <<\EOF #define OPT_DEC_CHRSET 0 EOF -echo "$as_me:14194: checking if you want fallback-support for box characters" >&5 +echo "$as_me:14277: checking if you want fallback-support for box characters" >&5 echo $ECHO_N "checking if you want fallback-support for box characters... $ECHO_C" >&6 # Check whether --enable-boxchars or --disable-boxchars was given. @@ -14208,14 +14291,14 @@ enable_boxchars=yes fi; -echo "$as_me:14211: result: $enable_boxchars" >&5 +echo "$as_me:14294: result: $enable_boxchars" >&5 echo "${ECHO_T}$enable_boxchars" >&6 test "$enable_boxchars" = no && cat >>confdefs.h <<\EOF #define OPT_BOX_CHARS 0 EOF -echo "$as_me:14218: checking if you want to allow spawning new xterms" >&5 +echo "$as_me:14301: checking if you want to allow spawning new xterms" >&5 echo $ECHO_N "checking if you want to allow spawning new xterms... $ECHO_C" >&6 # Check whether --enable-exec-xterm or --disable-exec-xterm was given. @@ -14232,11 +14315,11 @@ enable_exec_xterm=no fi; -echo "$as_me:14235: result: $enable_exec_xterm" >&5 +echo "$as_me:14318: result: $enable_exec_xterm" >&5 echo "${ECHO_T}$enable_exec_xterm" >&6 if test "$enable_exec_xterm" = yes ; then -echo "$as_me:14239: checking for proc tree with cwd-support" >&5 +echo "$as_me:14322: checking for proc tree with cwd-support" >&5 echo $ECHO_N "checking for proc tree with cwd-support... $ECHO_C" >&6 if test "${cf_cv_procfs_cwd+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14255,11 +14338,11 @@ done fi -echo "$as_me:14258: result: $cf_cv_procfs_cwd" >&5 +echo "$as_me:14341: result: $cf_cv_procfs_cwd" >&5 echo "${ECHO_T}$cf_cv_procfs_cwd" >&6 if test "$cf_cv_procfs_cwd" = no ; then - { echo "$as_me:14262: WARNING: no suitable proc filesystem found" >&5 + { echo "$as_me:14345: WARNING: no suitable proc filesystem found" >&5 echo "$as_me: WARNING: no suitable proc filesystem found" >&2;} else @@ -14274,7 +14357,7 @@ fi fi -echo "$as_me:14277: checking if you want to use double-buffering" >&5 +echo "$as_me:14360: checking if you want to use double-buffering" >&5 echo $ECHO_N "checking if you want to use double-buffering... $ECHO_C" >&6 # Check whether --enable-double-buffer or --disable-double-buffer was given. @@ -14291,7 +14374,7 @@ enable_double_bfr=no fi; -echo "$as_me:14294: result: $enable_double_bfr" >&5 +echo "$as_me:14377: result: $enable_double_bfr" >&5 echo "${ECHO_T}$enable_double_bfr" >&6 if test "$enable_double_bfr" = yes ; then case "x$LIBS" in @@ -14302,17 +14385,17 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then test -n "$verbose" && echo " found package Xext" 1>&6 -echo "${as_me:-configure}:14305: testing found package Xext ..." 1>&5 +echo "${as_me:-configure}:14388: testing found package Xext ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs Xext 2>/dev/null`" test -n "$verbose" && echo " package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14311: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:14394: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package Xext LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:14315: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:14398: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -14396,7 +14479,7 @@ : else - echo "$as_me:14399: checking for XextCreateExtension in -lXext" >&5 + echo "$as_me:14482: 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 @@ -14404,7 +14487,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 14407 "configure" +#line 14490 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14423,16 +14506,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14426: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14509: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14429: \$? = $ac_status" >&5 + echo "$as_me:14512: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14432: \"$ac_try\"") >&5 + { (eval echo "$as_me:14515: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14435: \$? = $ac_status" >&5 + echo "$as_me:14518: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xext_XextCreateExtension=yes else @@ -14443,7 +14526,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:14446: result: $ac_cv_lib_Xext_XextCreateExtension" >&5 +echo "$as_me:14529: 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" @@ -14460,7 +14543,7 @@ fi -echo "$as_me:14463: checking if you want to use FreeType library" >&5 +echo "$as_me:14546: checking if you want to use FreeType library" >&5 echo $ECHO_N "checking if you want to use FreeType library... $ECHO_C" >&6 # Check whether --enable-freetype or --disable-freetype was given. @@ -14477,7 +14560,7 @@ enable_freetype=yes fi; -echo "$as_me:14480: result: $enable_freetype" >&5 +echo "$as_me:14563: result: $enable_freetype" >&5 echo "${ECHO_T}$enable_freetype" >&6 if test "$enable_freetype" = yes ; then @@ -14487,7 +14570,7 @@ FREETYPE_CONFIG=none FREETYPE_PARAMS= -echo "$as_me:14490: checking for FreeType configuration script" >&5 +echo "$as_me:14573: checking for FreeType configuration script" >&5 echo $ECHO_N "checking for FreeType configuration script... $ECHO_C" >&6 # Check whether --with-freetype-config or --without-freetype-config was given. @@ -14499,12 +14582,12 @@ fi; test -z $cf_cv_x_freetype_cfgs && cf_cv_x_freetype_cfgs=auto test $cf_cv_x_freetype_cfgs = no && cf_cv_x_freetype_cfgs=none -echo "$as_me:14502: result: $cf_cv_x_freetype_cfgs" >&5 +echo "$as_me:14585: result: $cf_cv_x_freetype_cfgs" >&5 echo "${ECHO_T}$cf_cv_x_freetype_cfgs" >&6 case $cf_cv_x_freetype_cfgs in none) #(vi - echo "$as_me:14507: checking if you specified -D/-I options for FreeType" >&5 + echo "$as_me:14590: checking if you specified -D/-I options for FreeType" >&5 echo $ECHO_N "checking if you specified -D/-I options for FreeType... $ECHO_C" >&6 # Check whether --with-freetype-cflags or --without-freetype-cflags was given. @@ -14514,10 +14597,10 @@ else cf_cv_x_freetype_incs=no fi; - echo "$as_me:14517: result: $cf_cv_x_freetype_incs" >&5 + echo "$as_me:14600: result: $cf_cv_x_freetype_incs" >&5 echo "${ECHO_T}$cf_cv_x_freetype_incs" >&6 - echo "$as_me:14520: checking if you specified -L/-l options for FreeType" >&5 + echo "$as_me:14603: checking if you specified -L/-l options for FreeType" >&5 echo $ECHO_N "checking if you specified -L/-l options for FreeType... $ECHO_C" >&6 # Check whether --with-freetype-libs or --without-freetype-libs was given. @@ -14527,7 +14610,7 @@ else cf_cv_x_freetype_libs=no fi; - echo "$as_me:14530: result: $cf_cv_x_freetype_libs" >&5 + echo "$as_me:14613: result: $cf_cv_x_freetype_libs" >&5 echo "${ECHO_T}$cf_cv_x_freetype_libs" >&6 ;; auto) #(vi @@ -14537,7 +14620,7 @@ else # Extract the first word of "freetype-config", so it can be a program name with args. set dummy freetype-config; ac_word=$2 -echo "$as_me:14540: checking for $ac_word" >&5 +echo "$as_me:14623: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FREETYPE_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14554,7 +14637,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_FREETYPE_CONFIG="$ac_dir/$ac_word" - echo "$as_me:14557: found $ac_dir/$ac_word" >&5 + echo "$as_me:14640: found $ac_dir/$ac_word" >&5 break fi done @@ -14566,10 +14649,10 @@ FREETYPE_CONFIG=$ac_cv_path_FREETYPE_CONFIG if test -n "$FREETYPE_CONFIG"; then - echo "$as_me:14569: result: $FREETYPE_CONFIG" >&5 + echo "$as_me:14652: result: $FREETYPE_CONFIG" >&5 echo "${ECHO_T}$FREETYPE_CONFIG" >&6 else - echo "$as_me:14572: result: no" >&5 + echo "$as_me:14655: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -14579,7 +14662,7 @@ else # Extract the first word of "xft-config", so it can be a program name with args. set dummy xft-config; ac_word=$2 -echo "$as_me:14582: checking for $ac_word" >&5 +echo "$as_me:14665: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FREETYPE_OLD_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14596,7 +14679,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_FREETYPE_OLD_CONFIG="$ac_dir/$ac_word" - echo "$as_me:14599: found $ac_dir/$ac_word" >&5 + echo "$as_me:14682: found $ac_dir/$ac_word" >&5 break fi done @@ -14608,10 +14691,10 @@ FREETYPE_OLD_CONFIG=$ac_cv_path_FREETYPE_OLD_CONFIG if test -n "$FREETYPE_OLD_CONFIG"; then - echo "$as_me:14611: result: $FREETYPE_OLD_CONFIG" >&5 + echo "$as_me:14694: result: $FREETYPE_OLD_CONFIG" >&5 echo "${ECHO_T}$FREETYPE_OLD_CONFIG" >&6 else - echo "$as_me:14614: result: no" >&5 + echo "$as_me:14697: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -14626,14 +14709,14 @@ FREETYPE_CONFIG=$cf_cv_x_freetype_cfgs FREETYPE_PARAMS=xft else - { echo "$as_me:14629: WARNING: cannot find pkg-config for Xft" >&5 + { echo "$as_me:14712: WARNING: cannot find pkg-config for Xft" >&5 echo "$as_me: WARNING: cannot find pkg-config for Xft" >&2;} fi ;; *) #(vi # Extract the first word of "$cf_cv_x_freetype_cfgs", so it can be a program name with args. set dummy $cf_cv_x_freetype_cfgs; ac_word=$2 -echo "$as_me:14636: checking for $ac_word" >&5 +echo "$as_me:14719: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FREETYPE_XFT_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14650,7 +14733,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_FREETYPE_XFT_CONFIG="$ac_dir/$ac_word" - echo "$as_me:14653: found $ac_dir/$ac_word" >&5 + echo "$as_me:14736: found $ac_dir/$ac_word" >&5 break fi done @@ -14662,41 +14745,41 @@ FREETYPE_XFT_CONFIG=$ac_cv_path_FREETYPE_XFT_CONFIG if test -n "$FREETYPE_XFT_CONFIG"; then - echo "$as_me:14665: result: $FREETYPE_XFT_CONFIG" >&5 + echo "$as_me:14748: result: $FREETYPE_XFT_CONFIG" >&5 echo "${ECHO_T}$FREETYPE_XFT_CONFIG" >&6 else - echo "$as_me:14668: result: no" >&5 + echo "$as_me:14751: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$FREETYPE_XFT_CONFIG" != none; then FREETYPE_CONFIG=$FREETYPE_XFT_CONFIG else - { echo "$as_me:14675: WARNING: cannot find config script for Xft" >&5 + { echo "$as_me:14758: WARNING: cannot find config script for Xft" >&5 echo "$as_me: WARNING: cannot find config script for Xft" >&2;} fi ;; esac if test "$FREETYPE_CONFIG" != none ; then - echo "$as_me:14682: checking for FreeType config" >&5 + echo "$as_me:14765: checking for FreeType config" >&5 echo $ECHO_N "checking for FreeType config... $ECHO_C" >&6 - echo "$as_me:14684: result: $FREETYPE_CONFIG $FREETYPE_PARAMS" >&5 + echo "$as_me:14767: result: $FREETYPE_CONFIG $FREETYPE_PARAMS" >&5 echo "${ECHO_T}$FREETYPE_CONFIG $FREETYPE_PARAMS" >&6 if test "$cf_cv_x_freetype_incs" = no ; then - echo "$as_me:14688: checking for $FREETYPE_CONFIG cflags" >&5 + echo "$as_me:14771: checking for $FREETYPE_CONFIG cflags" >&5 echo $ECHO_N "checking for $FREETYPE_CONFIG cflags... $ECHO_C" >&6 cf_cv_x_freetype_incs="`$FREETYPE_CONFIG $FREETYPE_PARAMS --cflags 2>/dev/null`" - echo "$as_me:14691: result: $cf_cv_x_freetype_incs" >&5 + echo "$as_me:14774: result: $cf_cv_x_freetype_incs" >&5 echo "${ECHO_T}$cf_cv_x_freetype_incs" >&6 fi if test "$cf_cv_x_freetype_libs" = no ; then - echo "$as_me:14696: checking for $FREETYPE_CONFIG libs" >&5 + echo "$as_me:14779: checking for $FREETYPE_CONFIG libs" >&5 echo $ECHO_N "checking for $FREETYPE_CONFIG libs... $ECHO_C" >&6 cf_cv_x_freetype_libs="$cf_extra_freetype_libs `$FREETYPE_CONFIG $FREETYPE_PARAMS --libs 2>/dev/null`" - echo "$as_me:14699: result: $cf_cv_x_freetype_libs" >&5 + echo "$as_me:14782: result: $cf_cv_x_freetype_libs" >&5 echo "${ECHO_T}$cf_cv_x_freetype_libs" >&6 fi fi @@ -14709,7 +14792,7 @@ cf_cv_x_freetype_libs=-lXft fi -echo "$as_me:14712: checking if we can link with FreeType libraries" >&5 +echo "$as_me:14795: checking if we can link with FreeType libraries" >&5 echo $ECHO_N "checking if we can link with FreeType libraries... $ECHO_C" >&6 cf_save_LIBS="$LIBS" @@ -14719,7 +14802,7 @@ CPPFLAGS="$CPPFLAGS $cf_cv_x_freetype_incs" cat >conftest.$ac_ext <<_ACEOF -#line 14722 "configure" +#line 14805 "configure" #include "confdefs.h" #include @@ -14735,16 +14818,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14738: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14821: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14741: \$? = $ac_status" >&5 + echo "$as_me:14824: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14744: \"$ac_try\"") >&5 + { (eval echo "$as_me:14827: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14747: \$? = $ac_status" >&5 + echo "$as_me:14830: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_found_freetype=yes else @@ -14753,7 +14836,7 @@ cf_cv_found_freetype=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -echo "$as_me:14756: result: $cf_cv_found_freetype" >&5 +echo "$as_me:14839: result: $cf_cv_found_freetype" >&5 echo "${ECHO_T}$cf_cv_found_freetype" >&6 LIBS="$cf_save_LIBS" @@ -14851,13 +14934,13 @@ do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:14854: checking for $ac_func" >&5 +echo "$as_me:14937: 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 14860 "configure" +#line 14943 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -14888,16 +14971,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14891: \"$ac_link\"") >&5 +if { (eval echo "$as_me:14974: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14894: \$? = $ac_status" >&5 + echo "$as_me:14977: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14897: \"$ac_try\"") >&5 + { (eval echo "$as_me:14980: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14900: \$? = $ac_status" >&5 + echo "$as_me:14983: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -14907,7 +14990,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14910: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:14993: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 + { echo "$as_me:15004: WARNING: No libraries found for FreeType" >&5 echo "$as_me: WARNING: No libraries found for FreeType" >&2;} CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//` fi @@ -14926,14 +15009,14 @@ # FIXME: revisit this if needed if test "$cf_cv_found_freetype" = yes ; then -echo "$as_me:14929: checking for usable Xft/fontconfig package" >&5 +echo "$as_me:15012: checking for usable Xft/fontconfig package" >&5 echo $ECHO_N "checking for usable Xft/fontconfig package... $ECHO_C" >&6 if test "${cf_cv_xft_compat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 14936 "configure" +#line 15019 "configure" #include "confdefs.h" #include @@ -14952,16 +15035,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14955: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15038: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:14958: \$? = $ac_status" >&5 + echo "$as_me:15041: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14961: \"$ac_try\"") >&5 + { (eval echo "$as_me:15044: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:14964: \$? = $ac_status" >&5 + echo "$as_me:15047: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_xft_compat=yes else @@ -14972,7 +15055,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:14975: result: $cf_cv_xft_compat" >&5 +echo "$as_me:15058: result: $cf_cv_xft_compat" >&5 echo "${ECHO_T}$cf_cv_xft_compat" >&6 if test "$cf_cv_xft_compat" = no @@ -14984,22 +15067,22 @@ *) test -n "$verbose" && echo " work around broken package" 1>&6 -echo "${as_me:-configure}:14987: testing work around broken package ..." 1>&5 +echo "${as_me:-configure}:15070: testing work around broken package ..." 1>&5 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists fontconfig; then test -n "$verbose" && echo " found package fontconfig" 1>&6 -echo "${as_me:-configure}:14992: testing found package fontconfig ..." 1>&5 +echo "${as_me:-configure}:15075: testing found package fontconfig ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags fontconfig 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs fontconfig 2>/dev/null`" test -n "$verbose" && echo " package fontconfig CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:14998: testing package fontconfig CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15081: testing package fontconfig CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package fontconfig LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:15002: testing package fontconfig LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15085: testing package fontconfig LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -15085,12 +15168,12 @@ test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:15088: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:15171: testing ...before $LIBS ..." 1>&5 LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXft ,-lXft -lfontconfig ," -e 's/ / /g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:15093: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:15176: testing ...after $LIBS ..." 1>&5 fi @@ -15103,7 +15186,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-DXRENDERFONT//` fi -echo "$as_me:15106: checking if you want support for HP-style function keys" >&5 +echo "$as_me:15189: checking if you want support for HP-style function keys" >&5 echo $ECHO_N "checking if you want support for HP-style function keys... $ECHO_C" >&6 # Check whether --enable-hp-fkeys or --disable-hp-fkeys was given. @@ -15120,7 +15203,7 @@ enable_hp_fkeys=no fi; -echo "$as_me:15123: result: $enable_hp_fkeys" >&5 +echo "$as_me:15206: result: $enable_hp_fkeys" >&5 echo "${ECHO_T}$enable_hp_fkeys" >&6 if test "$enable_hp_fkeys" = yes ; then @@ -15130,7 +15213,7 @@ fi -echo "$as_me:15133: checking if you want support for SCO-style function keys" >&5 +echo "$as_me:15216: checking if you want support for SCO-style function keys" >&5 echo $ECHO_N "checking if you want support for SCO-style function keys... $ECHO_C" >&6 # Check whether --enable-sco-fkeys or --disable-sco-fkeys was given. @@ -15147,7 +15230,7 @@ enable_sco_fkeys=no fi; -echo "$as_me:15150: result: $enable_sco_fkeys" >&5 +echo "$as_me:15233: result: $enable_sco_fkeys" >&5 echo "${ECHO_T}$enable_sco_fkeys" >&6 if test "$enable_sco_fkeys" = yes ; then @@ -15157,7 +15240,7 @@ fi -echo "$as_me:15160: checking if you want support for Sun-style function keys" >&5 +echo "$as_me:15243: checking if you want support for Sun-style function keys" >&5 echo $ECHO_N "checking if you want support for Sun-style function keys... $ECHO_C" >&6 # Check whether --enable-sun-fkeys or --disable-sun-fkeys was given. @@ -15174,7 +15257,7 @@ enable_sun_fkeys=yes fi; -echo "$as_me:15177: result: $enable_sun_fkeys" >&5 +echo "$as_me:15260: result: $enable_sun_fkeys" >&5 echo "${ECHO_T}$enable_sun_fkeys" >&6 if test "$enable_sun_fkeys" = no ; then @@ -15184,7 +15267,7 @@ fi -echo "$as_me:15187: checking if you want saved-lines stored as a FIFO" >&5 +echo "$as_me:15270: checking if you want saved-lines stored as a FIFO" >&5 echo $ECHO_N "checking if you want saved-lines stored as a FIFO... $ECHO_C" >&6 # Check whether --enable-fifo-lines or --disable-fifo-lines was given. @@ -15201,7 +15284,7 @@ enable_fifo_lines=yes fi; -echo "$as_me:15204: result: $enable_fifo_lines" >&5 +echo "$as_me:15287: result: $enable_fifo_lines" >&5 echo "${ECHO_T}$enable_fifo_lines" >&6 if test "$enable_fifo_lines" = yes ; then @@ -15211,7 +15294,7 @@ fi -echo "$as_me:15214: checking if you want support for internationalization" >&5 +echo "$as_me:15297: checking if you want support for internationalization" >&5 echo $ECHO_N "checking if you want support for internationalization... $ECHO_C" >&6 # Check whether --enable-i18n or --disable-i18n was given. @@ -15228,7 +15311,7 @@ enable_i18n=yes fi; -echo "$as_me:15231: result: $enable_i18n" >&5 +echo "$as_me:15314: result: $enable_i18n" >&5 echo "${ECHO_T}$enable_i18n" >&6 if test "$enable_i18n" = no ; then @@ -15238,7 +15321,7 @@ fi -echo "$as_me:15241: checking if you want support for initial-erase setup" >&5 +echo "$as_me:15324: checking if you want support for initial-erase setup" >&5 echo $ECHO_N "checking if you want support for initial-erase setup... $ECHO_C" >&6 # Check whether --enable-initial-erase or --disable-initial-erase was given. @@ -15255,7 +15338,7 @@ enable_ie=yes fi; -echo "$as_me:15258: result: $enable_ie" >&5 +echo "$as_me:15341: result: $enable_ie" >&5 echo "${ECHO_T}$enable_ie" >&6 if test "$enable_ie" = no ; then @@ -15265,7 +15348,7 @@ fi -echo "$as_me:15268: checking if you want support for input-method" >&5 +echo "$as_me:15351: checking if you want support for input-method" >&5 echo $ECHO_N "checking if you want support for input-method... $ECHO_C" >&6 # Check whether --enable-input-method or --disable-input-method was given. @@ -15282,17 +15365,17 @@ enable_ximp=yes fi; -echo "$as_me:15285: result: $enable_ximp" >&5 +echo "$as_me:15368: result: $enable_ximp" >&5 echo "${ECHO_T}$enable_ximp" >&6 -echo "$as_me:15288: checking if X libraries support input-method" >&5 +echo "$as_me:15371: checking if X libraries support input-method" >&5 echo $ECHO_N "checking if X libraries support input-method... $ECHO_C" >&6 if test "${cf_cv_input_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15295 "configure" +#line 15378 "configure" #include "confdefs.h" #include @@ -15324,16 +15407,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15327: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15410: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15330: \$? = $ac_status" >&5 + echo "$as_me:15413: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15333: \"$ac_try\"") >&5 + { (eval echo "$as_me:15416: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15336: \$? = $ac_status" >&5 + echo "$as_me:15419: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_input_method=yes else @@ -15343,7 +15426,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15346: result: $cf_cv_input_method" >&5 +echo "$as_me:15429: result: $cf_cv_input_method" >&5 echo "${ECHO_T}$cf_cv_input_method" >&6 test "$cf_cv_input_method" = no && enable_ximp=no @@ -15355,7 +15438,7 @@ fi -echo "$as_me:15358: checking if you want support for load-vt-fonts" >&5 +echo "$as_me:15441: checking if you want support for load-vt-fonts" >&5 echo $ECHO_N "checking if you want support for load-vt-fonts... $ECHO_C" >&6 # Check whether --enable-load-vt-fonts or --disable-load-vt-fonts was given. @@ -15372,7 +15455,7 @@ enable_load_vt_fonts=no fi; -echo "$as_me:15375: result: $enable_load_vt_fonts" >&5 +echo "$as_me:15458: result: $enable_load_vt_fonts" >&5 echo "${ECHO_T}$enable_load_vt_fonts" >&6 if test "$enable_load_vt_fonts" = yes ; then @@ -15382,7 +15465,7 @@ fi -echo "$as_me:15385: checking if you want support for logging" >&5 +echo "$as_me:15468: checking if you want support for logging" >&5 echo $ECHO_N "checking if you want support for logging... $ECHO_C" >&6 # Check whether --enable-logging or --disable-logging was given. @@ -15399,7 +15482,7 @@ enable_logging=no fi; -echo "$as_me:15402: result: $enable_logging" >&5 +echo "$as_me:15485: result: $enable_logging" >&5 echo "${ECHO_T}$enable_logging" >&6 if test "$enable_logging" = yes ; then @@ -15407,7 +15490,7 @@ #define ALLOWLOGGING 1 EOF - echo "$as_me:15410: checking if you want to allow logging via a pipe" >&5 + echo "$as_me:15493: checking if you want to allow logging via a pipe" >&5 echo $ECHO_N "checking if you want to allow logging via a pipe... $ECHO_C" >&6 # Check whether --enable-logfile-exec or --disable-logfile-exec was given. @@ -15424,7 +15507,7 @@ enable_log_exec=no fi; - echo "$as_me:15427: result: $enable_log_exec" >&5 + echo "$as_me:15510: result: $enable_log_exec" >&5 echo "${ECHO_T}$enable_log_exec" >&6 if test "$enable_log_exec" = yes ; then @@ -15435,7 +15518,7 @@ fi fi -echo "$as_me:15438: checking if you want support for iconify/maximize translations" >&5 +echo "$as_me:15521: checking if you want support for iconify/maximize translations" >&5 echo $ECHO_N "checking if you want support for iconify/maximize translations... $ECHO_C" >&6 # Check whether --enable-maximize or --disable-maximize was given. @@ -15452,14 +15535,14 @@ enable_maximize=yes fi; -echo "$as_me:15455: result: $enable_maximize" >&5 +echo "$as_me:15538: result: $enable_maximize" >&5 echo "${ECHO_T}$enable_maximize" >&6 test "$enable_maximize" = no && cat >>confdefs.h <<\EOF #define OPT_MAXIMIZE 0 EOF -echo "$as_me:15462: checking if you want NumLock to override keyboard tables" >&5 +echo "$as_me:15545: checking if you want NumLock to override keyboard tables" >&5 echo $ECHO_N "checking if you want NumLock to override keyboard tables... $ECHO_C" >&6 # Check whether --enable-num-lock or --disable-num-lock was given. @@ -15476,14 +15559,14 @@ enable_numlock=yes fi; -echo "$as_me:15479: result: $enable_numlock" >&5 +echo "$as_me:15562: result: $enable_numlock" >&5 echo "${ECHO_T}$enable_numlock" >&6 test "$enable_numlock" = no && cat >>confdefs.h <<\EOF #define OPT_NUM_LOCK 0 EOF -echo "$as_me:15486: checking if you want support for get/set of base64 selection data" >&5 +echo "$as_me:15569: checking if you want support for get/set of base64 selection data" >&5 echo $ECHO_N "checking if you want support for get/set of base64 selection data... $ECHO_C" >&6 # Check whether --enable-paste64 or --disable-paste64 was given. @@ -15500,7 +15583,7 @@ enable_paste64=yes fi; -echo "$as_me:15503: result: $enable_paste64" >&5 +echo "$as_me:15586: result: $enable_paste64" >&5 echo "${ECHO_T}$enable_paste64" >&6 if test "$enable_paste64" = yes ; then @@ -15516,7 +15599,7 @@ fi -echo "$as_me:15519: checking if you want support for pty-handshaking" >&5 +echo "$as_me:15602: checking if you want support for pty-handshaking" >&5 echo $ECHO_N "checking if you want support for pty-handshaking... $ECHO_C" >&6 # Check whether --enable-pty-handshake or --disable-pty-handshake was given. @@ -15533,7 +15616,7 @@ enable_pty_handshake=yes fi; -echo "$as_me:15536: result: $enable_pty_handshake" >&5 +echo "$as_me:15619: result: $enable_pty_handshake" >&5 echo "${ECHO_T}$enable_pty_handshake" >&6 if test "$enable_pty_handshake" = yes ; then @@ -15549,7 +15632,7 @@ fi -echo "$as_me:15552: checking if you want support for mouse in readline applications" >&5 +echo "$as_me:15635: checking if you want support for mouse in readline applications" >&5 echo $ECHO_N "checking if you want support for mouse in readline applications... $ECHO_C" >&6 # Check whether --enable-readline-mouse or --disable-readline-mouse was given. @@ -15566,7 +15649,7 @@ enable_readline_mouse=no fi; -echo "$as_me:15569: result: $enable_readline_mouse" >&5 +echo "$as_me:15652: result: $enable_readline_mouse" >&5 echo "${ECHO_T}$enable_readline_mouse" >&6 if test "$enable_readline_mouse" = yes ; then @@ -15576,7 +15659,7 @@ fi -echo "$as_me:15579: checking if you want support for regular-expression selections" >&5 +echo "$as_me:15662: checking if you want support for regular-expression selections" >&5 echo $ECHO_N "checking if you want support for regular-expression selections... $ECHO_C" >&6 # Check whether --enable-regex or --disable-regex was given. @@ -15593,11 +15676,11 @@ enable_regex=yes fi; -echo "$as_me:15596: result: $enable_regex" >&5 +echo "$as_me:15679: result: $enable_regex" >&5 echo "${ECHO_T}$enable_regex" >&6 if test "$enable_regex" = yes ; then -echo "$as_me:15600: checking if you want to use PCRE for regular-expressions" >&5 +echo "$as_me:15683: checking if you want to use PCRE for regular-expressions" >&5 echo $ECHO_N "checking if you want to use PCRE for regular-expressions... $ECHO_C" >&6 # Check whether --with-pcre or --without-pcre was given. @@ -15606,7 +15689,7 @@ fi; test -z "$with_pcre" && with_pcre=no -echo "$as_me:15609: result: $with_pcre" >&5 +echo "$as_me:15692: result: $with_pcre" >&5 echo "${ECHO_T}$with_pcre" >&6 if test "$with_pcre" != no ; then @@ -15614,17 +15697,17 @@ if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists libpcre; then test -n "$verbose" && echo " found package libpcre" 1>&6 -echo "${as_me:-configure}:15617: testing found package libpcre ..." 1>&5 +echo "${as_me:-configure}:15700: testing found package libpcre ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags libpcre 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs libpcre 2>/dev/null`" test -n "$verbose" && echo " package libpcre CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:15623: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:15706: testing package libpcre CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package libpcre LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:15627: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:15710: testing package libpcre LIBS: $cf_pkgconfig_libs ..." 1>&5 cf_fix_cppflags=no cf_new_cflags= @@ -15708,7 +15791,7 @@ : else -echo "$as_me:15711: checking for pcre_compile in -lpcre" >&5 +echo "$as_me:15794: checking for pcre_compile in -lpcre" >&5 echo $ECHO_N "checking for pcre_compile in -lpcre... $ECHO_C" >&6 if test "${ac_cv_lib_pcre_pcre_compile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15716,7 +15799,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lpcre $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15719 "configure" +#line 15802 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15735,16 +15818,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15738: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15821: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15741: \$? = $ac_status" >&5 + echo "$as_me:15824: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15744: \"$ac_try\"") >&5 + { (eval echo "$as_me:15827: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15747: \$? = $ac_status" >&5 + echo "$as_me:15830: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_pcre_pcre_compile=yes else @@ -15755,7 +15838,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15758: result: $ac_cv_lib_pcre_pcre_compile" >&5 +echo "$as_me:15841: result: $ac_cv_lib_pcre_pcre_compile" >&5 echo "${ECHO_T}$ac_cv_lib_pcre_pcre_compile" >&6 if test $ac_cv_lib_pcre_pcre_compile = yes; then cat >>confdefs.h <&5 + { { echo "$as_me:15851: error: Cannot find PCRE library" >&5 echo "$as_me: error: Cannot find PCRE library" >&2;} { (exit 1); exit 1; }; } fi @@ -15780,7 +15863,7 @@ *pcreposix*) #(vi ;; *) - echo "$as_me:15783: checking for pcreposix_regcomp in -lpcreposix" >&5 + echo "$as_me:15866: checking for pcreposix_regcomp in -lpcreposix" >&5 echo $ECHO_N "checking for pcreposix_regcomp in -lpcreposix... $ECHO_C" >&6 if test "${ac_cv_lib_pcreposix_pcreposix_regcomp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15788,7 +15871,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lpcreposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15791 "configure" +#line 15874 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15807,16 +15890,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15810: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15893: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15813: \$? = $ac_status" >&5 + echo "$as_me:15896: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15816: \"$ac_try\"") >&5 + { (eval echo "$as_me:15899: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15819: \$? = $ac_status" >&5 + echo "$as_me:15902: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_pcreposix_pcreposix_regcomp=yes else @@ -15827,7 +15910,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15830: result: $ac_cv_lib_pcreposix_pcreposix_regcomp" >&5 +echo "$as_me:15913: result: $ac_cv_lib_pcreposix_pcreposix_regcomp" >&5 echo "${ECHO_T}$ac_cv_lib_pcreposix_pcreposix_regcomp" >&6 if test $ac_cv_lib_pcreposix_pcreposix_regcomp = yes; then @@ -15837,7 +15920,7 @@ LIBS="-lpcreposix $LIBS" else - echo "$as_me:15840: checking for regcomp in -lpcreposix" >&5 + echo "$as_me:15923: checking for regcomp in -lpcreposix" >&5 echo $ECHO_N "checking for regcomp in -lpcreposix... $ECHO_C" >&6 if test "${ac_cv_lib_pcreposix_regcomp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15845,7 +15928,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lpcreposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15848 "configure" +#line 15931 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15864,16 +15947,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15867: \"$ac_link\"") >&5 +if { (eval echo "$as_me:15950: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15870: \$? = $ac_status" >&5 + echo "$as_me:15953: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15873: \"$ac_try\"") >&5 + { (eval echo "$as_me:15956: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15876: \$? = $ac_status" >&5 + echo "$as_me:15959: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_pcreposix_regcomp=yes else @@ -15884,7 +15967,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:15887: result: $ac_cv_lib_pcreposix_regcomp" >&5 +echo "$as_me:15970: result: $ac_cv_lib_pcreposix_regcomp" >&5 echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6 if test $ac_cv_lib_pcreposix_regcomp = yes; then @@ -15894,7 +15977,7 @@ LIBS="-lpcreposix $LIBS" else - { { echo "$as_me:15897: error: Cannot find PCRE POSIX library" >&5 + { { echo "$as_me:15980: error: Cannot find PCRE POSIX library" >&5 echo "$as_me: error: Cannot find PCRE POSIX library" >&2;} { (exit 1); exit 1; }; } fi @@ -15916,13 +15999,13 @@ ;; esac -echo "$as_me:15919: checking for regcomp" >&5 +echo "$as_me:16002: checking for regcomp" >&5 echo $ECHO_N "checking for regcomp... $ECHO_C" >&6 if test "${ac_cv_func_regcomp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 15925 "configure" +#line 16008 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char regcomp (); below. */ @@ -15953,16 +16036,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15956: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16039: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:15959: \$? = $ac_status" >&5 + echo "$as_me:16042: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15962: \"$ac_try\"") >&5 + { (eval echo "$as_me:16045: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:15965: \$? = $ac_status" >&5 + echo "$as_me:16048: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_regcomp=yes else @@ -15972,7 +16055,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:15975: result: $ac_cv_func_regcomp" >&5 +echo "$as_me:16058: result: $ac_cv_func_regcomp" >&5 echo "${ECHO_T}$ac_cv_func_regcomp" >&6 if test $ac_cv_func_regcomp = yes; then cf_regex_func=regcomp @@ -15981,7 +16064,7 @@ for cf_regex_lib in $cf_regex_libs do as_ac_Lib=`echo "ac_cv_lib_$cf_regex_lib''_regcomp" | $as_tr_sh` -echo "$as_me:15984: checking for regcomp in -l$cf_regex_lib" >&5 +echo "$as_me:16067: checking for regcomp in -l$cf_regex_lib" >&5 echo $ECHO_N "checking for regcomp in -l$cf_regex_lib... $ECHO_C" >&6 if eval "test \"\${$as_ac_Lib+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15989,7 +16072,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-l$cf_regex_lib $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 15992 "configure" +#line 16075 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16008,16 +16091,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16011: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16094: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16014: \$? = $ac_status" >&5 + echo "$as_me:16097: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16017: \"$ac_try\"") >&5 + { (eval echo "$as_me:16100: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16020: \$? = $ac_status" >&5 + echo "$as_me:16103: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Lib=yes" else @@ -16028,7 +16111,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16031: result: `eval echo '${'$as_ac_Lib'}'`" >&5 +echo "$as_me:16114: 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 @@ -16042,13 +16125,13 @@ fi if test "$cf_regex_func" = no ; then - echo "$as_me:16045: checking for compile" >&5 + echo "$as_me:16128: checking for compile" >&5 echo $ECHO_N "checking for compile... $ECHO_C" >&6 if test "${ac_cv_func_compile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 16051 "configure" +#line 16134 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char compile (); below. */ @@ -16079,16 +16162,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16082: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16165: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16085: \$? = $ac_status" >&5 + echo "$as_me:16168: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16088: \"$ac_try\"") >&5 + { (eval echo "$as_me:16171: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16091: \$? = $ac_status" >&5 + echo "$as_me:16174: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_compile=yes else @@ -16098,13 +16181,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:16101: result: $ac_cv_func_compile" >&5 +echo "$as_me:16184: result: $ac_cv_func_compile" >&5 echo "${ECHO_T}$ac_cv_func_compile" >&6 if test $ac_cv_func_compile = yes; then cf_regex_func=compile else - echo "$as_me:16107: checking for compile in -lgen" >&5 + echo "$as_me:16190: checking for compile in -lgen" >&5 echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6 if test "${ac_cv_lib_gen_compile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16112,7 +16195,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgen $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 16115 "configure" +#line 16198 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -16131,16 +16214,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16134: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16217: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16137: \$? = $ac_status" >&5 + echo "$as_me:16220: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16140: \"$ac_try\"") >&5 + { (eval echo "$as_me:16223: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16143: \$? = $ac_status" >&5 + echo "$as_me:16226: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gen_compile=yes else @@ -16151,7 +16234,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:16154: result: $ac_cv_lib_gen_compile" >&5 +echo "$as_me:16237: result: $ac_cv_lib_gen_compile" >&5 echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6 if test $ac_cv_lib_gen_compile = yes; then @@ -16164,11 +16247,11 @@ fi if test "$cf_regex_func" = no ; then - { echo "$as_me:16167: WARNING: cannot find regular expression library" >&5 + { echo "$as_me:16250: WARNING: cannot find regular expression library" >&5 echo "$as_me: WARNING: cannot find regular expression library" >&2;} fi -echo "$as_me:16171: checking for regular-expression headers" >&5 +echo "$as_me:16254: checking for regular-expression headers" >&5 echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6 if test "${cf_cv_regex_hdrs+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16180,7 +16263,7 @@ for cf_regex_hdr in regexp.h regexpr.h do cat >conftest.$ac_ext <<_ACEOF -#line 16183 "configure" +#line 16266 "configure" #include "confdefs.h" #include <$cf_regex_hdr> int @@ -16195,16 +16278,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16198: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16281: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16201: \$? = $ac_status" >&5 + echo "$as_me:16284: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16204: \"$ac_try\"") >&5 + { (eval echo "$as_me:16287: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16207: \$? = $ac_status" >&5 + echo "$as_me:16290: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -16221,7 +16304,7 @@ for cf_regex_hdr in regex.h do cat >conftest.$ac_ext <<_ACEOF -#line 16224 "configure" +#line 16307 "configure" #include "confdefs.h" #include #include <$cf_regex_hdr> @@ -16239,16 +16322,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16242: \"$ac_link\"") >&5 +if { (eval echo "$as_me:16325: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:16245: \$? = $ac_status" >&5 + echo "$as_me:16328: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16248: \"$ac_try\"") >&5 + { (eval echo "$as_me:16331: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:16251: \$? = $ac_status" >&5 + echo "$as_me:16334: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_regex_hdrs=$cf_regex_hdr @@ -16264,11 +16347,11 @@ esac fi -echo "$as_me:16267: result: $cf_cv_regex_hdrs" >&5 +echo "$as_me:16350: result: $cf_cv_regex_hdrs" >&5 echo "${ECHO_T}$cf_cv_regex_hdrs" >&6 case $cf_cv_regex_hdrs in #(vi - no) { echo "$as_me:16271: WARNING: no regular expression header found" >&5 + no) { echo "$as_me:16354: WARNING: no regular expression header found" >&5 echo "$as_me: WARNING: no regular expression header found" >&2;} ;; #(vi regex.h) cat >>confdefs.h <<\EOF @@ -16288,7 +16371,7 @@ esac if test "X$cf_cv_regex_hdrs" != "Xregex.h" ; then - { { echo "$as_me:16291: error: Only POSIX or PCRE regular expressions are supported" >&5 + { { echo "$as_me:16374: error: Only POSIX or PCRE regular expressions are supported" >&5 echo "$as_me: error: Only POSIX or PCRE regular expressions are supported" >&2;} { (exit 1); exit 1; }; } fi @@ -16300,7 +16383,7 @@ fi -echo "$as_me:16303: checking if you want support for right-scrollbar" >&5 +echo "$as_me:16386: checking if you want support for right-scrollbar" >&5 echo $ECHO_N "checking if you want support for right-scrollbar... $ECHO_C" >&6 # Check whether --enable-rightbar or --disable-rightbar was given. @@ -16317,7 +16400,7 @@ enable_rightbar=yes fi; -echo "$as_me:16320: result: $enable_rightbar" >&5 +echo "$as_me:16403: result: $enable_rightbar" >&5 echo "${ECHO_T}$enable_rightbar" >&6 if test "$enable_rightbar" = yes ; then @@ -16327,7 +16410,7 @@ fi -echo "$as_me:16330: checking if you want check for redundant name-change" >&5 +echo "$as_me:16413: checking if you want check for redundant name-change" >&5 echo $ECHO_N "checking if you want check for redundant name-change... $ECHO_C" >&6 # Check whether --enable-samename or --disable-samename was given. @@ -16344,14 +16427,14 @@ enable_samename=yes fi; -echo "$as_me:16347: result: $enable_samename" >&5 +echo "$as_me:16430: result: $enable_samename" >&5 echo "${ECHO_T}$enable_samename" >&6 test "$enable_samename" = no && cat >>confdefs.h <<\EOF #define OPT_SAME_NAME 0 EOF -echo "$as_me:16354: checking if you want support for selection-actions" >&5 +echo "$as_me:16437: checking if you want support for selection-actions" >&5 echo $ECHO_N "checking if you want support for selection-actions... $ECHO_C" >&6 # Check whether --enable-selection-ops or --disable-selection-ops was given. @@ -16368,14 +16451,14 @@ enable_selection_ops=yes fi; -echo "$as_me:16371: result: $enable_selection_ops" >&5 +echo "$as_me:16454: result: $enable_selection_ops" >&5 echo "${ECHO_T}$enable_selection_ops" >&6 test "$enable_selection_ops" = no && cat >>confdefs.h <<\EOF #define OPT_SELECTION_OPS 0 EOF -echo "$as_me:16378: checking if you want support for session management" >&5 +echo "$as_me:16461: checking if you want support for session management" >&5 echo $ECHO_N "checking if you want support for session management... $ECHO_C" >&6 # Check whether --enable-session-mgt or --disable-session-mgt was given. @@ -16392,14 +16475,14 @@ enable_session_mgt=yes fi; -echo "$as_me:16395: result: $enable_session_mgt" >&5 +echo "$as_me:16478: result: $enable_session_mgt" >&5 echo "${ECHO_T}$enable_session_mgt" >&6 test "$enable_session_mgt" = no && cat >>confdefs.h <<\EOF #define OPT_SESSION_MGT 0 EOF -echo "$as_me:16402: checking if you want to use termcap function-keys" >&5 +echo "$as_me:16485: checking if you want to use termcap function-keys" >&5 echo $ECHO_N "checking if you want to use termcap function-keys... $ECHO_C" >&6 # Check whether --enable-tcap-fkeys or --disable-tcap-fkeys was given. @@ -16416,14 +16499,14 @@ enable_tcap_fkeys=yes fi; -echo "$as_me:16419: result: $enable_tcap_fkeys" >&5 +echo "$as_me:16502: result: $enable_tcap_fkeys" >&5 echo "${ECHO_T}$enable_tcap_fkeys" >&6 test "$enable_tcap_fkeys" = yes && cat >>confdefs.h <<\EOF #define OPT_TCAP_FKEYS 1 EOF -echo "$as_me:16426: checking if you want to use termcap-query/report" >&5 +echo "$as_me:16509: checking if you want to use termcap-query/report" >&5 echo $ECHO_N "checking if you want to use termcap-query/report... $ECHO_C" >&6 # Check whether --enable-tcap-query or --disable-tcap-query was given. @@ -16440,14 +16523,14 @@ enable_tcap_query=yes fi; -echo "$as_me:16443: result: $enable_tcap_query" >&5 +echo "$as_me:16526: result: $enable_tcap_query" >&5 echo "${ECHO_T}$enable_tcap_query" >&6 test "$enable_tcap_query" = yes && cat >>confdefs.h <<\EOF #define OPT_TCAP_QUERY 1 EOF -echo "$as_me:16450: checking if you want support for tek4014" >&5 +echo "$as_me:16533: checking if you want support for tek4014" >&5 echo $ECHO_N "checking if you want support for tek4014... $ECHO_C" >&6 # Check whether --enable-tek4014 or --disable-tek4014 was given. @@ -16464,7 +16547,7 @@ enable_tek4014=yes fi; -echo "$as_me:16467: result: $enable_tek4014" >&5 +echo "$as_me:16550: result: $enable_tek4014" >&5 echo "${ECHO_T}$enable_tek4014" >&6 if test "$enable_tek4014" = no ; then @@ -16478,7 +16561,7 @@ EXTRAOBJS="$EXTRAOBJS TekPrsTbl.o Tekproc.o" fi -echo "$as_me:16481: checking if you want pulldown menus with a toolbar" >&5 +echo "$as_me:16564: checking if you want pulldown menus with a toolbar" >&5 echo $ECHO_N "checking if you want pulldown menus with a toolbar... $ECHO_C" >&6 # Check whether --enable-toolbar or --disable-toolbar was given. @@ -16495,7 +16578,7 @@ enable_toolbar=no fi; -echo "$as_me:16498: result: $enable_toolbar" >&5 +echo "$as_me:16581: result: $enable_toolbar" >&5 echo "${ECHO_T}$enable_toolbar" >&6 if test "$enable_toolbar" = yes ; then @@ -16505,7 +16588,7 @@ fi -echo "$as_me:16508: checking if you want VT52 emulation" >&5 +echo "$as_me:16591: checking if you want VT52 emulation" >&5 echo $ECHO_N "checking if you want VT52 emulation... $ECHO_C" >&6 # Check whether --enable-vt52 or --disable-vt52 was given. @@ -16522,14 +16605,14 @@ enable_vt52=yes fi; -echo "$as_me:16525: result: $enable_vt52" >&5 +echo "$as_me:16608: result: $enable_vt52" >&5 echo "${ECHO_T}$enable_vt52" >&6 test "$enable_vt52" = no && cat >>confdefs.h <<\EOF #define OPT_VT52_MODE 0 EOF -echo "$as_me:16532: checking if you want to use mini-luit/Latin9 built-in support" >&5 +echo "$as_me:16615: checking if you want to use mini-luit/Latin9 built-in support" >&5 echo $ECHO_N "checking if you want to use mini-luit/Latin9 built-in support... $ECHO_C" >&6 # Check whether --enable-mini-luit or --disable-mini-luit was given. @@ -16546,7 +16629,7 @@ enable_mini_luit=no fi; -echo "$as_me:16549: result: $enable_mini_luit" >&5 +echo "$as_me:16632: result: $enable_mini_luit" >&5 echo "${ECHO_T}$enable_mini_luit" >&6 if test "$enable_mini_luit" = yes ; then @@ -16556,7 +16639,7 @@ fi -echo "$as_me:16559: checking if you want to use luit" >&5 +echo "$as_me:16642: checking if you want to use luit" >&5 echo $ECHO_N "checking if you want to use luit... $ECHO_C" >&6 # Check whether --enable-luit or --disable-luit was given. @@ -16573,7 +16656,7 @@ enable_luit=$enable_mini_luit fi; -echo "$as_me:16576: result: $enable_luit" >&5 +echo "$as_me:16659: result: $enable_luit" >&5 echo "${ECHO_T}$enable_luit" >&6 if test "$enable_luit" = yes ; then @@ -16586,7 +16669,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:16589: checking for $ac_word" >&5 +echo "$as_me:16672: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_LUIT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -16603,7 +16686,7 @@ test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_LUIT="$ac_dir/$ac_word" - echo "$as_me:16606: found $ac_dir/$ac_word" >&5 + echo "$as_me:16689: found $ac_dir/$ac_word" >&5 break fi done @@ -16614,10 +16697,10 @@ LUIT=$ac_cv_path_LUIT if test -n "$LUIT"; then - echo "$as_me:16617: result: $LUIT" >&5 + echo "$as_me:16700: result: $LUIT" >&5 echo "${ECHO_T}$LUIT" >&6 else - echo "$as_me:16620: result: no" >&5 + echo "$as_me:16703: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -16676,7 +16759,7 @@ if test -n "$cf_path_prog" ; then -echo "${as_me:-configure}:16679: testing defining path for ${cf_path_prog} ..." 1>&5 +echo "${as_me:-configure}:16762: testing defining path for ${cf_path_prog} ..." 1>&5 cat >>confdefs.h <&5 +echo "$as_me:16777: checking if you want wide-character support" >&5 echo $ECHO_N "checking if you want wide-character support... $ECHO_C" >&6 # Check whether --enable-wide-chars or --disable-wide-chars was given. @@ -16708,10 +16791,10 @@ enable_wchar=$enable_luit fi; -echo "$as_me:16711: result: $enable_wchar" >&5 +echo "$as_me:16794: result: $enable_wchar" >&5 echo "${ECHO_T}$enable_wchar" >&6 -echo "$as_me:16714: checking if you want only 16-bit character support" >&5 +echo "$as_me:16797: checking if you want only 16-bit character support" >&5 echo $ECHO_N "checking if you want only 16-bit character support... $ECHO_C" >&6 # Check whether --enable-16bit-chars or --disable-16bit-chars was given. @@ -16728,7 +16811,7 @@ enable_16bit_chars=no fi; -echo "$as_me:16731: result: $enable_16bit_chars" >&5 +echo "$as_me:16814: result: $enable_16bit_chars" >&5 echo "${ECHO_T}$enable_16bit_chars" >&6 if test "$enable_16bit_chars" = yes ; then @@ -16751,7 +16834,7 @@ EXTRAOBJS="$EXTRAOBJS charclass.o precompose.o wcwidth.o" fi -echo "$as_me:16754: checking if you want dynamic-abbreviation support" >&5 +echo "$as_me:16837: checking if you want dynamic-abbreviation support" >&5 echo $ECHO_N "checking if you want dynamic-abbreviation support... $ECHO_C" >&6 # Check whether --enable-dabbrev or --disable-dabbrev was given. @@ -16768,7 +16851,7 @@ enable_dabbrev=no fi; -echo "$as_me:16771: result: $enable_dabbrev" >&5 +echo "$as_me:16854: result: $enable_dabbrev" >&5 echo "${ECHO_T}$enable_dabbrev" >&6 if test "$enable_dabbrev" = yes ; then @@ -16778,7 +16861,7 @@ fi -echo "$as_me:16781: checking if you want DECterm Locator support" >&5 +echo "$as_me:16864: checking if you want DECterm Locator support" >&5 echo $ECHO_N "checking if you want DECterm Locator support... $ECHO_C" >&6 # Check whether --enable-dec-locator or --disable-dec-locator was given. @@ -16795,7 +16878,7 @@ enable_dec_locator=no fi; -echo "$as_me:16798: result: $enable_dec_locator" >&5 +echo "$as_me:16881: result: $enable_dec_locator" >&5 echo "${ECHO_T}$enable_dec_locator" >&6 if test "$enable_dec_locator" = yes ; then @@ -16805,7 +16888,7 @@ fi -echo "$as_me:16808: checking if you want VT420 rectangle support" >&5 +echo "$as_me:16891: checking if you want VT420 rectangle support" >&5 echo $ECHO_N "checking if you want VT420 rectangle support... $ECHO_C" >&6 # Check whether --enable-rectangles or --disable-rectangles was given. @@ -16822,7 +16905,7 @@ enable_rectangles=yes fi; -echo "$as_me:16825: result: $enable_rectangles" >&5 +echo "$as_me:16908: result: $enable_rectangles" >&5 echo "${ECHO_T}$enable_rectangles" >&6 if test "$enable_rectangles" = yes ; then @@ -16832,7 +16915,7 @@ fi -echo "$as_me:16835: checking if you want -ziconbeep option" >&5 +echo "$as_me:16918: checking if you want -ziconbeep option" >&5 echo $ECHO_N "checking if you want -ziconbeep option... $ECHO_C" >&6 # Check whether --enable-ziconbeep or --disable-ziconbeep was given. @@ -16849,7 +16932,7 @@ enable_ziconbeep=yes fi; -echo "$as_me:16852: result: $enable_ziconbeep" >&5 +echo "$as_me:16935: result: $enable_ziconbeep" >&5 echo "${ECHO_T}$enable_ziconbeep" >&6 test "$enable_ziconbeep" = no && cat >>confdefs.h <<\EOF @@ -16858,7 +16941,7 @@ ############################################################################### -echo "$as_me:16861: checking if you want debugging traces" >&5 +echo "$as_me:16944: checking if you want debugging traces" >&5 echo $ECHO_N "checking if you want debugging traces... $ECHO_C" >&6 # Check whether --enable-trace or --disable-trace was given. @@ -16875,7 +16958,7 @@ enable_trace=no fi; -echo "$as_me:16878: result: $enable_trace" >&5 +echo "$as_me:16961: result: $enable_trace" >&5 echo "${ECHO_T}$enable_trace" >&6 if test "$enable_trace" = yes ; then @@ -16887,149 +16970,681 @@ EXTRAOBJS="$EXTRAOBJS trace.o" fi -echo "$as_me:16890: checking if you want to test memory leaks" >&5 -echo $ECHO_N "checking if you want to test memory leaks... $ECHO_C" >&6 +echo "$as_me:16973: 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 --enable-leaks or --disable-leaks was given. -if test "${enable_leaks+set}" = set; then - enableval="$enable_leaks" - test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then - disable_leaks=yes - else - disable_leaks=no - fi -else - enableval=yes - disable_leaks=no +# Check whether --with-dmalloc or --without-dmalloc was given. +if test "${with_dmalloc+set}" = set; then + withval="$with_dmalloc" + +cat >>confdefs.h <&5 -echo "${ECHO_T}$disable_leaks" >&6 -if test "$disable_leaks" = yes ; then +echo "$as_me:16990: result: ${with_dmalloc:-no}" >&5 +echo "${ECHO_T}${with_dmalloc:-no}" >&6 -cat >>confdefs.h <<\EOF -#define NO_LEAKS 1 -EOF +case .$with_cflags in #(vi +.*-g*) + case .$CFLAGS in #(vi + .*-g*) #(vi + ;; + *) -fi +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= -echo "$as_me:16917: 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 +for cf_add_cflags in -g +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` -# Check whether --enable-echo or --disable-echo was given. -if test "${enable_echo+set}" = set; then - enableval="$enable_echo" - test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes - ECHO_LT='--silent' - ECHO_LD='@echo linking $@;' - RULE_CC='@echo compiling $<' - SHOW_CC='@echo compiling $@' - ECHO_CC='@' + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - else +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` - ECHO_LT='' - ECHO_LD='' - RULE_CC='' - SHOW_CC='' - ECHO_CC='' + ;; + esac + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" - fi -else - enableval=yes + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` - ECHO_LT='' - ECHO_LD='' - RULE_CC='' - SHOW_CC='' - ECHO_CC='' + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done -fi; -echo "$as_me:16951: result: $enableval" >&5 -echo "${ECHO_T}$enableval" >&6 +if test -n "$cf_new_cflags" ; then -echo "$as_me:16954: checking if you want magic cookie emulation" >&5 -echo $ECHO_N "checking if you want magic cookie emulation... $ECHO_C" >&6 + CFLAGS="$CFLAGS $cf_new_cflags" +fi -# Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. -if test "${enable_xmc_glitch+set}" = set; then - enableval="$enable_xmc_glitch" - test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then - enable_xmc=yes - else - enable_xmc=no - fi -else - enableval=no - enable_xmc=no +if test -n "$cf_new_cppflags" ; then -fi; -echo "$as_me:16971: result: $enable_xmc" >&5 -echo "${ECHO_T}$enable_xmc" >&6 -if test "$enable_xmc" = yes ; then + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" +fi -cat >>confdefs.h <<\EOF -#define OPT_XMC_GLITCH 1 -EOF +if test -n "$cf_new_extra_cppflags" ; then - EXTRASRCS="$EXTRASRCS testxmc.c" - EXTRAOBJS="$EXTRAOBJS testxmc.o" + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi -for ac_func in tigetstr -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:16986: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then + ;; + esac + ;; +esac + +if test "$with_dmalloc" = yes ; then + echo "$as_me:17084: 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 16992 "configure" +#line 17090 "configure" #include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $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; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; -#endif - +#include +_ACEOF +if { (eval echo "$as_me:17094: \"$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:17100: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_dmalloc_h=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_header_dmalloc_h=no +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:17119: 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:17123: 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 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldmalloc $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 17131 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dmalloc_debug (); +int +main () +{ +dmalloc_debug (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:17150: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:17153: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:17156: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17159: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dmalloc_dmalloc_debug=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_dmalloc_dmalloc_debug=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:17170: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5 +echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6 +if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then + cat >>confdefs.h <&5 +echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6 + +# Check whether --with-dbmalloc or --without-dbmalloc was given. +if test "${with_dbmalloc+set}" = set; then + withval="$with_dbmalloc" + +cat >>confdefs.h <&5 +echo "${ECHO_T}${with_dbmalloc:-no}" >&6 + +case .$with_cflags in #(vi +.*-g*) + case .$CFLAGS in #(vi + .*-g*) #(vi + ;; + *) + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in -g +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" +fi + +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" +fi + +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi + + ;; + esac + ;; +esac + +if test "$with_dbmalloc" = yes ; then + echo "$as_me:17296: 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 17302 "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:17306: \"$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:17312: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_dbmalloc_h=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_header_dbmalloc_h=no +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:17331: 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:17335: 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 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldbmalloc $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 17343 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char debug_malloc (); +int +main () +{ +debug_malloc (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:17362: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:17365: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:17368: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:17371: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dbmalloc_debug_malloc=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_dbmalloc_debug_malloc=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:17382: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5 +echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6 +if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then + cat >>confdefs.h <&5 +echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6 + +# Check whether --with-valgrind or --without-valgrind was given. +if test "${with_valgrind+set}" = set; then + withval="$with_valgrind" + +cat >>confdefs.h <&5 +echo "${ECHO_T}${with_valgrind:-no}" >&6 + +case .$with_cflags in #(vi +.*-g*) + case .$CFLAGS in #(vi + .*-g*) #(vi + ;; + *) + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in -g +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" +fi + +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" +fi + +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi + + ;; + esac + ;; +esac + +echo "$as_me:17507: checking if you want to perform memory-leak testing" >&5 +echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6 + +# Check whether --enable-leaks or --disable-leaks was given. +if test "${enable_leaks+set}" = set; then + enableval="$enable_leaks" + if test "x$enableval" = xno; then with_no_leaks=yes; else with_no_leaks=no; fi +else + : ${with_no_leaks:=no} +fi; +echo "$as_me:17517: result: $with_no_leaks" >&5 +echo "${ECHO_T}$with_no_leaks" >&6 + +if test "$with_no_leaks" = yes ; then + +cat >>confdefs.h <<\EOF +#define NO_LEAKS 1 +EOF + +cat >>confdefs.h <<\EOF +#define YY_NO_LEAKS 1 +EOF + +fi + +echo "$as_me:17532: checking if you want to see long compiling messages" >&5 +echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6 + +# Check whether --enable-echo or --disable-echo was given. +if test "${enable_echo+set}" = set; then + enableval="$enable_echo" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + + ECHO_LT='--silent' + ECHO_LD='@echo linking $@;' + RULE_CC='@echo compiling $<' + SHOW_CC='@echo compiling $@' + ECHO_CC='@' + + else + + ECHO_LT='' + ECHO_LD='' + RULE_CC='' + SHOW_CC='' + ECHO_CC='' + + fi +else + enableval=yes + + ECHO_LT='' + ECHO_LD='' + RULE_CC='' + SHOW_CC='' + ECHO_CC='' + +fi; +echo "$as_me:17566: result: $enableval" >&5 +echo "${ECHO_T}$enableval" >&6 + +echo "$as_me:17569: checking if you want magic cookie emulation" >&5 +echo $ECHO_N "checking if you want magic cookie emulation... $ECHO_C" >&6 + +# Check whether --enable-xmc-glitch or --disable-xmc-glitch was given. +if test "${enable_xmc_glitch+set}" = set; then + enableval="$enable_xmc_glitch" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + enable_xmc=yes + else + enable_xmc=no + fi +else + enableval=no + enable_xmc=no + +fi; +echo "$as_me:17586: result: $enable_xmc" >&5 +echo "${ECHO_T}$enable_xmc" >&6 +if test "$enable_xmc" = yes ; then + +cat >>confdefs.h <<\EOF +#define OPT_XMC_GLITCH 1 +EOF + + EXTRASRCS="$EXTRASRCS testxmc.c" + EXTRAOBJS="$EXTRAOBJS testxmc.o" +fi + +for ac_func in tigetstr +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:17601: 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 17607 "configure" +#include "confdefs.h" +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. */ +#include +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $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; /* workaround for ICC 12.0.3 */ if (f == 0) return 1; +#endif + ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17023: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17638: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17026: \$? = $ac_status" >&5 + echo "$as_me:17641: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17029: \"$ac_try\"") >&5 + { (eval echo "$as_me:17644: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17032: \$? = $ac_status" >&5 + echo "$as_me:17647: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -17039,7 +17654,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17042: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:17657: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:17672: 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 17063 "configure" +#line 17678 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -17091,16 +17706,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17094: \"$ac_link\"") >&5 +if { (eval echo "$as_me:17709: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17097: \$? = $ac_status" >&5 + echo "$as_me:17712: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17100: \"$ac_try\"") >&5 + { (eval echo "$as_me:17715: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17103: \$? = $ac_status" >&5 + echo "$as_me:17718: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -17110,7 +17725,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:17113: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:17728: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <&5 +echo "$as_me:17741: checking if you want to turn on gcc warnings" >&5 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6 # Check whether --enable-warnings or --disable-warnings was given. @@ -17140,7 +17755,7 @@ with_warnings=no fi; -echo "$as_me:17143: result: $with_warnings" >&5 +echo "$as_me:17758: result: $with_warnings" >&5 echo "${ECHO_T}$with_warnings" >&6 if test "$with_warnings" = yes then @@ -17163,10 +17778,10 @@ EOF if test "$GCC" = yes then - { echo "$as_me:17166: checking for $CC __attribute__ directives..." >&5 + { echo "$as_me:17781: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > conftest.$ac_ext <&5 + if { (eval echo "$as_me:17833: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17221: \$? = $ac_status" >&5 + echo "$as_me:17836: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:17223: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:17838: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in #(vi @@ -17284,12 +17899,12 @@ if test "$GCC" = yes ; then case $host_os in linux*|gnu*) - echo "$as_me:17287: checking if this is really Intel C compiler" >&5 + echo "$as_me:17902: 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 17292 "configure" +#line 17907 "configure" #include "confdefs.h" int @@ -17306,16 +17921,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17309: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17924: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17312: \$? = $ac_status" >&5 + echo "$as_me:17927: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17315: \"$ac_try\"") >&5 + { (eval echo "$as_me:17930: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17318: \$? = $ac_status" >&5 + echo "$as_me:17933: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" @@ -17326,7 +17941,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:17329: result: $INTEL_COMPILER" >&5 + echo "$as_me:17944: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -17335,12 +17950,12 @@ CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:17338: checking if this is really Clang C compiler" >&5 + echo "$as_me:17953: checking if this is really Clang C compiler" >&5 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Qunused-arguments" cat >conftest.$ac_ext <<_ACEOF -#line 17343 "configure" +#line 17958 "configure" #include "confdefs.h" int @@ -17357,16 +17972,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:17360: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:17975: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17363: \$? = $ac_status" >&5 + echo "$as_me:17978: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17366: \"$ac_try\"") >&5 + { (eval echo "$as_me:17981: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17369: \$? = $ac_status" >&5 + echo "$as_me:17984: \$? = $ac_status" >&5 (exit $ac_status); }; }; then CLANG_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" @@ -17377,12 +17992,12 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:17380: result: $CLANG_COMPILER" >&5 + echo "$as_me:17995: result: $CLANG_COMPILER" >&5 echo "${ECHO_T}$CLANG_COMPILER" >&6 fi cat > conftest.$ac_ext <&5 + { echo "$as_me:18017: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" @@ -17415,12 +18030,12 @@ wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:17418: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:18033: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17421: \$? = $ac_status" >&5 + echo "$as_me:18036: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:17423: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:18038: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -17429,7 +18044,7 @@ elif test "$GCC" = yes then - { echo "$as_me:17432: checking for $CC warning options..." >&5 + { echo "$as_me:18047: checking for $CC warning options..." >&5 echo "$as_me: checking for $CC warning options..." >&6;} cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS= @@ -17449,12 +18064,12 @@ Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo "$as_me:17452: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:18067: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:17455: \$? = $ac_status" >&5 + echo "$as_me:18070: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:17457: result: ... -$cf_opt" >&5 + test -n "$verbose" && echo "$as_me:18072: result: ... -$cf_opt" >&5 echo "${ECHO_T}... -$cf_opt" >&6 case $cf_opt in #(vi Wcast-qual) #(vi @@ -17465,7 +18080,7 @@ [34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:17468: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:18083: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -17475,7 +18090,7 @@ [12].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:17478: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:18093: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac @@ -17528,7 +18143,7 @@ CPPFLAGS=`echo "$CPPFLAGS" | sed -e s/-D$cf_def//` done -echo "$as_me:17531: checking if filesystem supports mixed-case filenames" >&5 +echo "$as_me:18146: checking if filesystem supports mixed-case filenames" >&5 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6 if test "${cf_cv_mixedcase+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17555,7 +18170,7 @@ fi fi -echo "$as_me:17558: result: $cf_cv_mixedcase" >&5 +echo "$as_me:18173: result: $cf_cv_mixedcase" >&5 echo "${ECHO_T}$cf_cv_mixedcase" >&6 test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF @@ -17566,7 +18181,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:17569: checking for $ac_word" >&5 +echo "$as_me:18184: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CTAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17581,7 +18196,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CTAGS="$ac_prog" -echo "$as_me:17584: found $ac_dir/$ac_word" >&5 +echo "$as_me:18199: found $ac_dir/$ac_word" >&5 break done @@ -17589,10 +18204,10 @@ fi CTAGS=$ac_cv_prog_CTAGS if test -n "$CTAGS"; then - echo "$as_me:17592: result: $CTAGS" >&5 + echo "$as_me:18207: result: $CTAGS" >&5 echo "${ECHO_T}$CTAGS" >&6 else - echo "$as_me:17595: result: no" >&5 + echo "$as_me:18210: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -17603,7 +18218,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:17606: checking for $ac_word" >&5 +echo "$as_me:18221: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ETAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17618,7 +18233,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ETAGS="$ac_prog" -echo "$as_me:17621: found $ac_dir/$ac_word" >&5 +echo "$as_me:18236: found $ac_dir/$ac_word" >&5 break done @@ -17626,10 +18241,10 @@ fi ETAGS=$ac_cv_prog_ETAGS if test -n "$ETAGS"; then - echo "$as_me:17629: result: $ETAGS" >&5 + echo "$as_me:18244: result: $ETAGS" >&5 echo "${ECHO_T}$ETAGS" >&6 else - echo "$as_me:17632: result: no" >&5 + echo "$as_me:18247: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -17638,7 +18253,7 @@ # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args. set dummy ${CTAGS:-ctags}; ac_word=$2 -echo "$as_me:17641: checking for $ac_word" >&5 +echo "$as_me:18256: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17653,7 +18268,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_LOWER_TAGS="yes" -echo "$as_me:17656: found $ac_dir/$ac_word" >&5 +echo "$as_me:18271: found $ac_dir/$ac_word" >&5 break done @@ -17662,17 +18277,17 @@ fi MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS if test -n "$MAKE_LOWER_TAGS"; then - echo "$as_me:17665: result: $MAKE_LOWER_TAGS" >&5 + echo "$as_me:18280: result: $MAKE_LOWER_TAGS" >&5 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6 else - echo "$as_me:17668: result: no" >&5 + echo "$as_me:18283: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test "$cf_cv_mixedcase" = yes ; then # Extract the first word of "${ETAGS:-etags}", so it can be a program name with args. set dummy ${ETAGS:-etags}; ac_word=$2 -echo "$as_me:17675: checking for $ac_word" >&5 +echo "$as_me:18290: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17687,7 +18302,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_MAKE_UPPER_TAGS="yes" -echo "$as_me:17690: found $ac_dir/$ac_word" >&5 +echo "$as_me:18305: found $ac_dir/$ac_word" >&5 break done @@ -17696,10 +18311,10 @@ fi MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS if test -n "$MAKE_UPPER_TAGS"; then - echo "$as_me:17699: result: $MAKE_UPPER_TAGS" >&5 + echo "$as_me:18314: result: $MAKE_UPPER_TAGS" >&5 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6 else - echo "$as_me:17702: result: no" >&5 + echo "$as_me:18317: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -17720,7 +18335,7 @@ fi LD_RPATH_OPT= -echo "$as_me:17723: checking for an rpath option" >&5 +echo "$as_me:18338: checking for an rpath option" >&5 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6 case $cf_cv_system_name in #(vi irix*) #(vi @@ -17751,17 +18366,17 @@ *) ;; esac -echo "$as_me:17754: result: $LD_RPATH_OPT" >&5 +echo "$as_me:18369: result: $LD_RPATH_OPT" >&5 echo "${ECHO_T}$LD_RPATH_OPT" >&6 case "x$LD_RPATH_OPT" in #(vi x-R*) - echo "$as_me:17759: checking if we need a space after rpath option" >&5 + echo "$as_me:18374: checking if we need a space after rpath option" >&5 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 cf_save_LIBS="$LIBS" LIBS="${LD_RPATH_OPT}$libdir $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 17764 "configure" +#line 18379 "configure" #include "confdefs.h" int @@ -17773,16 +18388,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17776: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18391: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17779: \$? = $ac_status" >&5 + echo "$as_me:18394: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17782: \"$ac_try\"") >&5 + { (eval echo "$as_me:18397: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17785: \$? = $ac_status" >&5 + echo "$as_me:18400: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_space=no else @@ -17792,13 +18407,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$cf_save_LIBS" - echo "$as_me:17795: result: $cf_rpath_space" >&5 + echo "$as_me:18410: result: $cf_rpath_space" >&5 echo "${ECHO_T}$cf_rpath_space" >&6 test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT " ;; esac -echo "$as_me:17801: checking if rpath-hack should be disabled" >&5 +echo "$as_me:18416: checking if rpath-hack should be disabled" >&5 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6 # Check whether --enable-rpath-hack or --disable-rpath-hack was given. @@ -17815,21 +18430,21 @@ cf_disable_rpath_hack=no fi; -echo "$as_me:17818: result: $cf_disable_rpath_hack" >&5 +echo "$as_me:18433: result: $cf_disable_rpath_hack" >&5 echo "${ECHO_T}$cf_disable_rpath_hack" >&6 if test "$cf_disable_rpath_hack" = no ; then -echo "$as_me:17822: checking for updated LDFLAGS" >&5 +echo "$as_me:18437: checking for updated LDFLAGS" >&5 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6 if test -n "$LD_RPATH_OPT" ; then - echo "$as_me:17825: result: maybe" >&5 + echo "$as_me:18440: result: maybe" >&5 echo "${ECHO_T}maybe" >&6 for ac_prog in ldd do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:17832: checking for $ac_word" >&5 +echo "$as_me:18447: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -17844,7 +18459,7 @@ test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_cf_ldd_prog="$ac_prog" -echo "$as_me:17847: found $ac_dir/$ac_word" >&5 +echo "$as_me:18462: found $ac_dir/$ac_word" >&5 break done @@ -17852,10 +18467,10 @@ fi cf_ldd_prog=$ac_cv_prog_cf_ldd_prog if test -n "$cf_ldd_prog"; then - echo "$as_me:17855: result: $cf_ldd_prog" >&5 + echo "$as_me:18470: result: $cf_ldd_prog" >&5 echo "${ECHO_T}$cf_ldd_prog" >&6 else - echo "$as_me:17858: result: no" >&5 + echo "$as_me:18473: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -17869,7 +18484,7 @@ cf_rpath_oops= cat >conftest.$ac_ext <<_ACEOF -#line 17872 "configure" +#line 18487 "configure" #include "confdefs.h" #include int @@ -17881,16 +18496,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17884: \"$ac_link\"") >&5 +if { (eval echo "$as_me:18499: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:17887: \$? = $ac_status" >&5 + echo "$as_me:18502: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17890: \"$ac_try\"") >&5 + { (eval echo "$as_me:18505: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:17893: \$? = $ac_status" >&5 + echo "$as_me:18508: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u` cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ ]/%/%' -e 's%/[^/][^/]*$%%' |sort -u` @@ -17918,7 +18533,7 @@ then test -n "$verbose" && echo " ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6 -echo "${as_me:-configure}:17921: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 +echo "${as_me:-configure}:18536: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5 LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" break @@ -17930,11 +18545,11 @@ test -n "$verbose" && echo " ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:17933: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:18548: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:17937: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:18552: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LDFLAGS @@ -17971,7 +18586,7 @@ then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:17974: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:18589: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -17984,11 +18599,11 @@ test -n "$verbose" && echo " ...checked LDFLAGS $LDFLAGS" 1>&6 -echo "${as_me:-configure}:17987: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:18602: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5 test -n "$verbose" && echo " ...checking LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:17991: testing ...checking LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:18606: testing ...checking LIBS $LIBS ..." 1>&5 cf_rpath_dst= for cf_rpath_src in $LIBS @@ -18025,7 +18640,7 @@ then test -n "$verbose" && echo " ...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6 -echo "${as_me:-configure}:18028: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 +echo "${as_me:-configure}:18643: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5 EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS" fi @@ -18038,11 +18653,11 @@ test -n "$verbose" && echo " ...checked LIBS $LIBS" 1>&6 -echo "${as_me:-configure}:18041: testing ...checked LIBS $LIBS ..." 1>&5 +echo "${as_me:-configure}:18656: testing ...checked LIBS $LIBS ..." 1>&5 test -n "$verbose" && echo " ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6 -echo "${as_me:-configure}:18045: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 +echo "${as_me:-configure}:18660: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5 fi @@ -18136,7 +18751,7 @@ : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:18139: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:18754: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -18309,7 +18924,7 @@ echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:18312: error: ambiguous option: $1 + { { echo "$as_me:18927: 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;} @@ -18328,7 +18943,7 @@ ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:18331: error: unrecognized option: $1 + -*) { { echo "$as_me:18946: 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;} @@ -18367,7 +18982,7 @@ "df-install" ) CONFIG_FILES="$CONFIG_FILES df-install" ;; "minstall" ) CONFIG_FILES="$CONFIG_FILES minstall:minstall.in" ;; "xtermcfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS xtermcfg.h:xtermcfg.hin" ;; - *) { { echo "$as_me:18370: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:18985: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -18467,6 +19082,9 @@ s,@EXTRA_CPPFLAGS@,$EXTRA_CPPFLAGS,;t t s,@CPP@,$CPP,;t t s,@AWK@,$AWK,;t t +s,@GROFF_PATH@,$GROFF_PATH,;t t +s,@GROFF_NOTE@,$GROFF_NOTE,;t t +s,@NROFF_NOTE@,$NROFF_NOTE,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t @@ -18475,6 +19093,8 @@ s,@APP_CLASS@,$APP_CLASS,;t t s,@APPSDIR@,$APPSDIR,;t t s,@no_appsdir@,$no_appsdir,;t t +s,@ICON_NAME@,$ICON_NAME,;t t +s,@ICON_SYMLINK@,$ICON_SYMLINK,;t t s,@PIXMAPDIR@,$PIXMAPDIR,;t t s,@no_pixmapdir@,$no_pixmapdir,;t t s,@ICONDIR@,$ICONDIR,;t t @@ -18482,7 +19102,6 @@ s,@ICON_FORMAT@,$ICON_FORMAT,;t t s,@ICON_THEME@,$ICON_THEME,;t t s,@ICON_LIST@,$ICON_LIST,;t t -s,@ICON_NAME@,$ICON_NAME,;t t s,@desktop_utils@,$desktop_utils,;t t s,@DESKTOP_FLAGS@,$DESKTOP_FLAGS,;t t s,@DESKTOP_CATEGORY@,$DESKTOP_CATEGORY,;t t @@ -18501,7 +19120,7 @@ s,@IMAKE_LOADFLAGS@,$IMAKE_LOADFLAGS,;t t s,@default_termid@,$default_termid,;t t s,@default_TERM@,$default_TERM,;t t -s,@backarrow_is_del@,$backarrow_is_del,;t t +s,@backarrow_is_bs@,$backarrow_is_bs,;t t s,@backarrow_is_erase@,$backarrow_is_erase,;t t s,@delete_is_del@,$delete_is_del,;t t s,@alt_sends_esc@,$alt_sends_esc,;t t @@ -18648,7 +19267,7 @@ esac if test x"$ac_file" != x-; then - { echo "$as_me:18651: creating $ac_file" >&5 + { echo "$as_me:19270: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -18666,7 +19285,7 @@ -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:18669: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:19288: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -18679,7 +19298,7 @@ echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:18682: error: cannot find input file: $f" >&5 + { { echo "$as_me:19301: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -18695,7 +19314,7 @@ if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' $ac_item` if test -z "$ac_used"; then - { echo "$as_me:18698: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:19317: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&2;} @@ -18704,7 +19323,7 @@ fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:18707: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:19326: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&2;} @@ -18741,7 +19360,7 @@ ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:18744: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:19363: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&5 echo "$as_me: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&2;} @@ -18752,7 +19371,7 @@ egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out if test -s $tmp/out; then ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` - { echo "$as_me:18755: WARNING: Some variables may not be substituted: + { echo "$as_me:19374: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -18801,7 +19420,7 @@ * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:18804: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:19423: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -18812,7 +19431,7 @@ -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:18815: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:19434: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -18825,7 +19444,7 @@ echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:18828: error: cannot find input file: $f" >&5 + { { echo "$as_me:19447: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -18943,7 +19562,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:18946: $ac_file is unchanged" >&5 + { echo "$as_me:19565: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff -Nru xterm-287/configure.in xterm-293/configure.in --- xterm-287/configure.in 2012-10-10 23:32:47.000000000 +0000 +++ xterm-293/configure.in 2013-05-27 13:46:02.000000000 +0000 @@ -1,9 +1,9 @@ -dnl $XTermId: configure.in,v 1.306 2012/10/10 23:32:47 tom Exp $ +dnl $XTermId: configure.in,v 1.316 2013/05/27 13:46:02 tom Exp $ dnl dnl ----------------------------------------------------------------------------- dnl this file is part of xterm dnl -dnl Copyright 1997-2011,2012 by Thomas E. Dickey +dnl Copyright 1997-2012,2013 by Thomas E. Dickey dnl dnl All Rights Reserved dnl @@ -53,8 +53,8 @@ CF_PROG_CC AC_PROG_CPP -AC_PROG_GCC_TRADITIONAL AC_PROG_AWK +CF_PROG_GROFF AC_PROG_INSTALL AC_PROG_LN_S AC_ARG_PROGRAM @@ -110,9 +110,12 @@ CF_WITH_APP_CLASS(XTerm) CF_WITH_APP_DEFAULTS CF_WITH_ICON_NAME(xterm-color) +CF_WITH_ICON_SYMLINK(xterm) CF_WITH_ICON_THEME([icons/$ICON_NAME icons/${ICON_NAME}_48x48],,,icons/${ICON_NAME}_48x48) CF_DISABLE_DESKTOP(xterm) -CF_WITH_DESKTOP_CATEGORY(xterm,[*rxvt*|konsole|*-terminal],[System|TerminalEmulator|Utility|*]) +CF_WITH_DESKTOP_CATEGORY(xterm, + [*rxvt*|konsole|*-terminal], + [System|TerminalEmulator|Utility|*]) AC_MSG_CHECKING(for install-permissions reference) AC_ARG_WITH(reference, @@ -145,6 +148,14 @@ XTERM_SYMLINK="$with_symlink" fi +AC_MSG_CHECKING(if you want to disable openpty) +CF_ARG_DISABLE(openpty, + [ --disable-openpty disable openpty, prefer other interfaces], + [disable_openpty=yes], + [disable_openpty=no], + no) +AC_MSG_RESULT($disable_openpty) + AC_MSG_CHECKING(if you want to disable setuid) CF_ARG_DISABLE(setuid, [ --disable-setuid disable setuid in xterm, do not install setuid/setgid], @@ -279,7 +290,7 @@ AC_MSG_CHECKING(for default terminal-id) AC_ARG_WITH(terminal-id, - [ --with-terminal-id=V set default decTerminalID (default: vt100)], + [ --with-terminal-id=V set default decTerminalID (default: vt420)], [default_termid=$withval], [default_termid=vt420]) AC_MSG_RESULT($default_termid) @@ -300,12 +311,12 @@ AC_SUBST(default_TERM) ############################################################################### -AC_MSG_CHECKING(if backarrow-key should be DEL) +AC_MSG_CHECKING(if backarrow-key should be BS) CF_ARG_DISABLE(backarrow-key, [ --enable-backarrow-key set default backarrowKey resource (default: true)], - [backarrow_is_del=$enableval], - [backarrow_is_del=yes]) -CF_XBOOL_RESULT(DEF_BACKARO_DEL,backarrow_is_del,[Define to 1 if backarrow-key should be DEL]) + [backarrow_is_bs=$enableval], + [backarrow_is_bs=yes]) +CF_XBOOL_RESULT(DEF_BACKARO_BS,backarrow_is_bs,[Define to 1 if backarrow-key should be BS]) AC_MSG_CHECKING(if backarrow-key should be treated as erase) CF_ARG_ENABLE(backarrow-is-erase, @@ -926,16 +937,7 @@ EXTRAOBJS="$EXTRAOBJS trace.o" fi -AC_MSG_CHECKING(if you want to test memory leaks) -CF_ARG_DISABLE(leaks, - [ --disable-leaks test: set to test memory leaks], - [disable_leaks=yes], - [disable_leaks=no]) -AC_MSG_RESULT($disable_leaks) -if test "$disable_leaks" = yes ; then - AC_DEFINE(NO_LEAKS,1,[Define to 1 to test memory leaks]) -fi - +CF_DISABLE_LEAKS CF_DISABLE_ECHO AC_MSG_CHECKING(if you want magic cookie emulation) diff -Nru xterm-287/ctlseqs.ms xterm-293/ctlseqs.ms --- xterm-287/ctlseqs.ms 2012-11-25 16:23:14.000000000 +0000 +++ xterm-293/ctlseqs.ms 2013-04-24 09:49:19.000000000 +0000 @@ -1,9 +1,9 @@ .\"#! troff -ms $1 -*- Nroff -*- .\" "Xterm Control Sequences" document -.\" $XTermId: ctlseqs.ms,v 1.276 2012/11/25 16:23:14 tom Exp $ +.\" $XTermId: ctlseqs.ms,v 1.288 2013/04/24 09:49:19 tom Exp $ .\" .\" -.\" Copyright 1996-2011,2012 by Thomas E. Dickey +.\" Copyright 1996-2012,2013 by Thomas E. Dickey .\" .\" All Rights Reserved .\" @@ -69,8 +69,8 @@ .\" .ds XT XTerm .ds xt xterm -.ds LF Patch #287 -.ds RF 2012/11/25 +.ds LF Patch #292 +.ds RF 2013/04/24 .\" .if n .pl 9999v \" no page breaks in nroff .ND @@ -111,6 +111,8 @@ .de Ss .LP .B +\\$* +.br .. .ds CH \" as nothing .ds LH \*(XT Control Sequences @@ -409,8 +411,7 @@ . .St .\" -.Ss -Single-character functions +.Ss Single-character functions .\" .IP \\*(Be Bell (Ctrl-G). @@ -453,8 +454,7 @@ .\" .\" .St -.Ss -Controls beginning with \*(Es +.Ss Controls beginning with \*(Es .LP This excludes controls where \*(Es is part of a 7-bit equivalent to 8-bit C1 controls, ordered by the final character(s). .\" @@ -598,16 +598,14 @@ .Ed . .St -.Ss -Application Program-Control functions +.Ss Application Program-Control functions .IP \\*(AP\\*(Pt\\*s\\*(ST None. \fIxterm\fP implements no \*(AP functions; \*(Pt is ignored. \*(Pt need not be printable characters. .Ed . .St -.Ss -Device-Control functions +.Ss Device-Control functions .IP \\*(Dc\\*(Ps\\*;\\*(Ps\\*|\\*(Pt\\*s\\*(ST User-Defined Keys (DECUDK). The first parameter: @@ -670,8 +668,7 @@ .Ed .\" .St -.Ss -Functions using \*(Cs, ordered by the final character(s) +.Ss Functions using \*(Cs, ordered by the final character(s) .IP \\*(Cs\\*(Ps\\*s\\*@ Insert \*(Ps (Blank) Character(s) (default = 1) (ICH). . @@ -1203,7 +1200,7 @@ Request DEC private mode (DECRQM). For VT300 and up, reply is .br - \*(Cs\*?\*(Ps\*;\*(Pm\*$\*p + \*(Cs\*?\*(Ps\*;\*(Pm\*$\*y .br where \*(Ps is the mode number as in DECSET, \*(Pm is the mode value as in the ANSI DECRQM. @@ -1478,17 +1475,16 @@ .br The ``page'' parameter is not used by \*(xt, and will be omitted. . -.IP \\*(Cs\\*(Pm\\*s\\*(Sp\\*} +.IP \\*(Cs\\*(Pm\\*s\\*(qu\\*} Insert \*(Ps Column(s) (default = 1) (DECIC), VT420 and up. . -.IP \\*(Cs\\*(Pm\\*s\\*(Sp\\*~ +.IP \\*(Cs\\*(Pm\\*s\\*(qu\\*~ Delete \*(Ps Column(s) (default = 1) (DECDC), VT420 and up. . .Ed . .St -.Ss -Operating System Controls +.Ss Operating System Controls . .IP \\*(Os\\*(Ps\\*s\\*;\\*(Pt\\*s\\*(ST .IP \\*(Os\\*(Ps\\*s\\*;\\*(Pt\\*s\\*(Be @@ -1639,8 +1635,7 @@ \*(Ps = \*1\*1\*8 \(-> Reset Tektronix cursor color. . .St -.Ss -Privacy Message +.Ss Privacy Message .IP \\*(PM\\*(Pt\\*s\\*(ST \fIxterm\fP implements no \*(PM functions; \*(Pt is ignored. \*(Pt need not be printable characters. @@ -1679,12 +1674,15 @@ The table shows the result for a given character "x" with modifiers according to the default translations with the resources set on or off. This assumes \fBaltIsNotMeta\fP is set: -.ne 23 -.TS +.\" page-eject to work around grohtml bugs +.if t .bp +.TS H center; -lf3 lf3 lf3 lf3 lf3w(2c) lf3w(2c) lf3w(2c) lf3w(2c) . _ +.TH +.T& +l | l | l | l . key altSendsEscape metaSendsEscape result _ x off off x @@ -1721,13 +1719,14 @@ .lP The cursor keys transmit the following escape sequences depending on the mode specified via the \fBDECCKM\fP escape sequence. -.ne 10 -.TS +.TS H center; -cf3 cf3 cf3 lf3w(2c) lf3w(2c) lf3w(2c) . Key Normal Application _ +.TH +.T& +l | l | l . Cursor Up \*(Cs\*A \*(S3\*A Cursor Down \*(Cs\*(cB \*(S3\*(cB Cursor Right \*(Cs\*C \*(S3\*C @@ -1738,13 +1737,14 @@ (unlike PageUp and other keys also on the 6-key editing keypad) are considered "cursor keys" by \fIxterm\fP. Their mode is also controlled by the \fBDECCKM\fP escape sequence: -.ne 8 -.TS +.TS H center; -cf3 cf3 cf3 lf3w(2c) lf3w(2c) lf3w(2c) . Key Normal Application _ +.TH +.T& +l | l | l . Home \*(Cs\*H \*(S3\*H End \*(Cs\*F \*(S3\*F _ @@ -1756,13 +1756,14 @@ .lP Not all keys are present on the Sun/PC keypad (e.g., PF1, Tab), but are supported by the program. -.ne 30 -.TS +.TS H center; -cf3 cf3 cf3 cf3 cf3 lf3w(2c) lf3w(2c) lf3w(2c) lf3w(2c) lf3w(2c) . Key Numeric Application Terminfo Termcap _ +.TH +.T& +l | l | l | l | l . Space \*(Sp \*(S3\*(Sp - - Tab \*(Ta \*(S3\*I - - Enter \*(Cr \*(S3\*M kent @8 @@ -1791,13 +1792,14 @@ .TE .br They also provide 12 function keys, as well as a few other special-purpose keys: -.ne 18 -.TS +.TS H center; -cf3 cf3 lf3w(2c) lf3w(2c) . Key Escape Sequence _ +.TH +.T& +l | l . F1 \*(S3\*P F2 \*(S3\*Q F3 \*(S3\*R @@ -1817,13 +1819,14 @@ These can be activated by setting the \fBoldXtermFKeys\fP resource. However, since they do not correspond to any hardware terminal, they have been deprecated. (The DEC VT220 reserves F1 through F5 for local functions such as \fBSetup\fP). -.ne 10 -.TS +.TS H center; -cf3 cf3 lf3w(2c) lf3w(2c) . Key Escape Sequence _ +.TH +.T& +l | l . F1 \*(Cs\*1\*1\*(c~ F2 \*(Cs\*1\*2\*(c~ F3 \*(Cs\*1\*3\*(c~ @@ -1835,13 +1838,14 @@ \fIxterm\fP recognizes function key modifiers which are parameters appended before the final character of the control sequence. -.ne 13 -.TS +.TS H center; -cf3 lf3 cf3w(2c) lf3w(2c) . Code Modifiers _ +.TH +.T& +l | l . 2 Shift 3 Alt 4 Shift + Alt @@ -1864,13 +1868,14 @@ .lP The VT102/VT220 application keypad transmits unique escape sequences in application mode, which are distinct from the cursor and scrolling keypad: -.ne 32 -.TS +.TS H center; -cf3 cf3 cf3 lf3w(2c) lf3w(2c) lf3w(2c) . Key Numeric Application _ +.TH +.T& +l | l | l . Space \*(Sp \*(S3\*(Sp Tab \*(Ta \*(S3\*I Enter \*(Cr \*(S3\*M @@ -1900,13 +1905,14 @@ The VT220 provides a 6-key editing keypad, which is analogous to that on the PC keyboard. It is not affected by \fBDECCKM\fP or \fBDECKPNM\fP/\fBDECKPAM\fP: -.ne 12 -.TS +.TS H center; -cf3 cf3 cf3 lf3w(2c) lf3w(2c) lf3w(2c) . Key Normal Application _ +.TH +.T& +l | l | l . \f1Insert\fP \*(Cs\*2\*(c~ \*(Cs\*2\*(c~ \f1Delete\fP \*(Cs\*3\*(c~ \*(Cs\*3\*(c~ \f1Home\fP \*(Cs\*1\*(c~ \*(Cs\*1\*(c~ @@ -1918,13 +1924,14 @@ .LP The VT220 provides 8 additional function keys. With a Sun/PC keyboard, access these keys by Control/F1 for F13, etc. -.ne 16 -.TS +.TS H center; -cf3 cf3 lf3w(2c) lf3w(2c) . Key Escape Sequence _ +.TH +.T& +l | l . F13 \*(Cs\*2\*5\*(c~ F14 \*(Cs\*2\*6\*(c~ F15 \*(Cs\*2\*8\*(c~ @@ -1940,13 +1947,14 @@ A VT52 does not have function keys, but it does have a numeric keypad and cursor keys. They differ from the other emulations by the prefix. Also, the cursor keys do not change: -.ne 13 -.TS +.TS H center; -cf3 cf3 lf3w(2c) lf3w(2c) . Key Normal/Application _ +.TH +.T& +l | l . Cursor Up \*(Es\*A Cursor Down \*(Es\*(cB Cursor Right \*(Es\*C @@ -1954,13 +1962,14 @@ _ .TE The keypad is similar: -.ne 33 -.TS +.TS H center; -cf3 cf3 cf3 lf3w(2c) lf3w(2c) lf3w(2c) . Key Numeric Application _ +.TH +.T& +l | l | l . Space \*(Sp \*(Es\*?\*(Sp Tab \*(Ta \*(Es\*?\*I Enter \*(Cr \*(Es\*?\*M @@ -2140,6 +2149,7 @@ The upper left character position on the terminal is denoted as 1,1. This scheme dates back to X10, though the normal mouse-tracking (from X11) is more elaborate. +.Ss X10 compatbility mode .lP X10 compatibility mode sends an escape sequence only on button press, encoding the location and the mouse button pressed. @@ -2151,6 +2161,7 @@ .bP \*(Cx and \*(Cy are the x and y coordinates of the mouse when the button was pressed. +.Ss Normal tracking mode .lP Normal tracking mode sends an escape sequence on both button press and release. @@ -2172,6 +2183,7 @@ .bP \*(Cx and \*(Cy are the x and y coordinates of the mouse event, encoded as in X10 mode. +.Ss Wheel mice .lP Wheel mice may return buttons 4 and 5. Those buttons are represented by the same event codes @@ -2188,6 +2200,7 @@ the alternate screen. The initial state of Alternate Scroll mode is set using the \fBalternateScroll\fP resource. +.Ss Highlight tracking .lP Mouse highlight tracking notifies a program of a button press, receives a range of lines from the program, highlights the region covered by @@ -2235,6 +2248,7 @@ give the location of the mouse at button up, which may not be over a character. .RE +.Ss Button-event tracking .lP Button-event tracking is essentially the same as normal tracking, but \fIxterm\fP also reports button-motion events. @@ -2255,16 +2269,19 @@ Similarly, motion with button 3 down is reported as \*(Cs\*M\*(cB\*(Cx\*(Cy. (\ \*(cB = 32 + 2 (button 3) + 32 (motion indicator)\ ). +.Ss Any-event tracking .lP Any-event mode is the same as button-event mode, except that all motion events are reported, even if no mouse button is down. It is enabled by specifying 1003 to DECSET. +.Ss FocusIn/FocusOut .lP FocusIn/FocusOut can be combined with any of the mouse events since it uses a different protocol. When set, it causes \fIxterm\fP to send \*(Cs\*I when the terminal gains focus, and \*(Cs\*O when it loses focus. +.Ss Extended coordinates .lP The original X10 mouse protocol limits the \*(Cx and \*(Cy ordinates to 223 (=255\ -\ 32). @@ -2295,13 +2312,17 @@ the \*(Cx and \*(Cy ordinates and a final character which is \*M for button press and \*m for button release. -.IP +.RS +.bP The encoded button value in this case does not add 32 since that was useful only in the X10 scheme for ensuring that the byte containing the button value is a printable code. +.bP The modifiers are encoded in the same way. +.bP A different final character is used for button release to resolve the X10 ambiguity regarding which button was released. +.RE .IP The highlight tracking responses are also modified to an SGR-like format, using the same SGR-style scheme and button-encodings. diff -Nru xterm-287/ctlseqs.txt xterm-293/ctlseqs.txt --- xterm-287/ctlseqs.txt 2012-11-25 16:23:17.000000000 +0000 +++ xterm-293/ctlseqs.txt 2013-04-24 09:49:34.000000000 +0000 @@ -21,7 +21,7 @@ Thomas Dickey XFree86 Project (1996-2006) invisible-island.net (2006-2012) - updated for XTerm Patch #287 (2012/11/25) + updated for XTerm Patch #292 (2013/04/24) @@ -676,7 +676,7 @@ 4 - permanently reset CSI ? Ps$ p Request DEC private mode (DECRQM). For VT300 and up, reply is - CSI ? Ps; Pm$ p + CSI ? Ps; Pm$ y where Ps is the mode number as in DECSET, Pm is the mode value as in the ANSI DECRQM. CSI Ps ; Ps " p @@ -921,9 +921,9 @@ mal. The ``page'' parameter is not used by xterm, and will be omit- ted. -CSI Pm SP } +CSI Pm ' } Insert Ps Column(s) (default = 1) (DECIC), VT420 and up. -CSI Pm SP ~ +CSI Pm ' ~ Delete Ps Column(s) (default = 1) (DECDC), VT420 and up. Operating System Controls @@ -1089,24 +1089,24 @@ ----------------------------------------------------------- key altSendsEscape metaSendsEscape result - ----------------------------------------------------------- - x off off x - Meta-x off off shift - Alt-x off off shift - Alt+Meta-x off off shift - x ON off x - Meta-x ON off shift - Alt-x ON off ESC x - Alt+Meta-x ON off ESC shift - x off ON x - Meta-x off ON ESC x - Alt-x off ON shift - Alt+Meta-x off ON ESC shift - x ON ON x - Meta-x ON ON ESC x - Alt-x ON ON ESC x - Alt+Meta-x ON ON ESC x - ----------------------------------------------------------- + -----------+----------------+-----------------+------------ + x | off | off | x + Meta-x | off | off | shift + Alt-x | off | off | shift + Alt+Meta-x | off | off | shift + x | ON | off | x + Meta-x | ON | off | shift + Alt-x | ON | off | ESC x + Alt+Meta-x | ON | off | ESC shift + x | off | ON | x + Meta-x | off | ON | ESC x + Alt-x | off | ON | shift + Alt+Meta-x | off | ON | ESC shift + x | ON | ON | x + Meta-x | ON | ON | ESC x + Alt-x | ON | ON | ESC x + Alt+Meta-x | ON | ON | ESC x + -----------+----------------+-----------------+------------ PC-Style Function Keys @@ -1124,23 +1124,23 @@ The cursor keys transmit the following escape sequences depending on the mode specified via the DECCKM escape sequence. - Key Normal Application - -------------------------------------- - Cursor Up CSI A SS3 A - Cursor Down CSI B SS3 B - Cursor Right CSI C SS3 C - Cursor Left CSI D SS3 D - -------------------------------------- + Key Normal Application + -------------+----------+------------- + Cursor Up | CSI A | SS3 A + Cursor Down | CSI B | SS3 B + Cursor Right | CSI C | SS3 C + Cursor Left | CSI D | SS3 D + -------------+----------+------------- The home- and end-keys (unlike PageUp and other keys also on the 6-key editing keypad) are considered "cursor keys" by xterm. Their mode is also controlled by the DECCKM escape sequence: - Key Normal Application - ---------------------------------- - Home CSI H SS3 H - End CSI F SS3 F - ---------------------------------- + Key Normal Application + ---------+----------+------------- + Home | CSI H | SS3 H + End | CSI F | SS3 F + ---------+----------+------------- The application keypad transmits the following escape sequences depend- @@ -1150,52 +1150,52 @@ Not all keys are present on the Sun/PC keypad (e.g., PF1, Tab), but are supported by the program. - Key Numeric Application Terminfo Termcap - -------------------------------------------------------------- - Space SP SS3 SP - - - Tab TAB SS3 I - - - Enter CR SS3 M kent @8 - PF1 SS3 P SS3 P kf1 k1 - PF2 SS3 Q SS3 Q kf2 k2 - PF3 SS3 R SS3 R kf3 k3 - PF4 SS3 S SS3 S kf4 k4 - * (multiply) * SS3 j - - - + (add) + SS3 k - - - , (comma) , SS3 l - - - - (minus) - SS3 m - - - . (Delete) . CSI 3 ~ - - - / (divide) / SS3 o - - - 0 (Insert) 0 CSI 2 ~ - - - 1 (End) 1 SS3 F kc1 K4 - 2 (DownArrow) 2 CSI B - - - 3 (PageDown) 3 CSI 6 ~ kc3 K5 - 4 (LeftArrow) 4 CSI D - - - 5 (Begin) 5 CSI E kb2 K2 - 6 (RightArrow) 6 CSI C - - - 7 (Home) 7 SS3 H ka1 K1 - 8 (UpArrow) 8 CSI A - - - 9 (PageUp) 9 CSI 5 ~ ka3 K3 - = (equal) = SS3 X - - - -------------------------------------------------------------- + Key Numeric Application Terminfo Termcap + ---------------+----------+-------------+----------+---------- + Space | SP | SS3 SP | - | - + Tab | TAB | SS3 I | - | - + Enter | CR | SS3 M | kent | @8 + PF1 | SS3 P | SS3 P | kf1 | k1 + PF2 | SS3 Q | SS3 Q | kf2 | k2 + PF3 | SS3 R | SS3 R | kf3 | k3 + PF4 | SS3 S | SS3 S | kf4 | k4 + * (multiply) | * | SS3 j | - | - + + (add) | + | SS3 k | - | - + , (comma) | , | SS3 l | - | - + - (minus) | - | SS3 m | - | - + . (Delete) | . | CSI 3 ~ | - | - + / (divide) | / | SS3 o | - | - + 0 (Insert) | 0 | CSI 2 ~ | - | - + 1 (End) | 1 | SS3 F | kc1 | K4 + 2 (DownArrow) | 2 | CSI B | - | - + 3 (PageDown) | 3 | CSI 6 ~ | kc3 | K5 + 4 (LeftArrow) | 4 | CSI D | - | - + 5 (Begin) | 5 | CSI E | kb2 | K2 + 6 (RightArrow) | 6 | CSI C | - | - + 7 (Home) | 7 | SS3 H | ka1 | K1 + 8 (UpArrow) | 8 | CSI A | - | - + 9 (PageUp) | 9 | CSI 5 ~ | ka3 | K3 + = (equal) | = | SS3 X | - | - + ---------------+----------+-------------+----------+---------- They also provide 12 function keys, as well as a few other special-pur- pose keys: - Key Escape Sequence - --------------------------- - F1 SS3 P - F2 SS3 Q - F3 SS3 R - F4 SS3 S - F5 CSI 1 5 ~ - F6 CSI 1 7 ~ - F7 CSI 1 8 ~ - F8 CSI 1 9 ~ - F9 CSI 2 0 ~ - F10 CSI 2 1 ~ - F11 CSI 2 3 ~ - F12 CSI 2 4 ~ - --------------------------- + Key Escape Sequence + ---------+----------------- + F1 | SS3 P + F2 | SS3 Q + F3 | SS3 R + F4 | SS3 S + F5 | CSI 1 5 ~ + F6 | CSI 1 7 ~ + F7 | CSI 1 8 ~ + F8 | CSI 1 9 ~ + F9 | CSI 2 0 ~ + F10 | CSI 2 1 ~ + F11 | CSI 2 3 ~ + F12 | CSI 2 4 ~ + ---------+----------------- Older versions of xterm implement different escape sequences for F1 @@ -1204,28 +1204,28 @@ nal, they have been deprecated. (The DEC VT220 reserves F1 through F5 for local functions such as Setup). - Key Escape Sequence - --------------------------- - F1 CSI 1 1 ~ - F2 CSI 1 2 ~ - F3 CSI 1 3 ~ - F4 CSI 1 4 ~ - --------------------------- + Key Escape Sequence + ---------+----------------- + F1 | CSI 1 1 ~ + F2 | CSI 1 2 ~ + F3 | CSI 1 3 ~ + F4 | CSI 1 4 ~ + ---------+----------------- In normal mode, i.e., a Sun/PC keyboard when the sunKeyboard resource is false, xterm recognizes function key modifiers which are parameters appended before the final character of the control sequence. Code Modifiers - --------------------------------- - 2 Shift - 3 Alt - 4 Shift + Alt - 5 Control - 6 Shift + Control - 7 Alt + Control - 8 Shift + Alt + Control - --------------------------------- + ---------+----------------------- + 2 | Shift + 3 | Alt + 4 | Shift + Alt + 5 | Control + 6 | Shift + Control + 7 | Alt + Control + 8 | Shift + Alt + Control + ---------+----------------------- For example, shift-F5 would be sent as CSI 1 5 ; 2 ~ @@ -1241,61 +1241,61 @@ application mode, which are distinct from the cursor and scrolling key- pad: - Key Numeric Application - -------------------------------------- - Space SP SS3 SP - Tab TAB SS3 I - Enter CR SS3 M - PF1 SS3 P SS3 P - PF2 SS3 Q SS3 Q - PF3 SS3 R SS3 R - PF4 SS3 S SS3 S - * (multiply) * SS3 j - + (add) + SS3 k - , (comma) , SS3 l - - (minus) - SS3 m - . (period) . SS3 n - / (divide) / SS3 o - 0 0 SS3 p - 1 1 SS3 q - 2 2 SS3 r - 3 3 SS3 s - 4 4 SS3 t - 5 5 SS3 u - 6 6 SS3 v - 7 7 SS3 w - 8 8 SS3 x - 9 9 SS3 y - = (equal) = SS3 X - -------------------------------------- + Key Numeric Application + -------------+----------+------------- + Space | SP | SS3 SP + Tab | TAB | SS3 I + Enter | CR | SS3 M + PF1 | SS3 P | SS3 P + PF2 | SS3 Q | SS3 Q + PF3 | SS3 R | SS3 R + PF4 | SS3 S | SS3 S + * (multiply) | * | SS3 j + + (add) | + | SS3 k + , (comma) | , | SS3 l + - (minus) | - | SS3 m + . (period) | . | SS3 n + / (divide) | / | SS3 o + 0 | 0 | SS3 p + 1 | 1 | SS3 q + 2 | 2 | SS3 r + 3 | 3 | SS3 s + 4 | 4 | SS3 t + 5 | 5 | SS3 u + 6 | 6 | SS3 v + 7 | 7 | SS3 w + 8 | 8 | SS3 x + 9 | 9 | SS3 y + = (equal) | = | SS3 X + -------------+----------+------------- The VT220 provides a 6-key editing keypad, which is analogous to that on the PC keyboard. It is not affected by DECCKM or DECKPNM/DECKPAM: - Key Normal Application - ---------------------------------- - Insert CSI 2 ~ CSI 2 ~ - Delete CSI 3 ~ CSI 3 ~ - Home CSI 1 ~ CSI 1 ~ - End CSI 4 ~ CSI 4 ~ - PageUp CSI 5 ~ CSI 5 ~ - PageDown CSI 6 ~ CSI 6 ~ - ---------------------------------- + Key Normal Application + ---------+----------+------------- + Insert | CSI 2 ~ | CSI 2 ~ + Delete | CSI 3 ~ | CSI 3 ~ + Home | CSI 1 ~ | CSI 1 ~ + End | CSI 4 ~ | CSI 4 ~ + PageUp | CSI 5 ~ | CSI 5 ~ + PageDown | CSI 6 ~ | CSI 6 ~ + ---------+----------+------------- The VT220 provides 8 additional function keys. With a Sun/PC keyboard, access these keys by Control/F1 for F13, etc. - Key Escape Sequence - --------------------------- - F13 CSI 2 5 ~ - F14 CSI 2 6 ~ - F15 CSI 2 8 ~ - F16 CSI 2 9 ~ - F17 CSI 3 1 ~ - F18 CSI 3 2 ~ - F19 CSI 3 3 ~ - F20 CSI 3 4 ~ - --------------------------- + Key Escape Sequence + ---------+----------------- + F13 | CSI 2 5 ~ + F14 | CSI 2 6 ~ + F15 | CSI 2 8 ~ + F16 | CSI 2 9 ~ + F17 | CSI 3 1 ~ + F18 | CSI 3 2 ~ + F19 | CSI 3 3 ~ + F20 | CSI 3 4 ~ + ---------+----------------- VT52-Style Function Keys @@ -1303,43 +1303,43 @@ and cursor keys. They differ from the other emulations by the prefix. Also, the cursor keys do not change: - Key Normal/Application - ---------------------------------- - Cursor Up ESC A - Cursor Down ESC B - Cursor Right ESC C - Cursor Left ESC D - ---------------------------------- + Key Normal/Application + -------------+-------------------- + Cursor Up | ESC A + Cursor Down | ESC B + Cursor Right | ESC C + Cursor Left | ESC D + -------------+-------------------- The keypad is similar: - Key Numeric Application - -------------------------------------- - Space SP ESC ? SP - Tab TAB ESC ? I - Enter CR ESC ? M - PF1 ESC P ESC P - PF2 ESC Q ESC Q - PF3 ESC R ESC R - PF4 ESC S ESC S - * (multiply) * ESC ? j - + (add) + ESC ? k - , (comma) , ESC ? l - - (minus) - ESC ? m - . (period) . ESC ? n - / (divide) / ESC ? o - 0 0 ESC ? p - 1 1 ESC ? q - 2 2 ESC ? r - 3 3 ESC ? s - 4 4 ESC ? t - 5 5 ESC ? u - 6 6 ESC ? v - 7 7 ESC ? w - 8 8 ESC ? x - 9 9 ESC ? y - = (equal) = ESC ? X - -------------------------------------- + Key Numeric Application + -------------+----------+------------- + Space | SP | ESC ? SP + Tab | TAB | ESC ? I + Enter | CR | ESC ? M + PF1 | ESC P | ESC P + PF2 | ESC Q | ESC Q + PF3 | ESC R | ESC R + PF4 | ESC S | ESC S + * (multiply) | * | ESC ? j + + (add) | + | ESC ? k + , (comma) | , | ESC ? l + - (minus) | - | ESC ? m + . (period) | . | ESC ? n + / (divide) | / | ESC ? o + 0 | 0 | ESC ? p + 1 | 1 | ESC ? q + 2 | 2 | ESC ? r + 3 | 3 | ESC ? s + 4 | 4 | ESC ? t + 5 | 5 | ESC ? u + 6 | 6 | ESC ? v + 7 | 7 | ESC ? w + 8 | 8 | ESC ? x + 9 | 9 | ESC ? y + = (equal) | = | ESC ? X + -------------+----------+------------- Sun-Style Function Keys @@ -1460,6 +1460,7 @@ the value 1. The upper left character position on the terminal is denoted as 1,1. This scheme dates back to X10, though the normal mouse- tracking (from X11) is more elaborate. +X10 compatbility mode X10 compatibility mode sends an escape sequence only on button press, encoding the location and the mouse button pressed. It is enabled by @@ -1468,6 +1469,7 @@ o Cb is button-1. o Cx and Cy are the x and y coordinates of the mouse when the button was pressed. +Normal tracking mode Normal tracking mode sends an escape sequence on both button press and release. Modifier key (shift, ctrl, meta) information is also sent. It @@ -1484,6 +1486,7 @@ the mod1 mask, and is not necessarily the "Meta" key (see xmodmap). o Cx and Cy are the x and y coordinates of the mouse event, encoded as in X10 mode. +Wheel mice Wheel mice may return buttons 4 and 5. Those buttons are represented by the same event codes as buttons 1 and 2 respectively, except that 64 is @@ -1494,6 +1497,7 @@ is set, then cursor up/down controls are sent when the terminal is dis- playing the alternate screen. The initial state of Alternate Scroll mode is set using the alternateScroll resource. +Highlight tracking Mouse highlight tracking notifies a program of a button press, receives a range of lines from the program, highlights the region covered by the @@ -1525,6 +1529,7 @@ character positions of the region. - mousex and mousey give the location of the mouse at button up, which may not be over a character. +Button-event tracking Button-event tracking is essentially the same as normal tracking, but xterm also reports button-motion events. Motion events are reported @@ -1539,14 +1544,17 @@ (motion indicator) ). Similarly, motion with button 3 down is reported as CSI M B CxCy. ( B = 32 + 2 (button 3) + 32 (motion indicator) ). +Any-event tracking Any-event mode is the same as button-event mode, except that all motion events are reported, even if no mouse button is down. It is enabled by specifying 1003 to DECSET. +FocusIn/FocusOut FocusIn/FocusOut can be combined with any of the mouse events since it uses a different protocol. When set, it causes xterm to send CSI I when the terminal gains focus, and CSI O when it loses focus. +Extended coordinates The original X10 mouse protocol limits the Cx and Cy ordinates to 223 (=255 - 32). Xterm supports more than one scheme for extending this @@ -1573,12 +1581,14 @@ semicolon-separated encoded button value, the Cx and Cy ordi- nates and a final character which is M for button press and m for button release. - The encoded button value in this case does not add 32 since - that was useful only in the X10 scheme for ensuring that the - byte containing the button value is a printable code. The - modifiers are encoded in the same way. A different final - character is used for button release to resolve the X10 ambi- - guity regarding which button was released. + o The encoded button value in this case does not add 32 + since that was useful only in the X10 scheme for ensuring + that the byte containing the button value is a printable + code. + o The modifiers are encoded in the same way. + o A different final character is used for button release to + resolve the X10 ambiguity regarding which button was + released. The highlight tracking responses are also modified to an SGR- like format, using the same SGR-style scheme and button-encod- ings. diff -Nru xterm-287/debian/changelog xterm-293/debian/changelog --- xterm-287/debian/changelog 2013-06-02 00:33:43.000000000 +0000 +++ xterm-293/debian/changelog 2013-06-02 00:33:43.000000000 +0000 @@ -1,3 +1,47 @@ +xterm (293-SprezzOS1) unstable; urgency=low + + * New upstream + + -- Nick Black Thu, 30 May 2013 07:34:42 -0400 + +xterm (292-SprezzOS1) unstable; urgency=low + + * New upstream + * Debhelper 9 + * Standards-version 3.9.4 + + -- Nick Black Fri, 26 Apr 2013 01:34:32 -0400 + +xterm (291-SprezzOS1) unstable; urgency=low + + * New upstream + + -- Nick Black Fri, 01 Mar 2013 15:47:39 -0500 + +xterm (290-SprezzOS1) unstable; urgency=low + + * New upstream + + -- Nick Black Wed, 13 Feb 2013 10:09:18 -0500 + +xterm (289-SprezzOS1) unstable; urgency=low + + * New upstream + + -- Nick Black Sat, 09 Feb 2013 16:08:13 -0500 + +xterm (288-SprezzOS1) unstable; urgency=low + + * New upstream 288 + + -- Nick Black Wed, 09 Jan 2013 17:02:51 -0500 + +xterm (287-SprezzOS1) unstable; urgency=low + + * SprezzOS build + + -- Nick Black Wed, 12 Dec 2012 22:00:22 -0500 + xterm (287-1) experimental; urgency=low * New upstream release (closes: #694375) diff -Nru xterm-287/debian/compat xterm-293/debian/compat --- xterm-287/debian/compat 2013-06-02 00:33:43.000000000 +0000 +++ xterm-293/debian/compat 2013-06-02 00:33:43.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru xterm-287/debian/control xterm-293/debian/control --- xterm-287/debian/control 2013-06-02 00:33:43.000000000 +0000 +++ xterm-293/debian/control 2013-06-02 00:33:43.000000000 +0000 @@ -1,9 +1,9 @@ Source: xterm Section: x11 Priority: optional -Maintainer: Debian X Strike Force -Uploaders: Cyril Brulebois -Standards-Version: 3.9.2 +Maintainer: Nick Black +XSBC-Original-Maintainer: Debian X Strike Force +Standards-Version: 3.9.4 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xterm.git Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xterm Homepage: http://invisible-island.net/xterm/xterm.html @@ -13,7 +13,7 @@ libxaw7-dev, libxkbfile-dev, libutempter-dev, - debhelper (>= 5), + debhelper (>= 9), quilt, lynx-cur | lynx, xorg-docs-core, diff -Nru xterm-287/debian/patches/100_manpage_whatis.diff xterm-293/debian/patches/100_manpage_whatis.diff --- xterm-287/debian/patches/100_manpage_whatis.diff 2013-06-02 00:33:43.000000000 +0000 +++ xterm-293/debian/patches/100_manpage_whatis.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Index: xterm/xterm.man -=================================================================== ---- xterm.orig/xterm.man -+++ xterm/xterm.man -@@ -85,7 +85,7 @@ - .el .ds '' '' - .TH XTERM 1 "__app_date__" "__app_version__" "X Window System" - .SH NAME --\*n \- terminal emulator for X -+xterm \- terminal emulator for X - .SH SYNOPSIS - .B \*n - [\-\fItoolkitoption\fP ...] [\-\fIoption\fP ...] [\fIshell\fP] diff -Nru xterm-287/debian/patches/904_fontops.diff xterm-293/debian/patches/904_fontops.diff --- xterm-287/debian/patches/904_fontops.diff 2013-06-02 00:33:43.000000000 +0000 +++ xterm-293/debian/patches/904_fontops.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Index: xterm/xterm.man -=================================================================== ---- xterm.orig/xterm.man -+++ xterm/xterm.man -@@ -1707,7 +1707,7 @@ The default is \*(``true\*(''. - .TP - .B "allowFontOps (\fPclass\fB AllowFontOps)" - Specifies whether control sequences that set/query the font should be allowed. --The default is \*(``true\*(''. -+The default is \*(``false\*(''. - .TP 8 - .B "allowScrollLock (\fPclass\fB AllowScrollLock)" - Specifies whether control sequences that set/query diff -Nru xterm-287/debian/patches/series xterm-293/debian/patches/series --- xterm-287/debian/patches/series 2013-06-02 00:33:43.000000000 +0000 +++ xterm-293/debian/patches/series 2013-06-02 00:33:43.000000000 +0000 @@ -1,4 +1,2 @@ -100_manpage_whatis.diff 900_debian_xterm.diff 902_windowops.diff -904_fontops.diff diff -Nru xterm-287/fontutils.c xterm-293/fontutils.c --- xterm-287/fontutils.c 2012-09-22 00:15:55.000000000 +0000 +++ xterm-293/fontutils.c 2013-05-15 00:31:56.000000000 +0000 @@ -1,4 +1,4 @@ -/* $XTermId: fontutils.c,v 1.383 2012/09/22 00:15:55 tom Exp $ */ +/* $XTermId: fontutils.c,v 1.387 2013/05/15 00:31:56 tom Exp $ */ /* * Copyright 1998-2011,2012 by Thomas E. Dickey @@ -89,8 +89,6 @@ } \ } -#define MAX_FONTNAME 200 - /* * A structure to hold the relevant properties from a font * we need to make a well formed font name for it. @@ -243,9 +241,6 @@ if (IsEmpty(name)) { TRACE(("fontname missing\n")); result = False; - } else if (strlen(name) >= MAX_FONTNAME - 1) { - TRACE(("fontname too large: %s\n", name)); - result = False; } return result; } @@ -258,7 +253,7 @@ * or NULL on error. */ static FontNameProperties * -get_font_name_props(Display * dpy, XFontStruct * fs, char *result) +get_font_name_props(Display * dpy, XFontStruct * fs, char **result) { static FontNameProperties props; static char *last_name; @@ -294,7 +289,9 @@ if (result != 0) { if (!check_fontname(name)) return 0; - strcpy(result, name); + if (*result != 0) + free(*result); + *result = x_strdup(name); } /* @@ -515,7 +512,8 @@ old_props.res_x = res_x; old_props.res_x = res_y; old_props.pixel_size = pixel_size; - old_props.spacing = strcpy(old_spacing, props->spacing); + old_props.spacing = old_spacing; + sprintf(old_spacing, "%.*s", (int) sizeof(old_spacing) - 2, props->spacing); } #endif @@ -584,13 +582,14 @@ static int got_bold_font(Display * dpy, XFontStruct * fs, String requested) { - char actual[MAX_FONTNAME]; + char *actual = 0; int got; - if (get_font_name_props(dpy, fs, actual) == 0) + if (get_font_name_props(dpy, fs, &actual) == 0) got = 0; else got = same_font_name(requested, actual); + free(actual); return got; } @@ -876,7 +875,7 @@ Pixel new_normal; Pixel new_revers; char *tmpname = NULL; - char normal[MAX_FONTNAME]; + char *normal = NULL; Boolean proportional = False; fontWarningTypes warn[fMAX]; int j; @@ -945,10 +944,10 @@ goto bad; } - strcpy(normal, myfonts.f_n); + normal = x_strdup(myfonts.f_n); if (!check_fontname(myfonts.f_b)) { warn[fBold] = fwAlways; - fp = get_font_name_props(screen->display, fnts[fNorm].fs, normal); + fp = get_font_name_props(screen->display, fnts[fNorm].fs, &normal); if (fp != 0) { myfonts.f_b = bold_font_name(fp, fp->average_width); if (!xtermOpenFont(xw, myfonts.f_b, &fnts[fBold], fwAlways, False)) { @@ -984,12 +983,12 @@ */ if_OPT_WIDE_CHARS(screen, { Boolean derived; - char bold[MAX_FONTNAME]; + char *bold = NULL; if (check_fontname(myfonts.f_w)) { cache_menu_font_name(screen, fontnum, fWide, myfonts.f_w); } else if (screen->utf8_fonts && !is_double_width_font(fnts[fNorm].fs)) { - fp = get_font_name_props(screen->display, fnts[fNorm].fs, normal); + fp = get_font_name_props(screen->display, fnts[fNorm].fs, &normal); if (fp != 0) { myfonts.f_w = wide_font_name(fp); warn[fWide] = fwAlways; @@ -1007,7 +1006,7 @@ derived = False; if (!check_fontname(myfonts.f_wb)) { - fp = get_font_name_props(screen->display, fnts[fBold].fs, bold); + fp = get_font_name_props(screen->display, fnts[fBold].fs, &bold); if (fp != 0) { myfonts.f_wb = widebold_font_name(fp); warn[fWBold] = fwAlways; @@ -1059,6 +1058,8 @@ TRACE(("...cannot load wide bold font, use wide %s\n", NonNull(myfonts.f_w))); } + free(bold); + if (EmptyFont(fnts[fWBold].fs)) goto bad; /* can't use a 0-sized font */ }); @@ -1251,12 +1252,16 @@ screen->menu_font_sizes[fontnum] = FontSize(fnts[fNorm].fs); #endif } + if (normal) + free(normal); set_cursor_gcs(xw); xtermUpdateFontInfo(xw, doresize); TRACE(("Success Cgs - xtermLoadFont\n")); return 1; bad: + if (normal) + free(normal); if (tmpname) free(tmpname); @@ -1537,9 +1542,9 @@ char name_buf[80]; char class_buf[80]; String name = (String) ((*param_count > 0) ? params[0] : empty); - char *myName = (char *) MyStackAlloc(strlen(name), name_buf); + char *myName = (char *) MyStackAlloc(strlen(name) + 1, name_buf); String convert = (String) ((*param_count > 1) ? params[1] : myName); - char *myClass = (char *) MyStackAlloc(strlen(convert), class_buf); + char *myClass = (char *) MyStackAlloc(strlen(convert) + 1, class_buf); int n; TRACE(("HandleLoadVTFonts(%d)\n", *param_count)); @@ -1857,7 +1862,7 @@ /* * Get the faceName/faceDoublesize resource setting. Strip off "xft:", which - * is not recognized by XftParseName(). + * is not recognized by XftNameParse(). */ String getFaceName(XtermWidget xw, Bool wideName GCC_UNUSED) diff -Nru xterm-287/input.c xterm-293/input.c --- xterm-287/input.c 2012-11-23 18:43:35.000000000 +0000 +++ xterm-293/input.c 2013-02-06 09:51:33.000000000 +0000 @@ -1,4 +1,4 @@ -/* $XTermId: input.c,v 1.344 2012/11/23 18:43:35 tom Exp $ */ +/* $XTermId: input.c,v 1.345 2013/02/06 09:51:33 tom Exp $ */ /* * Copyright 1999-2011,2012 by Thomas E. Dickey @@ -143,42 +143,6 @@ static void hpfuncvalue(ANSI *, KEY_DATA *); static void scofuncvalue(ANSI *, KEY_DATA *); -#if OPT_TRACE -static const char * -ModifierName(unsigned modifier) -{ - const char *s = ""; - if (modifier & ShiftMask) - s = " Shift"; - else if (modifier & LockMask) - s = " Lock"; - else if (modifier & ControlMask) - s = " Control"; - else if (modifier & Mod1Mask) - s = " Mod1"; - else if (modifier & Mod2Mask) - s = " Mod2"; - else if (modifier & Mod3Mask) - s = " Mod3"; - else if (modifier & Mod4Mask) - s = " Mod4"; - else if (modifier & Mod5Mask) - s = " Mod5"; - return s; -} - -#define FMT_MODIFIER_NAMES "%s%s%s%s%s%s%s%s" -#define ARG_MODIFIER_NAMES(state) \ - ModifierName(state & ShiftMask), \ - ModifierName(state & LockMask), \ - ModifierName(state & ControlMask), \ - ModifierName(state & Mod1Mask), \ - ModifierName(state & Mod2Mask), \ - ModifierName(state & Mod3Mask), \ - ModifierName(state & Mod4Mask), \ - ModifierName(state & Mod5Mask) -#endif - static void AdjustAfterInput(XtermWidget xw) { diff -Nru xterm-287/koi8rxterm.man xterm-293/koi8rxterm.man --- xterm-287/koi8rxterm.man 2012-10-23 23:27:24.000000000 +0000 +++ xterm-293/koi8rxterm.man 2013-01-01 00:43:18.000000000 +0000 @@ -1,4 +1,4 @@ -.\" $XTermId: koi8rxterm.man,v 1.5 2012/10/23 23:27:24 tom Exp $ +.\" $XTermId: koi8rxterm.man,v 1.6 2013/01/01 00:43:18 tom Exp $ .\" .\" Copyright 2004 Branden Robinson .\" @@ -19,22 +19,33 @@ .\" 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. +.\" +.ds N Koi8rxterm +.ds n koi8rxterm +.\" +.ie \n(.g .ds AQ \(aq +.el .ds AQ ' +.ie \n(.g .ds `` \(lq +.el .ds `` `` +.ie \n(.g .ds '' \(rq +.el .ds '' '' +.\" .TH KOI8RXTERM 1 "__app_date__" "__app_version__" "X Window System" .SH NAME koi8rxterm \- X terminal emulator for KOI8-R environments .SH SYNOPSIS -.B koi8rxterm +.B \*n [ .I xterm-options ] .SH DESCRIPTION -.B koi8rxterm +.B \*n is a wrapper around the .BR xterm(1) -program that invokes the latter program with the \(oqKOI8R__default_class__\(cq X +program that invokes the latter program with the \*(``KOI8R__default_class__\*('' X resource class set. All arguments to -.B koi8rxterm +.B \*n are passed to .B xterm without processing; the @@ -47,9 +58,9 @@ manual page for more information on .IR xterm-options . .PP -The environment's locale settings (see \(lqENVIRONMENT\(rq below) are +The environment's locale settings (see \*(``ENVIRONMENT\*('' below) are used to discern the locale's character set. -If no current locale can be determined, the locale \(oqru_RU.KOI8-R\(cq +If no current locale can be determined, the locale \*(``ru_RU.KOI8-R\*('' (the Russian language as used in the territory of Russia, with the KOI8-R character set) is assumed. The @@ -57,20 +68,20 @@ utility is used to determine whether the system supports the selected locale. If it does not, -.B koi8rxterm +.B \*n will exit with an error and report the output of .BR locale . .PP -.B Note: koi8rxterm +.B Note: \*n may produce unexpected results if the current locale is set to one in which the KOI8-R character encoding is not supported, or if fonts using that encoding are not available. -In the Debian system, the \(oqxfonts\-cyrillic\(cq package provides the +In the Debian system, the \*(``xfonts\-cyrillic\*('' package provides the fonts that -.B koi8rxterm +.B \*n uses by default. To change the fonts -.B koi8rxterm +.B \*n uses, edit the .I __apploaddir__/KOI8R__default_class__ file. @@ -84,7 +95,7 @@ The values of these variables are checked, in order, to determine the character set used by the current locale. .SH AUTHOR -.B koi8rxterm +.B \*n was written by Branden Robinson and is very heavily based on .BR uxterm , by Thomas Dickey. diff -Nru xterm-287/linedata.c xterm-293/linedata.c --- xterm-287/linedata.c 2012-09-21 20:40:21.000000000 +0000 +++ xterm-293/linedata.c 2013-02-08 00:11:16.000000000 +0000 @@ -1,7 +1,7 @@ -/* $XTermId: linedata.c,v 1.81 2012/09/21 20:40:21 tom Exp $ */ +/* $XTermId: linedata.c,v 1.82 2013/02/08 00:11:16 tom Exp $ */ /* - * Copyright 2009-2010,2011 by Thomas E. Dickey + * Copyright 2009-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -31,7 +31,6 @@ */ #include -#include /* FIXME - needed for 'term' */ #include @@ -64,6 +63,7 @@ result = (LineData *) scrnHeadAddr(screen, buffer, (unsigned) row); if (result != 0) { #if 1 /* FIXME - these should be done in setupLineData, etc. */ + result->lineSize = (Dimension) MaxCols(screen); #if OPT_WIDE_CHARS if (screen->wide_chars) { result->combSize = (Char) screen->max_combining; diff -Nru xterm-287/main.c xterm-293/main.c --- xterm-287/main.c 2012-11-19 10:33:33.000000000 +0000 +++ xterm-293/main.c 2013-05-27 22:11:11.000000000 +0000 @@ -1,7 +1,7 @@ -/* $XTermId: main.c,v 1.689 2012/11/19 10:33:33 tom Exp $ */ +/* $XTermId: main.c,v 1.727 2013/05/27 22:11:11 tom Exp $ */ /* - * Copyright 2002-2011,2012 by Thomas E. Dickey + * Copyright 2002-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -90,6 +90,7 @@ #define RES_OFFSET(field) XtOffsetOf(XTERM_RESOURCE, field) #include +#include #include #include @@ -445,7 +446,7 @@ #endif #ifndef VMS -static SIGNAL_T reapchild(int /* n */ ); +static void reapchild(int /* n */ ); static int spawnXTerm(XtermWidget /* xw */ ); static void remove_termcap_entry(char *, const char *); #ifdef USE_PTY_SEARCH @@ -1534,9 +1535,10 @@ if (result != 0) { TRACE(("...result %s\n", result->option)); /* expand abbreviations */ - if (result->argKind != XrmoptionStickyArg - && strcmp(argv[*num], x_strdup(result->option))) { - argv[*num] = x_strdup(result->option); + if (result->argKind != XrmoptionStickyArg) { + if (strcmp(argv[*num], result->option)) { + argv[*num] = x_strdup(result->option); + } } /* adjust (*num) to skip option value */ @@ -1998,7 +2000,9 @@ for (n = 1; n < argc; n++) { if ((option_ptr = parseArg(&n, argv, &option_value)) == 0) { - if (isOption(argv[n])) { + if (argv[n] == 0) { + break; + } else if (isOption(argv[n])) { Syntax(argv[n]); } else if (explicit_shname != 0) { xtermWarning("Explicit shell already was %s\n", explicit_shname); @@ -2178,7 +2182,7 @@ my_class, optionDescList, XtNumber(optionDescList), - &argc, argv, + &argc, (String *) argv, fallback_resources, sessionShellWidgetClass, NULL, 0); @@ -2428,21 +2432,19 @@ x_appendargv(command_to_exec_with_luit, command_to_exec); } TRACE_ARGV("luit command", command_to_exec_with_luit); + xtermSetenv("XTERM_FILTER", *command_to_exec_with_luit); } #endif -#ifdef DEBUG - { + if_DEBUG({ /* Set up stderr properly. Opening this log file cannot be done securely by a privileged xterm process (although we try), so the debug feature is disabled by default. */ char dbglogfile[TIMESTAMP_LEN + 20]; int i = -1; - if (debug) { - timestamp_filename(dbglogfile, "xterm.debug.log."); - if (creat_as(save_ruid, save_rgid, False, dbglogfile, 0600) > 0) { - i = open(dbglogfile, O_WRONLY | O_TRUNC); - } + timestamp_filename(dbglogfile, "xterm.debug.log."); + if (creat_as(save_ruid, save_rgid, False, dbglogfile, 0600) > 0) { + i = open(dbglogfile, O_WRONLY | O_TRUNC); } if (i >= 0) { dup2(i, 2); @@ -2450,8 +2452,7 @@ /* mark this file as close on exec */ (void) fcntl(i, F_SETFD, 1); } - } -#endif /* DEBUG */ + }); spawnXTerm(term); @@ -2530,10 +2531,9 @@ : (1 + screen->respond)); #endif /* !VMS */ -#ifdef DEBUG - if (debug) - printf("debugging on\n"); -#endif /* DEBUG */ + if_DEBUG({ + TRACE(("debugging on pid %d\n", (int) getpid())); + }); XSetErrorHandler(xerror); XSetIOErrorHandler(xioerror); IceSetIOErrorHandler(ice_error); @@ -2601,7 +2601,9 @@ { int result = 1; -#if defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME) && defined(HAVE_GRANTPT_PTY_ISATTY) +#if defined(USE_OPENPTY) + result = openpty(pty, &opened_tty, ttydev, NULL, NULL); +#elif defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME) && defined(HAVE_GRANTPT_PTY_ISATTY) if ((*pty = posix_openpt(O_RDWR)) >= 0) { char *name = ptsname(*pty); if (name != 0) { @@ -2615,19 +2617,11 @@ } #endif #elif defined(PUCC_PTYD) - result = ((*pty = openrpty(ttydev, ptydev, (resource.utmpInhibit ? OPTY_NOP : OPTY_LOGIN), save_ruid, from)) < 0); - -#elif defined(USE_OPENPTY) - - result = openpty(pty, &opened_tty, ttydev, NULL, NULL); - #elif defined(__QNXNTO__) - result = pty_search(pty); - #else #if defined(USE_USG_PTYS) || defined(__CYGWIN__) #ifdef __GLIBC__ /* if __GLIBC__ and USE_USG_PTYS, we know glibc >= 2.1 */ @@ -2776,6 +2770,11 @@ } else { result = -1; } + TRACE(("get_pty(ttydev=%s, ptydev=%s) %s fd=%d (utmp setgid)\n", + ttydev != 0 ? ttydev : "?", + ptydev != 0 ? ptydev : "?", + result ? "FAIL" : "OK", + pty != 0 ? *pty : -1)); return result; } #endif @@ -2889,11 +2888,11 @@ }; /* ARGSUSED */ -static SIGNAL_T +static void hungtty(int i GCC_UNUSED) { + DEBUG_MSG("handle:hungtty\n"); siglongjmp(env, 1); - SIGNAL_RETURN; } #if OPT_PTY_HANDSHAKE @@ -2983,7 +2982,7 @@ handshake.status = PTY_FATALERROR; handshake.error = errno; handshake.fatal_error = error; - strcpy(handshake.buffer, ttydev); + strncpy(handshake.buffer, ttydev, sizeof(handshake.buffer)); if (resource.ptyHandshake && (cp_pipe[1] >= 0)) { TRACE(("HsSysError errno=%d, error=%d device \"%s\"\n", @@ -3050,7 +3049,7 @@ TRACE_IDS; TRACE(("set_owner(%s, uid=%d, gid=%d, mode=%#o\n", - device, uid, gid, (unsigned) mode)); + device, (int) uid, (int) gid, (unsigned) mode)); if (chown(device, uid, gid) < 0) { why = errno; @@ -3073,7 +3072,7 @@ (unsigned long) mode, (unsigned long) (sb.st_mode & 0777U)); TRACE(("...stat uid=%d, gid=%d, mode=%#o\n", - sb.st_uid, sb.st_gid, (unsigned) sb.st_mode)); + (int) sb.st_uid, (int) sb.st_gid, (unsigned) sb.st_mode)); } } TRACE(("...chmod failed: %s\n", strerror(why))); @@ -3101,18 +3100,26 @@ find_utmp(struct UTMP_STR *tofind) { struct UTMP_STR *result; + struct UTMP_STR limited; struct UTMP_STR working; for (;;) { memset(&working, 0, sizeof(working)); working.ut_type = tofind->ut_type; - memcpy(working.ut_id, tofind->ut_id, sizeof(tofind->ut_id)); + strncpy(working.ut_id, tofind->ut_id, sizeof(tofind->ut_id)); #if defined(__digital__) && defined(__unix__) && (defined(OSMAJORVERSION) && OSMAJORVERSION < 5) working.ut_type = 0; #endif if ((result = call_getutid(&working)) == 0) break; - if (!strcmp(result->ut_line, tofind->ut_line)) + /* + * ut_line may not be null-terminated, but if it is, there may be + * garbage after the null. Use strncpy to ensure that the value + * we check is null-terminated (if there is enough space in the + * buffer), and that unused space is nulled. + */ + strncpy(limited.ut_line, result->ut_line, sizeof(result->ut_line)); + if (!memcmp(limited.ut_line, tofind->ut_line, sizeof(limited.ut_line))) break; /* * Solaris, IRIX64 and HPUX manpages say to fill the static area @@ -3181,7 +3188,8 @@ #endif /* sony */ #endif /* TERMIO_STRUCT */ - char *ptr, *shname, *shname_minus; + char *shell_path = 0; + char *shname, *shname_minus; int i; #if USE_NO_DEV_TTY int no_dev_tty = False; @@ -3447,7 +3455,7 @@ if (get_termcap(xw, next)) { free(TermName); TermName = next; - ok_termcap = True; + ok_termcap = True + 1; break; } else { free(next); @@ -3529,6 +3537,7 @@ TTYSIZE_COLS(ts), i)); #endif /* TTYSIZE_STRUCT */ +#if !defined(USE_OPENPTY) #if defined(USE_USG_PTYS) || defined(HAVE_POSIX_OPENPT) /* * utempter checks the ownership of the device; some implementations @@ -3540,6 +3549,7 @@ unlockpt(screen->respond); TRACE_TTYSIZE(screen->respond, "after unlockpt"); #endif +#endif /* !USE_OPENPTY */ added_utmp_entry = False; #if defined(USE_UTEMPTER) @@ -3645,6 +3655,8 @@ #if OPT_PTY_HANDSHAKE /* warning, goes for a long ways */ if (resource.ptyHandshake) { + char *ptr; + /* close parent's sides of the pipes */ close(cp_pipe[0]); close(pc_pipe[1]); @@ -3743,7 +3755,7 @@ /* let our master know that the open failed */ handshake.status = PTY_BAD; handshake.error = errno; - strcpy(handshake.buffer, ttydev); + strncpy(handshake.buffer, ttydev, sizeof(handshake.buffer)); TRACE_HANDSHAKE("writing", &handshake); IGNORE_RC(write(cp_pipe[1], (const char *) &handshake, @@ -3763,6 +3775,8 @@ } /* We have a new pty to try */ + if (ttyfd >= 0) + close(ttyfd); free(ttydev); ttydev = x_strdup(handshake.buffer); } @@ -4175,9 +4189,10 @@ if (!utret) TRACE(("getutid: NULL\n")); else - TRACE(("getutid: pid=%d type=%d user=%s line=%s id=%s\n", + TRACE(("getutid: pid=%d type=%d user=%s line=%.*s id=%.*s\n", (int) utret->ut_pid, utret->ut_type, utret->ut_user, - utret->ut_line, utret->ut_id)); + (int) sizeof(utret->ut_line), utret->ut_line, + (int) sizeof(utret->ut_id), utret->ut_id)); #endif /* set up the new entry */ @@ -4219,9 +4234,9 @@ if (!resource.utmpInhibit) { errno = 0; call_pututline(&utmp); - TRACE(("pututline: id %s, line %s, pid %ld, errno %d %s\n", - utmp.ut_id, - utmp.ut_line, + TRACE(("pututline: id %.*s, line %.*s, pid %ld, errno %d %s\n", + (int) sizeof(utmp.ut_id), utmp.ut_id, + (int) sizeof(utmp.ut_line), utmp.ut_line, (long) utmp.ut_pid, errno, (errno != 0) ? strerror(errno) : "")); } @@ -4235,7 +4250,7 @@ #else if (xw->misc.login_shell && (i = open(etc_wtmp, O_WRONLY | O_APPEND)) >= 0) { - write(i, (char *) &utmp, sizeof(utmp)); + IGNORE_RC(write(i, (char *) &utmp, sizeof(utmp))); close(i); } #endif @@ -4267,7 +4282,7 @@ utmp.ut_time = time((time_t *) 0); lseek(i, (long) (tslot * sizeof(utmp)), 0); - write(i, (char *) &utmp, sizeof(utmp)); + IGNORE_RC(write(i, (char *) &utmp, sizeof(utmp))); close(i); added_utmp_entry = True; #if defined(WTMP) @@ -4282,7 +4297,7 @@ (i = open(_U_LASTLOG, O_WRONLY)) >= 0) { lseek(i, (long) (screen->uid * sizeof(utmp)), 0); - write(i, (char *) &utmp, sizeof(utmp)); + IGNORE_RC(write(i, (char *) &utmp, sizeof(utmp))); close(i); } #endif /* WTMP or MNX_LASTLOG */ @@ -4325,7 +4340,7 @@ SetUtmpHost(lastlog.ll_host, screen); lastlog.ll_time = time((time_t *) 0); if (lseek(i, offset, 0) != (off_t) (-1)) { - write(i, (char *) &lastlog, size); + IGNORE_RC(write(i, (char *) &lastlog, size)); } close(i); } @@ -4343,7 +4358,7 @@ if (resource.ptyHandshake) { handshake.status = UTMP_ADDED; handshake.error = 0; - strcpy(handshake.buffer, ttydev); + strncpy(handshake.buffer, ttydev, sizeof(handshake.buffer)); TRACE_HANDSHAKE("writing", &handshake); IGNORE_RC(write(cp_pipe[1], (char *) &handshake, sizeof(handshake))); } @@ -4368,8 +4383,8 @@ #if OPT_PTY_HANDSHAKE if (resource.ptyHandshake) { /* mark the pipes as close on exec */ - fcntl(cp_pipe[1], F_SETFD, 1); - fcntl(pc_pipe[0], F_SETFD, 1); + (void) fcntl(cp_pipe[1], F_SETFD, 1); + (void) fcntl(pc_pipe[0], F_SETFD, 1); /* We are at the point where we are going to * exec our shell (or whatever). Let our parent @@ -4377,7 +4392,7 @@ */ handshake.status = PTY_GOOD; handshake.error = 0; - (void) strcpy(handshake.buffer, ttydev); + (void) strncpy(handshake.buffer, ttydev, sizeof(handshake.buffer)); TRACE_HANDSHAKE("writing", &handshake); IGNORE_RC(write(cp_pipe[1], (const char *) &handshake, @@ -4491,22 +4506,29 @@ * Incidentally, our setting of $SHELL tells luit to use that * program rather than choosing between $SHELL and "/bin/sh". */ - if ((ptr = explicit_shname) == NULL) { - if ((ptr = x_getenv("SHELL")) == NULL) { + if ((shell_path = explicit_shname) == NULL) { + if ((shell_path = x_getenv("SHELL")) == NULL) { if ((!OkPasswd(&pw) && !x_getpwuid(screen->uid, &pw)) - || *(ptr = pw.pw_shell) == 0) { - ptr = x_strdup("/bin/sh"); - } else if (ptr != 0) { - xtermSetenv("SHELL", ptr); + || *(shell_path = x_strdup(pw.pw_shell)) == 0) { + if (shell_path) + free(shell_path); + shell_path = x_strdup("/bin/sh"); + } else if (shell_path != 0) { + xtermSetenv("SHELL", shell_path); } } } else { xtermSetenv("SHELL", explicit_shname); } - xtermSetenv("XTERM_SHELL", ptr); + if (access(shell_path, X_OK) != 0) { + xtermPerror("Cannot use '%s' as shell", shell_path); + free(shell_path); + shell_path = x_strdup("/bin/sh"); + } + xtermSetenv("XTERM_SHELL", shell_path); - shname = x_basename(ptr); - TRACE(("shell path '%s' leaf '%s'\n", ptr, shname)); + shname = x_basename(shell_path); + TRACE(("shell path '%s' leaf '%s'\n", shell_path, shname)); #if OPT_LUIT_PROG /* @@ -4515,8 +4537,9 @@ * to command that the user gave anyway. */ if (command_to_exec_with_luit && command_to_exec) { - xtermSetenv("XTERM_SHELL", - xtermFindShell(*command_to_exec_with_luit, False)); + char *myShell = xtermFindShell(*command_to_exec_with_luit, False); + xtermSetenv("XTERM_SHELL", myShell); + free(myShell); TRACE_ARGV("spawning luit command", command_to_exec_with_luit); execvp(*command_to_exec_with_luit, command_to_exec_with_luit); xtermPerror("Can't execvp %s", *command_to_exec_with_luit); @@ -4524,12 +4547,14 @@ } #endif if (command_to_exec) { - xtermSetenv("XTERM_SHELL", - xtermFindShell(*command_to_exec, False)); + char *myShell = xtermFindShell(*command_to_exec, False); + xtermSetenv("XTERM_SHELL", myShell); + free(myShell); TRACE_ARGV("spawning command", command_to_exec); execvp(*command_to_exec, command_to_exec); if (command_to_exec[1] == 0) - execlp(ptr, shname, "-c", command_to_exec[0], (void *) 0); + execlp(shell_path, shname, "-c", command_to_exec[0], + (void *) 0); xtermPerror("Can't execvp %s", *command_to_exec); } #ifdef USE_SYSV_SIGHUP @@ -4569,13 +4594,14 @@ xtermPerror("Can't execvp %s", *command_to_exec_with_luit); } #endif - execlp(ptr, + execlp(shell_path, (xw->misc.login_shell ? shname_minus : shname), (void *) 0); /* Exec failed. */ - xtermPerror("Could not exec %s", ptr); + xtermPerror("Could not exec %s", shell_path); IGNORE_RC(sleep(5)); + free(shell_path); exit(ERROR_EXEC); } /* end if in child after fork */ @@ -4625,7 +4651,7 @@ exit(ERROR_PTYS); } handshake.status = PTY_NEW; - (void) strcpy(handshake.buffer, ttydev); + (void) strncpy(handshake.buffer, ttydev, sizeof(handshake.buffer)); TRACE_HANDSHAKE("writing", &handshake); IGNORE_RC(write(pc_pipe[1], (const char *) &handshake, @@ -4717,17 +4743,22 @@ signal(SIGTERM, Exit); signal(SIGPIPE, Exit); #endif /* USE_SYSV_SIGNALS and not SIGTSTP */ +#ifdef NO_LEAKS + if (ok_termcap != True) + free(TermName); +#endif return 0; } /* end spawnXTerm */ -SIGNAL_T +void Exit(int n) { XtermWidget xw = term; TScreen *screen = TScreenOf(xw); #ifdef USE_UTEMPTER + DEBUG_MSG("handle:Exit USE_UTEMPTER\n"); if (!resource.utmpInhibit && added_utmp_entry) { TRACE(("...calling removeFromUtmp\n")); removeFromUtmp(); @@ -4737,9 +4768,11 @@ struct UTMP_STR utmp; struct UTMP_STR *utptr; + DEBUG_MSG("handle:Exit USE_SYSV_UTMP\n"); /* don't do this more than once */ - if (xterm_exiting) - SIGNAL_RETURN; + if (xterm_exiting) { + exit(n); + } xterm_exiting = True; #ifdef PUCC_PTYD @@ -4789,7 +4822,7 @@ if (xw->misc.login_shell) { int fd; if ((fd = open(etc_wtmp, O_WRONLY | O_APPEND)) >= 0) { - write(fd, utptr, sizeof(*utptr)); + IGNORE_RC(write(fd, utptr, sizeof(*utptr))); close(fd); } } @@ -4809,6 +4842,7 @@ int wfd; struct utmp utmp; + DEBUG_MSG("handle:Exit !USE_SYSV_UTMP\n"); if (!resource.utmpInhibit && added_utmp_entry && (am_slave < 0 && tslot > 0)) { #if defined(USE_UTMP_SETGID) @@ -4818,7 +4852,7 @@ if ((wfd = open(etc_utmp, O_WRONLY)) >= 0) { memset(&utmp, 0, sizeof(utmp)); lseek(wfd, (long) (tslot * sizeof(utmp)), 0); - write(wfd, (char *) &utmp, sizeof(utmp)); + IGNORE_RC(write(wfd, (char *) &utmp, sizeof(utmp))); close(wfd); } #ifdef WTMP @@ -4828,7 +4862,7 @@ my_pty_name(ttydev), sizeof(utmp.ut_line)); utmp.ut_time = time((time_t *) 0); - write(wfd, (char *) &utmp, sizeof(utmp)); + IGNORE_RC(write(wfd, (char *) &utmp, sizeof(utmp))); close(wfd); } #endif /* WTMP */ @@ -4871,32 +4905,31 @@ #ifdef NO_LEAKS if (n == 0) { + Display *dpy = TScreenOf(xw)->display; + TRACE(("Freeing memory leaks\n")); - if (xw != 0) { - Display *dpy = TScreenOf(xw)->display; - if (toplevel) { - XtDestroyWidget(toplevel); - TRACE(("destroyed top-level widget\n")); - } - sortedOpts(0, 0, 0); - noleaks_charproc(); - noleaks_ptydata(); + if (toplevel) { + XtDestroyWidget(toplevel); + TRACE(("destroyed top-level widget\n")); + } + sortedOpts(0, 0, 0); + noleaks_charproc(); + noleaks_ptydata(); #if OPT_WIDE_CHARS - noleaks_CharacterClass(); + noleaks_CharacterClass(); #endif - /* XrmSetDatabase(dpy, 0); increases leaks ;-) */ - XtCloseDisplay(dpy); - XtDestroyApplicationContext(app_con); - xtermCloseSession(); - TRACE(("closed display\n")); - } + /* XrmSetDatabase(dpy, 0); increases leaks ;-) */ + XtCloseDisplay(dpy); + XtDestroyApplicationContext(app_con); + xtermCloseSession(); + TRACE(("closed display\n")); + TRACE_CLOSE(); } #endif exit(n); - SIGNAL_RETURN; } /* ARGSUSED */ @@ -4938,14 +4971,16 @@ ? MaxRows(screen) : MaxCols(screen))); temp += strlen(temp); - ptr1 = strchr(ptr1, ':'); - strncpy(temp, ptr1, i = (size_t) (ptr2 - ptr1)); - temp += i; - sprintf(temp, "%d", (li_first - ? MaxCols(screen) - : MaxRows(screen))); - ptr2 = strchr(ptr2, ':'); - strcat(temp, ptr2); + if ((ptr1 = strchr(ptr1, ':')) != 0 && (ptr1 < ptr2)) { + strncpy(temp, ptr1, i = (size_t) (ptr2 - ptr1)); + temp += i; + sprintf(temp, "%d", (li_first + ? MaxCols(screen) + : MaxRows(screen))); + if ((ptr2 = strchr(ptr2, ':')) != 0) { + strcat(temp, ptr2); + } + } TRACE((" ==> %s\n", newtc)); TRACE((" new size %dx%d\n", MaxRows(screen), MaxCols(screen))); } @@ -4985,12 +5020,14 @@ #ifndef VMS /* ARGSUSED */ -static SIGNAL_T +static void reapchild(int n GCC_UNUSED) { int olderrno = errno; int pid; + DEBUG_MSG("handle:reapchild\n"); + pid = wait(NULL); #ifdef USE_SYSV_SIGNALS @@ -5002,17 +5039,13 @@ do { if (pid == TScreenOf(term)->pid) { -#ifdef DEBUG - if (debug) - fputs("Exiting\n", stderr); -#endif + DEBUG_MSG("Exiting\n"); if (!hold_screen) need_cleanup = True; } } while ((pid = nonblocking_wait()) > 0); errno = olderrno; - SIGNAL_RETURN; } #endif /* !VMS */ diff -Nru xterm-287/main.h xterm-293/main.h --- xterm-287/main.h 2012-06-05 00:37:22.000000000 +0000 +++ xterm-293/main.h 2013-04-24 08:52:20.000000000 +0000 @@ -1,7 +1,7 @@ -/* $XTermId: main.h,v 1.58 2012/06/05 00:37:22 tom Exp $ */ +/* $XTermId: main.h,v 1.61 2013/04/24 08:52:20 tom Exp $ */ /* - * Copyright 2000-2011,2012 by Thomas E. Dickey + * Copyright 2000-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -145,8 +145,8 @@ #define DEF_BACKARO_ERASE False #endif -#ifndef DEF_BACKARO_DEL -#define DEF_BACKARO_DEL True +#ifndef DEF_BACKARO_BS +#define DEF_BACKARO_BS True #endif #ifndef DEF_ALT_SENDS_ESC diff -Nru xterm-287/menu.c xterm-293/menu.c --- xterm-287/menu.c 2012-09-22 14:53:45.000000000 +0000 +++ xterm-293/menu.c 2013-02-03 21:53:58.000000000 +0000 @@ -1,7 +1,7 @@ -/* $XTermId: menu.c,v 1.310 2012/09/22 14:53:45 tom Exp $ */ +/* $XTermId: menu.c,v 1.313 2013/02/03 21:53:58 tom Exp $ */ /* - * Copyright 1999-2011,2012 by Thomas E. Dickey + * Copyright 1999-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -842,7 +842,7 @@ FindFontSelection(xw, NULL, True); SetItemSensitivity( fontMenuEntries[fontMenu_fontsel].widget, - (screen->menu_font_names[fontMenu_fontsel] + (screen->menu_font_names[fontMenu_fontsel][fNorm] ? True : False)); break; @@ -1639,6 +1639,7 @@ char *entryname = (char *) closure; int i; + TRACE(("do_vtfont(%s)\n", entryname)); for (i = 0; i < NMENUFONTS; i++) { if (strcmp(entryname, fontMenuEntries[i].name) == 0) { SetVTFont(xw, i, True, NULL); diff -Nru xterm-287/minstall.in xterm-293/minstall.in --- xterm-287/minstall.in 2012-10-29 09:23:22.000000000 +0000 +++ xterm-293/minstall.in 2013-04-21 18:58:54.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# $XTermId: minstall.in,v 1.15 2012/10/29 09:23:22 tom Exp $ +# $XTermId: minstall.in,v 1.19 2013/04/21 18:58:54 Andres.Perera Exp $ # ----------------------------------------------------------------------------- # this file is part of xterm # @@ -42,7 +42,8 @@ # $4 = app-defaults directory # $5 = app-defaults class # $6 = application name, normally "xterm" -# $7 = pixmap directory +# $7 = application name transformed +# $8 = pixmap directory # # Other values correspond to definitions in xtermcfg.h, and cannot be directly # modified using "make". They are substituted directly into this script. @@ -72,7 +73,8 @@ APPS_DIR="$4" APP_TYPE="$5" APP_name="$6" -XPMS_DIR="$7" +USE_name="$7" +XPMS_DIR="$8" suffix=`echo "$END_FILE" | sed -e 's%^.*\.%%'` NEW_FILE=temp$$ @@ -122,22 +124,31 @@ PATCH_NUM=`fgrep XTERM_PATCH $VERSION_H|sed -e 's/[^0-9]*//g'` PATCH_YMD=`fgrep XTERM_DATE $VERSION_H|sed -e 's,[^0-9/.-]*,,g'` -# Provide for renaming in test-builds: -APP_Name=`echo "$APP_name" | sed -e s/xterm/Xterm/` +# Make capitalization variants +APP_chr0=`echo "$APP_name" | sed -e 's/^\(.\).*/\1/' | tr '[a-z]' '[A-Z]'` +APP_chr1=`echo "$APP_name" | sed -e 's/^.//'` +APP_Name=${APP_chr0}${APP_chr1} APP_NAME=`echo "$APP_name" | tr '[a-z]' '[A-Z]'` +# Provide for renaming in test-builds: +USE_chr0=`echo "$USE_name" | sed -e 's/^\(.\).*/\1/' | tr '[a-z]' '[A-Z]'` +USE_chr1=`echo "$USE_name" | sed -e 's/^.//'` +USE_Name=${USE_chr0}${USE_chr1} +USE_NAME=`echo "$USE_name" | tr '[a-z]' '[A-Z]'` + sed -e 's%__vendorversion__%"X Window System"%' \ -e 's%__app_version__%Patch\ \#'$PATCH_NUM% \ -e 's%__app_date__%'$PATCH_YMD% \ - -e "s%^\.TH [^ ][^ ]*%.TH $APP_NAME%" \ - -e "s%^\.ds N Xterm%.ds N $APP_Name%" \ - -e "s%^\.ds n xterm%.ds n $APP_name%" \ + -e "s%^\.TH [^ ][^ ]*%.TH $USE_NAME%" \ + -e "s%^\.ds N $APP_Name%.ds N $USE_Name%" \ + -e "s%^\.ds n $APP_name%.ds n $USE_name%" \ + -e 's%^'"$APP_name"' \\- %'"$USE_name"' \- %' \ -e s%__default_termname__%@default_TERM@% \ -e s%__default_termid__%@default_termid@% \ -e s%__alt_sends_esc__%@alt_sends_esc@% \ -e s%__meta_sends_esc__%@meta_sends_esc@% \ - -e s%__backarrow_key_is_del__%@backarrow_is_del@% \ - -e s%__backarrow_key_erase__%@backarrow_is_erase@% \ + -e s%__backarrow_is_bs__%@backarrow_is_bs@% \ + -e s%__backarrow_is_erase__%@backarrow_is_erase@% \ -e s%__delete_is_del__%@delete_is_del@% \ -e s%__default_class__%$APP_TYPE% \ -e s%__apploaddir__%$APPS_DIR% \ @@ -149,6 +160,7 @@ -e s%fIwtmp'\\%fI'$WTMP_NAME'\\%g' \ -e s%/etc/wtmp%$WTMP_PATH%g \ $OLD_FILE >$NEW_FILE +# diff -u $OLD_FILE $NEW_FILE echo "$MINSTALL $OLD_FILE $END_FILE" eval "$MINSTALL $NEW_FILE $END_FILE" diff -Nru xterm-287/misc.c xterm-293/misc.c --- xterm-287/misc.c 2012-11-25 16:05:51.000000000 +0000 +++ xterm-293/misc.c 2013-05-26 21:16:20.000000000 +0000 @@ -1,7 +1,7 @@ -/* $XTermId: misc.c,v 1.631 2012/11/25 16:05:51 tom Exp $ */ +/* $XTermId: misc.c,v 1.660 2013/05/26 21:16:20 tom Exp $ */ /* - * Copyright 1999-2011,2012 by Thomas E. Dickey + * Copyright 1999-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -126,6 +126,8 @@ static Boolean xtermAllocColor(XtermWidget, XColor *, const char *); static Cursor make_hidden_cursor(XtermWidget); +static char emptyString[] = ""; + #if OPT_EXEC_XTERM /* Like readlink(2), but returns a malloc()ed buffer, or NULL on error; adapted from libc docs */ @@ -551,7 +553,7 @@ XtInputMask input_mask; if (need_cleanup) - Cleanup(0); + NormalExit(); if (screen->scroll_amt) FlushScroll(xw); @@ -844,13 +846,12 @@ xtermWarning("exec of '%s': %s\n", child_exe, SysErrorMsg(errno)); } _exit(0); - } else { - /* We are the parent; clean up */ - if (child_cwd) - free(child_cwd); - if (child_exe) - free(child_exe); } + + /* We are the parent; clean up */ + if (child_cwd) + free(child_cwd); + free(child_exe); } #endif /* OPT_EXEC_XTERM */ @@ -1563,6 +1564,7 @@ success = True; } else if (screen->restore_data) { success = True; + maximize = 0; } if (success) { @@ -1764,7 +1766,7 @@ int childstat = 0; #ifndef HAVE_WAITPID int waited; - SIGNAL_T(*chldfunc) (int); + void (*chldfunc) (int); chldfunc = signal(SIGCHLD, SIG_DFL); #endif /* HAVE_WAITPID */ @@ -1830,7 +1832,7 @@ */ do if (waited == TScreenOf(term)->pid) - Cleanup(0); + NormalExit(); while ((waited = nonblocking_wait()) > 0) ; #endif /* HAVE_WAITPID */ #ifndef WIFEXITED @@ -1866,12 +1868,13 @@ */ #ifdef ALLOWLOGFILEEXEC -static SIGNAL_T +static void logpipe(int sig GCC_UNUSED) { XtermWidget xw = term; TScreen *screen = TScreenOf(xw); + DEBUG_MSG("handle:logpipe\n"); #ifdef SYSV (void) signal(SIGPIPE, SIG_IGN); #endif /* SYSV */ @@ -1945,8 +1948,34 @@ static char *shell; struct passwd pw; - if (pipe(p) < 0 || (pid = fork()) < 0) + if ((shell = x_getenv("SHELL")) == NULL) { + + if (x_getpwuid(screen->uid, &pw)) { + char *name = x_getlogin(screen->uid, &pw); + if (*(pw.pw_shell)) { + shell = pw.pw_shell; + } + free(name); + } + } + + if (shell == 0) { + static char dummy[] = "/bin/sh"; + shell = dummy; + } + + if (access(shell, X_OK) != 0) { + xtermPerror("Can't execute `%s'\n", shell); + return; + } + + if (pipe(p) < 0) { + xtermPerror("Can't make a pipe connection\n"); + return; + } else if ((pid = fork()) < 0) { + xtermPerror("Can't fork...\n"); return; + } if (pid == 0) { /* child */ /* * Close our output (we won't be talking back to the @@ -1963,21 +1992,6 @@ close(ConnectionNumber(screen->display)); close(screen->respond); - if ((shell = x_getenv("SHELL")) == NULL) { - - if (x_getpwuid(screen->uid, &pw)) { - x_getlogin(screen->uid, &pw); - if (*(pw.pw_shell)) { - shell = pw.pw_shell; - } - } - } - - if (shell == 0) { - static char dummy[] = "/bin/sh"; - shell = dummy; - } - signal(SIGHUP, SIG_DFL); signal(SIGCHLD, SIG_DFL); @@ -1985,9 +1999,12 @@ if (xtermResetIds(screen) < 0) exit(ERROR_SETUID); - execl(shell, shell, "-c", &screen->logfile[1], (void *) 0); - - xtermWarning("Can't exec `%s'\n", &screen->logfile[1]); + if (access(shell, X_OK) == 0) { + execl(shell, shell, "-c", &screen->logfile[1], (void *) 0); + xtermWarning("Can't exec `%s'\n", &screen->logfile[1]); + } else { + xtermWarning("Can't execute `%s'\n", shell); + } exit(ERROR_LOGEXEC); } close(p[0]); @@ -2701,9 +2718,9 @@ }; const char *base = buf; - char *used = x_strdup(base); + char *used; Cardinal j, n = 0; - String *select_args = 0; + String *select_args; TRACE(("Manipulate selection data\n")); @@ -2716,46 +2733,54 @@ if (*base == '\0') base = "s0"; - if ((select_args = TypeCallocN(String, 1 + strlen(base))) == 0) - return; - while (*base != '\0') { - for (j = 0; j < XtNumber(table); ++j) { - if (*base == table[j].given) { - used[n] = *base; - select_args[n++] = table[j].result; - TRACE(("atom[%d] %s\n", n, table[j].result)); - break; - } - } - ++base; - } - used[n] = 0; - if (!strcmp(buf, "?")) { - if (AllowWindowOps(xw, ewGetSelection)) { - TRACE(("Getting selection\n")); - unparseputc1(xw, ANSI_OSC); - unparseputs(xw, "52"); - unparseputc(xw, ';'); - - unparseputs(xw, used); - unparseputc(xw, ';'); - - /* Tell xtermGetSelection data is base64 encoded */ - screen->base64_paste = n; - screen->base64_final = final; + if ((used = x_strdup(base)) != 0) { + if ((select_args = TypeCallocN(String, 2 + strlen(base))) != 0) { + while (*base != '\0') { + for (j = 0; j < XtNumber(table); ++j) { + if (*base == table[j].given) { + used[n] = *base; + select_args[n++] = table[j].result; + TRACE(("atom[%d] %s\n", n, table[j].result)); + break; + } + } + ++base; + } + used[n] = 0; - /* terminator will be written in this call */ - xtermGetSelection((Widget) xw, (Time) 0, select_args, n, NULL); - } - } else { - if (AllowWindowOps(xw, ewSetSelection)) { - TRACE(("Setting selection with %s\n", buf)); - ClearSelectionBuffer(screen); - while (*buf != '\0') - AppendToSelectionBuffer(screen, CharOf(*buf++)); - CompleteSelection(xw, select_args, n); + if (!strcmp(buf, "?")) { + if (AllowWindowOps(xw, ewGetSelection)) { + TRACE(("Getting selection\n")); + unparseputc1(xw, ANSI_OSC); + unparseputs(xw, "52"); + unparseputc(xw, ';'); + + unparseputs(xw, used); + unparseputc(xw, ';'); + + /* Tell xtermGetSelection data is base64 encoded */ + screen->base64_paste = n; + screen->base64_final = final; + + /* terminator will be written in this call */ + xtermGetSelection((Widget) xw, + (Time) 0, + select_args, n, + NULL); + } + } else { + if (AllowWindowOps(xw, ewSetSelection)) { + TRACE(("Setting selection with %s\n", buf)); + ClearSelectionBuffer(screen); + while (*buf != '\0') + AppendToSelectionBuffer(screen, CharOf(*buf++)); + CompleteSelection(xw, select_args, n); + } + } + free(select_args); } + free(used); } } } @@ -3569,7 +3594,7 @@ { while (*cp) { const char *base = cp; - char *str = CastMallocN(char, strlen(cp) + 1); + char *str = CastMallocN(char, strlen(cp) + 2); unsigned key = 0; int lo, hi; int len = 0; @@ -3584,6 +3609,7 @@ } } if (len > 0 && key < MAX_UDK) { + str[len] = '\0'; if (user_keys[key].str != 0) free(user_keys[key].str); user_keys[key].str = str; @@ -3623,7 +3649,7 @@ ? Pcmw : (Pcmw + 3))); int char_high = ((Pcmh == 0) - ? ((Pcmw >= 2 || Pcmw <= 4) + ? ((Pcmw >= 2 && Pcmw <= 4) ? 10 : 20) : Pcmh); @@ -3869,7 +3895,7 @@ if (okay) { unparseputc1(xw, ANSI_DCS); - unparseputc(xw, okay ? '1' : '0'); + unparseputc(xw, '1'); unparseputc(xw, '$'); unparseputc(xw, 'r'); cp = reply; @@ -4538,7 +4564,6 @@ #if OPT_WIDE_CHARS static Char *converted; /* NO_LEAKS */ #endif - static char empty[1]; Arg args[1]; Boolean changed = True; @@ -4555,14 +4580,16 @@ return; if (value == 0) - value = empty; + value = emptyString; if (IsTitleMode(xw, tmSetBase16)) { const char *temp; char *test; value = x_decode_hex(value, &temp); - if (*temp != '\0') + if (*temp != '\0') { + free(value); return; + } for (test = value; *test != '\0'; ++test) { if (CharOf(*test) < 32) { *test = '\0'; @@ -4668,13 +4695,12 @@ } #endif } - - free(my_attr); - - if (IsTitleMode(xw, tmSetBase16)) - free(value); - } + if (IsTitleMode(xw, tmSetBase16)) { + free(value); + } + free(my_attr); + return; } @@ -4682,8 +4708,7 @@ ChangeIconName(XtermWidget xw, char *name) { if (name == 0) { - static char dummy[] = ""; - name = dummy; + name = emptyString; } if (!showZIconBeep(xw, name)) ChangeGroup(xw, XtNiconName, name); @@ -4807,11 +4832,9 @@ void Panic(const char *s GCC_UNUSED, int a GCC_UNUSED) { -#ifdef DEBUG - if (debug) { + if_DEBUG({ xtermWarning(s, a); - } -#endif /* DEBUG */ + }); } const char * @@ -4895,44 +4918,48 @@ Cleanup(code); } -/* - * cleanup by sending SIGHUP to client processes - */ void -Cleanup(int code) +NormalExit(void) { static Bool cleaning; - TScreen *screen = TScreenOf(term); /* * Process "-hold" and session cleanup only for a normal exit. */ - if (code == 0) { - if (cleaning) { - hold_screen = 0; - return; - } - - cleaning = True; - need_cleanup = False; + if (cleaning) { + hold_screen = 0; + return; + } - TRACE(("Cleanup %d\n", code)); + cleaning = True; + need_cleanup = False; - if (hold_screen) { - hold_screen = 2; - while (hold_screen) { - xevents(); - Sleep(10); - } + if (hold_screen) { + hold_screen = 2; + while (hold_screen) { + xevents(); + Sleep(10); } + } #if OPT_SESSION_MGT - if (resource.sessionMgt) { - XtVaSetValues(toplevel, - XtNjoinSession, False, - (void *) 0); - } -#endif + if (resource.sessionMgt) { + XtVaSetValues(toplevel, + XtNjoinSession, False, + (void *) 0); } +#endif + Cleanup(0); +} + +/* + * cleanup by sending SIGHUP to client processes + */ +void +Cleanup(int code) +{ + TScreen *screen = TScreenOf(term); + + TRACE(("Cleanup %d\n", code)); if (screen->pid > 1) { (void) kill_process_group(screen->pid, SIGHUP); @@ -4947,10 +4974,12 @@ char * xtermFindShell(char *leaf, Bool warning) { + char *s0; char *s; char *d; char *tmp; char *result = leaf; + Bool allocated = False; TRACE(("xtermFindShell(%s)\n", leaf)); @@ -4963,13 +4992,14 @@ if (getcwd(buffer, need) != 0) { sprintf(buffer + strlen(buffer), "/%s", result); result = buffer; + allocated = True; } else { free(buffer); } } } else if (*result != '\0' && strchr("+/-", *result) == 0) { /* find it in $PATH */ - if ((s = x_getenv("PATH")) != 0) { + if ((s = s0 = x_getenv("PATH")) != 0) { if ((tmp = TypeMallocN(char, strlen(leaf) + strlen(s) + 2)) != 0) { Bool found = False; while (*s != '\0') { @@ -4987,17 +5017,17 @@ && access(tmp, X_OK) == 0) { result = x_strdup(tmp); found = True; + allocated = True; } break; } - if (found) - break; } if (found) break; } free(tmp); } + free(s0); } } TRACE(("...xtermFindShell(%s)\n", result)); @@ -5006,8 +5036,13 @@ || access(result, X_OK) != 0) { if (warning) xtermWarning("No absolute path found for shell: %s\n", result); + if (allocated) + free(result); result = 0; } + /* be consistent, so that caller can always free the result */ + if (result != 0 && !allocated) + result = x_strdup(result); return result; } #endif /* VMS */ @@ -5468,7 +5503,9 @@ } else { code = 0; } - strcpy(temp, opt_array[j].desc); + sprintf(temp, "%.*s", + (int) sizeof(temp) - 2, + opt_array[j].desc); if (x_strindex(temp, "inhibit") != 0) code = -code; if (code != 0 @@ -5577,45 +5614,6 @@ #endif /* OPT_WIDE_CHARS */ /* - * Returns the version-string used in the "-v' message as well as a few other - * places. It is derived (when possible) from the __vendorversion__ symbol - * that some newer imake configurations define. - */ -char * -xtermVersion(void) -{ - static char vendor_version[] = __vendorversion__; - static char *result; - - if (result == 0) { - char *vendor = vendor_version; - char first[BUFSIZ]; - char second[BUFSIZ]; - - result = CastMallocN(char, strlen(vendor) + 9); - if (result == 0) - result = vendor; - else { - /* some vendors leave trash in this string */ - for (;;) { - if (!strncmp(vendor, "Version ", (size_t) 8)) - vendor += 8; - else if (isspace(CharOf(*vendor))) - ++vendor; - else - break; - } - if (strlen(vendor) < BUFSIZ && - sscanf(vendor, "%[0-9.] %[A-Za-z_0-9.]", first, second) == 2) - sprintf(result, "%s %s(%d)", second, first, XTERM_PATCH); - else - sprintf(result, "%s(%d)", vendor, XTERM_PATCH); - } - } - return result; -} - -/* * Check if the current widget, or any parent, is the VT100 "xterm" widget. */ XtermWidget @@ -5643,7 +5641,7 @@ XtPointer client_data GCC_UNUSED, XtPointer call_data GCC_UNUSED) { - Cleanup(0); + NormalExit(); } static void diff -Nru xterm-287/os2main.c xterm-293/os2main.c --- xterm-287/os2main.c 2012-10-14 18:55:18.000000000 +0000 +++ xterm-293/os2main.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,2230 +0,0 @@ -/* $XTermId: os2main.c,v 1.277 2012/10/14 18:55:18 tom Exp $ */ - -/* removed all foreign stuff to get the code more clear (hv) - * and did some rewrite for the obscure OS/2 environment - */ - -/*********************************************************** - -Copyright (c) 1987, 1988 X Consortium - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of the X Consortium shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from the X Consortium. - -Copyright 1987, 1988 by Digital Equipment Corporation, Maynard. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Digital not be used in -advertising or publicity pertaining to distribution of the software -without specific, written prior permission. - -DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - -******************************************************************/ - -/* os2main.c */ -#define INCL_DOSFILEMGR -#define INCL_DOSDEVIOCTL -#define INCL_DOSSEMAPHORES -#ifdef __INNOTEK_LIBC__ -#define INCL_DOSDEVICES -#endif -#define I_NEED_OS2_H -#include -#define XTERM_MAIN - -#define RES_OFFSET(field) XtOffsetOf(XTERM_RESOURCE, field) - -#include - -#include -#ifdef I18N -#include -#endif - -#if OPT_TOOLBAR - -#if defined(HAVE_LIB_XAW) -#include -#elif defined(HAVE_LIB_XAW3D) -#include -#elif defined(HAVE_LIB_NEXTAW) -#include -#elif defined(HAVE_LIB_XAWPLUS) -#include -#endif - -#endif /* OPT_TOOLBAR */ - -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#if OPT_WIDE_CHARS -#include -#endif - -int -setpgrp(pid_t pid, gid_t pgid) -{ - return 0; -} - -int -chown(const char *fn, pid_t pid, gid_t gid) -{ - return 0; -} - -char * -ttyname(int fd) -{ - return "/dev/tty"; -} - -#include -#include /* for NOFILE */ -#include -#include - -static SIGNAL_T reapchild(int n); -static int spawnXTerm(XtermWidget /* xw */ ); -static void resize_termcap(XtermWidget xw); -static void set_owner(char *device, uid_t uid, gid_t gid, mode_t mode); - -static Bool added_utmp_entry = False; - -static uid_t save_ruid; -static gid_t save_rgid; - -/* -** Ordinarily it should be okay to omit the assignment in the following -** statement. Apparently the c89 compiler on AIX 4.1.3 has a bug, or does -** it? Without the assignment though the compiler will init command_to_exec -** to 0xffffffff instead of NULL; and subsequent usage, e.g. in spawnXTerm() to -** SEGV. -*/ -static char **command_to_exec = NULL; - -#if OPT_LUIT_PROG -static char **command_to_exec_with_luit = NULL; -#endif - -/* The following structures are initialized in main() in order -** to eliminate any assumptions about the internal order of their -** contents. -*/ -static struct termio d_tio; - -/* allow use of system default characters if defined and reasonable */ -#ifndef CEOF -#define CEOF CONTROL('D') -#endif -#ifndef CEOL -#define CEOL 0 -#endif -#ifndef CFLUSH -#define CFLUSH CONTROL('O') -#endif -#ifndef CLNEXT -#define CLNEXT CONTROL('V') -#endif -#ifndef CNUL -#define CNUL 0 -#endif -#ifndef CQUIT -#define CQUIT CONTROL('\\') -#endif -#ifndef CRPRNT -#define CRPRNT CONTROL('R') -#endif -#ifndef CSTART -#define CSTART CONTROL('Q') -#endif -#ifndef CSTOP -#define CSTOP CONTROL('S') -#endif -#ifndef CSUSP -#define CSUSP CONTROL('Z') -#endif -#ifndef CSWTCH -#define CSWTCH 0 -#endif -#ifndef CWERASE -#define CWERASE CONTROL('W') -#endif - -#define TERMIO_STRUCT struct termio - -/* - * SYSV has the termio.c_cc[V] and ltchars; BSD has tchars and ltchars; - * SVR4 has only termio.c_cc, but it includes everything from ltchars. - * POSIX termios has termios.c_cc, which is similar to SVR4. - */ -#define TTYMODE(name) { name, sizeof(name)-1, 0, 0 } -static Boolean override_tty_modes = False; -/* *INDENT-OFF* */ -static struct _xttymodes { - const char *name; - size_t len; - int set; - int value; -} ttymodelist[] = { - TTYMODE("intr"), /* tchars.t_intrc ; VINTR */ -#define XTTYMODE_intr 0 - TTYMODE("quit"), /* tchars.t_quitc ; VQUIT */ -#define XTTYMODE_quit 1 - TTYMODE("erase"), /* sgttyb.sg_erase ; VERASE */ -#define XTTYMODE_erase 2 - TTYMODE("kill"), /* sgttyb.sg_kill ; VKILL */ -#define XTTYMODE_kill 3 - TTYMODE("eof"), /* tchars.t_eofc ; VEOF */ -#define XTTYMODE_eof 4 - TTYMODE("eol"), /* VEOL */ -#define XTTYMODE_eol 5 - TTYMODE("swtch"), /* VSWTCH */ -#define XTTYMODE_swtch 6 - TTYMODE("start"), /* tchars.t_startc ; VSTART */ -#define XTTYMODE_start 7 - TTYMODE("stop"), /* tchars.t_stopc ; VSTOP */ -#define XTTYMODE_stop 8 - TTYMODE("brk"), /* tchars.t_brkc */ -#define XTTYMODE_brk 9 - TTYMODE("susp"), /* ltchars.t_suspc ; VSUSP */ -#define XTTYMODE_susp 10 - TTYMODE("dsusp"), /* ltchars.t_dsuspc ; VDSUSP */ -#define XTTYMODE_dsusp 11 - TTYMODE("rprnt"), /* ltchars.t_rprntc ; VREPRINT */ -#define XTTYMODE_rprnt 12 - TTYMODE("flush"), /* ltchars.t_flushc ; VDISCARD */ -#define XTTYMODE_flush 13 - TTYMODE("weras"), /* ltchars.t_werasc ; VWERASE */ -#define XTTYMODE_weras 14 - TTYMODE("lnext"), /* ltchars.t_lnextc ; VLNEXT */ -#define XTTYMODE_lnext 15 - { NULL, 0, 0, '\0' }, /* end of data */ -}; -/* *INDENT-ON* */ - -#define TMODE(ind,var) if (ttymodelist[ind].set) var = ttymodelist[ind].value - -static int parse_tty_modes(char *s, struct _xttymodes *modelist); - -static char passedPty[2]; /* name if pty if slave */ - -static int Console; -#include /* XmuGetHostname */ -#define MIT_CONSOLE_LEN 12 -#define MIT_CONSOLE "MIT_CONSOLE_" -static char mit_console_name[255 + MIT_CONSOLE_LEN + 1] = MIT_CONSOLE; -static Atom mit_console; - -static int tslot; -static jmp_buf env; - -/* used by VT (charproc.c) */ - -static XtResource application_resources[] = -{ - Sres("iconGeometry", "IconGeometry", icon_geometry, NULL), - Sres(XtNtitle, XtCTitle, title, NULL), - Sres(XtNiconHint, XtCIconHint, icon_hint, NULL), - Sres(XtNiconName, XtCIconName, icon_name, NULL), - Sres("termName", "TermName", term_name, NULL), - Sres("ttyModes", "TtyModes", tty_modes, NULL), - Bres("hold", "Hold", hold_screen, False), - Bres("utmpInhibit", "UtmpInhibit", utmpInhibit, False), - Bres("utmpDisplayId", "UtmpDisplayId", utmpDisplayId, True), - Bres("messages", "Messages", messages, True), - Ires("minBufSize", "MinBufSize", minBufSize, 4096), - Ires("maxBufSize", "MaxBufSize", maxBufSize, 32768), - Sres("menuLocale", "MenuLocale", menuLocale, DEF_MENU_LOCALE), - Sres("omitTranslation", "OmitTranslation", omitTranslation, NULL), - Sres("keyboardType", "KeyboardType", keyboardType, "unknown"), -#if OPT_PRINT_ON_EXIT - Ires("printModeImmediate", "PrintModeImmediate", printModeNow, 0), - Ires("printOptsImmediate", "PrintOptsImmediate", printOptsNow, 9), - Sres("printFileImmediate", "PrintFileImmediate", printFileNow, NULL), - Ires("printModeOnXError", "PrintModeOnXError", printModeOnXError, 0), - Ires("printOptsOnXError", "PrintOptsOnXError", printOptsOnXError, 9), - Sres("printFileOnXError", "PrintFileOnXError", printFileOnXError, NULL), -#endif -#if OPT_SUNPC_KBD - Bres("sunKeyboard", "SunKeyboard", sunKeyboard, False), -#endif -#if OPT_HP_FUNC_KEYS - Bres("hpFunctionKeys", "HpFunctionKeys", hpFunctionKeys, False), -#endif -#if OPT_SCO_FUNC_KEYS - Bres("scoFunctionKeys", "ScoFunctionKeys", scoFunctionKeys, False), -#endif -#if OPT_SUN_FUNC_KEYS - Bres("sunFunctionKeys", "SunFunctionKeys", sunFunctionKeys, False), -#endif -#if OPT_TCAP_FKEYS - Bres("tcapFunctionKeys", "TcapFunctionKeys", termcapKeys, False), -#endif -#if OPT_INITIAL_ERASE - Bres("ptyInitialErase", "PtyInitialErase", ptyInitialErase, DEF_INITIAL_ERASE), - Bres("backarrowKeyIsErase", "BackarrowKeyIsErase", backarrow_is_erase, DEF_BACKARO_ERASE), -#endif - Bres("useInsertMode", "UseInsertMode", useInsertMode, False), -#if OPT_ZICONBEEP - Ires("zIconBeep", "ZIconBeep", zIconBeep, 0), - Sres("zIconTitleFormat", "ZIconTitleFormat", zIconFormat, "*** %s"), -#endif -#if OPT_PTY_HANDSHAKE - Bres("waitForMap", "WaitForMap", wait_for_map, False), - Bres("ptyHandshake", "PtyHandshake", ptyHandshake, True), - Bres("ptySttySize", "PtySttySize", ptySttySize, DEF_PTY_STTY_SIZE), -#endif -#if OPT_SAME_NAME - Bres("sameName", "SameName", sameName, True), -#endif -#if OPT_SESSION_MGT - Bres("sessionMgt", "SessionMgt", sessionMgt, True), -#endif -#if OPT_TOOLBAR - Bres(XtNtoolBar, XtCToolBar, toolBar, True), -#endif -#if OPT_MAXIMIZE - Bres(XtNmaximized, XtCMaximized, maximized, False), - Sres(XtNfullscreen, XtCFullscreen, fullscreen_s, "off"), -#endif -}; - -static String fallback_resources[] = -{ -#if OPT_TOOLBAR - "*toolBar: false", -#endif - "*SimpleMenu*menuLabel.vertSpace: 100", - "*SimpleMenu*HorizontalMargins: 16", - "*SimpleMenu*Sme.height: 16", - "*SimpleMenu*Cursor: left_ptr", - "*mainMenu.Label: Main Options (no app-defaults)", - "*vtMenu.Label: VT Options (no app-defaults)", - "*fontMenu.Label: VT Fonts (no app-defaults)", -#if OPT_TEK4014 - "*tekMenu.Label: Tek Options (no app-defaults)", -#endif - NULL -}; - -/* Command line options table. Only resources are entered here...there is a - pass over the remaining options after XrmParseCommand is let loose. */ -/* *INDENT-OFF* */ -static XrmOptionDescRec optionDescList[] = { -{"-geometry", "*vt100.geometry",XrmoptionSepArg, (XPointer) NULL}, -{"-132", "*c132", XrmoptionNoArg, (XPointer) "on"}, -{"+132", "*c132", XrmoptionNoArg, (XPointer) "off"}, -{"-ah", "*alwaysHighlight", XrmoptionNoArg, (XPointer) "on"}, -{"+ah", "*alwaysHighlight", XrmoptionNoArg, (XPointer) "off"}, -{"-aw", "*autoWrap", XrmoptionNoArg, (XPointer) "on"}, -{"+aw", "*autoWrap", XrmoptionNoArg, (XPointer) "off"}, -#ifndef NO_ACTIVE_ICON -{"-ai", "*activeIcon", XrmoptionNoArg, (XPointer) "off"}, -{"+ai", "*activeIcon", XrmoptionNoArg, (XPointer) "on"}, -#endif /* NO_ACTIVE_ICON */ -{"-b", "*internalBorder",XrmoptionSepArg, (XPointer) NULL}, -{"-bc", "*cursorBlink", XrmoptionNoArg, (XPointer) "on"}, -{"+bc", "*cursorBlink", XrmoptionNoArg, (XPointer) "off"}, -{"-bcf", "*cursorOffTime",XrmoptionSepArg, (XPointer) NULL}, -{"-bcn", "*cursorOnTime",XrmoptionSepArg, (XPointer) NULL}, -{"-bdc", "*colorBDMode", XrmoptionNoArg, (XPointer) "off"}, -{"+bdc", "*colorBDMode", XrmoptionNoArg, (XPointer) "on"}, -{"-cb", "*cutToBeginningOfLine", XrmoptionNoArg, (XPointer) "off"}, -{"+cb", "*cutToBeginningOfLine", XrmoptionNoArg, (XPointer) "on"}, -{"-cc", "*charClass", XrmoptionSepArg, (XPointer) NULL}, -{"-cm", "*colorMode", XrmoptionNoArg, (XPointer) "off"}, -{"+cm", "*colorMode", XrmoptionNoArg, (XPointer) "on"}, -{"-cn", "*cutNewline", XrmoptionNoArg, (XPointer) "off"}, -{"+cn", "*cutNewline", XrmoptionNoArg, (XPointer) "on"}, -{"-cr", "*cursorColor", XrmoptionSepArg, (XPointer) NULL}, -{"-cu", "*curses", XrmoptionNoArg, (XPointer) "on"}, -{"+cu", "*curses", XrmoptionNoArg, (XPointer) "off"}, -{"-dc", "*dynamicColors",XrmoptionNoArg, (XPointer) "off"}, -{"+dc", "*dynamicColors",XrmoptionNoArg, (XPointer) "on"}, -{"-fb", "*boldFont", XrmoptionSepArg, (XPointer) NULL}, -{"-fbb", "*freeBoldBox", XrmoptionNoArg, (XPointer)"off"}, -{"+fbb", "*freeBoldBox", XrmoptionNoArg, (XPointer)"on"}, -{"-fbx", "*forceBoxChars", XrmoptionNoArg, (XPointer)"off"}, -{"+fbx", "*forceBoxChars", XrmoptionNoArg, (XPointer)"on"}, -#ifndef NO_ACTIVE_ICON -{"-fi", "*iconFont", XrmoptionSepArg, (XPointer) NULL}, -#endif /* NO_ACTIVE_ICON */ -#if OPT_RENDERFONT -{"-fa", "*faceName", XrmoptionSepArg, (XPointer) NULL}, -{"-fd", "*faceNameDoublesize", XrmoptionSepArg, (XPointer) NULL}, -{"-fs", "*faceSize", XrmoptionSepArg, (XPointer) NULL}, -#endif -#if OPT_WIDE_CHARS -{"-fw", "*wideFont", XrmoptionSepArg, (XPointer) NULL}, -{"-fwb", "*wideBoldFont", XrmoptionSepArg, (XPointer) NULL}, -#endif -#if OPT_INPUT_METHOD -{"-fx", "*ximFont", XrmoptionSepArg, (XPointer) NULL}, -#endif -#if OPT_HIGHLIGHT_COLOR -{"-hc", "*highlightColor", XrmoptionSepArg, (XPointer) NULL}, -{"-hm", "*highlightColorMode", XrmoptionNoArg, (XPointer) "on"}, -{"+hm", "*highlightColorMode", XrmoptionNoArg, (XPointer) "off"}, -{"-selfg", "*highlightTextColor", XrmoptionSepArg, (XPointer) NULL}, -{"-selbg", "*highlightColor", XrmoptionSepArg, (XPointer) NULL}, -#endif -#if OPT_HP_FUNC_KEYS -{"-hf", "*hpFunctionKeys",XrmoptionNoArg, (XPointer) "on"}, -{"+hf", "*hpFunctionKeys",XrmoptionNoArg, (XPointer) "off"}, -#endif -{"-hold", "*hold", XrmoptionNoArg, (XPointer) "on"}, -{"+hold", "*hold", XrmoptionNoArg, (XPointer) "off"}, -#if OPT_INITIAL_ERASE -{"-ie", "*ptyInitialErase", XrmoptionNoArg, (XPointer) "on"}, -{"+ie", "*ptyInitialErase", XrmoptionNoArg, (XPointer) "off"}, -#endif -{"-j", "*jumpScroll", XrmoptionNoArg, (XPointer) "on"}, -{"+j", "*jumpScroll", XrmoptionNoArg, (XPointer) "off"}, -#if OPT_C1_PRINT -{"-k8", "*allowC1Printable", XrmoptionNoArg, (XPointer) "on"}, -{"+k8", "*allowC1Printable", XrmoptionNoArg, (XPointer) "off"}, -#endif -{"-kt", "*keyboardType", XrmoptionSepArg, (XPointer) NULL}, -/* parse logging options anyway for compatibility */ -{"-l", "*logging", XrmoptionNoArg, (XPointer) "on"}, -{"+l", "*logging", XrmoptionNoArg, (XPointer) "off"}, -{"-lf", "*logFile", XrmoptionSepArg, (XPointer) NULL}, -{"-ls", "*loginShell", XrmoptionNoArg, (XPointer) "on"}, -{"+ls", "*loginShell", XrmoptionNoArg, (XPointer) "off"}, -{"-mb", "*marginBell", XrmoptionNoArg, (XPointer) "on"}, -{"+mb", "*marginBell", XrmoptionNoArg, (XPointer) "off"}, -{"-mc", "*multiClickTime", XrmoptionSepArg, (XPointer) NULL}, -{"-mesg", "*messages", XrmoptionNoArg, (XPointer) "off"}, -{"+mesg", "*messages", XrmoptionNoArg, (XPointer) "on"}, -{"-ms", "*pointerColor",XrmoptionSepArg, (XPointer) NULL}, -{"-nb", "*nMarginBell", XrmoptionSepArg, (XPointer) NULL}, -{"-nul", "*underLine", XrmoptionNoArg, (XPointer) "off"}, -{"+nul", "*underLine", XrmoptionNoArg, (XPointer) "on"}, -{"-pc", "*boldColors", XrmoptionNoArg, (XPointer) "on"}, -{"+pc", "*boldColors", XrmoptionNoArg, (XPointer) "off"}, -{"-rw", "*reverseWrap", XrmoptionNoArg, (XPointer) "on"}, -{"+rw", "*reverseWrap", XrmoptionNoArg, (XPointer) "off"}, -{"-s", "*multiScroll", XrmoptionNoArg, (XPointer) "on"}, -{"+s", "*multiScroll", XrmoptionNoArg, (XPointer) "off"}, -{"-sb", "*scrollBar", XrmoptionNoArg, (XPointer) "on"}, -{"+sb", "*scrollBar", XrmoptionNoArg, (XPointer) "off"}, -#ifdef SCROLLBAR_RIGHT -{"-leftbar", "*rightScrollBar", XrmoptionNoArg, (XPointer) "off"}, -{"-rightbar", "*rightScrollBar", XrmoptionNoArg, (XPointer) "on"}, -#endif -{"-rvc", "*colorRVMode", XrmoptionNoArg, (XPointer) "off"}, -{"+rvc", "*colorRVMode", XrmoptionNoArg, (XPointer) "on"}, -{"-sf", "*sunFunctionKeys", XrmoptionNoArg, (XPointer) "on"}, -{"+sf", "*sunFunctionKeys", XrmoptionNoArg, (XPointer) "off"}, -{"-sh", "*scaleHeight", XrmoptionSepArg, (XPointer) NULL}, -{"-si", "*scrollTtyOutput", XrmoptionNoArg, (XPointer) "off"}, -{"+si", "*scrollTtyOutput", XrmoptionNoArg, (XPointer) "on"}, -{"-sk", "*scrollKey", XrmoptionNoArg, (XPointer) "on"}, -{"+sk", "*scrollKey", XrmoptionNoArg, (XPointer) "off"}, -{"-sl", "*saveLines", XrmoptionSepArg, (XPointer) NULL}, -#if OPT_SUNPC_KBD -{"-sp", "*sunKeyboard", XrmoptionNoArg, (XPointer) "on"}, -{"+sp", "*sunKeyboard", XrmoptionNoArg, (XPointer) "off"}, -#endif -#if OPT_TEK4014 -{"-t", "*tekStartup", XrmoptionNoArg, (XPointer) "on"}, -{"+t", "*tekStartup", XrmoptionNoArg, (XPointer) "off"}, -#endif -{"-ti", "*decTerminalID",XrmoptionSepArg, (XPointer) NULL}, -{"-tm", "*ttyModes", XrmoptionSepArg, (XPointer) NULL}, -{"-tn", "*termName", XrmoptionSepArg, (XPointer) NULL}, -#if OPT_WIDE_CHARS -{"-u8", "*utf8", XrmoptionNoArg, (XPointer) "2"}, -{"+u8", "*utf8", XrmoptionNoArg, (XPointer) "0"}, -#endif -#if OPT_LUIT_PROG -{"-lc", "*locale", XrmoptionNoArg, (XPointer) "on"}, -{"+lc", "*locale", XrmoptionNoArg, (XPointer) "off"}, -{"-lcc", "*localeFilter",XrmoptionSepArg, (XPointer) NULL}, -{"-en", "*locale", XrmoptionSepArg, (XPointer) NULL}, -#endif -{"-uc", "*cursorUnderLine", XrmoptionNoArg, (XPointer) "on"}, -{"+uc", "*cursorUnderLine", XrmoptionNoArg, (XPointer) "off"}, -{"-ulc", "*colorULMode", XrmoptionNoArg, (XPointer) "off"}, -{"+ulc", "*colorULMode", XrmoptionNoArg, (XPointer) "on"}, -{"-ulit", "*italicULMode", XrmoptionNoArg, (XPointer) "off"}, -{"+ulit", "*italicULMode", XrmoptionNoArg, (XPointer) "on"}, -{"-ut", "*utmpInhibit", XrmoptionNoArg, (XPointer) "on"}, -{"+ut", "*utmpInhibit", XrmoptionNoArg, (XPointer) "off"}, -{"-im", "*useInsertMode", XrmoptionNoArg, (XPointer) "on"}, -{"+im", "*useInsertMode", XrmoptionNoArg, (XPointer) "off"}, -{"-vb", "*visualBell", XrmoptionNoArg, (XPointer) "on"}, -{"+vb", "*visualBell", XrmoptionNoArg, (XPointer) "off"}, -{"-pob", "*popOnBell", XrmoptionNoArg, (XPointer) "on"}, -{"+pob", "*popOnBell", XrmoptionNoArg, (XPointer) "off"}, -#if OPT_WIDE_CHARS -{"-wc", "*wideChars", XrmoptionNoArg, (XPointer) "on"}, -{"+wc", "*wideChars", XrmoptionNoArg, (XPointer) "off"}, -{"-mk_width", "*mkWidth", XrmoptionNoArg, (XPointer) "on"}, -{"+mk_width", "*mkWidth", XrmoptionNoArg, (XPointer) "off"}, -{"-cjk_width", "*cjkWidth", XrmoptionNoArg, (XPointer) "on"}, -{"+cjk_width", "*cjkWidth", XrmoptionNoArg, (XPointer) "off"}, -#endif -{"-wf", "*waitForMap", XrmoptionNoArg, (XPointer) "on"}, -{"+wf", "*waitForMap", XrmoptionNoArg, (XPointer) "off"}, -#if OPT_ZICONBEEP -{"-ziconbeep", "*zIconBeep", XrmoptionSepArg, (XPointer) NULL}, -#endif -#if OPT_SAME_NAME -{"-samename", "*sameName", XrmoptionNoArg, (XPointer) "on"}, -{"+samename", "*sameName", XrmoptionNoArg, (XPointer) "off"}, -#endif -#if OPT_SESSION_MGT -{"-sm", "*sessionMgt", XrmoptionNoArg, (XPointer) "on"}, -{"+sm", "*sessionMgt", XrmoptionNoArg, (XPointer) "off"}, -#endif -#if OPT_TOOLBAR -{"-tb", "*"XtNtoolBar, XrmoptionNoArg, (XPointer) "on"}, -{"+tb", "*"XtNtoolBar, XrmoptionNoArg, (XPointer) "off"}, -#endif -#if OPT_MAXIMIZE -{"-maximized", "*maximized", XrmoptionNoArg, (XPointer) "on"}, -{"+maximized", "*maximized", XrmoptionNoArg, (XPointer) "off"}, -{"-fullscreen", "*fullscreen", XrmoptionNoArg, (XPointer) "on"}, -{"+fullscreen", "*fullscreen", XrmoptionNoArg, (XPointer) "off"}, -#endif -/* options that we process ourselves */ -{"-help", NULL, XrmoptionSkipNArgs, (XPointer) NULL}, -{"-version", NULL, XrmoptionSkipNArgs, (XPointer) NULL}, -{"-class", NULL, XrmoptionSkipArg, (XPointer) NULL}, -{"-e", NULL, XrmoptionSkipLine, (XPointer) NULL}, -{"-into", NULL, XrmoptionSkipArg, (XPointer) NULL}, -/* bogus old compatibility stuff for which there are - standard XtOpenApplication options now */ -{"%", "*tekGeometry", XrmoptionStickyArg, (XPointer) NULL}, -{"#", ".iconGeometry",XrmoptionStickyArg, (XPointer) NULL}, -{"-T", ".title", XrmoptionSepArg, (XPointer) NULL}, -{"-n", "*iconName", XrmoptionSepArg, (XPointer) NULL}, -{"-r", "*reverseVideo",XrmoptionNoArg, (XPointer) "on"}, -{"+r", "*reverseVideo",XrmoptionNoArg, (XPointer) "off"}, -{"-rv", "*reverseVideo",XrmoptionNoArg, (XPointer) "on"}, -{"+rv", "*reverseVideo",XrmoptionNoArg, (XPointer) "off"}, -{"-w", ".borderWidth", XrmoptionSepArg, (XPointer) NULL}, -}; - -static OptionHelp xtermOptions[] = { -{ "-version", "print the version number" }, -{ "-help", "print out this message" }, -{ "-display displayname", "X server to contact" }, -{ "-geometry geom", "size (in characters) and position" }, -{ "-/+rv", "turn on/off reverse video" }, -{ "-bg color", "background color" }, -{ "-fg color", "foreground color" }, -{ "-bd color", "border color" }, -{ "-bw number", "border width in pixels" }, -{ "-fn fontname", "normal text font" }, -{ "-fb fontname", "bold text font" }, -{ "-/+fbb", "turn on/off normal/bold font comparison inhibit"}, -{ "-/+fbx", "turn off/on linedrawing characters"}, -#if OPT_RENDERFONT -{ "-fa pattern", "FreeType font-selection pattern" }, -{ "-fd pattern", "FreeType Doublesize font-selection pattern" }, -{ "-fs size", "FreeType font-size" }, -#endif -#if OPT_WIDE_CHARS -{ "-fw fontname", "doublewidth text font" }, -{ "-fwb fontname", "doublewidth bold text font" }, -#endif -#if OPT_INPUT_METHOD -{ "-fx fontname", "XIM fontset" }, -#endif -{ "-iconic", "start iconic" }, -{ "-name string", "client instance, icon, and title strings" }, -{ "-class string", "class string (XTerm)" }, -{ "-title string", "title string" }, -{ "-xrm resourcestring", "additional resource specifications" }, -{ "-/+132", "turn on/off 80/132 column switching" }, -{ "-/+ah", "turn on/off always highlight" }, -#ifndef NO_ACTIVE_ICON -{ "-/+ai", "turn off/on active icon" }, -{ "-fi fontname", "icon font for active icon" }, -#endif /* NO_ACTIVE_ICON */ -{ "-b number", "internal border in pixels" }, -{ "-/+bc", "turn on/off text cursor blinking" }, -{ "-bcf milliseconds", "time text cursor is off when blinking"}, -{ "-bcn milliseconds", "time text cursor is on when blinking"}, -{ "-/+bdc", "turn off/on display of bold as color"}, -{ "-/+cb", "turn on/off cut-to-beginning-of-line inhibit" }, -{ "-cc classrange", "specify additional character classes" }, -{ "-/+cm", "turn off/on ANSI color mode" }, -{ "-/+cn", "turn on/off cut newline inhibit" }, -{ "-cr color", "text cursor color" }, -{ "-/+cu", "turn on/off curses emulation" }, -{ "-/+dc", "turn off/on dynamic color selection" }, -#if OPT_HIGHLIGHT_COLOR -{ "-/+hm", "turn on/off selection-color override" }, -{ "-selbg color", "selection background color" }, -{ "-selfg color", "selection foreground color" }, -#endif -#if OPT_HP_FUNC_KEYS -{ "-/+hf", "turn on/off HP Function Key escape codes" }, -#endif -{ "-/+hold", "turn on/off logic that retains window after exit" }, -#if OPT_INITIAL_ERASE -{ "-/+ie", "turn on/off initialization of 'erase' from pty" }, -#endif -{ "-/+im", "use insert mode for TERMCAP" }, -{ "-/+j", "turn on/off jump scroll" }, -#if OPT_C1_PRINT -{ "-/+k8", "turn on/off C1-printable classification"}, -#endif -{ "-kt keyboardtype", "set keyboard type:" KEYBOARD_TYPES }, -#ifdef ALLOWLOGGING -{ "-/+l", "turn on/off logging" }, -{ "-lf filename", "logging filename" }, -#else -{ "-/+l", "turn on/off logging (not supported)" }, -{ "-lf filename", "logging filename (not supported)" }, -#endif -{ "-/+ls", "turn on/off login shell" }, -{ "-/+mb", "turn on/off margin bell" }, -{ "-mc milliseconds", "multiclick time in milliseconds" }, -{ "-/+mesg", "forbid/allow messages" }, -{ "-ms color", "pointer color" }, -{ "-nb number", "margin bell in characters from right end" }, -{ "-/+nul", "turn off/on display of underlining" }, -{ "-/+aw", "turn on/off auto wraparound" }, -{ "-/+pc", "turn on/off PC-style bold colors" }, -{ "-/+rw", "turn on/off reverse wraparound" }, -{ "-/+s", "turn on/off multiscroll" }, -{ "-/+sb", "turn on/off scrollbar" }, -#ifdef SCROLLBAR_RIGHT -{ "-rightbar", "force scrollbar right (default left)" }, -{ "-leftbar", "force scrollbar left" }, -#endif -{ "-/+rvc", "turn off/on display of reverse as color" }, -{ "-/+sf", "turn on/off Sun Function Key escape codes" }, -{ "-/+si", "turn on/off scroll-on-tty-output inhibit" }, -{ "-/+sk", "turn on/off scroll-on-keypress" }, -{ "-sl number", "number of scrolled lines to save" }, -#if OPT_SUNPC_KBD -{ "-/+sp", "turn on/off Sun/PC Function/Keypad mapping" }, -#endif -#if OPT_TEK4014 -{ "-/+t", "turn on/off Tek emulation window" }, -#endif -#if OPT_TOOLBAR -{ "-/+tb", "turn on/off toolbar" }, -#endif -{ "-ti termid", "terminal identifier" }, -{ "-tm string", "terminal mode keywords and characters" }, -{ "-tn name", "TERM environment variable name" }, -#if OPT_WIDE_CHARS -{ "-/+u8", "turn on/off UTF-8 mode (implies wide-characters)" }, -#endif -#if OPT_LUIT_PROG -{ "-/+lc", "turn on/off locale mode using luit" }, -{ "-lcc path", "filename of locale converter (" DEFLOCALEFILTER ")" }, -#endif -{ "-/+uc", "turn on/off underline cursor" }, -{ "-/+ulc", "turn off/on display of underline as color" }, -{ "-/+ulit", "turn off/on display of underline as italics" }, -{ "-/+ut", "turn on/off utmp inhibit (not supported)" }, -{ "-/+vb", "turn on/off visual bell" }, -{ "-/+pob", "turn on/off pop on bell" }, -#if OPT_WIDE_CHARS -{ "-/+wc", "turn on/off wide-character mode" }, -{ "-/+mk_width", "turn on/off simple width convention" }, -{ "-/+cjk_width", "turn on/off legacy CJK width convention" }, -#endif -{ "-/+wf", "turn on/off wait for map before command exec" }, -{ "-e command args ...", "command to execute" }, -#if OPT_TEK4014 -{ "%geom", "Tek window geometry" }, -#endif -{ "#geom", "icon window geometry" }, -{ "-T string", "title name for window" }, -{ "-n string", "icon name for window" }, -{ "-C", "intercept console messages" }, -{ "-Sccn", "slave mode on \"ttycc\", file descriptor \"n\"" }, -{ "-into windowId", "use the window id given to -into as the parent window rather than the default root window" }, -#if OPT_ZICONBEEP -{ "-ziconbeep percent", "beep and flag icon of window having hidden output" }, -#endif -#if OPT_SAME_NAME -{ "-/+samename", "turn on/off the no-flicker option for title and icon name" }, -#endif -#if OPT_SESSION_MGT -{ "-/+sm", "turn on/off the session-management support" }, -#endif -#if OPT_MAXIMIZE -{"-/+maximized", "turn on/off maxmize on startup" }, -{"-/+fullscreen", "turn on/off fullscreen on startup" }, -#endif -{ NULL, NULL }}; -/* *INDENT-ON* */ - -#ifdef DBG_CONSOLE -FILE *confd; - -static void -closecons(void) -{ - if (confs != 0) { - fclose(confd); - confd = 0; - } -} -static void -opencons(void) -{ - closecons(); - if ((confd = fopen("/dev/console$", "w")) < 0) { - fputs("!!! Cannot open console device.\n", - stderr); - exit(1); - } -} -#else -#define opencons() /* nothing */ -#define closecons() /* nothing */ -#endif - -static const char *message[] = -{ - "Fonts should be fixed width and, if both normal and bold are specified, should", - "have the same size. If only a normal font is specified, it will be used for", - "both normal and bold text (by doing overstriking). The -e option, if given,", - "must appear at the end of the command line, otherwise the user's default shell", - "will be started. Options that start with a plus sign (+) restore the default.", - NULL}; - -/* - * Decode a key-definition. This combines the termcap and ttyModes, for - * comparison. Note that octal escapes in ttyModes are done by the normal - * resource translation. Also, ttyModes allows '^-' as a synonym for disabled. - */ -static int -decode_keyvalue(char **ptr, int termcap) -{ - char *string = *ptr; - int value = -1; - - TRACE(("decode_keyvalue '%s'\n", string)); - if (*string == '^') { - switch (*++string) { - case '?': - value = A2E(ANSI_DEL); - break; - case '-': - if (!termcap) { - errno = 0; -#if defined(_POSIX_VDISABLE) && defined(HAVE_UNISTD_H) - value = _POSIX_VDISABLE; -#endif -#if defined(_PC_VDISABLE) - if (value == -1) { - value = (int) fpathconf(0, _PC_VDISABLE); - if (value == -1) { - if (errno != 0) - break; /* skip this (error) */ - value = 0377; - } - } -#elif defined(VDISABLE) - if (value == -1) - value = VDISABLE; -#endif - break; - } - /* FALLTHRU */ - default: - value = CONTROL(*string); - break; - } - ++string; - } else if (termcap && (*string == '\\')) { - char *d; - int temp = (int) strtol(string + 1, &d, 8); - if (temp > 0 && d != string) { - value = temp; - string = d; - } - } else { - value = CharOf(*string); - ++string; - } - *ptr = string; - TRACE(("...decode_keyvalue %#x\n", value)); - return value; -} - -static int -abbrev(const char *tst, const char *cmp, size_t need) -{ - size_t len = strlen(tst); - return ((len >= need) && (!strncmp(tst, cmp, len))); -} - -static void -Syntax(char *badOption) -{ - OptionHelp *opt; - OptionHelp *list = sortedOpts(xtermOptions, optionDescList, XtNumber(optionDescList)); - int col; - - xtermWarning("bad command line option \"%s\"\r\n\n", badOption); - - fprintf(stderr, "usage: %s", ProgramName); - col = 8 + (int) strlen(ProgramName); - for (opt = list; opt->opt; opt++) { - int len = 3 + (int) strlen(opt->opt); /* space [ string ] */ - if (col + len > 79) { - fprintf(stderr, "\r\n "); /* 3 spaces */ - col = 3; - } - fprintf(stderr, " [%s]", opt->opt); - col += len; - } - - fprintf(stderr, "\r\n\nType %s -help for a full description.\r\n\n", - ProgramName); - exit(1); -} - -static void -Version(void) -{ - printf("%s\n", xtermVersion()); - fflush(stdout); -} - -static void -Help(void) -{ - OptionHelp *opt; - OptionHelp *list = sortedOpts(xtermOptions, optionDescList, XtNumber(optionDescList)); - const char **cpp; - - printf("%s usage:\n %s [-options ...] [-e command args]\n\n", - xtermVersion(), ProgramName); - printf("where options include:\n"); - for (opt = list; opt->opt; opt++) { - printf(" %-28s %s\n", opt->opt, opt->desc); - } - - putchar('\n'); - for (cpp = message; *cpp; cpp++) - puts(*cpp); - putchar('\n'); - fflush(stdout); -} - -/* ARGSUSED */ -static Boolean -ConvertConsoleSelection(Widget w GCC_UNUSED, - Atom * selection GCC_UNUSED, - Atom * target GCC_UNUSED, - Atom * type GCC_UNUSED, - XtPointer *value GCC_UNUSED, - unsigned long *length GCC_UNUSED, - int *format GCC_UNUSED) -{ - /* we don't save console output, so can't offer it */ - return False; -} - -#if OPT_SESSION_MGT -static void -die_callback(Widget w GCC_UNUSED, - XtPointer client_data GCC_UNUSED, - XtPointer call_data GCC_UNUSED) -{ - Cleanup(0); -} - -static void -save_callback(Widget w GCC_UNUSED, - XtPointer client_data GCC_UNUSED, - XtPointer call_data) -{ - XtCheckpointToken token = (XtCheckpointToken) call_data; - /* we have nothing to save */ - token->save_success = True; -} - -static void -icewatch(IceConn iceConn, - IcePointer clientData GCC_UNUSED, - Bool opening, - IcePointer * watchData GCC_UNUSED) -{ - if (opening) { - ice_fd = IceConnectionNumber(iceConn); - TRACE(("got IceConnectionNumber %d\n", ice_fd)); - } else { - ice_fd = -1; - TRACE(("reset IceConnectionNumber\n")); - } -} - -#endif /* OPT_SESSION_MGT */ - -/* - * DeleteWindow(): Action proc to implement ICCCM delete_window. - */ -/* ARGSUSED */ -static void -DeleteWindow(Widget w, - XEvent * event GCC_UNUSED, - String * params GCC_UNUSED, - Cardinal *num_params GCC_UNUSED) -{ -#if OPT_TEK4014 - if (w == toplevel) { - if (TEK4014_SHOWN(term)) - hide_vt_window(); - else - do_hangup(w, (XtPointer) 0, (XtPointer) 0); - } else if (TScreenOf(term)->Vshow) - hide_tek_window(); - else -#endif - do_hangup(w, (XtPointer) 0, (XtPointer) 0); -} - -/* ARGSUSED */ -static void -KeyboardMapping(Widget w GCC_UNUSED, - XEvent * event, - String * params GCC_UNUSED, - Cardinal *num_params GCC_UNUSED) -{ - switch (event->type) { - case MappingNotify: - XRefreshKeyboardMapping(&event->xmapping); - break; - } -} - -static XtActionsRec actionProcs[] = -{ - {"DeleteWindow", DeleteWindow}, - {"KeyboardMapping", KeyboardMapping}, -}; - -char **gblenvp; - -int -main(int argc, char **argv ENVP_ARG) -{ - Widget form_top, menu_top; - Dimension menu_high; - TScreen *screen; - int mode; - char *my_class = DEFCLASS; - Window winToEmbedInto = None; -#if OPT_COLOR_RES - Bool reversed = False; -#endif - - ProgramName = argv[0]; - - save_ruid = getuid(); - save_rgid = getgid(); - - /* Do these first, since we may not be able to open the display */ - TRACE_OPTS(xtermOptions, optionDescList, XtNumber(optionDescList)); - TRACE_ARGV("Before XtOpenApplication", argv); - if (argc > 1) { - int n; - size_t unique = 2; - Bool quit = False; - - for (n = 1; n < argc; n++) { - TRACE(("parsing %s\n", argv[n])); - if (abbrev(argv[n], "-version", unique)) { - Version(); - quit = True; - } else if (abbrev(argv[n], "-help", unique)) { - Help(); - quit = True; - } else if (abbrev(argv[n], "-class", (size_t) 3)) { - if ((my_class = argv[++n]) == 0) { - Help(); - quit = True; - } - } - } - if (quit) - exit(0); - } - - /* XXX: for some obscure reason EMX seems to lose the value of - * the environ variable, don't understand why, so save it recently - */ - gblenvp = envp; - -#ifdef I18N - setlocale(LC_ALL, NULL); -#endif - - opencons(); - - ttydev = TypeMallocN(char, PTMS_BUFSZ); - ptydev = TypeMallocN(char, PTMS_BUFSZ); - if (!ttydev || !ptydev) { - xtermWarning("unable to allocate memory for ttydev or ptydev\n"); - exit(1); - } - strcpy(ttydev, TTYDEV); - strcpy(ptydev, PTYDEV); - - /* Initialization is done here rather than above in order - * to prevent any assumptions about the order of the contents - * of the various terminal structures (which may change from - * implementation to implementation). - */ - d_tio.c_iflag = ICRNL | IXON; - d_tio.c_oflag = OPOST | ONLCR | TAB3; - d_tio.c_cflag = B38400 | CS8 | CREAD | PARENB | HUPCL; - d_tio.c_lflag = ISIG | ICANON | ECHO | ECHOE | ECHOK; - d_tio.c_line = 0; - d_tio.c_cc[VINTR] = CONTROL('C'); /* '^C' */ - d_tio.c_cc[VERASE] = ANSI_DEL; /* DEL */ - d_tio.c_cc[VKILL] = CONTROL('U'); /* '^U' */ - d_tio.c_cc[VQUIT] = CQUIT; /* '^\' */ - d_tio.c_cc[VEOF] = CEOF; /* '^D' */ - d_tio.c_cc[VEOL] = CEOL; /* '^@' */ - - XtSetErrorHandler(xt_error); -#if OPT_SESSION_MGT - toplevel = XtOpenApplication(&app_con, my_class, - optionDescList, - XtNumber(optionDescList), - &argc, argv, fallback_resources, - sessionShellWidgetClass, - NULL, 0); - IceAddConnectionWatch(icewatch, NULL); -#else - toplevel = XtAppInitialize(&app_con, my_class, - optionDescList, - XtNumber(optionDescList), - &argc, argv, fallback_resources, - NULL, 0); -#endif /* OPT_SESSION_MGT */ - XtSetErrorHandler((XtErrorHandler) 0); - - XtGetApplicationResources(toplevel, (XtPointer) &resource, - application_resources, - XtNumber(application_resources), NULL, 0); - TRACE_XRES(); -#if OPT_MAXIMIZE - resource.fullscreen = extendedBoolean(resource.fullscreen_s, - tblFullscreen, - XtNumber(tblFullscreen)); -#endif - - /* - * ICCCM delete_window. - */ - XtAppAddActions(app_con, actionProcs, XtNumber(actionProcs)); - - /* - * fill in terminal modes - */ - if (resource.tty_modes) { - int n = parse_tty_modes(resource.tty_modes, ttymodelist); - if (n < 0) { - xtermWarning("bad tty modes \"%s\"\n", resource.tty_modes); - } else if (n > 0) { - override_tty_modes = True; - } - } - initZIconBeep(); - hold_screen = resource.hold_screen ? 1 : 0; - if (resource.icon_geometry != NULL) { - int scr, junk; - int ix, iy; - Arg args[2]; - - for (scr = 0; /* yyuucchh */ - XtScreen(toplevel) != ScreenOfDisplay(XtDisplay(toplevel), scr); - scr++) ; - - args[0].name = XtNiconX; - args[1].name = XtNiconY; - XGeometry(XtDisplay(toplevel), scr, resource.icon_geometry, "", - 0, 0, 0, 0, 0, &ix, &iy, &junk, &junk); - args[0].value = (XtArgVal) ix; - args[1].value = (XtArgVal) iy; - XtSetValues(toplevel, args, 2); - } - - XtSetValues(toplevel, ourTopLevelShellArgs, - number_ourTopLevelShellArgs); - -#if OPT_WIDE_CHARS - /* seems as good a place as any */ - init_classtab(); -#endif - - /* Parse the rest of the command line */ - TRACE_ARGV("After XtOpenApplication", argv); - for (argc--, argv++; argc > 0; argc--, argv++) { - if (**argv != '-') - Syntax(*argv); - - TRACE(("parsing %s\n", argv[0])); - switch (argv[0][1]) { - case 'h': /* -help */ - Help(); - exit(0); - case 'v': /* -version */ - Version(); - exit(0); - case 'C': - { - struct stat sbuf; - - /* Must be owner and have read/write permission. - xdm cooperates to give the console the right user. */ - if (!stat("/dev/console", &sbuf) && - (sbuf.st_uid == save_ruid) && - !access("/dev/console", R_OK | W_OK)) { - Console = True; - } else - Console = False; - } - continue; - case 'S': - if (sscanf(*argv + 2, "%c%c%d", passedPty, passedPty + 1, - &am_slave) != 3) - Syntax(*argv); - continue; -#ifdef DEBUG - case 'D': - debug = True; - continue; -#endif /* DEBUG */ - case 'c': /* -class param */ - if (strcmp(argv[0] + 1, "class") == 0) - argc--, argv++; - else - Syntax(*argv); - continue; - case 'e': - if (argc <= 1) - Syntax(*argv); - command_to_exec = ++argv; - break; - case 'i': - if (argc <= 1) { - Syntax(*argv); - } else { - char *endPtr; - --argc; - ++argv; - winToEmbedInto = (Window) strtol(argv[0], &endPtr, 10); - } - continue; - - default: - Syntax(*argv); - } - break; - } - - SetupMenus(toplevel, &form_top, &menu_top, &menu_high); - - term = (XtermWidget) XtVaCreateManagedWidget("vt100", xtermWidgetClass, - form_top, -#if OPT_TOOLBAR - XtNmenuBar, menu_top, - XtNresizable, True, - XtNfromVert, menu_top, - XtNleft, XawChainLeft, - XtNright, XawChainRight, - XtNtop, XawChainTop, - XtNbottom, XawChainBottom, - XtNmenuHeight, menu_high, -#endif - (XtPointer) 0); - decode_keyboard_type(term, &resource); - - screen = TScreenOf(term); - screen->inhibit = 0; - -#ifdef ALLOWLOGGING - if (term->misc.logInhibit) - screen->inhibit |= I_LOG; -#endif - if (term->misc.signalInhibit) - screen->inhibit |= I_SIGNAL; -#if OPT_TEK4014 - if (term->misc.tekInhibit) - screen->inhibit |= I_TEK; -#endif - - /* - * We might start by showing the tek4014 window. - */ -#if OPT_TEK4014 - if (screen->inhibit & I_TEK) - TEK4014_ACTIVE(term) = False; - - if (TEK4014_ACTIVE(term) && !TekInit()) - SysError(ERROR_INIT); -#endif - - /* - * Start the toolbar at this point, after the first window has been setup. - */ -#if OPT_TOOLBAR - ShowToolbar(resource.toolBar); -#endif - -#if OPT_SESSION_MGT - if (resource.sessionMgt) { - TRACE(("Enabling session-management callbacks\n")); - XtAddCallback(toplevel, XtNdieCallback, die_callback, NULL); - XtAddCallback(toplevel, XtNsaveCallback, save_callback, NULL); - } -#endif - - /* - * Set title and icon name if not specified - */ - if (command_to_exec) { - Arg args[2]; - - if (!resource.title) { - if (command_to_exec) { - resource.title = x_basename(command_to_exec[0]); - } /* else not reached */ - } - - if (!resource.icon_name) - resource.icon_name = resource.title; - XtSetArg(args[0], XtNtitle, resource.title); - XtSetArg(args[1], XtNiconName, resource.icon_name); - - TRACE(("setting:\n\ttitle \"%s\"\n\ticon \"%s\"\n\thint \"%s\"\n\tbased on command \"%s\"\n", - resource.title, - resource.icon_name, - NonNull(resource.icon_hint), - *command_to_exec)); - - XtSetValues(toplevel, args, 2); - } -#if OPT_LUIT_PROG - if (term->misc.callfilter) { - int u = (term->misc.use_encoding ? 2 : 0); - if (command_to_exec) { - int n; - char **c; - for (n = 0, c = command_to_exec; *c; n++, c++) ; - c = TypeMallocN(char *, (unsigned) (n + 3 + u)); - if (c == NULL) - SysError(ERROR_LUMALLOC); - memcpy(c + 2 + u, command_to_exec, (unsigned) (n + 1) * sizeof(char *)); - c[0] = term->misc.localefilter; - if (u) { - c[1] = "-encoding"; - c[2] = term->misc.locale_str; - } - c[1 + u] = "--"; - command_to_exec_with_luit = c; - } else { - static char *luit[6]; - luit[0] = term->misc.localefilter; - if (u) { - luit[1] = "-encoding"; - luit[2] = term->misc.locale_str; - luit[3] = NULL; - } else - luit[1] = NULL; - command_to_exec_with_luit = luit; - } - } -#endif - -#ifdef DEBUG - { - /* Set up stderr properly. Opening this log file cannot be - done securely by a privileged xterm process (although we try), - so the debug feature is disabled by default. */ - char dbglogfile[TIMESTAMP_LEN + 20]; - int i = -1; - if (debug) { - timestamp_filename(dbglogfile, "xterm.debug.log."); - if (creat_as(save_ruid, save_rgid, False, dbglogfile, 0600) > 0) { - i = open(dbglogfile, O_WRONLY | O_TRUNC); - } - } - if (i >= 0) { - dup2(i, 2); - - /* mark this file as close on exec */ - (void) fcntl(i, F_SETFD, 1); - } - } -#endif /* DEBUG */ - - spawnXTerm(term); - - /* Child process is out there, let's catch its termination */ - (void) signal(SIGCHLD, reapchild); - - /* Realize procs have now been executed */ - - if (am_slave >= 0) { /* Write window id so master end can read and use */ - char buf[80]; - - buf[0] = '\0'; - sprintf(buf, "%lx\n", XtWindow(SHELL_OF(CURRENT_EMU()))); - IGNORE_RC(write(screen->respond, buf, strlen(buf))); - } - - if (0 > (mode = fcntl(screen->respond, F_GETFL, 0))) - SysError(ERROR_F_GETFL); - mode |= O_NDELAY; - - if (fcntl(screen->respond, F_SETFL, mode)) - SysError(ERROR_F_SETFL); - - FD_ZERO(&pty_mask); - FD_ZERO(&X_mask); - FD_ZERO(&Select_mask); - FD_SET(screen->respond, &pty_mask); - FD_SET(ConnectionNumber(screen->display), &X_mask); - FD_SET(screen->respond, &Select_mask); - FD_SET(ConnectionNumber(screen->display), &Select_mask); - max_plus1 = ((screen->respond < ConnectionNumber(screen->display)) - ? (1 + ConnectionNumber(screen->display)) - : (1 + screen->respond)); - -#ifdef DEBUG - if (debug) - printf("debugging on\n"); -#endif /* DEBUG */ - XSetErrorHandler(xerror); - XSetIOErrorHandler(xioerror); - - initPtyData(&VTbuffer); -#ifdef ALLOWLOGGING - if (term->misc.log_on) { - StartLog(term); - } -#endif - - TRACE(("checking winToEmbedInto %#lx\n", winToEmbedInto)); - if (winToEmbedInto != None) { - XtRealizeWidget(toplevel); - /* - * This should probably query the tree or check the attributes of - * winToEmbedInto in order to verify that it exists, but I'm still not - * certain what is the best way to do it -GPS - */ - TRACE(("...reparenting toplevel %#lx into %#lx\n", - XtWindow(toplevel), - winToEmbedInto)); - XReparentWindow(XtDisplay(toplevel), - XtWindow(toplevel), - winToEmbedInto, 0, 0); - } -#if OPT_COLOR_RES - TRACE(("checking reverseVideo before rv %s fg %s, bg %s\n", - term->misc.re_verse0 ? "reverse" : "normal", - NonNull(TScreenOf(term)->Tcolors[TEXT_FG].resource), - NonNull(TScreenOf(term)->Tcolors[TEXT_BG].resource))); - - if (term->misc.re_verse0) { - if (isDefaultForeground(TScreenOf(term)->Tcolors[TEXT_FG].resource) - && isDefaultBackground(TScreenOf(term)->Tcolors[TEXT_BG].resource)) { - TScreenOf(term)->Tcolors[TEXT_FG].resource = x_strdup(XtDefaultBackground); - TScreenOf(term)->Tcolors[TEXT_BG].resource = x_strdup(XtDefaultForeground); - } else { - ReverseVideo(term); - } - term->misc.re_verse = True; - update_reversevideo(); - TRACE(("updated reverseVideo after rv %s fg %s, bg %s\n", - term->misc.re_verse ? "reverse" : "normal", - NonNull(TScreenOf(term)->Tcolors[TEXT_FG].resource), - NonNull(TScreenOf(term)->Tcolors[TEXT_BG].resource))); - } -#endif /* OPT_COLOR_RES */ - -#if OPT_MAXIMIZE - if (resource.maximized) - RequestMaximize(term, True); -#endif - for (;;) { -#if OPT_TEK4014 - if (TEK4014_ACTIVE(term)) - TekRun(); - else -#endif - VTRun(term); - } - return 0; -} - -/* - * Called from get_pty to iterate over likely pseudo terminals - * we might allocate. Used on those systems that do not have - * a functional interface for allocating a pty. - * Returns 0 if found a pty, 1 if fails. - */ -static int -pty_search(int *pty) -{ - char namebuf[PTMS_BUFSZ]; - - /* ask the PTY manager */ - int fd = open("/dev/ptms$", 0); - if (fd && ptioctl(fd, PTMS_GETPTY, namebuf) == 0) { - strcpy(ttydev, namebuf); - strcpy(ptydev, namebuf); - *x_basename(ttydev) = 't'; - close(fd); - if ((*pty = open(ptydev, O_RDWR)) >= 0) { -#ifdef PTYDEBUG - ptioctl(*pty, XTY_TRACE, 0); -#endif - return 0; - } else { - xtermWarning("Unable to open %s, errno=%d\n", ptydev, errno); - } - } - return 1; -} - -/* - * This function opens up a pty master and stuffs its value into pty. - * - * If it finds one, it returns a value of 0. If it does not find one, - * it returns a value of !0. This routine is designed to be re-entrant, - * so that if a pty master is found and later, we find that the slave - * has problems, we can re-enter this function and get another one. - */ -static int -get_pty(int *pty) -{ - return pty_search(pty); -} - -/* - * The only difference in /etc/termcap between 4014 and 4015 is that - * the latter has support for switching character sets. We support the - * 4015 protocol, but ignore the character switches. Therefore, we - * choose 4014 over 4015. - * - * Features of the 4014 over the 4012: larger (19") screen, 12-bit - * graphics addressing (compatible with 4012 10-bit addressing), - * special point plot mode, incremental plot mode (not implemented in - * later Tektronix terminals), and 4 character sizes. - * All of these are supported by xterm. - */ - -#if OPT_TEK4014 -static char *tekterm[] = -{ - "tek4014", - "tek4015", /* 4014 with APL character set support */ - "tek4012", /* 4010 with lower case */ - "tek4013", /* 4012 with APL character set support */ - "tek4010", /* small screen, upper-case only */ - "dumb", - 0 -}; -#endif - -/* The VT102 is a VT100 with the Advanced Video Option included standard. - * It also adds Escape sequences for insert/delete character/line. - * The VT220 adds 8-bit character sets, selective erase. - * The VT320 adds a 25th status line, terminal state interrogation. - * The VT420 has up to 48 lines on the screen. - */ - -static const char *vtterm[] = -{ -#ifdef USE_X11TERM - "x11term", /* for people who want special term name */ -#endif - DFT_TERMTYPE, /* for people who want special term name */ - "xterm", /* the prefered name, should be fastest */ - "vt102", - "vt100", - "ansi", - "dumb", - 0 -}; - -/* ARGSUSED */ -static SIGNAL_T -hungtty(int i GCC_UNUSED) -{ - longjmp(env, 1); - SIGNAL_RETURN; -} - -#if OPT_PTY_HANDSHAKE -struct { - int rows; - int cols; -} handshake = { - - -1, -1 -}; - -void -first_map_occurred(void) -{ - if (resource.wait_for_map) { - TScreen *screen = TScreenOf(term); - handshake.rows = screen->max_row; - handshake.cols = screen->max_col; - resource.wait_for_map = False; - } -} -#endif /* OPT_PTY_HANDSHAKE else !OPT_PTY_HANDSHAKE */ - -static void -set_owner(char *device, uid_t uid, gid_t gid, mode_t mode) -{ - int why; - - if (chown(device, uid, gid) < 0) { - why = errno; - if (why != ENOENT - && save_ruid == 0) { - xtermPerror("Cannot chown %s to %ld,%ld", - device, (long) uid, (long) gid); - } - } -} - -#define THE_PARENT 1 -#define THE_CHILD 2 -int whoami = -1; - -SIGNAL_T -killit(int sig) -{ - switch (whoami) { - case -1: - signal(sig, killit); - kill(-getpid(), sig); - break; - case THE_PARENT: - wait(NULL); - signal(SIGTERM, SIG_DFL); - kill(-getpid(), SIGTERM); - Exit(0); - break; - case THE_CHILD: - signal(SIGTERM, SIG_DFL); - kill(-getppid(), SIGTERM); - Exit(0); - break; - } - - SIGNAL_RETURN; -} - -#define close_fd(fd) close(fd), fd = -1 - -static int -spawnXTerm(XtermWidget xw) -/* - * Inits pty and tty and forks a login process. - * Does not close fd Xsocket. - * If slave, the pty named in passedPty is already open for use - */ -{ - TScreen *screen = TScreenOf(xw); - int Xsocket = ConnectionNumber(screen->display); - - int ttyfd = -1; - TERMIO_STRUCT tio; - int status; - Bool ok_termcap; - - char *TermName = NULL; - char *ptr, *shname, buf[64]; - int i, no_dev_tty = False; - char *dev_tty_name = (char *) 0; - TTYSIZE_STRUCT ts; - int pgrp = getpid(); - char numbuf[12], **envnew; - - screen->uid = save_ruid; - screen->gid = save_rgid; - - if (am_slave >= 0) { - screen->respond = am_slave; - ptydev[strlen(ptydev) - 2] = - ttydev[strlen(ttydev) - 2] = passedPty[0]; - ptydev[strlen(ptydev) - 1] = - ttydev[strlen(ttydev) - 1] = passedPty[1]; - - (void) xtermResetIds(screen); - } else { - Bool tty_got_hung; - - /* - * Sometimes /dev/tty hangs on open (as in the case of a pty - * that has gone away). Simply make up some reasonable - * defaults. - */ - - signal(SIGALRM, hungtty); - alarm(2); /* alarm(1) might return too soon */ - if (!setjmp(env)) { - ttyfd = open("/dev/tty", O_RDWR); - alarm(0); - tty_got_hung = False; - } else { - tty_got_hung = True; - ttyfd = -1; - errno = ENXIO; - } - signal(SIGALRM, SIG_DFL); - - /* - * Check results and ignore current control terminal if - * necessary. ENXIO is what is normally returned if there is - * no controlling terminal, but some systems (e.g. SunOS 4.0) - * seem to return EIO. Solaris 2.3 is said to return EINVAL. - */ - if (ttyfd < 0) { - if (tty_got_hung || errno == ENXIO || errno == EIO || - errno == EINVAL || errno == ENOTTY) { - no_dev_tty = True; - tio = d_tio; - } else { - SysError(ERROR_OPDEVTTY); - } - } else { - - /* Get a copy of the current terminal's state, - * if we can. Some systems (e.g., SVR4 and MacII) - * may not have a controlling terminal at this point - * if started directly from xdm or xinit, - * in which case we just use the defaults as above. - */ - if (ioctl(ttyfd, TCGETA, &tio) == -1) - tio = d_tio; - - close_fd(ttyfd); - } - - if (get_pty(&screen->respond)) { - /* no ptys! */ - exit(ERROR_PTYS); - } - } - - /* avoid double MapWindow requests */ - XtSetMappedWhenManaged(SHELL_OF(CURRENT_EMU()), False); - - wm_delete_window = XInternAtom(XtDisplay(toplevel), "WM_DELETE_WINDOW", - False); - - if (!TEK4014_ACTIVE(xw)) - VTInit(xw); /* realize now so know window size for tty driver */ - - if (Console) { - /* - * Inform any running xconsole program - * that we are going to steal the console. - */ - XmuGetHostname(mit_console_name + MIT_CONSOLE_LEN, 255); - mit_console = XInternAtom(screen->display, mit_console_name, False); - /* the user told us to be the console, so we can use CurrentTime */ - XtOwnSelection(SHELL_OF(CURRENT_EMU()), - mit_console, CurrentTime, - ConvertConsoleSelection, NULL, NULL); - } -#if OPT_TEK4014 - if (TEK4014_ACTIVE(xw)) { - envnew = tekterm; - } else -#endif - { - envnew = vtterm; - } - - /* - * This used to exit if no termcap entry was found for the specified - * terminal name. That's a little unfriendly, so instead we'll allow - * the program to proceed (but not to set $TERMCAP) if the termcap - * entry is not found. - */ - ok_termcap = True; - if (!get_termcap(xw, TermName = resource.term_name)) { - const char *last = NULL; - char *next; - - TermName = x_strdup(*envnew); - ok_termcap = False; - while (*envnew != NULL) { - if (last == NULL || strcmp(last, *envnew)) { - next = x_strdup(*envnew); - if (get_termcap(xw, next)) { - free(TermName); - TermName = next; - ok_termcap = True; - break; - } else { - free(next); - } - } - last = *envnew; - envnew++; - } - } - if (ok_termcap) { - resource.term_name = TermName; - resize_termcap(xw); - } - - /* tell tty how big window is */ -#if OPT_TEK4014 - if (TEK4014_ACTIVE(xw)) { - TTYSIZE_ROWS(ts) = 38; - TTYSIZE_COLS(ts) = 81; - ts.ws_xpixel = TFullWidth(TekScreenOf(tekWidget)); - ts.ws_ypixel = TFullHeight(TekScreenOf(tekWidget)); - } else -#endif - { - TTYSIZE_ROWS(ts) = MaxRows(screen); - TTYSIZE_COLS(ts) = MaxCols(screen); - ts.ws_xpixel = FullWidth(screen); - ts.ws_ypixel = FullHeight(screen); - } - - if (am_slave < 0) { - - char sema[40]; - HEV sev; - /* start a child process - * use an event sema for sync - */ - sprintf(sema, "\\SEM32\\xterm%s", &ptydev[8]); - if (DosCreateEventSem(sema, &sev, DC_SEM_SHARED, False)) - SysError(ERROR_FORK); - - switch ((screen->pid = fork())) { - case -1: /* error */ - SysError(ERROR_FORK); - default: /* parent */ - whoami = THE_PARENT; - DosWaitEventSem(sev, 1000L); - DosCloseEventSem(sev); - break; - case 0: /* child */ - whoami = THE_CHILD; - - opencons(); - /* we don't need the socket, or the pty master anymore */ - close(ConnectionNumber(screen->display)); - close(screen->respond); - - /* Now is the time to set up our process group and - * open up the pty slave. - */ - if ((ttyfd = open(ttydev, O_RDWR)) < 0) { - /* dumm gelaufen */ - xtermWarning("Cannot open slave side of PTY\n"); - exit(1); - } - - /* use the same tty name that everyone else will use - * (from ttyname) - */ -#ifdef EMXNOTBOGUS - if ((ptr = ttyname(ttyfd)) != 0) { - ttydev = x_strdup(ptr); - } -#else - ptr = ttydev; -#endif - /* for safety: enable DUPs */ - ptioctl(ttyfd, XTY_ENADUP, 0); - - /* change ownership of tty to real group and user id */ - set_owner(ttydev, screen->uid, screen->gid, - (resource.messages ? 0622U : 0600U)); - - /* for the xf86sup-pty, we set the pty to bypass: OS/2 does - * not have a line discipline structure - */ - { - TERMIO_STRUCT t, t1; - if (ptioctl(ttyfd, TCGETA, (char *) &t) < 0) - t = d_tio; - - t.c_iflag = ICRNL; - t.c_oflag = OPOST | ONLCR; - t.c_lflag = ISIG | ICANON | ECHO | ECHOE | ECHOK; - - /* ignore error code, user will see it :-) */ - ptioctl(ttyfd, TCSETA, (char *) &t); - - /* set the console mode */ - if (Console) { - int on = 1; - if (ioctl(ttyfd, TIOCCONS, (char *) &on) == -1) - xtermPerror("cannot open console"); - } - } - - signal(SIGCHLD, SIG_DFL); - signal(SIGHUP, SIG_IGN); - - /* restore various signals to their defaults */ - signal(SIGINT, SIG_DFL); - signal(SIGQUIT, SIG_DFL); - signal(SIGTERM, SIG_DFL); - - xtermCopyEnv(gblenvp); - - xtermSetenv("TERM", resource.term_name); - if (!resource.term_name) - *get_tcap_buffer(xw) = 0; - - sprintf(buf, "%lu", - ((unsigned long) XtWindow(SHELL_OF(CURRENT_EMU())))); - xtermSetenv("WINDOWID", buf); - - /* put the display into the environment of the shell */ - xtermSetenv("DISPLAY", XDisplayString(screen->display)); - - xtermSetenv("XTERM_VERSION", xtermVersion()); - xtermSetenv("XTERM_LOCALE", xtermEnvLocale()); - - signal(SIGTERM, SIG_DFL); - - /* this is the time to go and set up stdin, out, and err - */ - /* dup the tty */ - for (i = 0; i <= 2; i++) - if (i != ttyfd) { - IGNORE_RC(close(i)); - IGNORE_RC(dup(ttyfd)); - } - - /* and close the tty */ - if (ttyfd > 2) - close_fd(ttyfd); - - setpgrp(0, pgrp); - (void) xtermResetIds(screen); - - if (handshake.rows > 0 && handshake.cols > 0) { - TRACE(("handshake ttysize: %dx%d\n", - handshake.rows, handshake.cols)); - set_max_row(screen, handshake.rows); - set_max_col(screen, handshake.cols); - TTYSIZE_ROWS(ts) = (ttySize_t) MaxRows(screen); - TTYSIZE_COLS(ts) = (ttySize_t) MaxCols(screen); - ts.ws_xpixel = (ttySize_t) FullWidth(screen); - ts.ws_ypixel = (ttySize_t) FullHeight(screen); - } - - sprintf(numbuf, "%d", MaxCols(screen)); - xtermSetenv("COLUMNS", numbuf); - sprintf(numbuf, "%d", MaxRows(screen)); - xtermSetenv("LINES", numbuf); - - gblenvp = environ; - - /* need to reset after all the ioctl bashing we did above */ - ptioctl(0, TIOCSWINSZ, (char *) &ts); - - signal(SIGHUP, SIG_DFL); - - /* okay everything seems right, so tell the parent, we are going */ - { - char sema[40]; - HEV sev; - sprintf(sema, "\\SEM32\\xterm%s", &ttydev[8]); - DosOpenEventSem(sema, &sev); - DosPostEventSem(sev); - DosCloseEventSem(sev); - } - -#if OPT_LUIT_PROG - /* - * Use two copies of command_to_exec, in case luit is not actually - * there, or refuses to run. In that case we will fall-through to - * to command that the user gave anyway. - */ - if (command_to_exec_with_luit) { - xtermSetenv("XTERM_SHELL", - xtermFindShell(*command_to_exec_with_luit, False)); - TRACE(("spawning command \"%s\"\n", *command_to_exec_with_luit)); - execvp(*command_to_exec_with_luit, command_to_exec_with_luit); - xtermPerror("Can't execvp %s", *command_to_exec_with_luit); - xtermWarning("cannot support your locale.\n"); - } -#endif - if (command_to_exec) { - xtermSetenv("XTERM_SHELL", - xtermFindShell(*command_to_exec, False)); - TRACE(("spawning command \"%s\"\n", *command_to_exec)); - execvpe(*command_to_exec, command_to_exec, gblenvp); - - /* print error message on screen */ - xtermWarning("Can't execvp %s\n", *command_to_exec); - } - - /* use a layered mechanism to find a shell */ - ptr = x_getenv("X11SHELL"); - if (!ptr) - ptr = x_getenv("SHELL"); - if (!ptr) - ptr = x_getenv("OS2_SHELL"); - if (!ptr) - ptr = "SORRY_NO_SHELL_FOUND"; - xtermSetenv("XTERM_SHELL", ptr); - - shname = x_basename(ptr); - if (command_to_exec) { - char *exargv[10]; /*XXX */ - - exargv[0] = ptr; - exargv[1] = "/C"; - exargv[2] = command_to_exec[0]; - exargv[3] = command_to_exec[1]; - exargv[4] = command_to_exec[2]; - exargv[5] = command_to_exec[3]; - exargv[6] = command_to_exec[4]; - exargv[7] = command_to_exec[5]; - exargv[8] = command_to_exec[6]; - exargv[9] = 0; - execvpe(exargv[0], exargv, gblenvp); - - /* print error message on screen */ - xtermWarning("Can't execvp %s\n", *command_to_exec); - } else { - execlpe(ptr, shname, 0, gblenvp); - - /* Exec failed. */ - xtermWarning("Could not exec %s!\n", ptr); - } - sleep(5); - - /* preventively shoot the parent */ - kill(-getppid(), SIGTERM); - - exit(ERROR_EXEC); - } /* endcase */ - } - /* !am_slave */ - signal(SIGHUP, SIG_IGN); -/* - * Unfortunately, System V seems to have trouble divorcing the child process - * from the process group of xterm. This is a problem because hitting the - * INTR or QUIT characters on the keyboard will cause xterm to go away if we - * don't ignore the signals. This is annoying. - */ - -/* signal (SIGINT, SIG_IGN);*/ - signal(SIGINT, killit); - signal(SIGTERM, killit); - - /* hung shell problem */ - signal(SIGQUIT, SIG_IGN); -/* signal (SIGTERM, SIG_IGN);*/ - return 0; -} /* end spawnXTerm */ - -SIGNAL_T -Exit(int n) -{ - XtermWidget xw = term; - TScreen *screen = TScreenOf(xw); - int pty = TScreenOf(xw)->respond; - close(pty); /* close explicitly to avoid race with slave side */ -#ifdef ALLOWLOGGING - if (screen->logging) - CloseLog(xw); -#endif - if (am_slave < 0) { - /* restore ownership of tty and pty */ - set_owner(ttydev, 0, 0, 0666U); - set_owner(ptydev, 0, 0, 0666U); - } - - /* - * Close after releasing ownership to avoid race condition: other programs - * grabbing it, and *then* having us release ownership.... - */ - close(screen->respond); /* close explicitly to avoid race with slave side */ -#ifdef ALLOWLOGGING - if (screen->logging) - CloseLog(xw); -#endif - -#ifdef NO_LEAKS - if (n == 0) { - TRACE(("Freeing memory leaks\n")); - if (xw != 0) { - Display *dpy = TScreenOf(xw)->display; - - if (toplevel) { - XtDestroyWidget(toplevel); - TRACE(("destroyed top-level widget\n")); - } - sortedOpts(0, 0, 0); - noleaks_charproc(); - noleaks_ptydata(); -#if OPT_WIDE_CHARS - noleaks_CharacterClass(); -#endif - /* XrmSetDatabase(dpy, 0); increases leaks ;-) */ - XtCloseDisplay(dpy); - XtDestroyApplicationContext(app_con); -#if OPT_SESSION_MGT - IceRemoveConnectionWatch(icewatch, NULL); -#endif - TRACE(("closed display\n")); - } - TRACE_CLOSE(); - } -#endif - - exit(n); - SIGNAL_RETURN; -} - -/* ARGSUSED */ -static void -resize_termcap(XtermWidget xw) -{ -} - -/* - * Does a non-blocking wait for a child process. If the system - * doesn't support non-blocking wait, do nothing. - * Returns the pid of the child, or 0 or -1 if none or error. - */ -int -nonblocking_wait(void) -{ - pid_t pid; - - pid = waitpid(-1, NULL, WNOHANG); - return pid; -} - -/* ARGSUSED */ -static SIGNAL_T -reapchild(int n GCC_UNUSED) -{ - int olderrno = errno; - int pid; - - pid = wait(NULL); - - /* cannot re-enable signal before waiting for child - * because then SVR4 loops. Sigh. HP-UX 9.01 too. - */ - (void) signal(SIGCHLD, reapchild); - - do { - if (pid == TScreenOf(term)->pid) { -#ifdef DEBUG - if (debug) - fputs("Exiting\n", stderr); -#endif - if (!hold_screen) - need_cleanup = True; - } - } while ((pid = nonblocking_wait()) > 0); - - errno = olderrno; - SIGNAL_RETURN; -} - -/* - * parse_tty_modes accepts lines of the following form: - * - * [SETTING] ... - * - * where setting consists of the words in the modelist followed by a character - * or ^char. - */ -static int -parse_tty_modes(char *s, struct _xttymodes *modelist) -{ - struct _xttymodes *mp; - int c; - int count = 0; - - TRACE(("parse_tty_modes\n")); - for (;;) { - size_t len; - - while (*s && isascii(CharOf(*s)) && isspace(CharOf(*s))) - s++; - if (!*s) - return count; - - for (len = 0; isalnum(CharOf(s[len])); ++len) ; - for (mp = modelist; mp->name; mp++) { - if (len == mp->len - && strncmp(s, mp->name, mp->len) == 0) - break; - } - if (!mp->name) - return -1; - - s += mp->len; - while (*s && isascii(CharOf(*s)) && isspace(CharOf(*s))) - s++; - if (!*s) - return -1; - - if ((c = decode_keyvalue(&s, False)) != -1) { - mp->value = c; - mp->set = 1; - count++; - TRACE(("...parsed #%d: %s=%#x\n", count, mp->name, c)); - } - } -} - -int -GetBytesAvailable(int fd) -{ - long arg; - ioctl(fd, FIONREAD, (char *) &arg); - return (int) arg; -} - -/* Utility function to try to hide system differences from - everybody who used to call killpg() */ - -int -kill_process_group(int pid, int sig) -{ - return kill(-pid, sig); -} - -int -ptioctl(int fd, int func, void *data) -{ - APIRET rc; - ULONG len; - struct pt_termios pt; - TERMIO_STRUCT *t; - int i; - - switch (func) { - case TCGETA: - rc = DosDevIOCtl(fd, XFREE86_PTY, XTY_TIOCGETA, - NULL, 0, NULL, - (ULONG *) & pt, sizeof(struct pt_termios), &len); - if (rc) - return -1; - t = (TERMIO_STRUCT *) data; - t->c_iflag = pt.c_iflag; - t->c_oflag = pt.c_oflag; - t->c_cflag = pt.c_cflag; - t->c_lflag = pt.c_lflag; - for (i = 0; i < NCC; i++) - t->c_cc[i] = pt.c_cc[i]; - return 0; - case TCSETA: - case TCSETAW: - case TCSETAF: - t = (TERMIO_STRUCT *) data; - pt.c_iflag = t->c_iflag; - pt.c_oflag = t->c_oflag; - pt.c_cflag = t->c_cflag; - pt.c_lflag = t->c_lflag; - - for (i = 0; i < NCC; i++) - pt.c_cc[i] = t->c_cc[i]; - if (func == TCSETA) - i = XTY_TIOCSETA; - else if (func == TCSETAW) - i = XTY_TIOCSETAW; - else - i = XTY_TIOCSETAF; - rc = DosDevIOCtl(fd, XFREE86_PTY, i, - (ULONG *) & pt, sizeof(struct pt_termios), &len, - NULL, 0, NULL); - return (rc) ? -1 : 0; - case TIOCCONS: - return DosDevIOCtl(fd, XFREE86_PTY, XTY_TIOCCONS, - (ULONG *) data, sizeof(ULONG), &len, - NULL, 0, NULL); - case TIOCSWINSZ: - return DosDevIOCtl(fd, XFREE86_PTY, XTY_TIOCSWINSZ, - (ULONG *) data, sizeof(TTYSIZE_STRUCT), &len, - NULL, 0, NULL); - case TIOCGWINSZ: - return DosDevIOCtl(fd, XFREE86_PTY, XTY_TIOCGWINSZ, - NULL, 0, NULL, - (ULONG *) data, sizeof(TTYSIZE_STRUCT), &len); - case XTY_ENADUP: - i = 1; - return DosDevIOCtl(fd, XFREE86_PTY, XTY_ENADUP, - (ULONG *) & i, sizeof(ULONG), &len, - NULL, 0, NULL); - case XTY_TRACE: - i = 2; - return DosDevIOCtl(fd, XFREE86_PTY, XTY_TRACE, - (ULONG *) & i, sizeof(ULONG), &len, - NULL, 0, NULL); - case PTMS_GETPTY: - i = 1; - return DosDevIOCtl(fd, XFREE86_PTY, PTMS_GETPTY, - (ULONG *) & i, sizeof(ULONG), &len, - (UCHAR *) data, 14, &len); - default: - return -1; - } -} diff -Nru xterm-287/package/debian/changelog xterm-293/package/debian/changelog --- xterm-287/package/debian/changelog 2012-11-19 10:36:06.000000000 +0000 +++ xterm-293/package/debian/changelog 2013-05-08 22:29:24.000000000 +0000 @@ -1,3 +1,40 @@ +xterm-dev (293) unstable; urgency=low + + * Miscellaneous fixes. + + -- Thomas E. Dickey Wed, 08 May 2013 18:29:21 -0400 + +xterm-dev (292) unstable; urgency=low + + * Miscellaneous fixes. + + -- Thomas E. Dickey Tue, 26 Mar 2013 19:11:17 -0400 + +xterm-dev (291) unstable; urgency=low + + * Fix a different #282 change (Redhat #874327). + + -- Thomas E. Dickey Tue, 26 Feb 2013 19:09:32 -0500 + +xterm-dev (290) unstable; urgency=low + + * Fix incomplete revert of #282 change. + + -- Thomas E. Dickey Tue, 12 Feb 2013 19:48:21 -0500 + +xterm-dev (289) unstable; urgency=low + + * Miscellaneous fixes. + * Fix regression with XTERM_SHELL feature. + + -- Thomas E. Dickey Sun, 03 Feb 2013 13:59:20 -0500 + +xterm-dev (288) unstable; urgency=low + + * Miscellaneous fixes. + + -- Thomas E. Dickey Mon, 26 Nov 2012 20:53:23 -0500 + xterm-dev (287) unstable; urgency=low * Miscellaneous fixes. diff -Nru xterm-287/package/debian/rules xterm-293/package/debian/rules --- xterm-287/package/debian/rules 2012-08-28 09:45:55.000000000 +0000 +++ xterm-293/package/debian/rules 2013-01-01 12:24:53.000000000 +0000 @@ -58,6 +58,7 @@ --libdir=/etc/$(PACKAGE) \ --with-app-class=$(PKG_CLASS) \ --without-xterm-symlink \ + --disable-imake \ --enable-256-color \ --enable-88-color \ --enable-dabbrev \ diff -Nru xterm-287/package/freebsd/Makefile xterm-293/package/freebsd/Makefile --- xterm-287/package/freebsd/Makefile 2012-10-29 23:55:09.000000000 +0000 +++ xterm-293/package/freebsd/Makefile 2013-05-08 22:29:47.000000000 +0000 @@ -5,7 +5,7 @@ # and "make makesum". PORTNAME= xterm -PORTVERSION= 286 +PORTVERSION= 293 CATEGORIES= x11 MASTER_SITES= ftp://invisible-island.net/xterm/ \ CRITICAL diff -Nru xterm-287/package/xterm.spec xterm-293/package/xterm.spec --- xterm-287/package/xterm.spec 2012-11-19 09:53:15.000000000 +0000 +++ xterm-293/package/xterm.spec 2013-05-27 15:17:47.000000000 +0000 @@ -1,7 +1,11 @@ -# $XTermId: xterm.spec,v 1.40 2012/11/19 09:53:15 tom Exp $ +# $XTermId: xterm.spec,v 1.50 2013/05/27 15:17:47 tom Exp $ Summary: X terminal emulator (development version) -Name: xterm-dev -Version: 287 +%global my_middle xterm +%global my_suffix -dev +%global fullname %{my_middle}%{my_suffix} +%global my_class XTermDev +Name: %{fullname} +Version: 293 Release: 1 License: X11 Group: User Interface/X @@ -17,30 +21,28 @@ used by DEC VT220 terminals. This package provides four commands: - a) xterm, which is the actual terminal emulator - b) uxterm, which is a wrapper around xterm which sets xterm to use UTF-8 - encoding when the user's locale supports this, - c) koi8rxterm, a wrapper similar to uxterm for locales that use the - KOI8-R character set, and - d) resize. + a) %{fullname}, which is the actual terminal emulator + b) u%{fullname}, which is a wrapper around %{fullname} + which sets %{fullname} to use UTF-8 encoding when + the user's locale supports this, + c) koi8r%{fullname}, a wrapper similar to u%{fullname} + for locales that use the KOI8-R character set, and + d) resize%{my_suffix}. A complete list of control sequences supported by the X terminal emulator -is provided in /usr/share/doc/xterm. +is provided in /usr/share/doc/%{fullname}. -The xterm program uses bitmap images provided by the xbitmaps package. +The %{fullname} program uses bitmap images provided by the xbitmaps package. -Those interested in using koi8rxterm will likely want to install the +Those interested in using koi8r%{fullname} will likely want to install the xfonts-cyrillic package as well. -This package is configured to use "xterm-dev" and "XTermDev" for the program -and its resource class, to avoid conflict with other packages. +This package is configured to use "%{fullname}" and "%{my_class}" +for the program and its resource class, to avoid conflict with other packages. %prep -%define my_suffix -dev -%define my_class XTermDev - -%define desktop_vendor dickey +%global desktop_vendor dickey %define desktop_utils %(if which desktop-file-install 2>&1 >/dev/null ; then echo 1 || echo 0 ; fi) %define icon_theme %(test -d /usr/share/icons/hicolor && echo 1 || echo 0) @@ -55,7 +57,7 @@ %define _iconsdir %{_datadir}/icons %define _pixmapsdir %{_datadir}/pixmaps -%define my_docdir %{_datadir}/doc/xterm%{my_suffix} +%define my_docdir %{_datadir}/doc/%{fullname} # no need for debugging symbols... %define debug_package %{nil} @@ -75,10 +77,12 @@ --without-xterm-symlink \ %endif %if "%{icon_theme}" + --with-icon-symlink \ --with-icon-theme \ --with-icondir=%{_iconsdir} \ %endif --with-app-class=%{my_class} \ + --disable-imake \ --enable-256-color \ --enable-88-color \ --enable-dabbrev \ @@ -101,6 +105,7 @@ --with-own-terminfo=%{_datadir}/terminfo \ --with-terminal-type=xterm-new \ --with-utempter \ + --with-icon-name=mini.xterm \ --with-xpm copy config.status /tmp/ make @@ -172,9 +177,9 @@ %files %defattr(-,root,root,-) -%{_bindir}/koi8rxterm%{my_suffix} -%{_bindir}/xterm%{my_suffix} -%{_bindir}/uxterm%{my_suffix} +%{_bindir}/koi8r%{fullname} +%{_bindir}/%{fullname} +%{_bindir}/u%{fullname} %{_bindir}/resize%{my_suffix} %{_mandir}/*/* %{my_docdir}/* @@ -185,18 +190,28 @@ %endif %if "%{desktop_utils}" -%config(missingok) %{_datadir}/applications/%{desktop_vendor}-xterm%{my_suffix}.desktop -%config(missingok) %{_datadir}/applications/%{desktop_vendor}-uxterm%{my_suffix}.desktop +%config(missingok) %{_datadir}/applications/%{desktop_vendor}-%{fullname}.desktop +%config(missingok) %{_datadir}/applications/%{desktop_vendor}-u%{fullname}.desktop %endif %if "%{icon_theme}" -%{_iconsdir}/hicolor/48x48/apps/xterm*.png -%{_iconsdir}/hicolor/scalable/apps/xterm*.svg +%{_iconsdir}/hicolor/48x48/apps/%{fullname}*.png +%{_iconsdir}/hicolor/scalable/apps/%{fullname}*.svg %endif -%{_pixmapsdir}/*xterm*.xpm +%{_pixmapsdir}/*%{fullname}*.xpm + +# files added by --with-icon-symlink +%if "%{icon_theme}" +%{_iconsdir}/hicolor/xterm.png +%{_iconsdir}/hicolor/xterm.svg +%endif +%{_pixmapsdir}/xterm.xpm %changelog +* Mon May 27 2013 Thomas E. Dickey +- use --with-icon-symlink + * Mon Oct 08 2012 Thomas E. Dickey - added to pixmapsdir diff -Nru xterm-287/precompose.c xterm-293/precompose.c --- xterm-287/precompose.c 2007-02-05 01:06:36.000000000 +0000 +++ xterm-293/precompose.c 2013-02-03 17:06:01.000000000 +0000 @@ -4,7 +4,7 @@ * DO NOT EDIT BY HAND! This is generated by the script * unicode/make-precompose.sh */ -/* $XTermId: precompose.c,v 1.8 2007/02/05 01:06:36 Thomas.Wolff Exp $ */ +/* $XTermId: precompose.c,v 1.9 2013/02/03 17:06:01 tom Exp $ */ /* $XFree86$ */ #include @@ -1014,6 +1014,11 @@ { 0x30FE, 0x30FD, 0x3099}, { 0xFB2C, 0xFB49, 0x05C1}, { 0xFB2D, 0xFB49, 0x05C2}, +{ 0x1109A, 0x11099, 0x110BA}, +{ 0x1109C, 0x1109B, 0x110BA}, +{ 0x110AB, 0x110A5, 0x110BA}, +{ 0x1112E, 0x11131, 0x11127}, +{ 0x1112F, 0x11132, 0x11127}, { 0x1D15E, 0x1D157, 0x1D165}, { 0x1D15F, 0x1D158, 0x1D165}, { 0x1D160, 0x1D15F, 0x1D16E}, diff -Nru xterm-287/print.c xterm-293/print.c --- xterm-287/print.c 2012-10-29 10:41:53.000000000 +0000 +++ xterm-293/print.c 2013-05-27 00:55:47.000000000 +0000 @@ -1,7 +1,7 @@ -/* $XTermId: print.c,v 1.147 2012/10/29 10:41:53 tom Exp $ */ +/* $XTermId: print.c,v 1.150 2013/05/27 00:55:47 tom Exp $ */ /* - * Copyright 1997-2011,2012 by Thomas E. Dickey + * Copyright 1997-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -87,6 +87,7 @@ #endif if (SPS.fp != 0) { + DEBUG_MSG("closePrinter\n"); pclose(SPS.fp); TRACE(("closed printer, waiting...\n")); #ifdef VMS /* This is a quick hack, really should use @@ -94,11 +95,14 @@ and go straight to the queue */ (void) system(pcommand); #else /* VMS */ - while (nonblocking_wait() > 0) ; + while (nonblocking_wait() > 0) { + ; + } #endif /* VMS */ SPS.fp = 0; SPS.isOpen = False; TRACE(("closed printer\n")); + DEBUG_MSG("...closePrinter (done)\n"); } } } @@ -300,6 +304,7 @@ int save_which = screen->whichBuf; int done_which = 0; + DEBUG_MSG("xtermPrintEverything\n"); if (p->print_everything) { if (p->print_everything & 8) { printLines(xw, -screen->savedlines, -(screen->topline + 1), p); @@ -436,8 +441,8 @@ SysError(ERROR_FORK); if (my_pid == 0) { + DEBUG_MSG("charToPrinter: subprocess for printer\n"); TRACE_CLOSE(); - (void) signal(SIGCHLD, SIG_DFL); /* no reapchild! */ close(my_pipe[1]); /* printer is silent */ close(screen->respond); @@ -455,23 +460,38 @@ SPS.fp = popen(SPS.printer_command, "w"); if (SPS.fp != 0) { + DEBUG_MSG("charToPrinter: opened pipe to printer\n"); input = fdopen(my_pipe[0], "r"); clearerr(input); - while (!ferror(input) && !feof(input)) { - if ((c = fgetc(input)) == EOF) + for (;;) { + if (ferror(input)) { + DEBUG_MSG("charToPrinter: break on ferror\n"); + break; + } else if (feof(input)) { + DEBUG_MSG("charToPrinter: break on feof\n"); + break; + } else if ((c = fgetc(input)) == EOF) { + DEBUG_MSG("charToPrinter: break on EOF\n"); break; + } fputc(c, SPS.fp); if (isForm(c)) fflush(SPS.fp); } + DEBUG_MSG("charToPrinter: calling pclose\n"); pclose(SPS.fp); } exit(0); } else { close(my_pipe[0]); /* won't read from printer */ - SPS.fp = fdopen(my_pipe[1], "w"); - TRACE(("opened printer from pid %d/%d\n", - (int) getpid(), (int) my_pid)); + if ((SPS.fp = fdopen(my_pipe[1], "w")) != 0) { + DEBUG_MSG("charToPrinter: opened printer in parent\n"); + TRACE(("opened printer from pid %d/%d\n", + (int) getpid(), (int) my_pid)); + } else { + TRACE(("failed to open printer:%s\n", strerror(errno))); + DEBUG_MSG("charToPrinter: could not open in parent\n"); + } } } #endif @@ -659,14 +679,19 @@ if (strlen(SPS.printer_command) != 0 && !result) { char **argv = x_splitargs(SPS.printer_command); - if (argv && argv[0]) { - if (xtermFindShell(argv[0], False) == 0) { - xtermWarning("No program found for printerCommand: %s\n", SPS.printer_command); - SPS.printer_command = x_strdup(""); - } else { - SPS.printer_checked = True; - result = True; + if (argv) { + if (argv[0]) { + char *myShell = xtermFindShell(argv[0], False); + if (myShell == 0) { + xtermWarning("No program found for printerCommand: %s\n", SPS.printer_command); + SPS.printer_command = x_strdup(""); + } else { + free(myShell); + SPS.printer_checked = True; + result = True; + } } + x_freeargs(argv); } TRACE(("xtermHasPrinter:%d\n", result)); } diff -Nru xterm-287/proto.h xterm-293/proto.h --- xterm-287/proto.h 2003-10-27 01:07:57.000000000 +0000 +++ xterm-293/proto.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,62 +0,0 @@ -/* - * $XTermId: proto.h,v 1.10 2003/10/27 01:07:57 tom Exp $ - * ---------------------------------------------------------------------------- - * this file is part of xterm - * - * Copyright 1996-2008,2003 by Thomas E. Dickey - * - * All Rights Reserved - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) 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 included_proto_h -#define included_proto_h - -#define PROTO_XT_ACTIONS_ARGS \ - (Widget w, XEvent *event, String *params, Cardinal *num_params) - -#define PROTO_XT_CALLBACK_ARGS \ - (Widget gw, XtPointer closure, XtPointer data) - -#define PROTO_XT_CVT_SELECT_ARGS \ - (Widget w, Atom *selection, Atom *target, Atom *type, XtPointer *value, unsigned long *length, int *format) - -#define PROTO_XT_EV_HANDLER_ARGS \ - (Widget w, XtPointer closure, XEvent *event, Boolean *cont) - -#define PROTO_XT_SEL_CB_ARGS \ - (Widget w, XtPointer client_data, Atom *selection, Atom *type, XtPointer value, unsigned long *length, int *format) - -#ifdef SIGNALRETURNSINT -#define SIGNAL_T int -#define SIGNAL_RETURN return 0 -#else -#define SIGNAL_T void -#define SIGNAL_RETURN return -#endif - -#endif/*included_proto_h*/ diff -Nru xterm-287/ptydata.c xterm-293/ptydata.c --- xterm-287/ptydata.c 2011-09-11 14:59:38.000000000 +0000 +++ xterm-293/ptydata.c 2013-02-03 23:17:07.000000000 +0000 @@ -1,7 +1,7 @@ -/* $XTermId: ptydata.c,v 1.101 2011/09/11 14:59:38 tom Exp $ */ +/* $XTermId: ptydata.c,v 1.103 2013/02/03 23:17:07 tom Exp $ */ /* - * Copyright 1999-2010,2011 by Thomas E. Dickey + * Copyright 1999-2011,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -203,7 +203,7 @@ */ if (size <= 0) { if (save_err == EIO || save_err == 0) - Cleanup(0); + NormalExit(); else if (!E_TEST(save_err)) Panic("input: read returned unexpected error (%d)\n", save_err); size = 0; @@ -211,13 +211,13 @@ #else /* !f*ugly */ if (size < 0) { if (save_err == EIO) - Cleanup(0); + NormalExit(); else if (!E_TEST(save_err)) Panic("input: read returned unexpected error (%d)\n", save_err); size = 0; } else if (size == 0) { -#if defined(__UNIXOS2__) || defined(__FreeBSD__) - Cleanup(0); +#if defined(__FreeBSD__) + NormalExit(); #else Panic("input: read returned zero\n", 0); #endif diff -Nru xterm-287/ptyx.h xterm-293/ptyx.h --- xterm-287/ptyx.h 2012-11-25 16:05:51.000000000 +0000 +++ xterm-293/ptyx.h 2013-05-27 22:21:32.000000000 +0000 @@ -1,7 +1,7 @@ -/* $XTermId: ptyx.h,v 1.759 2012/11/25 16:05:51 tom Exp $ */ +/* $XTermId: ptyx.h,v 1.767 2013/05/27 22:21:32 tom Exp $ */ /* - * Copyright 1999-2011,2012 by Thomas E. Dickey + * Copyright 1999-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -231,11 +231,7 @@ #ifdef __hpux #define PTYCHAR1 "zyxwvutsrqp" #else /* !__hpux */ -#ifdef __UNIXOS2__ -#define PTYCHAR1 "pq" -#else #define PTYCHAR1 "pqrstuvwxyzPQRSTUVWXYZ" -#endif /* !__UNIXOS2__ */ #endif /* !__hpux */ #endif /* !PTYCHAR1 */ @@ -866,13 +862,17 @@ , MOUSE_FG /* mouse foreground */ , MOUSE_BG /* mouse background */ #if OPT_TEK4014 - , TEK_FG /* tektronix foreground */ + , TEK_FG = 5 /* tektronix foreground */ , TEK_BG /* tektronix background */ - , TEK_CURSOR /* tektronix cursor */ #endif #if OPT_HIGHLIGHT_COLOR - , HIGHLIGHT_BG /* highlight background */ - , HIGHLIGHT_FG /* highlight foreground */ + , HIGHLIGHT_BG = 7 /* highlight background */ +#endif +#if OPT_TEK4014 + , TEK_CURSOR = 8 /* tektronix cursor */ +#endif +#if OPT_HIGHLIGHT_COLOR + , HIGHLIGHT_FG = 9 /* highlight foreground */ #endif , NCOLORS /* total number of colors */ } TermColors; @@ -1770,6 +1770,7 @@ Boolean visualbell; /* visual bell mode */ Boolean poponbell; /* pop on bell mode */ + Boolean allowPasteControls; /* PasteControls mode */ Boolean allowColorOps; /* ColorOps mode */ Boolean allowFontOps; /* FontOps mode */ Boolean allowSendEvents;/* SendEvent mode */ @@ -1897,7 +1898,6 @@ * Working variables for getLineData(). */ size_t lineExtra; /* extra space for combining chars */ - Dimension widestLine; /* length of longest LineData */ /* * Pointer to the current visible buffer. */ @@ -2728,8 +2728,9 @@ #define AllowTitleOps(w) AllowXtermOps(w, allowTitleOps) +#define SpecialWindowOps(w,name) (!TScreenOf(w)->disallow_win_ops[name]) #define AllowWindowOps(w,name) (AllowXtermOps(w, allowWindowOps) || \ - !TScreenOf(w)->disallow_win_ops[name]) + SpecialWindowOps(w,name)) #if OPT_TOOLBAR #define ToolbarHeight(w) ((resource.toolBar) \ @@ -2832,6 +2833,18 @@ #define TRACE2(p) /*nothing*/ #endif +#if OPT_TRACE && !defined(DEBUG) +#define DEBUG 1 +#endif + +#ifdef DEBUG +#define if_DEBUG(code) if(debug) code +#else +#define if_DEBUG(code) /*nothing*/ +#endif + +#define DEBUG_MSG(text) if_DEBUG({ IGNORE_RC(write(2, text, sizeof(text) - 1)); }) + /* *INDENT-ON* */ #endif /* included_ptyx_h */ diff -Nru xterm-287/resize.c xterm-293/resize.c --- xterm-287/resize.c 2011-09-11 20:19:19.000000000 +0000 +++ xterm-293/resize.c 2013-01-06 19:42:20.000000000 +0000 @@ -1,7 +1,7 @@ -/* $XTermId: resize.c,v 1.118 2011/09/11 20:19:19 tom Exp $ */ +/* $XTermId: resize.c,v 1.129 2013/01/06 19:42:20 tom Exp $ */ /* - * Copyright 2003-2010,2011 by Thomas E. Dickey + * Copyright 2003-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -54,17 +54,15 @@ /* resize.c */ -#include #include #include + +#include +#include #include #include #include -#ifdef APOLLO_SR9 -#define CANT_OPEN_DEV_TTY -#endif - #ifndef USE_TERMINFO /* avoid conflict with configure script */ #if defined(__QNX__) || defined(__SCO__) || defined(linux) || defined(__OpenBSD__) || defined(__UNIXWARE__) #define USE_TERMINFO @@ -140,14 +138,13 @@ ESCAPE("7") ESCAPE("[r") ESCAPE("[999;999H") ESCAPE("[6n"), ESCAPE("[18t"), }; -#if defined(USE_STRUCT_TTYSIZE) -#elif defined(USE_STRUCT_WINSIZE) +#if defined(USE_STRUCT_WINSIZE) static const char *getwsize[EMULATIONS] = { /* size in pixels */ 0, ESCAPE("[14t"), }; -#endif /* USE_STRUCT_{TTYSIZE|WINSIZE} */ +#endif /* USE_STRUCT_WINSIZE */ static const char *restore[EMULATIONS] = { ESCAPE("8"), @@ -177,20 +174,54 @@ static int tty; static FILE *ttyfp; -#if defined(USE_STRUCT_TTYSIZE) -#elif defined(USE_STRUCT_WINSIZE) +#if defined(USE_STRUCT_WINSIZE) static const char *wsize[EMULATIONS] = { 0, ESCAPE("[4;%hd;%hdt"), }; -#endif /* USE_STRUCT_{TTYSIZE|WINSIZE} */ +#endif /* USE_STRUCT_WINSIZE */ -static SIGNAL_T onintr(int sig); -static SIGNAL_T resize_timeout(int sig); -static int checkdigits(char *str); -static void Usage(void); -static void readstring(FILE *fp, char *buf, const char *str); +static void +failed(const char *s) +{ + int save = errno; + IGNORE_RC(write(2, myname, strlen(myname))); + IGNORE_RC(write(2, ": ", (size_t) 2)); + errno = save; + perror(s); + exit(EXIT_FAILURE); +} + +/* ARGSUSED */ +static void +onintr(int sig GCC_UNUSED) +{ +#ifdef USE_ANY_SYSV_TERMIO + (void) ioctl(tty, TCSETAW, &tioorig); +#elif defined(USE_TERMIOS) + (void) tcsetattr(tty, TCSADRAIN, &tioorig); +#else /* not USE_TERMIOS */ + (void) ioctl(tty, TIOCSETP, &sgorig); +#endif /* USE_ANY_SYSV_TERMIO/USE_TERMIOS */ + exit(EXIT_FAILURE); +} + +static void +resize_timeout(int sig) +{ + fprintf(stderr, "\n%s: Time out occurred\r\n", myname); + onintr(sig); +} + +static void +Usage(void) +{ + fprintf(stderr, strcmp(myname, sunname) == 0 ? + "Usage: %s [rows cols]\n" : + "Usage: %s [-v] [-u] [-c] [-s [rows cols]]\n", myname); + exit(EXIT_FAILURE); +} #ifdef USE_TERMCAP static void @@ -218,6 +249,58 @@ } #endif /* USE_TERMCAP */ +static int +checkdigits(char *str) +{ + while (*str) { + if (!isdigit(CharOf(*str))) + return (0); + str++; + } + return (1); +} + +static void +readstring(FILE *fp, char *buf, const char *str) +{ + int last, c; +#if !defined(USG) + /* What is the advantage of setitimer() over alarm()? */ + struct itimerval it; +#endif + + signal(SIGALRM, resize_timeout); +#if defined(USG) + alarm(TIMEOUT); +#else + memset((char *) &it, 0, sizeof(struct itimerval)); + it.it_value.tv_sec = TIMEOUT; + setitimer(ITIMER_REAL, &it, (struct itimerval *) NULL); +#endif + if ((c = getc(fp)) == 0233) { /* meta-escape, CSI */ + c = ESCAPE("")[0]; + *buf++ = (char) c; + *buf++ = '['; + } else { + *buf++ = (char) c; + } + if (c != *str) { + fprintf(stderr, "%s: unknown character, exiting.\r\n", myname); + onintr(0); + } + last = str[strlen(str) - 1]; + while ((*buf++ = (char) getc(fp)) != last) { + ; + } +#if defined(USG) + alarm(0); +#else + memset((char *) &it, 0, sizeof(struct itimerval)); + setitimer(ITIMER_REAL, &it, (struct itimerval *) NULL); +#endif + *buf = 0; +} + /* resets termcap string to reflect current screen size */ @@ -231,6 +314,7 @@ int emu = VT100; char *shell; int i; + int rc; int rows, cols; #ifdef USE_ANY_SYSV_TERMIO struct termio tio; @@ -269,6 +353,9 @@ case 'c': /* C shell */ shell_type = SHELL_C; break; + case 'v': + printf("%s\n", xtermVersion()); + exit(EXIT_SUCCESS); default: Usage(); /* Never returns */ } @@ -295,9 +382,11 @@ shell = x_basename(ptr); /* now that we know, what kind is it? */ - for (i = 0; shell_list[i].name; i++) - if (!strcmp(shell_list[i].name, shell)) + for (i = 0; shell_list[i].name; i++) { + if (!strcmp(shell_list[i].name, shell)) { break; + } + } shell_type = shell_list[i].type; } @@ -306,13 +395,14 @@ fprintf(stderr, "%s: Can't set window size under %s emulation\n", myname, emuname[emu]); - exit(1); + exit(EXIT_FAILURE); } - if (!checkdigits(argv[0]) || !checkdigits(argv[1])) + if (!checkdigits(argv[0]) || !checkdigits(argv[1])) { Usage(); /* Never returns */ - } else if (argc != 0) + } + } else if (argc != 0) { Usage(); /* Never returns */ - + } #ifdef CANT_OPEN_DEV_TTY if ((name_of_tty = ttyname(fileno(stderr))) == NULL) #endif @@ -321,32 +411,35 @@ if ((ttyfp = fopen(name_of_tty, "r+")) == NULL) { fprintf(stderr, "%s: can't open terminal %s\n", myname, name_of_tty); - exit(1); + exit(EXIT_FAILURE); } tty = fileno(ttyfp); #ifdef USE_TERMCAP if ((env = x_getenv("TERM")) == 0) { env = DFT_TERMTYPE; - if (SHELL_BOURNE == shell_type) + if (SHELL_BOURNE == shell_type) { setname = "TERM=" DFT_TERMTYPE ";\nexport TERM;\n"; - else + } else { setname = "setenv TERM " DFT_TERMTYPE ";\n"; + } } termcap[0] = 0; /* ...just in case we've accidentally gotten terminfo */ - if (tgetent(termcap, env) <= 0 || termcap[0] == 0) + if (tgetent(termcap, env) <= 0 || termcap[0] == 0) { ok_tcap = 0; + } #endif /* USE_TERMCAP */ #ifdef USE_TERMINFO if (x_getenv("TERM") == 0) { - if (SHELL_BOURNE == shell_type) + if (SHELL_BOURNE == shell_type) { setname = "TERM=" DFT_TERMTYPE ";\nexport TERM;\n"; - else + } else { setname = "setenv TERM " DFT_TERMTYPE ";\n"; + } } #endif /* USE_TERMINFO */ #ifdef USE_ANY_SYSV_TERMIO - ioctl(tty, TCGETA, &tioorig); + rc = ioctl(tty, TCGETA, &tioorig); tio = tioorig; UIntClr(tio.c_iflag, (ICRNL | IUCLC)); UIntClr(tio.c_lflag, (ICANON | ECHO)); @@ -354,7 +447,7 @@ tio.c_cc[VMIN] = 6; tio.c_cc[VTIME] = 1; #elif defined(USE_TERMIOS) - tcgetattr(tty, &tioorig); + rc = tcgetattr(tty, &tioorig); tio = tioorig; UIntClr(tio.c_iflag, ICRNL); UIntClr(tio.c_lflag, (ICANON | ECHO)); @@ -362,23 +455,29 @@ tio.c_cc[VMIN] = 6; tio.c_cc[VTIME] = 1; #else /* not USE_TERMIOS */ - ioctl(tty, TIOCGETP, &sgorig); + rc = ioctl(tty, TIOCGETP, &sgorig); sg = sgorig; sg.sg_flags |= RAW; UIntClr(sg.sg_flags, ECHO); #endif /* USE_ANY_SYSV_TERMIO/USE_TERMIOS */ + if (rc != 0) + failed("get tty settings"); + signal(SIGINT, onintr); signal(SIGQUIT, onintr); signal(SIGTERM, onintr); + #ifdef USE_ANY_SYSV_TERMIO - ioctl(tty, TCSETAW, &tio); + rc = ioctl(tty, TCSETAW, &tio); #elif defined(USE_TERMIOS) - tcsetattr(tty, TCSADRAIN, &tio); + rc = tcsetattr(tty, TCSADRAIN, &tio); #else /* not USE_TERMIOS */ - ioctl(tty, TIOCSETP, &sg); + rc = ioctl(tty, TIOCSETP, &sg); #endif /* USE_ANY_SYSV_TERMIO/USE_TERMIOS */ + if (rc != 0) + failed("set tty settings"); - if (argc == 2) { + if (argc == 2) { /* look for optional parameters of "-s" */ char *tmpbuf = TypeMallocN(char, strlen(setsize[emu]) + strlen(argv[0]) + @@ -401,14 +500,7 @@ } if (restore[emu]) IGNORE_RC(write(tty, restore[emu], strlen(restore[emu]))); -#if defined(USE_STRUCT_TTYSIZE) - /* finally, set the tty's window size */ - if (ioctl(tty, TIOCGSIZE, &ts) != -1) { - TTYSIZE_ROWS(ts) = rows; - TTYSIZE_COLS(ts) = cols; - SET_TTYSIZE(tty, ts); - } -#elif defined(USE_STRUCT_WINSIZE) +#if defined(USE_STRUCT_WINSIZE) /* finally, set the tty's window size */ if (getwsize[emu]) { /* get the window size in pixels */ @@ -434,15 +526,18 @@ TTYSIZE_COLS(ts) = (ttySize_t) cols; SET_TTYSIZE(tty, ts); } -#endif /* USE_STRUCT_{TTYSIZE|WINSIZE} */ +#endif /* USE_STRUCT_WINSIZE */ #ifdef USE_ANY_SYSV_TERMIO - ioctl(tty, TCSETAW, &tioorig); + rc = ioctl(tty, TCSETAW, &tioorig); #elif defined(USE_TERMIOS) - tcsetattr(tty, TCSADRAIN, &tioorig); + rc = tcsetattr(tty, TCSADRAIN, &tioorig); #else /* not USE_TERMIOS */ - ioctl(tty, TIOCSETP, &sgorig); + rc = ioctl(tty, TIOCSETP, &sgorig); #endif /* USE_ANY_SYSV_TERMIO/USE_TERMIOS */ + if (rc != 0) + failed("set tty settings"); + signal(SIGINT, SIG_DFL); signal(SIGQUIT, SIG_DFL); signal(SIGTERM, SIG_DFL); @@ -453,7 +548,7 @@ /* first do columns */ if ((ptr = x_strindex(termcap, "co#")) == NULL) { fprintf(stderr, "%s: No `co#'\n", myname); - exit(1); + exit(EXIT_FAILURE); } i = ptr - termcap + 3; @@ -465,7 +560,7 @@ /* now do lines */ if ((ptr = x_strindex(newtc, "li#")) == NULL) { fprintf(stderr, "%s: No `li#'\n", myname); - exit(1); + exit(EXIT_FAILURE); } i = ptr - newtc + 3; @@ -504,87 +599,5 @@ setname, cols, rows); #endif /* USE_TERMINFO */ } - exit(0); -} - -static int -checkdigits(char *str) -{ - while (*str) { - if (!isdigit(CharOf(*str))) - return (0); - str++; - } - return (1); -} - -static void -readstring(FILE *fp, char *buf, const char *str) -{ - int last, c; -#if !defined(USG) && !defined(__UNIXOS2__) - /* What is the advantage of setitimer() over alarm()? */ - struct itimerval it; -#endif - - signal(SIGALRM, resize_timeout); -#if defined(USG) || defined(__UNIXOS2__) - alarm(TIMEOUT); -#else - memset((char *) &it, 0, sizeof(struct itimerval)); - it.it_value.tv_sec = TIMEOUT; - setitimer(ITIMER_REAL, &it, (struct itimerval *) NULL); -#endif - if ((c = getc(fp)) == 0233) { /* meta-escape, CSI */ - c = ESCAPE("")[0]; - *buf++ = (char) c; - *buf++ = '['; - } else { - *buf++ = (char) c; - } - if (c != *str) { - fprintf(stderr, "%s: unknown character, exiting.\r\n", myname); - onintr(0); - } - last = str[strlen(str) - 1]; - while ((*buf++ = (char) getc(fp)) != last) { - ; - } -#if defined(USG) || defined(__UNIXOS2__) - alarm(0); -#else - memset((char *) &it, 0, sizeof(struct itimerval)); - setitimer(ITIMER_REAL, &it, (struct itimerval *) NULL); -#endif - *buf = 0; -} - -static void -Usage(void) -{ - fprintf(stderr, strcmp(myname, sunname) == 0 ? - "Usage: %s [rows cols]\n" : - "Usage: %s [-u] [-c] [-s [rows cols]]\n", myname); - exit(1); -} - -static SIGNAL_T -resize_timeout(int sig) -{ - fprintf(stderr, "\n%s: Time out occurred\r\n", myname); - onintr(sig); -} - -/* ARGSUSED */ -static SIGNAL_T -onintr(int sig GCC_UNUSED) -{ -#ifdef USE_ANY_SYSV_TERMIO - ioctl(tty, TCSETAW, &tioorig); -#elif defined(USE_TERMIOS) - tcsetattr(tty, TCSADRAIN, &tioorig); -#else /* not USE_TERMIOS */ - ioctl(tty, TIOCSETP, &sgorig); -#endif /* USE_ANY_SYSV_TERMIO/USE_TERMIOS */ - exit(1); + exit(EXIT_SUCCESS); } diff -Nru xterm-287/resize.man xterm-293/resize.man --- xterm-287/resize.man 2012-10-23 23:26:20.000000000 +0000 +++ xterm-293/resize.man 2013-01-06 16:13:44.000000000 +0000 @@ -1,7 +1,42 @@ -.\" $XTermId: resize.man,v 1.21 2012/10/23 23:26:20 tom Exp $ +.\" $XTermId: resize.man,v 1.30 2013/01/06 16:13:44 tom Exp $ +.\" +.\" Copyright 1998-2012,2013 by Thomas E. Dickey +.\" +.\" All Rights Reserved +.\" +.\" Permission is hereby granted, free of charge, to any person obtaining a +.\" copy of this software and associated documentation files (the +.\" "Software"), to deal in the Software without restriction, including +.\" without limitation the rights to use, copy, modify, merge, publish, +.\" distribute, sublicense, and/or sell copies of the Software, and to +.\" permit persons to whom the Software is furnished to do so, subject to +.\" the following conditions: +.\" +.\" The above copyright notice and this permission notice shall be included +.\" in all copies or substantial portions of the Software. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +.\" IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) 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. .\" .\" updated by Thomas E. Dickey for XFree86, 1998-2006. .\" +.ds N Resize +.ds n resize +.\" +.\" Bulleted paragraph +.de bP +.IP \(bu 4 +.. .\" Escape single quotes in literal strings from groff's Unicode transform. .ie \n(.g .ds AQ \(aq .el .ds AQ ' @@ -13,14 +48,57 @@ .SH NAME resize \- set environment and terminal settings to current xterm window size .SH SYNOPSIS -.B resize -[ \fB\-u\fP | \fB\-c\fP ] [ \fB\-s\fP [ \fIrow col\fP ] ] +.B \*n +[ \fB\-v\fP | \fB\-u\fP | \fB\-c\fP ] [ \fB\-s\fP [ \fIrow col\fP ] ] .SH DESCRIPTION -.I Resize +.I \*N prints a shell command for setting the appropriate environment variables to indicate the current size of \fIxterm\fP window from which the command is run. -For this output to take effect, \fIresize\fP must either be evaluated +.PP +.I \*N +determines the command through several steps: +.bP +first, it finds the name of the user's shell program. +It uses the \fBSHELL\fP variable if set, +otherwise it uses the user's data from /etc/passwd. +.bP +then it decides whether to use Bourne shell syntax or C-Shell syntax. +It uses a built-in table of known shells, +which can be overridden by the \fB\-u\fP and \fB\-c\fP options. +.bP +then \fI\*n\fP asks the operating system for the terminal settings. +This is the same information which can be manipulated using \fIstty\fP. +.bP +then \fI\*n\fP asks the terminal for its size in characters. +Depending on whether the "\fB\-s\fP option is given, +\fI\*n\fP uses a different escape sequence to ask for this information. +.bP +at this point, \fI\*n\fP attempts to update the terminal settings +to reflect the terminal window's size in pixels: +.RS +.bP +if the \fB\-s\fP option is used, +\fI\*n\fP then asks the terminal for its size in pixels. +.bP +otherwise, +\fI\*n\fP asks the operating system for the information +and updates that after ensuring that the window's dimensions are +a multiple of the character height and width. +.bP +in either case, the updated terminal settings are done +using a different system call than used for \fIstty\fP. +.RE +.bP +then \fI\*n\fP updates the terminal settings to reflect any altered +values such as its size in rows or columns. +This affects the values shown by \fIstty\fP. +.bP +finally, \fI\*n\fP writes the shell command for setting the +environment variables to the standard output. +.SH EXAMPLES +For \*n's output to take effect, +\fI\*n\fP must either be evaluated as part of the command line (usually done with a shell alias or function) or else redirected to a file which can then be read in. From the C shell (usually @@ -28,7 +106,7 @@ user's \fI.cshrc\fP: .sp .nf - % alias rs \*(AQset noglob; eval \fC\`\fPresize\fC\`\fP\*(AQ + % alias rs \*(AQset noglob; eval \fC\`\fP\*n\fC\`\fP\*(AQ .fi .sp After resizing the window, the user would type: @@ -43,41 +121,45 @@ in with the \*(``.\*('' command: .sp .nf - $ resize > /tmp/out + $ \*n > /tmp/out $ .\0/tmp/out .fi -.PP -.I Resize -determines the user's current shell by first checking if \fB$SHELL\fP -is set, and using that. -Otherwise it determines the user's shell by looking in the password file. -Generally Bourne-shell variants (including \fIksh\fP) -do not modify \fB$SHELL\fP, -so it is possible for \fIresize\fP to be confused if one runs -\fIresize\fP from a Bourne shell spawned from a C shell. .SH OPTIONS -The following options may be used with \fIresize\fP: -.TP 8 -.B \-u -This option indicates that Bourne shell commands should be generated even if -the user's current shell isn't \fI/bin/sh\fP. +The following options may be used with \fI\*n\fP: .TP 8 .B \-c This option indicates that C shell commands should be generated even if the -user's current shell isn't \fI/bin/csh\fP. +user's current shell is not \fI/bin/csh\fP. .TP 8 .B \-s \fR[\fIrows columns\fP] This option indicates that Sun console escape sequences will be used instead of the VT100-style \fIxterm\fP escape codes. If \fIrows\fP and -\fIcolumns\fP are given, \fIresize\fP will ask the \fIxterm\fP to resize -itself. -However, the window manager may choose to disallow the change. +\fIcolumns\fP are given, +\fI\*n\fP will ask the \fIxterm\fP to resize itself using those values. +.IP +Both of the escape sequences used for this option +(first to obtain the window size and +second to modify it) +are subject to \fIxterm\fP's \fBallowWindowOps\fP resource setting. +The window manager may also choose to disallow the change. +.IP +The VT100-style escape sequence used to determine the +screen size always works for VT100-compatible terminals. +VT100s have no corresponding way to modify the screensize. +.TP 8 +.B \-u +This option indicates that Bourne shell commands should be generated even if +the user's current shell is not \fI/bin/sh\fP. +.TP 8 +.B \-v +This causes \fI\*n\fP to print a version number to the standard output, +and then exit. .PP Note that the Sun console escape sequences are recognized by XFree86 \fIxterm\fP and by \fIdtterm\fP. -The \fIresize\fP program may be installed as \fIsunsize\fP, +The \fI\*n\fP program may be installed as \fIsunsize\fP, which causes makes it assume the \fB\-s\fP option. .PP The \fIrows\fP and @@ -92,19 +174,44 @@ user's alias for the command. .SH ENVIRONMENT .TP 15 +SHELL +.I \*N +determines the user's current shell by first checking if \fB$SHELL\fP +is set, and using that. +Otherwise it determines the user's shell by looking in the password file +(/etc/passwd). +Generally Bourne-shell variants (including \fIksh\fP) +do not modify \fB$SHELL\fP, +so it is possible for \fI\*n\fP to be confused if one runs +\fI\*n\fP from a Bourne shell spawned from a C shell. +.TP 15 TERM -set to "__default_termname__" if not already set. +.I \*N +sets this to "__default_termname__" if not already set. .TP 15 TERMCAP -variable set on systems using termcap +.I \*N +sets this variable on systems using termcap, +e.g., when \*n is linked with the \fItermcap\fP library +rather than a \fIterminfo\fP library. +The latter does not provide the complete text for a termcap entry. .TP 15 COLUMNS, LINES -variables set on systems using terminfo +.I \*N +sets these variables on systems using terminfo. +Many applications (including the curses library) +use those variables when set to override their screensize. .SH "SEE ALSO" -csh(1), tset(1), xterm(__mansuffix__) +use_env(3) +.br +csh(1), stty(1), tset(1) +.br +xterm(__mansuffix__) .SH AUTHORS Mark Vandevoorde (MIT-Athena), Edward Moy (Berkeley) .br +Thomas Dickey (invisible-island.net). +.br Copyright (c) 1984, 1985 by X Consortium .br See diff -Nru xterm-287/screen.c xterm-293/screen.c --- xterm-287/screen.c 2012-10-25 23:12:20.000000000 +0000 +++ xterm-293/screen.c 2013-04-23 09:50:23.000000000 +0000 @@ -1,7 +1,7 @@ -/* $XTermId: screen.c,v 1.469 2012/10/25 23:12:20 tom Exp $ */ +/* $XTermId: screen.c,v 1.477 2013/04/23 09:50:23 Bertram.Felgenhauer Exp $ */ /* - * Copyright 1999-2011,2012 by Thomas E. Dickey + * Copyright 1999-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -72,6 +72,10 @@ #include #include +#ifndef _Xconst +#define _Xconst const /* Solaris 7 workaround */ +#endif /* _Xconst */ + #define inSaveBuf(screen, buf, inx) \ ((buf) == (screen)->saveBuf_index && \ ((inx) < (screen)->savelines || (screen)->savelines == 0)) @@ -323,8 +327,9 @@ size_t length; AlignValue(ncol); - length = (nrow * sizeofScrnRow(screen, ncol)); - if ((result = (Char *) calloc(length, sizeof(Char))) == 0) + length = ((nrow + 1) * sizeofScrnRow(screen, ncol)); + if (length == 0 + || (result = (Char *) calloc(length, sizeof(Char))) == 0) SysError(ERROR_SCALLOC2); TRACE(("allocScrnData %ux%u -> %lu -> %p..%p\n", @@ -402,7 +407,7 @@ #if OPT_FIFO_LINES LineData *src; - if ((screen->saved_fifo - extra) <= 0) { + if (extra > screen->saved_fifo || extra > screen->savelines) { TRACE(("...FIXME: must clear text!\n")); continue; } @@ -442,10 +447,6 @@ return 0; } - if (screen->widestLine < ncol) - screen->widestLine = (Dimension) ncol; - ncol = screen->widestLine; - oldBufData = *sbufaddr; TRACE(("Reallocate %dx%d -> %dx%d\n", oldrow, MaxCols(screen), nrow, ncol)); @@ -545,10 +546,6 @@ assert(nrow != 0); assert(ncol != 0); - if (screen->widestLine < ncol) - screen->widestLine = (Dimension) ncol; - ncol = screen->widestLine; - oldBufData = *sbufaddr; oldBufHead = *sbuf; @@ -1865,7 +1862,9 @@ /* update buffers if the screen has changed size */ if (MaxRows(screen) != rows || MaxCols(screen) != cols) { +#if !OPT_SAVE_LINES int whichBuf = 0; +#endif int delta_rows = rows - MaxRows(screen); #if OPT_TRACE int delta_cols = cols - MaxCols(screen); @@ -2035,8 +2034,7 @@ /* free up storage in fifo from the copied lines */ while (unsave_fifo-- > 0) { - deleteScrollback(screen, -1); - screen->saved_fifo--; + deleteScrollback(screen); } #else amount = (screen->savelines - (int) move_down); @@ -2124,8 +2122,10 @@ screen->cursorp.row += move_down_by; ScrollSelection(screen, move_down_by, True); +#if !OPT_SAVE_LINES if (whichBuf) SwitchBufPtrs(screen, whichBuf); /* put the pointers back */ +#endif } } @@ -2881,7 +2881,7 @@ TRACE(("FullScreen %d:%s\n", new_ewmh_mode, BtoS(new_ewmh_mode))); - if (new_ewmh_mode < 0 || new_ewmh_mode > MAX_EWMH_MODE) { + if (new_ewmh_mode < 0 || new_ewmh_mode >= MAX_EWMH_MODE) { TRACE(("BUG: FullScreen %d\n", new_ewmh_mode)); return; } else if (new_ewmh_mode == 0) { diff -Nru xterm-287/scrollback.c xterm-293/scrollback.c --- xterm-287/scrollback.c 2011-09-11 14:59:40.000000000 +0000 +++ xterm-293/scrollback.c 2013-04-23 09:57:05.000000000 +0000 @@ -1,7 +1,7 @@ -/* $XTermId: scrollback.c,v 1.15 2011/09/11 14:59:40 tom Exp $ */ +/* $XTermId: scrollback.c,v 1.16 2013/04/23 09:57:05 Bertram.Felgenhauer Exp $ */ /* - * Copyright 2009-2010,2011 by Thomas E. Dickey + * Copyright 2009-2011,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -32,7 +32,7 @@ #include -#define REAL_ROW(screen, row) ((row) + 1 + (screen)->saved_fifo) +#define REAL_ROW(screen, row) ((row) + (screen)->saved_fifo) #define ROW2FIFO(screen, row) \ (unsigned) (REAL_ROW(screen, row) % (screen)->savelines) @@ -70,7 +70,6 @@ Char *block; if (screen->saveBuf_index != 0) { - screen->saved_fifo++; TRACE(("addScrollback %lu\n", screen->saved_fifo)); /* first, see which index we'll use */ @@ -90,6 +89,9 @@ free(prior->attribs); prior->attribs = 0; } + if (screen->saved_fifo > 2 * screen->savelines) { + screen->saved_fifo -= screen->savelines; + } } /* allocate the new data */ @@ -101,14 +103,15 @@ TRACE(("...storing new FIFO data in slot %d: %p->%p\n", which, (void *) where, block)); + screen->saved_fifo++; } return (LineData *) where; } void -deleteScrollback(TScreen * screen, int row) +deleteScrollback(TScreen * screen) { - unsigned which = ROW2FIFO(screen, row); + unsigned which = ROW2FIFO(screen, -1); ScrnBuf where = scrnHeadAddr(screen, screen->saveBuf_index, which); LineData *prior = (LineData *) where; /* @@ -121,4 +124,5 @@ free(prior->attribs); prior->attribs = 0; } + screen->saved_fifo--; } diff -Nru xterm-287/scrollbar.c xterm-293/scrollbar.c --- xterm-287/scrollbar.c 2012-09-28 21:04:50.000000000 +0000 +++ xterm-293/scrollbar.c 2013-02-26 23:36:05.000000000 +0000 @@ -1,7 +1,7 @@ -/* $XTermId: scrollbar.c,v 1.193 2012/09/28 21:04:50 tom Exp $ */ +/* $XTermId: scrollbar.c,v 1.196 2013/02/26 23:36:05 tom Exp $ */ /* - * Copyright 2000-2011,2012 by Thomas E. Dickey + * Copyright 2000-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -697,15 +697,19 @@ static void AlternateScroll(Widget w, long amount) { - XtermWidget xw = (XtermWidget) w; - TScreen *screen = TScreenOf(xw); + XtermWidget xw; + TScreen *screen; - if (screen->alternateScroll && screen->whichBuf) { + if ((xw = getXtermWidget(w)) != 0 && + (screen = TScreenOf(xw)) != 0 && + screen->alternateScroll && screen->whichBuf) { ANSI reply; amount /= FontHeight(screen); memset(&reply, 0, sizeof(reply)); - reply.a_type = ANSI_CSI; + reply.a_type = ((xw->keyboard.flags & MODE_DECCKM) + ? ANSI_SS3 + : ANSI_CSI); if (amount > 0) { reply.a_final = 'B'; } else { diff -Nru xterm-287/trace.c xterm-293/trace.c --- xterm-287/trace.c 2012-11-22 20:19:54.000000000 +0000 +++ xterm-293/trace.c 2013-04-21 00:37:00.000000000 +0000 @@ -1,7 +1,7 @@ -/* $XTermId: trace.c,v 1.142 2012/11/22 20:19:54 tom Exp $ */ +/* $XTermId: trace.c,v 1.146 2013/04/21 00:37:00 tom Exp $ */ /* - * Copyright 1997-2011,2012 by Thomas E. Dickey + * Copyright 1997-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -35,6 +35,7 @@ */ #include /* for definition of GCC_UNUSED */ +#include #if OPT_TRACE @@ -85,6 +86,7 @@ trace_out = trace_who; if (!trace_fp) { + unsigned oldmask = umask(077); char name[BUFSIZ]; #if 0 /* usually I do not want unique names */ int unique; @@ -110,6 +112,7 @@ xtermWarning("Cannot open \"%s\"\n", name); exit(EXIT_FAILURE); } + (void) umask(oldmask); } va_start(ap, fmt); @@ -749,6 +752,29 @@ return 1; } +const char * +ModifierName(unsigned modifier) +{ + const char *s = ""; + if (modifier & ShiftMask) + s = " Shift"; + else if (modifier & LockMask) + s = " Lock"; + else if (modifier & ControlMask) + s = " Control"; + else if (modifier & Mod1Mask) + s = " Mod1"; + else if (modifier & Mod2Mask) + s = " Mod2"; + else if (modifier & Mod3Mask) + s = " Mod3"; + else if (modifier & Mod4Mask) + s = " Mod4"; + else if (modifier & Mod5Mask) + s = " Mod5"; + return s; +} + void TraceTranslations(const char *name, Widget w) { diff -Nru xterm-287/trace.h xterm-293/trace.h --- xterm-287/trace.h 2012-11-22 20:22:15.000000000 +0000 +++ xterm-293/trace.h 2013-02-06 09:52:14.000000000 +0000 @@ -1,4 +1,4 @@ -/* $XTermId: trace.h,v 1.67 2012/11/22 20:22:15 tom Exp $ */ +/* $XTermId: trace.h,v 1.68 2013/02/06 09:52:14 tom Exp $ */ /* * Copyright 1997-2011,2012 by Thomas E. Dickey @@ -116,6 +116,18 @@ (reqwide), (reqhigh), \ (gotwide), (gothigh)) +extern const char * ModifierName(unsigned /* modifier */); +#define FMT_MODIFIER_NAMES "%s%s%s%s%s%s%s%s" +#define ARG_MODIFIER_NAMES(state) \ + ModifierName(state & ShiftMask), \ + ModifierName(state & LockMask), \ + ModifierName(state & ControlMask), \ + ModifierName(state & Mod1Mask), \ + ModifierName(state & Mod2Mask), \ + ModifierName(state & Mod3Mask), \ + ModifierName(state & Mod4Mask), \ + ModifierName(state & Mod5Mask) + #else #define REQ_RESIZE(w, reqwide, reqhigh, gotwide, gothigh) \ diff -Nru xterm-287/util.c xterm-293/util.c --- xterm-287/util.c 2012-10-05 00:26:28.000000000 +0000 +++ xterm-293/util.c 2013-05-09 01:00:59.000000000 +0000 @@ -1,7 +1,7 @@ -/* $XTermId: util.c,v 1.598 2012/10/05 00:26:28 tom Exp $ */ +/* $XTermId: util.c,v 1.601 2013/05/09 01:00:59 tom Exp $ */ /* - * Copyright 1999-2011,2012 by Thomas E. Dickey + * Copyright 1999-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -3541,24 +3541,17 @@ (unsigned) (last - first), on_wide); } #if OPT_WIDE_CHARS - if (ucs_workaround(xw, ch, flags, gc, - x, y, - chrset, on_wide)) { - /* - * if true, we drew at least one cell whether or not it is - * printable - */ - if (ch_width <= 0) - ch_width = 1; - } else -#endif - { - if (ch_width <= 0) - ch_width = 1; - xtermDrawBoxChar(xw, ch, flags, gc, - x, y, - ch_width); + /* + * One way or another, we will draw at least one cell. + */ + if (ch_width <= 0) + ch_width = 1; + if (!ucs_workaround(xw, ch, flags, gc, x, y, chrset, on_wide)) { + xtermDrawBoxChar(xw, ch, flags, gc, x, y, ch_width); } +#else + xtermDrawBoxChar(xw, ch, flags, gc, x, y, ch_width); +#endif x += (ch_width * FontWidth(screen)); first = last + 1; drewBoxes = True; @@ -4124,7 +4117,6 @@ { LineData *ld = getLineData(screen, row); - assert(ld && (col < (int) ld->lineSize)); return ((ld && (col < (int) ld->lineSize)) ? ld->charData[col] : (unsigned) ' '); @@ -4138,7 +4130,6 @@ { LineData *ld = getLineData(screen, row); - assert(ld && (col < (int) ld->lineSize)); if (ld && (col < (int) ld->lineSize)) { ld->charData[col] = (CharData) ch; if_OPT_WIDE_CHARS(screen, { diff -Nru xterm-287/uxterm.man xterm-293/uxterm.man --- xterm-287/uxterm.man 2012-10-23 23:25:53.000000000 +0000 +++ xterm-293/uxterm.man 2013-01-01 00:40:55.000000000 +0000 @@ -1,4 +1,4 @@ -.\" $XTermId: uxterm.man,v 1.5 2012/10/23 23:25:53 tom Exp $ +.\" $XTermId: uxterm.man,v 1.6 2013/01/01 00:40:55 tom Exp $ .\" .\" Copyright 2001, 2004 Branden Robinson .\" @@ -19,22 +19,33 @@ .\" 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. +.\" +.ds N Uxterm +.ds n uxterm +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds AQ \(aq +.el .ds AQ ' +.ie \n(.g .ds `` \(lq +.el .ds `` `` +.ie \n(.g .ds '' \(rq +.el .ds '' '' +.\" .TH UXTERM 1 "__app_date__" "__app_version__" "X Window System" .SH NAME uxterm \- X terminal emulator for Unicode (UTF-8) environments .SH SYNOPSIS -.B uxterm +.B \*n [ .I xterm-options ] .SH DESCRIPTION -.B uxterm +.B \*n is a wrapper around the .BR xterm(1) -program that invokes the latter program with the \(oqU__default_class__\(cq X resource +program that invokes the latter program with the \*(``U__default_class__\*('' X resource class set. All arguments to -.B uxterm +.B \*n are passed to .B xterm without processing; the @@ -47,29 +58,29 @@ manual page for more information on .IR xterm-options . .PP -The environment's locale settings (see \(lqENVIRONMENT\(rq below) are +The environment's locale settings (see \*(``ENVIRONMENT\*('' below) are used to discern the locale's character set. -If no current locale can be determined, the locale \(oqen_US\(cq (the +If no current locale can be determined, the locale \*(``en_US\*('' (the English language as used in the territory of the United States) is assumed. The .BR locale(1) utility is used to determine whether the system supports the selected locale. If it does not, -.B uxterm +.B \*n will exit with an error and report the output of .BR locale . .PP -.B Note: uxterm +.B Note: \*n may produce unexpected results if the current locale is set to one in which the UTF-8 character encoding is not supported, or if fonts using the ISO 10646-1 character set are not available. -In the Debian system, the \(oqxfonts\-base\(cq package provides the fonts +In the Debian system, the \*(``xfonts\-base\*('' package provides the fonts that -.B uxterm +.B \*n uses by default. To change the fonts -.B uxterm +.B \*n uses, edit the .I __apploaddir__/U__default_class__ file. diff -Nru xterm-287/version.c xterm-293/version.c --- xterm-287/version.c 1970-01-01 00:00:00.000000000 +0000 +++ xterm-293/version.c 2013-01-01 12:10:44.000000000 +0000 @@ -0,0 +1,74 @@ +/* $XTermId: version.c,v 1.1 2013/01/01 12:10:44 tom Exp $ */ + +/* + * Copyright 2013 by Thomas E. Dickey + * + * All Rights Reserved + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) 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. + */ + +#include +#include +#include + +/* + * Returns the version-string used in the "-v' message as well as a few other + * places. It is derived (when possible) from the __vendorversion__ symbol + * that some newer imake configurations define. + */ +char * +xtermVersion(void) +{ + static char vendor_version[] = __vendorversion__; + static char *result; + + if (result == 0) { + char *vendor = vendor_version; + char first[BUFSIZ]; + char second[BUFSIZ]; + + result = CastMallocN(char, strlen(vendor) + 9); + if (result == 0) + result = vendor; + else { + /* some vendors leave trash in this string */ + for (;;) { + if (!strncmp(vendor, "Version ", (size_t) 8)) + vendor += 8; + else if (isspace(CharOf(*vendor))) + ++vendor; + else + break; + } + if (strlen(vendor) < BUFSIZ && + sscanf(vendor, "%[0-9.] %[A-Za-z_0-9.]", first, second) == 2) + sprintf(result, "%s %s(%d)", second, first, XTERM_PATCH); + else + sprintf(result, "%s(%d)", vendor, XTERM_PATCH); + } + } + return result; +} diff -Nru xterm-287/version.h xterm-293/version.h --- xterm-287/version.h 2012-11-26 01:07:33.000000000 +0000 +++ xterm-293/version.h 2013-05-28 00:02:50.000000000 +0000 @@ -1,7 +1,7 @@ -/* $XTermId: version.h,v 1.352 2012/11/26 01:07:33 tom Exp $ */ +/* $XTermId: version.h,v 1.364 2013/05/28 00:02:50 tom Exp $ */ /* - * Copyright 1998-2011,2012 by Thomas E. Dickey + * Copyright 1998-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -30,15 +30,21 @@ * authorization. */ +#ifndef included_version_h +#define included_version_h /* * These definitions are used to build the string that's printed in response to * "xterm -version", or embedded in "xterm -help". It usually indicates the - * version of X to which this version of xterm has been built. The number in - * parentheses is my patch number (Thomas E. Dickey). + * version of X to which this version of xterm has been built. The resulting + * number in parentheses is my patch number (Thomas E. Dickey). */ -#define XTERM_PATCH 287 -#define XTERM_DATE 2012-11-25 +#define XTERM_PATCH 293 +#define XTERM_DATE 2013-05-27 #ifndef __vendorversion__ #define __vendorversion__ "XTerm" #endif + +extern char *xtermVersion(void); + +#endif /* included_version_h */ diff -Nru xterm-287/wcwidth.c xterm-293/wcwidth.c --- xterm-287/wcwidth.c 2009-02-13 19:53:12.000000000 +0000 +++ xterm-293/wcwidth.c 2013-02-03 18:54:31.000000000 +0000 @@ -1,4 +1,4 @@ -/* $XTermId: wcwidth.c,v 1.22 2009/02/13 19:53:12 tom Exp $ */ +/* $XTermId: wcwidth.c,v 1.24 2013/02/03 18:54:31 tom Exp $ */ /* $XFree86: xc/programs/xterm/wcwidth.c,v 1.9 2006/06/19 00:36:52 dickey Exp $ */ @@ -132,54 +132,83 @@ * uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c */ static const struct interval combining[] = { - { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 }, - { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, - { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 }, - { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 }, - { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED }, + { 0x0300, 0x036F }, { 0x0483, 0x0489 }, { 0x0591, 0x05BD }, + { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 }, { 0x05C4, 0x05C5 }, + { 0x05C7, 0x05C7 }, { 0x0600, 0x0604 }, { 0x0610, 0x061A }, + { 0x064B, 0x065F }, { 0x0670, 0x0670 }, { 0x06D6, 0x06DD }, + { 0x06DF, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED }, { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A }, - { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 }, - { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D }, - { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 }, - { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD }, - { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C }, - { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D }, - { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC }, + { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0816, 0x0819 }, + { 0x081B, 0x0823 }, { 0x0825, 0x0827 }, { 0x0829, 0x082D }, + { 0x0859, 0x085B }, { 0x08E4, 0x08FE }, { 0x0900, 0x0902 }, + { 0x093A, 0x093A }, { 0x093C, 0x093C }, { 0x0941, 0x0948 }, + { 0x094D, 0x094D }, { 0x0951, 0x0957 }, { 0x0962, 0x0963 }, + { 0x0981, 0x0981 }, { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, + { 0x09CD, 0x09CD }, { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, + { 0x0A3C, 0x0A3C }, { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, + { 0x0A4B, 0x0A4D }, { 0x0A51, 0x0A51 }, { 0x0A70, 0x0A71 }, + { 0x0A75, 0x0A75 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC }, { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD }, { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C }, - { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D }, - { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 }, - { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 }, - { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC }, - { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD }, - { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D }, + { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B44 }, { 0x0B4D, 0x0B4D }, + { 0x0B56, 0x0B56 }, { 0x0B62, 0x0B63 }, { 0x0B82, 0x0B82 }, + { 0x0BC0, 0x0BC0 }, { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, + { 0x0C46, 0x0C48 }, { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, + { 0x0C62, 0x0C63 }, { 0x0CBC, 0x0CBC }, { 0x0CBF, 0x0CBF }, + { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD }, { 0x0CE2, 0x0CE3 }, + { 0x0D41, 0x0D44 }, { 0x0D4D, 0x0D4D }, { 0x0D62, 0x0D63 }, { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 }, { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E }, { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC }, { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 }, { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E }, - { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 }, + { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F8D, 0x0F97 }, { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 }, - { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 }, - { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F }, + { 0x1032, 0x1037 }, { 0x1039, 0x103A }, { 0x103D, 0x103E }, + { 0x1058, 0x1059 }, { 0x105E, 0x1060 }, { 0x1071, 0x1074 }, + { 0x1082, 0x1082 }, { 0x1085, 0x1086 }, { 0x108D, 0x108D }, + { 0x109D, 0x109D }, { 0x1160, 0x11FF }, { 0x135D, 0x135F }, { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 }, { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD }, { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD }, { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 }, { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B }, - { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 }, - { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 }, - { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF }, - { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 }, - { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F }, - { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, - { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F }, - { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB }, + { 0x1A17, 0x1A18 }, { 0x1A56, 0x1A56 }, { 0x1A58, 0x1A5E }, + { 0x1A60, 0x1A60 }, { 0x1A62, 0x1A62 }, { 0x1A65, 0x1A6C }, + { 0x1A73, 0x1A7C }, { 0x1A7F, 0x1A7F }, { 0x1B00, 0x1B03 }, + { 0x1B34, 0x1B34 }, { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, + { 0x1B42, 0x1B42 }, { 0x1B6B, 0x1B73 }, { 0x1B80, 0x1B81 }, + { 0x1BA2, 0x1BA5 }, { 0x1BA8, 0x1BA9 }, { 0x1BAB, 0x1BAB }, + { 0x1BE6, 0x1BE6 }, { 0x1BE8, 0x1BE9 }, { 0x1BED, 0x1BED }, + { 0x1BEF, 0x1BF1 }, { 0x1C2C, 0x1C33 }, { 0x1C36, 0x1C37 }, + { 0x1CD0, 0x1CD2 }, { 0x1CD4, 0x1CE0 }, { 0x1CE2, 0x1CE8 }, + { 0x1CED, 0x1CED }, { 0x1CF4, 0x1CF4 }, { 0x1DC0, 0x1DE6 }, + { 0x1DFC, 0x1DFF }, { 0x200B, 0x200F }, { 0x202A, 0x202E }, + { 0x2060, 0x2064 }, { 0x206A, 0x206F }, { 0x20D0, 0x20F0 }, + { 0x2CEF, 0x2CF1 }, { 0x2D7F, 0x2D7F }, { 0x2DE0, 0x2DFF }, + { 0x302A, 0x302D }, { 0x3099, 0x309A }, { 0xA66F, 0xA672 }, + { 0xA674, 0xA67D }, { 0xA69F, 0xA69F }, { 0xA6F0, 0xA6F1 }, + { 0xA802, 0xA802 }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, + { 0xA825, 0xA826 }, { 0xA8C4, 0xA8C4 }, { 0xA8E0, 0xA8F1 }, + { 0xA926, 0xA92D }, { 0xA947, 0xA951 }, { 0xA980, 0xA982 }, + { 0xA9B3, 0xA9B3 }, { 0xA9B6, 0xA9B9 }, { 0xA9BC, 0xA9BC }, + { 0xAA29, 0xAA2E }, { 0xAA31, 0xAA32 }, { 0xAA35, 0xAA36 }, + { 0xAA43, 0xAA43 }, { 0xAA4C, 0xAA4C }, { 0xAAB0, 0xAAB0 }, + { 0xAAB2, 0xAAB4 }, { 0xAAB7, 0xAAB8 }, { 0xAABE, 0xAABF }, + { 0xAAC1, 0xAAC1 }, { 0xAAEC, 0xAAED }, { 0xAAF6, 0xAAF6 }, + { 0xABE5, 0xABE5 }, { 0xABE8, 0xABE8 }, { 0xABED, 0xABED }, + { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F }, { 0xFE20, 0xFE26 }, + { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB }, { 0x101FD, 0x101FD }, { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F }, - { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 }, - { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD }, - { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F }, - { 0xE0100, 0xE01EF } + { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x11001, 0x11001 }, + { 0x11038, 0x11046 }, { 0x11080, 0x11081 }, { 0x110B3, 0x110B6 }, + { 0x110B9, 0x110BA }, { 0x110BD, 0x110BD }, { 0x11100, 0x11102 }, + { 0x11127, 0x1112B }, { 0x1112D, 0x11134 }, { 0x11180, 0x11181 }, + { 0x111B6, 0x111BE }, { 0x116AB, 0x116AB }, { 0x116AD, 0x116AD }, + { 0x116B0, 0x116B5 }, { 0x116B7, 0x116B7 }, { 0x16F8F, 0x16F92 }, + { 0x1D167, 0x1D169 }, { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, + { 0x1D1AA, 0x1D1AD }, { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, + { 0xE0020, 0xE007F }, { 0xE0100, 0xE01EF } }; /* test for 8-bit control characters */ @@ -283,29 +312,34 @@ { 0x2113, 0x2113 }, { 0x2116, 0x2116 }, { 0x2121, 0x2122 }, { 0x2126, 0x2126 }, { 0x212B, 0x212B }, { 0x2153, 0x2154 }, { 0x215B, 0x215E }, { 0x2160, 0x216B }, { 0x2170, 0x2179 }, - { 0x2190, 0x2199 }, { 0x21B8, 0x21B9 }, { 0x21D2, 0x21D2 }, - { 0x21D4, 0x21D4 }, { 0x21E7, 0x21E7 }, { 0x2200, 0x2200 }, - { 0x2202, 0x2203 }, { 0x2207, 0x2208 }, { 0x220B, 0x220B }, - { 0x220F, 0x220F }, { 0x2211, 0x2211 }, { 0x2215, 0x2215 }, - { 0x221A, 0x221A }, { 0x221D, 0x2220 }, { 0x2223, 0x2223 }, - { 0x2225, 0x2225 }, { 0x2227, 0x222C }, { 0x222E, 0x222E }, - { 0x2234, 0x2237 }, { 0x223C, 0x223D }, { 0x2248, 0x2248 }, - { 0x224C, 0x224C }, { 0x2252, 0x2252 }, { 0x2260, 0x2261 }, - { 0x2264, 0x2267 }, { 0x226A, 0x226B }, { 0x226E, 0x226F }, - { 0x2282, 0x2283 }, { 0x2286, 0x2287 }, { 0x2295, 0x2295 }, - { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 }, { 0x22BF, 0x22BF }, - { 0x2312, 0x2312 }, { 0x2460, 0x24E9 }, { 0x24EB, 0x254B }, - { 0x2550, 0x2573 }, { 0x2580, 0x258F }, { 0x2592, 0x2595 }, - { 0x25A0, 0x25A1 }, { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 }, - { 0x25B6, 0x25B7 }, { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 }, - { 0x25C6, 0x25C8 }, { 0x25CB, 0x25CB }, { 0x25CE, 0x25D1 }, - { 0x25E2, 0x25E5 }, { 0x25EF, 0x25EF }, { 0x2605, 0x2606 }, - { 0x2609, 0x2609 }, { 0x260E, 0x260F }, { 0x2614, 0x2615 }, - { 0x261C, 0x261C }, { 0x261E, 0x261E }, { 0x2640, 0x2640 }, - { 0x2642, 0x2642 }, { 0x2660, 0x2661 }, { 0x2663, 0x2665 }, - { 0x2667, 0x266A }, { 0x266C, 0x266D }, { 0x266F, 0x266F }, - { 0x273D, 0x273D }, { 0x2776, 0x277F }, { 0xE000, 0xF8FF }, - { 0xFFFD, 0xFFFD }, { 0xF0000, 0xFFFFD }, { 0x100000, 0x10FFFD } + { 0x2189, 0x2189 }, { 0x2190, 0x2199 }, { 0x21B8, 0x21B9 }, + { 0x21D2, 0x21D2 }, { 0x21D4, 0x21D4 }, { 0x21E7, 0x21E7 }, + { 0x2200, 0x2200 }, { 0x2202, 0x2203 }, { 0x2207, 0x2208 }, + { 0x220B, 0x220B }, { 0x220F, 0x220F }, { 0x2211, 0x2211 }, + { 0x2215, 0x2215 }, { 0x221A, 0x221A }, { 0x221D, 0x2220 }, + { 0x2223, 0x2223 }, { 0x2225, 0x2225 }, { 0x2227, 0x222C }, + { 0x222E, 0x222E }, { 0x2234, 0x2237 }, { 0x223C, 0x223D }, + { 0x2248, 0x2248 }, { 0x224C, 0x224C }, { 0x2252, 0x2252 }, + { 0x2260, 0x2261 }, { 0x2264, 0x2267 }, { 0x226A, 0x226B }, + { 0x226E, 0x226F }, { 0x2282, 0x2283 }, { 0x2286, 0x2287 }, + { 0x2295, 0x2295 }, { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 }, + { 0x22BF, 0x22BF }, { 0x2312, 0x2312 }, { 0x2460, 0x24E9 }, + { 0x24EB, 0x254B }, { 0x2550, 0x2573 }, { 0x2580, 0x258F }, + { 0x2592, 0x2595 }, { 0x25A0, 0x25A1 }, { 0x25A3, 0x25A9 }, + { 0x25B2, 0x25B3 }, { 0x25B6, 0x25B7 }, { 0x25BC, 0x25BD }, + { 0x25C0, 0x25C1 }, { 0x25C6, 0x25C8 }, { 0x25CB, 0x25CB }, + { 0x25CE, 0x25D1 }, { 0x25E2, 0x25E5 }, { 0x25EF, 0x25EF }, + { 0x2605, 0x2606 }, { 0x2609, 0x2609 }, { 0x260E, 0x260F }, + { 0x2614, 0x2615 }, { 0x261C, 0x261C }, { 0x261E, 0x261E }, + { 0x2640, 0x2640 }, { 0x2642, 0x2642 }, { 0x2660, 0x2661 }, + { 0x2663, 0x2665 }, { 0x2667, 0x266A }, { 0x266C, 0x266D }, + { 0x266F, 0x266F }, { 0x269E, 0x269F }, { 0x26BE, 0x26BF }, + { 0x26C4, 0x26CD }, { 0x26CF, 0x26E1 }, { 0x26E3, 0x26E3 }, + { 0x26E8, 0x26FF }, { 0x273D, 0x273D }, { 0x2757, 0x2757 }, + { 0x2776, 0x277F }, { 0x2B55, 0x2B59 }, { 0x3248, 0x324F }, + { 0xE000, 0xF8FF }, { 0xFFFD, 0xFFFD }, { 0x1F100, 0x1F10A }, + { 0x1F110, 0x1F12D }, { 0x1F130, 0x1F169 }, { 0x1F170, 0x1F19A }, + { 0xF0000, 0xFFFFD }, { 0x100000, 0x10FFFD } }; /* binary search in table of non-spacing characters */ diff -Nru xterm-287/xstrings.c xterm-293/xstrings.c --- xterm-287/xstrings.c 2012-03-30 10:54:12.000000000 +0000 +++ xterm-293/xstrings.c 2013-02-03 22:11:25.000000000 +0000 @@ -1,7 +1,7 @@ -/* $XTermId: xstrings.c,v 1.50 2012/03/30 10:54:12 tom Exp $ */ +/* $XTermId: xstrings.c,v 1.57 2013/02/03 22:11:25 tom Exp $ */ /* - * Copyright 2000-2011,2012 by Thomas E. Dickey + * Copyright 2000-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -64,10 +64,6 @@ char *cp; cp = strrchr(name, '/'); -#ifdef __UNIXOS2__ - if (cp == 0) - cp = strrchr(name, '\\'); -#endif return (cp ? cp + 1 : name); } @@ -168,6 +164,7 @@ /* use the other passwd-data including shell */ alloc_pw(in_out, &pw2); } else { + free(login_name); login_name = NULL; } } @@ -188,6 +185,7 @@ login_name = login_alias(x_getenv("LOGNAME"), uid, in_out); if (IsEmpty(login_name)) { + free(login_name); login_name = login_alias(x_getenv("USER"), uid, in_out); } #ifdef HAVE_GETLOGIN @@ -199,14 +197,15 @@ */ if (IsEmpty(login_name)) { TRACE2(("...try getlogin\n")); - login_name = login_alias(getlogin(), uid, in_out); + free(login_name); + login_name = login_alias(x_strdup(getlogin()), uid, in_out); } #endif - if (IsEmpty(login_name)) - login_name = in_out->pw_name; - if (!IsEmpty(login_name)) - login_name = x_strdup(login_name); + if (IsEmpty(login_name)) { + free(login_name); + login_name = x_strdup(in_out->pw_name); + } TRACE2(("x_getloginid ->%s\n", NonNull(login_name))); return login_name; @@ -303,6 +302,14 @@ return s; } +static const char * +skip_blanks(const char *s) +{ + while (isspace(CharOf(*s))) + ++s; + return s; +} + /* * Split a command-string into an argv[]-style array. */ @@ -312,38 +319,43 @@ char **result = 0; if (command != 0) { - char *blob = x_strdup(command); + const char *first = skip_blanks(command); + char *blob = x_strdup(first); size_t count; size_t n; int state; int pass; - for (pass = 0; pass < 2; ++pass) { - for (n = count = 0, state = 0; command[n] != '\0'; ++n) { - switch (state) { - case 0: - if (!isspace(CharOf(command[n]))) { - state = 1; - if (pass) - result[count] = blob + n; - ++count; - } else { - blob[n] = '\0'; + if (blob != 0) { + for (pass = 0; pass < 2; ++pass) { + for (n = count = 0, state = 0; first[n] != '\0'; ++n) { + switch (state) { + case 0: + if (!isspace(CharOf(first[n]))) { + state = 1; + if (pass) + result[count] = blob + n; + ++count; + } else { + blob[n] = '\0'; + } + break; + case 1: + if (isspace(CharOf(first[n]))) { + blob[n] = '\0'; + state = 0; + } + break; } - break; - case 1: - if (isspace(CharOf(command[n]))) { - blob[n] = '\0'; - state = 0; + } + if (!pass) { + result = TypeCallocN(char *, count + 1); + if (!result) { + free(blob); + break; } - break; } } - if (!pass) { - result = TypeCallocN(char *, count + 1); - if (!result) - break; - } } } else { result = TypeCalloc(char *); @@ -351,6 +363,19 @@ return result; } +/* + * Free storage allocated by x_splitargs(). + */ +void +x_freeargs(char **argv) +{ + if (argv != 0) { + if (*argv != 0) + free(*argv); + free(argv); + } +} + int x_strcasecmp(const char *s1, const char *s2) { @@ -426,17 +451,19 @@ if (source != 0 && *source != '\0') { char *t = x_strdup(source); - s = t; - d = s; - while (isspace(CharOf(*s))) - ++s; - while ((*d++ = *s++) != '\0') { - ; - } - if (*t != '\0') { - s = t + strlen(t); - while (s != t && isspace(CharOf(s[-1]))) { - *--s = '\0'; + if (t != 0) { + s = t; + d = s; + while (isspace(CharOf(*s))) + ++s; + while ((*d++ = *s++) != '\0') { + ; + } + if (*t != '\0') { + s = t + strlen(t); + while (s != t && isspace(CharOf(s[-1]))) { + *--s = '\0'; + } } } result = t; diff -Nru xterm-287/xstrings.h xterm-293/xstrings.h --- xterm-287/xstrings.h 2012-03-25 23:31:52.000000000 +0000 +++ xterm-293/xstrings.h 2012-11-26 21:55:10.000000000 +0000 @@ -1,4 +1,4 @@ -/* $XTermId: xstrings.h,v 1.27 2012/03/25 23:31:52 tom Exp $ */ +/* $XTermId: xstrings.h,v 1.28 2012/11/26 21:55:10 tom Exp $ */ /* * Copyright 2000-2011,2012 by Thomas E. Dickey @@ -59,6 +59,7 @@ extern int x_strncasecmp(const char * /* s1 */, const char * /* s2 */, unsigned /* n */); extern unsigned x_countargv(char ** /* argv */); extern void x_appendargv(char ** /* target */, char ** /* source */); +extern void x_freeargs(char ** /* argv */); /* *INDENT-ON* */ diff -Nru xterm-287/xterm.h xterm-293/xterm.h --- xterm-287/xterm.h 2012-10-25 23:18:58.000000000 +0000 +++ xterm-293/xterm.h 2013-04-24 08:55:50.000000000 +0000 @@ -1,7 +1,7 @@ -/* $XTermId: xterm.h,v 1.710 2012/10/25 23:18:58 tom Exp $ */ +/* $XTermId: xterm.h,v 1.718 2013/04/24 08:55:50 tom Exp $ */ /* - * Copyright 1999-2011,2012 by Thomas E. Dickey + * Copyright 1999-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -123,7 +123,7 @@ #define HAVE_TCGETATTR 1 #endif -#if defined(__UNIXOS2__) || defined(__SCO__) || defined(__UNIXWARE__) +#if defined(__SCO__) || defined(__UNIXWARE__) #define USE_TERMCAP 1 #endif @@ -284,7 +284,21 @@ /***====================================================================***/ -#include +#define PROTO_XT_ACTIONS_ARGS \ + (Widget w, XEvent *event, String *params, Cardinal *num_params) + +#define PROTO_XT_CALLBACK_ARGS \ + (Widget gw, XtPointer closure, XtPointer data) + +#define PROTO_XT_CVT_SELECT_ARGS \ + (Widget w, Atom *selection, Atom *target, Atom *type, XtPointer *value, unsigned long *length, int *format) + +#define PROTO_XT_EV_HANDLER_ARGS \ + (Widget w, XtPointer closure, XEvent *event, Boolean *cont) + +#define PROTO_XT_SEL_CB_ARGS \ + (Widget w, XtPointer client_data, Atom *selection, Atom *type, XtPointer value, unsigned long *length, int *format) + #include #if (XtSpecificationRelease >= 6) && !defined(NO_XPOLL_H) && !defined(sun) @@ -325,10 +339,6 @@ #include -#if defined(__UNIXOS2__) && !defined(XTERM_MAIN) -#define environ gblenvp /* circumvent a bug */ -#endif - #if !defined(VMS) && !(defined(linux) && defined(__USE_GNU)) && !defined(__hpux) && !defined(_ALL_SOURCE) && !defined(__osf__) extern char **environ; #endif @@ -343,6 +353,7 @@ #define XtNallowC1Printable "allowC1Printable" #define XtNallowColorOps "allowColorOps" #define XtNallowFontOps "allowFontOps" +#define XtNallowPasteControls "allowPasteControls" #define XtNallowScrollLock "allowScrollLock" #define XtNallowSendEvents "allowSendEvents" #define XtNallowTcapOps "allowTcapOps" @@ -528,6 +539,7 @@ #define XtCAllowC1Printable "AllowC1Printable" #define XtCAllowColorOps "AllowColorOps" #define XtCAllowFontOps "AllowFontOps" +#define XtCAllowPasteControls "AllowPasteControls" #define XtCAllowScrollLock "AllowScrollLock" #define XtCAllowSendEvents "AllowSendEvents" #define XtCAllowTcapOps "AllowTcapOps" @@ -934,11 +946,7 @@ extern void restoreCellData(TScreen * /* screen */, CellData * /* data */, Cardinal /* cell */, LineData * /* ld */, int /* column */); /* main.c */ -#ifndef __UNIXOS2__ #define ENVP_ARG /**/ -#else -#define ENVP_ARG , char ** /* envp */ -#endif extern int main (int /* argc */, char ** /* argv */ ENVP_ARG); extern int GetBytesAvailable (int /* fd */); @@ -951,9 +959,7 @@ #define first_map_occurred() /* nothing */ #endif -#ifdef SIGNAL_T -extern SIGNAL_T Exit (int /* n */) GCC_NORETURN; -#endif +extern void Exit (int /* n */) GCC_NORETURN; #ifndef SIG_ATOMIC_T #define SIG_ATOMIC_T int @@ -987,7 +993,6 @@ extern char *udk_lookup (int /* keycode */, int * /* len */); extern char *xtermEnvEncoding (void); extern char *xtermFindShell (char * /* leaf */, Bool /* warning */); -extern char *xtermVersion (void); extern const char *SysErrorMsg (int /* n */); extern const char *SysReasonMsg (int /* n */); extern int ResetAnsiColorRequest (XtermWidget, char *, int); @@ -1004,7 +1009,7 @@ extern void ChangeIconName (XtermWidget /* xw */, char * /* name */); extern void ChangeTitle (XtermWidget /* xw */, char * /* name */); extern void ChangeXprop (char * /* name */); -extern void Cleanup (int /* code */); +extern void Cleanup (int /* code */) GCC_NORETURN; extern void HandleBellPropertyChange PROTO_XT_EV_HANDLER_ARGS; extern void HandleEightBitKeyPressed PROTO_XT_ACTIONS_ARGS; extern void HandleEnterWindow PROTO_XT_EV_HANDLER_ARGS; @@ -1014,6 +1019,7 @@ extern void HandleLeaveWindow PROTO_XT_EV_HANDLER_ARGS; extern void HandleSpawnTerminal PROTO_XT_ACTIONS_ARGS; extern void HandleStringEvent PROTO_XT_ACTIONS_ARGS; +extern void NormalExit (void); extern void Panic (const char * /* s */, int /* a */); extern void Redraw (void); extern void ReverseOldColors (void); @@ -1257,7 +1263,7 @@ /* scrollback.c */ extern LineData *getScrollback (TScreen * /* screen */, int /* row */); extern LineData *addScrollback (TScreen * /* screen */); -extern void deleteScrollback (TScreen * /* screen */, int /* row */); +extern void deleteScrollback (TScreen * /* screen */); /* scrollbar.c */ extern void DoResizeScreen (XtermWidget /* xw */); diff -Nru xterm-287/xterm.log.html xterm-293/xterm.log.html --- xterm-287/xterm.log.html 2012-11-26 00:52:40.000000000 +0000 +++ xterm-293/xterm.log.html 2013-05-28 00:01:55.000000000 +0000 @@ -1,9 +1,8 @@ - + @@ -43,33 +43,44 @@ -
- http://invisible-island.net/xterm/
- Copyright © 1997-2011,2012 by Thomas E. Dickey +

Copyright © 1997-2012,2013 by Thomas E. Dickey

Contents

-

This file contains a list of the changes that I have made for - xterm, from the notes that I add when submitting a patch.

- -

You should note that other changes have been made as well, by - other people, to fix bugs and correct ifdef's for portability. - Until mid-2006, most of these were summarized in the XFree86 - CHANGELOG (found in the unbundled tree, - xc/programs/Xserver/hw/xfree86). Here is the latest version of this file.

+

It began as a list of the changes that I made for xterm, using + the notes that I added when submitting a patch. You should note + that other changes were made as well, by other people, to fix + bugs and correct ifdef's for portability. Until mid-2006, most of + these were summarized in the XFree86 + CHANGELOG).

+ +

Patch #293 - + 2013/05/27

+ +
    +
  • modify sample xterm.spec to use newer icon
    • + +
  • add configure option --with-icon-symlink to + work around systems which map icon requests for to a single + "xterm" icon, but neglect to install the icon needed for window + decorations (report by H Merijn Brand).
    • + +
  • improve parameterizing of sample xterm.spec
    • + +
  • amend fix for printer from patch + #280, removing a reset of the signal handler for + SIGCHLD (report by Joe Julian).
    • + +
  • set environment variable XTERM_FILTER if a + locale-filter is used.
    • + +
  • enable DEBUG logic when + --enable-trace configure option is given.
    • + +
  • improve description of initialFont, + set-vt-font and set-tex-text in + manpage (Debian #707899).
    • + +
  • fix regression from patch #292; + selecting a word that ended at the right margin without + wrapping would not select the last cell (report by Christian + Weisgerber).
    • +
+ +

Patch #292 - + 2013/04/25

+ +
    +
  • add limit-check when double-click selects a word; if the + saved-lines were scrolled back and the word selected wrapped at + the screen's lower right corner, an assertion was triggered + (patch by Taketo Kabe).
    • + +
  • correct limit-check in unsaveEditBufLines, + fixing a case where enlarging the terminal size could show a + blank line where there actually is available text (patch by + Bertram Felgenhauer).
    • + +
  • add PasteControls feature to + allowWindowOps which by default disallows pasting + control characters other than formatting such as carriage + return (discussion with Hayaki Saito).
    • + +
  • fix typo in ctlseqs.ms for DECRQM response (patch by + Emanuele Giaquinta).
    • + +
  • update default shown in configure --help + message for --with-terminal-id option (patch by + Andres Perera).
    • + +
  • rename script/preprocessor variables used for substituting + the backarrowKey default value for consistency + (patch by Andres Perera).
    • + +
  • set umask to 077 before creating debugging-trace + files.
    • + +
  • add configure option --disable-openpty to + control whether openpty() may be used in preference to + posix_openpt().
    • + +
  • improve workaround from patch #279 + for BSD systems which do not complete initialization until both + sides of the pseudoterminal are opened, by preferring openpty() + function over posix_openpt() when available (report by + Christian Weisgerber).
    • +
+ +

Patch #291 - + 2013/02/26

+ +
    +
  • add validity check for xterm widget parameter to + AlternateScroll function, needed to handle wheel + mouse events in the scrollbar area since patch #282 changes which introduced + alternateScroll feature (Redhat #874327).
    • +
+ +

Patch #290 - + 2013/02/12

+ +
    +
  • revert of patch #282 change was + incomplete (report by Jim Reisert).
    • + +
  • fix typo in manpage (report by Vincent Lefevre).
    • +
+ +

Patch #289 - + 2013/02/08

+ +
    +
  • revert the patch #282 change which + restored "lost" text after shrinking/growing the screen size. + If the screen was updated between the two resizing operations, + unexpected text might be shown at the end (report/testcase by + Joe Peterson).
    • + +
  • reverse the arrow-keys sent for + alternateScroll to match the usage in browsers + (suggested by Dieter Roelants).
    • + +
  • modify mouse reports to consistently indicate motion events + whether or not a button is pressed. Old behavior (since + patch #127 modified encoding for wheel + mouse) showed only that the button was released if no button + had been pressed (report by Andy Koppe).
    • + +
  • correct and improve behavior for SGR 1006 mouse protocol on + button release in any-event mode. Initial implementation in + patch #277 left internal state showing + the last button pressed when reporting motion events. It now + keeps track of all buttons which have been pressed and + released, showing the lowest remaining button by number in the + response (reports by Hayaki Saito, Andy Koppe).
    • + +
  • fix inconsistency between TermColors and + OscTextColors enums which interchanged values for + tektronix cursor color and highlight foreground in control + sequences in patch #225 (report/patch + by Peder Stray).
    • + +
  • fix inconsistent use of noreturn-attribute in + Exit function which interfered with analysis by + clang.
    • + +
  • remove incorrect free used in computation of + XTERM_SHELL variable, from Coverity fixes in + patch #288 (FreeBSD #175782).
    • + +
  • add --with-valgrind option to configure script + for consistency with my other programs.
    • + +
  • update table of ambiguous width characters in wcwidth.c + based on Unicode 6.2.0
    • + +
  • update table of combining characters in wcwidth.c based on + Unicode 6.2.0
    • + +
  • update precompose.c based on Unicode 6.2.0
    • +
+ +

Patch #288 - + 2013/01/09

+ +
    +
  • fix a special case in ShowCursor where the + foreground and background colors of the current position are + the same. In that case, choose the further of the window's + foreground and background colors for the cursor color.
    • + +
  • modify alternateScroll feature added in + patch #282 to use either + CSI or SS3 according to the cursor + keys application mode setting, to simplify using it in vi, etc. + (suggested by Dietar Roelants).
    • + +
  • revise manpage for resize to clarify the + changes which resize may make to the terminal + settings as well as to the terminal itself.
    • + +
  • remove code such as struct ttysize, used for + SunOS 3 and 4.
    • + +
  • modify configure script and makefile to check for + groff and suppress groff-specific rules if groff + is not found.
    • + +
  • modify ctlseqs.ms and makefile to work around bugs in + grohtml which cause ".png" files to be truncated + when producing html documentation.
    • + +
  • modify suffix rules for "make docs" to make the names of + the generated ".png" files predictable, helping to work around + longstanding problems with this feature of groff—none of + its releases work for all of xterm's tables..
    • + +
  • correct typo in ctlseqs.ms for DECIC and DECDC; the + character preceding the final "~" is an ASCII + single-quote "'" rather than a space (report by + Paul LeoNerd Evans).
    • + +
  • update CF_GCC_VERSION macro, handling both Debian and + Darwin.
    • + +
  • improve configure script checks for the + --with-desktop-category option. After patch #280 changes, if no value was given for + this option, and no existing desktop files found for + comparison, the incorrect "auto" value was passed into the + generated desktop file (report by Julien Cristau).
    • + +
  • modify sample build-scripts to disable check for + imake due to code-rot in Xorg.
    • + +
  • add -v command-line option to + resize, reporting the same version string as + xterm and the two shell-wrappers.
    • + +
  • make name-transformation apply to other occurrences of + resize, other manpages.
    • + +
  • special-case the name-transformation in xterm's manpage in + the NAME section so that the result works with + makewhatis (report by Julien Cristau).
    • + +
  • modify install-rules for manpages to put each program's + respective transformed name into the header rather than + xterm's.
    • + +
  • remove deprecated files: proto.h, os2main.c
    • + +
  • minor fixes based on Coverity scan, including: + +
      +
    • correct caching of Atom value for the font menu's + "Selection" entry.
      • + +
    • ensure that utmp/utmpx calls do not depend upon + trailing nulls in the ut_id and + ut_line values.
      • +
    +
    • +
+

Patch #287 - 2012/11/25

@@ -1205,7 +1451,8 @@
  • add configure option --with-icon-theme to tell xterm whether to install into an icon theme, defaulting to - "hicolor" (Redhat #755206, #799614 and #804279).
    • + "hicolor" (Redhat #755206, Redhat #799614 and Redhat + #804279).
  • change --with-icondir to look for "icons" directory rather than "pixmaps" by default. Add new option @@ -2774,7 +3021,8 @@ used the wrong amount for copying to FIFO-lines, and then used this amount to adjust the current row on the screen. That was both a visible defect (Debian #541109) as well as a potential - addressing error (Debian #541132, #541160, and #541236).
    • + addressing error (Debian #541132, Debian #541160, and Debian + #541236).
  • add clarification in xterm manual about the various allowXXXOps resources, which are disabled @@ -4332,7 +4580,7 @@
  • add utf8Title resource and menu entry, allowing the user to control whether title strings are interpreted as ISO-8859-1 or UTF-8 encoding (Novell #52655, - #113206).
    • + Novell #113206).
  • change order of ifdef's for utempter versus platforms in Imakefile to ensure a proper value for @@ -4751,8 +4999,7 @@ icon.
  • fixes to make -geom option work properly with - the toolbar configuration (Gentoo Bugzilla #90717, - #91967).
    • + the toolbar configuration (Gentoo #90717, Gentoo #91967).
  • minor improvements to scrollbar layout: ensure that the scrollbar border is zero if the vt100 border is zero.
    • @@ -5199,10 +5446,10 @@ with Interix (Windows Services for UNIX) 3.5 using the xlibs libraries from freedesktop.org (patch by Min Sik Kim). -
  • amend solution for Debian #252873, #260471 from patch #194 by making the cursor not explicitly - colored if only the foreground color is set, and the cursor is - on a blank space (Debian #275473).
    • +
  • amend solution for Debian #252873, Debian #260471 from + patch #194 by making the cursor not + explicitly colored if only the foreground color is set, and the + cursor is on a blank space (Debian #275473).
  • correct logic for send/receive mode (SRM) with regard to control characters.
    • @@ -5253,7 +5500,7 @@
  • change clearing operations so foreground color attribute is not set. Usually this is benign, but in some cases when the cursor color is not set explicitly, the cursor would show this - color (Debian #252873, #260471).
    • + color (Debian #252873, Debian #260471).
  • add extra state (cursor-moved) to guard against deciding that the cursor did not require repainting after an indexing @@ -6304,7 +6551,7 @@ (void*)0 isn't true for all platforms (Egbert Eich).
  • initialise ProgramName in xterm's main before - referencing it (#5473, Peter Valchev).
    • + referencing it (XFree86 #5473, Peter Valchev).
  • some cleanup of Imakefile ifdef's (Marc La France).
    • @@ -6524,7 +6771,7 @@ version (Egbert Eich). -

    Patch #166 - 2002/03/25 - +

    Patch #166 - 2002/3/25 - XFree86 4.2.0

      @@ -6598,7 +6845,7 @@
    -

    Patch #165 - 2002/01/05 - +

    Patch #165 - 2002/1/5 - XFree86 4.1.0

      @@ -7269,7 +7516,9 @@ resize.c
    • correct manpage typo introduced by X11R6.5 resync.
      • -
    Changes from XFree86 4.0.2: + + +

    Changes from XFree86 4.0.2:

    • add definition of _POSIX_C_SOURCE for Solaris @@ -8453,12 +8702,12 @@ Wall).
    • work around problem observed in XFree86 3.3.5 (patch by - Alexander V Lukyanov, Mozilla #5419). From the problem report: + Alexander V Lukyanov, Redhat #5419). From the problem report:
      - xterm consumes cpu when selecting text with mouse (holding - down left mouse button) and when a program working under - the xterm outputs something to stdout. +

      xterm consumes cpu when selecting text with mouse + (holding down left mouse button) and when a program working + under the xterm outputs something to stdout.

      Easy way to reproduce:
      while :; do echo aaa; sleep 1; done
      @@ -8499,15 +8748,15 @@

    • add support for DEC Locator control sequences for xterm (integrated patch by Steve Wall): 
      -
                 DECEFR, "Enable Filter Rectangle"
                 DECELR, "Enable Locator Reports"
                 DECSLE, "Select Locator Events"
                 DECRQLP, "Request Locator Position"
-          
-
      This allows the xterm mouse to be used with applications that -use the DEC Locator sequences, such as VAX Tpu, or SMG$ based -applications. + + +

      This allows the xterm mouse to be used with applications + that use the DEC Locator sequences, such as VAX Tpu, or SMG$ + based applications.

    • improve print action (patch by Matthias Baake). From his @@ -8846,9 +9095,9 @@
    • Two changes from Stephen P Wall. From his description:
      - The first change is simple - I added ESC[3J to erase the +

      The first change is simple - I added ESC[3J to erase the stored lines above the screen. That's what the changes to - util.c and ctlseqs.ms are. + util.c and ctlseqs.ms are.

      The second change is to get the blinking cursor working. I took out the cursorBlinkTime resource, and put in @@ -8862,17 +9111,20 @@ From his description:

      - With this patch, selection conversion works properly: +

      With this patch, selection conversion works + properly:

               ISO 8859-1 xterm -> ISO 8859-1 xterm (transferred as STRING);
         ISO 8859-1 xterm -> UTF-8 xterm (transferred as STRING);
         UTF-8 xterm -> ISO 8859-1 xterm (transferred as STRING);
         UTF-8 xterm -> UTF-8 xterm (transferred as UTF-8).
-
      It will not work properly if one xterm is in, say, ISO -8859-2. Actually, for this case xterm breaks the ICCCM routinely -(sending ISO 8859-2 data as STRING), so I wouldn't worry too much -about it. I have not changed the behaviour in eight-bit mode in any -way. + + +

      It will not work properly if one xterm is in, say, ISO + 8859-2. Actually, for this case xterm breaks the ICCCM + routinely (sending ISO 8859-2 data as STRING), so I + wouldn't worry too much about it. I have not changed the + behaviour in eight-bit mode in any way.

    @@ -9583,13 +9835,17 @@ suppressed printing the script for $LINES and $COLUMNS. Solaris' resize utility does this; suppressing the behavior is unnecessary. - I tested the double-sized characters using vttest and the - xfsft patch. These fonts worked reasonably well: + + +

    I tested the double-sized characters using vttest and the + xfsft patch. These fonts worked reasonably well:

             -bitstream-courier-medium-r-normal--0-0-0-0-m-0-iso8859-1
         9x15
-
    The iso8859 font does not include box characters, of course, -but looks good. + + +

    The iso8859 font does not include box characters, of course, + but looks good.

    Patch #88 - 1998/10/31 - XFree86 3.9Nk and 3.3.2h

    @@ -9649,7 +9905,7 @@

    Patch #84 - 1998/10/9 - - XFree86 3.9Ni and 3.3.2e

    + XFree86 3.9Ni and 3.3.2e

    Several small fixes and enhancements, including a patch from Bjorn Helgaas:

    @@ -9667,7 +9923,9 @@
  • make word and line selections work even when lines are wrapped by xterm. Previously, selections were limited to one screen line.
    • - as well as + + +

    as well as

    • modify logic for line-wrapping to reset the associated flag @@ -9729,7 +9987,9 @@
    • limit the row and column values used to report mouse position.
      • -
    From resync with XFree86 3.9Nb: + + +

    From resync with XFree86 3.9Nb:

    • add support for the VSTATUS control character (patch by @@ -9770,7 +10030,9 @@
    • minor fixes for compiler warnings, including a syntax error in the AMOEBA ifdef's.
      • -
    From resync with XFree86 3.9Aj: + + +

    From resync with XFree86 3.9Aj:

    The problem on HP-UX was that we were linking with -lcurses + + +

    The problem on HP-UX was that we were linking with -lcurses rather than -ltermcap due to the second bullet above, and apparently something in HP-UX curses is broken. This seems very strange, because the only thing used is tgetent, which should affect any tty/pty configuration, but I lost interest in tracking - down the exact problem. + down the exact problem.

    Patch #62 - 1998/1/23 - XFree86 3.9Ac

    @@ -10526,29 +10792,32 @@ <arfst@luxor.IN-Berlin.DE>, who reported:

    - Setting the following resources xterm (all current versions) +

    Setting the following resources xterm (all current versions) receives a segmentation fault on <Btn2Up> after - scrolling: + scrolling:

    -
           *XTerm*VT100*translations:    #override \
               ~Shift~Ctrl<Btn2Up>: insert-selection(PRIMARY, CUT_BUFFER0)\n\
               Shift~Ctrl<Btn2Up>:  insert-selection(CLIPBOARD, CUT_BUFFER1)\n\
               ~Shift<BtnUp>:       select-end(PRIMARY, CUT_BUFFER0)\n\
               Shift<BtnUp>:        select-end(CLIPBOARD, CUT_BUFFER1)
-
    (The above resources intention is to be able to paste the -latest selection even if the xterm was cleared.) + + +

    (The above resources intention is to be able to paste the + latest selection even if the xterm was cleared.)

    And here is how it works (and a fix!): The widget given to the action handler as first argument is not guaranteed to be a XtermWidget (it can be the ScrollbarWidget). Instead of accessing the widget's member directly XtDisplay gives the required pointer in a safe way.

    -
    I noticed that this was not the only instance (by - reading the code, and testing with his example), and extended the - solution to check the widget-class to ensure that it is indeed - xterm's widget class before attempting to use it in the context - of translations. + + +

    I noticed that this was not the only instance (by reading the + code, and testing with his example), and extended the solution to + check the widget-class to ensure that it is indeed xterm's widget + class before attempting to use it in the context of + translations.

    Patch #55 - 1997/11/25 - XFree86 3.9x

    @@ -10619,8 +10888,10 @@ <Michael.Schroeder@informatik.uni-erlangen.de>,
  • Pablo Ariel Kohan <pablo@memco.co.il>
    • - Some of the changes are interrelated (it was an unusually - busy week). + + +

    Some of the changes are interrelated (it was an unusually busy + week).

    • change the default resource value for colorMode to true, @@ -10698,9 +10969,11 @@
    • correct several instances of unsigned/signed mixed expressions.
      • -
    I've tested the configure script on Linux, SunOS 4.1.3, + + +

    I've tested the configure script on Linux, SunOS 4.1.3, Solaris 2.5.1, IRIX 5.2 and 6.2, AIX 3.2.5 and CLIX 3.1 (all but - the last run properly as well). + the last run properly as well).

    Patch #50 - 1997/8/22 - XFree86 3.9m

    @@ -10929,7 +11202,9 @@
  • minor fixes/clarification of tgetent in terminfo vs termcap to 'resize'
    • - (both changes also modify the configure script) + + +

    (both changes also modify the configure script)

    Patch #38 - 1997/5/22 - XFree86 3.2Xh

    @@ -10945,10 +11220,12 @@
  • enables/disables the configuration ifdef's for ANSI color and VT52 emulation.
    • - It does not make tests for the things that imake does - (that's another project), instead it uses a hybrid of the - autoconf tests for libraries and adds imake's compiler options - (which are necessary in some cases to get main.c to compile). + + +

    It does not make tests for the things that imake does (that's + another project), instead it uses a hybrid of the autoconf tests + for libraries and adds imake's compiler options (which are + necessary in some cases to get main.c to compile).

    Patch #37 - 1997/5/7 - XFree86 3.9a

    @@ -11005,9 +11282,11 @@
  • some minor tidying up (e.g., signed/unsigned use bitcpy, MODE_DECCKM, resetColor, resetCharsets). More is done in patch #35.
    • - I got the description of DECSTR from a vt420 user's manual. + + +

    I got the description of DECSTR from a vt420 user's manual. I'll do some testing with vttest to ensure that there's nothing - else to do than what was documented. + else to do than what was documented.

    Patch #33 - 1996/11/24 - XFree86 3.2

    @@ -11061,7 +11340,9 @@
  • change valid-response code in DECRQSS from 0 to 1 (the manual says 0, but the VT420 terminal I've been testing on says 1).
    • - All of these changes are based on vttest 2.6 + + +

    All of these changes are based on vttest 2.6

    (Most of the volume in the patch is to add 2 more state tables for parsing the 2nd/3rd device-attribute controls).

    @@ -11079,12 +11360,16 @@
  • a typo in the termcap (missing '['), from 3.1.2Dj (my error)
    • - Roland also complained that he couldn't use box characters - with + + +

    Roland also complained that he couldn't use box characters + with

             -adobe-courier-bold-r-normal--12-120-75-75-m-70-iso8859-1
-
    but that's a known xterm limitation (the box characters must -be part of the font, in the first 32 locations). + + +

    but that's a known xterm limitation (the box characters must + be part of the font, in the first 32 locations).

    Patch #27 - 1996/8/21 - XFree86 3.1.2Ek

    @@ -11830,9 +12115,11 @@ options

             -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wnested-externs
-
    (I also compiled with -Wshadow, but while that found some -things that I wanted to find, there's far too many warnings from -the X headers to be usable in this context). + + +

    (I also compiled with -Wshadow, but while that found some + things that I wanted to find, there's far too many warnings from + the X headers to be usable in this context).

    The changes:

    @@ -12030,8 +12317,10 @@ 
             proto.h
         xterm.h
-
    I expect this to be the biggest patch by far. However -(barring a misplaced prototype), it shouldn't break anything, since -the intent of the patch is to provide missing declarations. + + +

    I expect this to be the biggest patch by far. However (barring + a misplaced prototype), it shouldn't break anything, since the + intent of the patch is to provide missing declarations.

    diff -Nru xterm-287/xterm.man xterm-293/xterm.man --- xterm-287/xterm.man 2012-11-22 18:42:30.000000000 +0000 +++ xterm-293/xterm.man 2013-05-16 09:57:06.000000000 +0000 @@ -1,7 +1,7 @@ '\" t -.\" $XTermId: xterm.man,v 1.554 2012/11/22 18:42:30 tom Exp $ +.\" $XTermId: xterm.man,v 1.564 2013/05/16 09:57:06 tom Exp $ .\" -.\" Copyright 1996-2011,2012 by Thomas E. Dickey +.\" Copyright 1996-2012,2013 by Thomas E. Dickey .\" .\" All Rights Reserved .\" @@ -85,7 +85,7 @@ .el .ds '' '' .TH XTERM 1 "__app_date__" "__app_version__" "X Window System" .SH NAME -\*n \- terminal emulator for X +xterm \- terminal emulator for X .SH SYNOPSIS .B \*n [\-\fItoolkitoption\fP ...] [\-\fIoption\fP ...] [\fIshell\fP] @@ -1247,7 +1247,7 @@ together by setting the DECBKM state according to whether the initial value of \fIstty\fP erase is a backspace (8) or delete (127) character. A \*(``false\*('' value disables this feature. -The default is \*(``__backarrow_key_erase__\*(''. +The default is \*(``__backarrow_is_erase__\*(''. .TP 8 .B "fullscreen (\fPclass\fB Fullscreen)" Specifies whether or not \fI\*n\fP should ask the window manager to @@ -1708,6 +1708,15 @@ .B "allowFontOps (\fPclass\fB AllowFontOps)" Specifies whether control sequences that set/query the font should be allowed. The default is \*(``true\*(''. +.TP 5 +.B "allowPasteControls (\fPclass\fB AllowPasteControls)" +If true, allow control characters such as BEL and CAN to be pasted. +Formatting characters (tab, newline) are always allowed. +Other C0 control characters are suppressed unless this resource is enabled. +The exact set of control characters (C0 and C1) +depends upon whether UTF-8 encoding is used, +as well as the \fBallowC1Printable\fP resource. +The default is \*(``false\*(''. .TP 8 .B "allowScrollLock (\fPclass\fB AllowScrollLock)" Specifies whether control sequences that set/query @@ -1903,7 +1912,7 @@ or delete (127) character. This corresponds to the DECBKM control sequence. A \*(``true\*('' value specifies backspace. -The default is \*(``__backarrow_key_is_del__\*(''. +The default is \*(``__backarrow_is_bs__\*(''. Pressing the control key toggles this behavior. .TP 8 .B "background (\fPclass\fB Background)" @@ -2728,22 +2737,28 @@ For instance, \fIcat\fP'ing a large file to the screen does this. .TP 8 .B "font1 (\fPclass\fB Font1)" -Specifies the name of the first alternative font. +Specifies the name of the first alternative font, +corresponding to \*(``Unreadable\*('' in the standard menu. .TP 8 .B "font2 (\fPclass\fB Font2)" -Specifies the name of the second alternative font. +Specifies the name of the second alternative font, +corresponding to \*(``Tiny\*('' in the standard menu. .TP 8 .B "font3 (\fPclass\fB Font3)" -Specifies the name of the third alternative font. +Specifies the name of the third alternative font, +corresponding to \*(``Small\*('' in the standard menu. .TP 8 .B "font4 (\fPclass\fB Font4)" -Specifies the name of the fourth alternative font. +Specifies the name of the fourth alternative font, +corresponding to \*(``Medium\*('' in the standard menu. .TP 8 .B "font5 (\fPclass\fB Font5)" -Specifies the name of the fifth alternative font. +Specifies the name of the fifth alternative font, +corresponding to \*(``Large\*('' in the standard menu. .TP 8 .B "font6 (\fPclass\fB Font6)" -Specifies the name of the sixth alternative font. +Specifies the name of the sixth alternative font, +corresponding to \*(``Huge\*('' in the standard menu. .TP 8 .B "fontDoublesize (\fPclass\fB FontDoublesize)" Specifies whether \fI\*n\fP should attempt to use font scaling to draw @@ -3073,6 +3088,11 @@ Alternatively, you may put those parameter within a shell script to execute the converter, and set this resource to point to the shell script. +.IP +When using a locale-filter, e.g., with the \fI\-e\fP option, or the shell, +\fI\*n\fP first tries passing control via that filter. +If it fails, \fI\*n\fP will retry without the locale-filter. +\fI\*N\fP warns about the failure before retrying. .TP 8 .B "loginShell (\fPclass\fB LoginShell)" Specifies whether or not the shell to be run in the window should be started @@ -3785,7 +3805,7 @@ Query window/icon labels using hexadecimal .TP 5 2 -Set window/icon labels using UTF-8 (overrides \fButf8Titles\fP resource). +Set window/icon labels using UTF-8 (overrides \fButf8Title\fP resource). .TP 5 3 Query window/icon labels using UTF-8 @@ -4044,13 +4064,16 @@ .PP The resources that may be specified for the various menus are described in the documentation for the Athena \fBSimpleMenu\fP widget. -The name and classes -of the entries in each of the menus are listed below. +The name and classes of the entries in each of the menus are listed below. Resources named \*(``\fBline\fR\fIN\fR\*('' where \fIN\fR is a number are separators with class \fBSmeLine\fR. +.PP +As with all X resource-based widgets, +the labels mentioned are customary defaults for the application. . .PP -The \fImainMenu\fP has the following entries: +The \fIMain Options\fP menu (widget name \fImainMenu\fP) +has the following entries: .TP 8 .B "toolbar (\fPclass\fB SmeBSB)" This entry invokes the \fBset-toolbar(toggle)\fP action. @@ -4136,7 +4159,8 @@ This entry invokes the \fBquit()\fP action. . .PP -The \fIvtMenu\fP has the following entries: +The \fIVT Options\fP menu (widget name \fIvtMenu\fP) +has the following entries: .TP 8 .B "scrollbar (\fPclass\fB SmeBSB)" This entry invokes the \fBset-scrollbar(toggle)\fP action. @@ -4218,28 +4242,43 @@ This entry invokes the \fBset-altscreen(toggle)\fP action. . .PP -The \fIfontMenu\fP has the following entries: +The \fIVT Fonts\fP menu (widget name \fIfontMenu\fP) +has the following entries: .TP 8 .B "fontdefault (\fPclass\fB SmeBSB)" -This entry invokes the \fBset-vt-font(d)\fP action. +This entry invokes the \fBset-vt-font(d)\fP action, +setting the font using the \fBfont\fP (default) resource, +e.g., \*(``Default\*('' in the menu. .TP 8 .B "font1 (\fPclass\fB SmeBSB)" -This entry invokes the \fBset-vt-font(1)\fP action. +This entry invokes the \fBset-vt-font(1)\fP action, +setting the font using the \fBfont1\fP resource, +e.g., \*(``Unreadable\*('' in the menu. .TP 8 .B "font2 (\fPclass\fB SmeBSB)" -This entry invokes the \fBset-vt-font(2)\fP action. +This entry invokes the \fBset-vt-font(2)\fP action, +setting the font using the \fBfont2\fP resource, +e.g., \*(``Tiny\*('' in the menu. .TP 8 .B "font3 (\fPclass\fB SmeBSB)" -This entry invokes the \fBset-vt-font(3)\fP action. +This entry invokes the \fBset-vt-font(3)\fP action, +setting the font using the \fBfont3\fP resource, +e.g., \*(``Small\*('' in the menu. .TP 8 .B "font4 (\fPclass\fB SmeBSB)" -This entry invokes the \fBset-vt-font(4)\fP action. +This entry invokes the \fBset-vt-font(4)\fP action, +letting the font using the \fBfont4\fP resource, +e.g., \*(``Medium\*('' in the menu. .TP 8 .B "font5 (\fPclass\fB SmeBSB)" -This entry invokes the \fBset-vt-font(5)\fP action. +This entry invokes the \fBset-vt-font(5)\fP action, +letting the font using the \fBfont5\fP resource, +e.g., \*(``Large\*('' in the menu. .TP 8 .B "font6 (\fPclass\fB SmeBSB)" -This entry invokes the \fBset-vt-font(6)\fP action. +This entry invokes the \fBset-vt-font(6)\fP action, +letting the font using the \fBfont6\fP resource, +e.g., \*(``Huge\*('' in the menu. .TP 8 .B "fontescape (\fPclass\fB SmeBSB)" This entry invokes the \fBset-vt-font(e)\fP action. @@ -4266,7 +4305,8 @@ This entry invokes the \fBset-utf8-title(s)\fP action. . .PP -The \fItekMenu\fP has the following entries: +The \fITEK Options\fP menu (widget name \fItekMenu\fP) +has the following entries: .TP 8 .B "tektextlarge (\fPclass\fB SmeBSB)" This entry invokes the \fBset-tek-text(large)\fP action. @@ -5884,11 +5924,24 @@ It is also invoked by the \fBsunKeyboard\fP entry in \fImainMenu\fP. .TP 8 .B "set-tek-text(\fIlarge/2/3/small\fP)" -This action sets font used in the Tektronix window to the value of the -resources \fBtektextlarge\fP, \fBtektext2\fP, \fBtektext3\fP, and -\fBtektextsmall\fP according to the argument. -It is also invoked by the entries -of the same names as the resources in \fItekMenu\fP. +This action sets the font used in the Tektronix window to the value of the +selected resource according to the argument. +The argument can be either a keyword or single-letter alias, +as shown in parentheses: +.RS +.TP 5 +large (l) +Use resource \fBfontLarge\fP, same as menu entry \fBtektextlarge\fP. +.TP 5 +two (2) +Use resource \fBfont2\fP, same as menu entry \fBtektext2\fP. +.TP 5 +three (3) +Use resource \fBfont3\fP, same as menu entry \fBtektext3\fP. +.TP 5 +small (s) +Use resource \fBfontSmall\fP, same as menu entry \fBtektextsmall\fP. +.RE .TP 8 .B "set-terminal-type(\fItype\fP)" This action directs output to either the \fIvt\fP or \fItek\fP windows, @@ -5935,7 +5988,7 @@ \fI\*n\fP was started), .HP \fI1\fP through \fI6\fP indicate the fonts -specified by the \fIfont1\fP through \fIfont6\fP resources, +specified by the \fBfont1\fP through \fBfont6\fP resources, .HP \fIe\fP or \fIE\fP indicate the normal and bold fonts that have been set through escape codes @@ -6182,6 +6235,10 @@ WINDOWID is set to the X window id number of the \fI\*n\fP window. .TP 5 +XTERM_FILTER +is set if a locale-filter is used. +The value is the pathname of the filter. +.TP 5 XTERM_LOCALE shows the locale which was used by \fI\*n\fP on startup. Some shell initialization scripts may set a different locale. diff -Nru xterm-287/xterm_io.h xterm-293/xterm_io.h --- xterm-287/xterm_io.h 2012-03-16 09:48:56.000000000 +0000 +++ xterm-293/xterm_io.h 2013-01-06 15:20:45.000000000 +0000 @@ -1,7 +1,7 @@ -/* $XTermId: xterm_io.h,v 1.54 2012/03/16 09:48:56 tom Exp $ */ +/* $XTermId: xterm_io.h,v 1.56 2013/01/06 15:20:45 tom Exp $ */ /* - * Copyright 2000-2011,2012 by Thomas E. Dickey + * Copyright 2000-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -52,10 +52,6 @@ #define USE_SYSV_TERMIO #endif -#ifdef __UNIXOS2__ -#define USE_SYSV_TERMIO -#endif - #if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__INTERIX) || defined(__APPLE__) || defined(__UNIXWARE__) || defined(__hpux) #ifndef USE_POSIX_TERMIOS #define USE_POSIX_TERMIOS @@ -171,11 +167,6 @@ #include /* get struct winsize */ #endif #endif /* USE_USG_PTYS */ -#elif defined(sun) && !defined(SVR4) -#include -#ifdef TIOCSWINSZ -#undef TIOCSSIZE -#endif #endif /* SYSV */ /* @@ -186,56 +177,6 @@ #define TIOCSPGRP (_IOW('t', 118, pid_t)) #endif -#ifdef __UNIXOS2__ - -#define XFREE86_PTY 0x76 - -#define XTY_TIOCSETA 0x48 -#define XTY_TIOCSETAW 0x49 -#define XTY_TIOCSETAF 0x4a -#define XTY_TIOCCONS 0x4d -#define XTY_TIOCSWINSZ 0x53 -#define XTY_ENADUP 0x5a -#define XTY_TRACE 0x5b -#define XTY_TIOCGETA 0x65 -#define XTY_TIOCGWINSZ 0x66 -#define PTMS_GETPTY 0x64 -#define PTMS_BUFSZ 14 - -#ifndef NCCS -#define NCCS 11 -#endif - -#define TIOCCONS 108 -#define TIOCSWINSZ 113 -#define TIOCGWINSZ 117 - -struct pt_termios -{ - unsigned short c_iflag; - unsigned short c_oflag; - unsigned short c_cflag; - unsigned short c_lflag; - unsigned char c_cc[NCCS]; - long _reserved_[4]; -}; - -struct winsize { - unsigned short ws_row; /* rows, in characters */ - unsigned short ws_col; /* columns, in characters */ - unsigned short ws_xpixel; /* horizontal size, pixels */ - unsigned short ws_ypixel; /* vertical size, pixels */ -}; -#define TTYSIZE_STRUCT struct winsize -#define USE_STRUCT_WINSIZE 1 - -#ifdef XTERM_MAIN -extern int ptioctl(int fd, int func, void* data); -#define ioctl ptioctl -#endif - -#endif /* __UNIXOS2__ */ - #ifdef __hpux #include /* defines TIOCSLTC */ #endif @@ -283,32 +224,19 @@ #endif #if !defined(TTYSIZE_STRUCT) -#if defined(TIOCSSIZE) && (defined(sun) && !defined(SVR4)) -#define USE_STRUCT_TTYSIZE 1 -#define TTYSIZE_STRUCT struct ttysize -#elif defined(TIOCSWINSZ) +#if defined(TIOCSWINSZ) #define USE_STRUCT_WINSIZE 1 #define TTYSIZE_STRUCT struct winsize -#endif /* sun vs TIOCSWINSZ */ -#endif /* TTYSIZE_STRUCT */ - -#if defined(USE_STRUCT_TTYSIZE) - -#define TTYSIZE_STRUCT struct ttysize -#define GET_TTYSIZE(fd, data) ioctl(fd, TIOCGSIZE, &data) -#define SET_TTYSIZE(fd, data) ioctl(fd, TIOCSSIZE, &data) -#define TTYSIZE_COLS(data) data.ts_cols -#define TTYSIZE_ROWS(data) data.ts_lines - -#elif defined(USE_STRUCT_WINSIZE) - -#define TTYSIZE_STRUCT struct winsize #define GET_TTYSIZE(fd, data) ioctl(fd, TIOCGWINSZ, (char *) &data) #define SET_TTYSIZE(fd, data) ioctl(fd, TIOCSWINSZ, (char *) &data) #define TTYSIZE_COLS(data) data.ws_col #define TTYSIZE_ROWS(data) data.ws_row +#endif /* TIOCSWINSZ */ +#endif /* TTYSIZE_STRUCT */ -#endif /* (USE_STRUCT_TTYSIZE) */ +#ifndef USE_STRUCT_WINSIZE +#error "There is a configuration error with struct winsize ifdef" +#endif #if OPT_TRACE #define TRACE_TTYSIZE(fd, id) { \ diff -Nru xterm-287/xtermcfg.hin xterm-293/xtermcfg.hin --- xterm-287/xtermcfg.hin 2012-10-05 00:27:29.000000000 +0000 +++ xterm-293/xtermcfg.hin 2013-05-27 21:05:23.000000000 +0000 @@ -1,7 +1,7 @@ -/* $XTermId: xtermcfg.hin,v 1.196 2012/10/05 00:27:29 tom Exp $ */ +/* $XTermId: xtermcfg.hin,v 1.199 2013/05/27 21:05:23 tom Exp $ */ /* - * Copyright 1997-2011,2012 by Thomas E. Dickey + * Copyright 1997-2012,2013 by Thomas E. Dickey * * All Rights Reserved * @@ -42,7 +42,7 @@ #undef DECL_ERRNO /* CF_ERRNO */ #undef DEFDELETE_DEL /* AC_ARG_ENABLE(delete-is-del) */ #undef DEF_ALT_SENDS_ESC /* CF_ARG_ENABLE(alt-sends-esc) */ -#undef DEF_BACKARO_DEL /* CF_ARG_DISABLE(backarrow-is-del) */ +#undef DEF_BACKARO_BS /* CF_ARG_DISABLE(backarrow-key) */ #undef DEF_BACKARO_ERASE /* CF_ARG_ENABLE(backarrow-is-erase) */ #undef DEF_META_SENDS_ESC /* CF_ARG_ENABLE(meta-sends-esc) */ #undef DFT_COLORMODE /* AC_ARG_WITH(default-color-mode) */ @@ -177,6 +177,7 @@ #undef USE_UTMP_SETGID /* AC_ARG_WITH(utmp-setgid) */ #undef UTMPX_FOR_UTMP /* CF_UTMP */ #undef XRENDERFONT /* CF_X_FREETYPE */ +#undef cc_t /* CF_TYPE_CC_T */ #undef gid_t /* AC_TYPE_UID_T */ #undef mode_t /* AC_TYPE_MODE_T */ #undef off_t /* AC_TYPE_OFF_T */ @@ -201,6 +202,7 @@ #ifndef __cplusplus #undef GCC_PRINTF #undef GCC_PRINTFLIKE +#undef GCC_NORETURN #undef GCC_UNUSED #endif