changeset 335:54f7aa390f4f r21-0-65

Import from CVS: tag r21-0-65
author cvs
date Mon, 13 Aug 2007 10:50:39 +0200
parents 58353925ad93
children fe0a93612022
files .cvsignore CHANGES-beta ChangeLog PROBLEMS configure configure.in etc/package-index.LATEST.pgp lib-src/.cvsignore lib-src/ChangeLog lisp/.cvsignore lisp/ChangeLog lisp/font-lock.el lisp/info.el lisp/menubar-items.el lisp/package-ui.el lisp/x-faces.el lwlib/.cvsignore lwlib/ChangeLog lwlib/xlwmenu.c man/ChangeLog man/lispref/extents.texi man/lispref/faces.texi man/lispref/glyphs.texi man/lispref/markers.texi man/lispref/menus.texi man/lispref/objects.texi man/lispref/positions.texi man/lispref/sequences.texi man/lispref/specifiers.texi man/lispref/strings.texi man/lispref/toolbar.texi man/new-users-guide/modes.texi man/new-users-guide/region.texi man/termcap.texi man/texinfo.texi man/xemacs-faq.texi man/xemacs/custom.texi man/xemacs/keystrokes.texi man/xemacs/mark.texi man/xemacs/menus.texi man/xemacs/startup.texi nt/ChangeLog src/.cvsignore src/ChangeLog src/console.h src/database.c src/depend src/device-x.c src/dgif_lib.c src/emacs.c src/xselect.c version.sh
diffstat 52 files changed, 2403 insertions(+), 1252 deletions(-) [+]
line wrap: on
line diff
--- a/.cvsignore	Mon Aug 13 10:49:52 2007 +0200
+++ b/.cvsignore	Mon Aug 13 10:50:39 2007 +0200
@@ -1,1 +1,6 @@
 typescript
+Makefile
+Installation.el
+Installation
+config.log
+config.status
--- a/CHANGES-beta	Mon Aug 13 10:49:52 2007 +0200
+++ b/CHANGES-beta	Mon Aug 13 10:50:39 2007 +0200
@@ -1,5 +1,16 @@
 							-*- indented-text -*-
-to 21.0 "20 minutes to Nikko"
+to 21.0.65 "20 minutes to Nikko"
+-- Fix for new Berkeley DB library from Paul Keusemann/Gregory Neal Shapiro
+-- Various package-ui fixes from Jan Vroonhof
+-- Fix for doubled font-locking during buffer reversion
+-- KFM browsing support from Neal Becker
+-- info fix from Didier Verna
+-- Build bug fixes from Martin Buchholz
+-- Various Documentation updates
+-- X-Face support for MS Windows native build from Gleb Arshinov
+-- Restore corrupted CHANGES-beta file
+
+to 21.0.64 "20 minutes to Nikko"
 -- Dialog box fix from Jan Vroonhof
 -- prevent minimization of maximized frame from Andy Piper
 -- miscellaneous patches from Andy Piper and Gleb Arshinov
@@ -236,3 +247,1163 @@
 -- Various warning fixes from Martin Buchholz
 -- face fix from Andy Piper
 -- Various MS Windows fixes from Kirill Katsnelson
+-- etags.c-13.6 courtesy of Francesco Potort,Al(B
+-- FreeBSD 2.2.6 now supports LC_ALL from Kazuyuki IENAGA
+-- Toolbar fixes from Kirill Katsnelson
+-- Ignore most recent libtiff from Martin Buchholz
+-- minor mode menu cleanup from Hrvoje Niksic
+-- OpenBSD support from Hans Guenter Weigand
+-- MS Windows NT process fixes from Kirill Katsnelson
+-- miscellaneous patches from Martin Buchholz
+-- MS Windows toolbar hasing fix from Andy Piper
+-- MS Windows cursor resources update from Andy Piper
+-- AIX initialization fixes from Michael Sperber
+-- Startup optimization from Michael Sperber
+-- MS Windows cursor initialization from Kirill Katsnelson
+-- miscellaneous patches from Kirill Katsnelson
+-- 64 bit clean fixes from Olivier Galibert
+-- Interactive compiled functions and anonymous forms fixes from Hrvoje Niksic
+-- Miscellaneous cleanup fixes from Altrasoft
+
+to 21.0 beta40 "Saanen"
+-- Vertical divider hacking from Didier Verna and Kirill Katsnelson
+-- Bind cut'n'paste keys to generic functions from Jonathan Harris
+-- MS Windows toolbar size fix from Andy Piper
+-- Icons from MS Windows resources from Andy Piper
+-- New function `windows-text-lines-pixel-height' from Greg Klanderman
+-- Window beats buffer in specifiers from Kirill Katsnelson
+-- Dialog box as a dialog box from Kirill Katsnelson
+-- More DnD fixes from Oliver Graf
+-- NEWS updates from Hrvoje Niksic
+-- More device metrics from Kirill Katsnelson
+-- Miscellaneous patches from Hrvoje Niksic
+-- Documentation updates from Christian Nyb,Ax(B
+-- More vertical divider fixes from Kirill Katsnelson
+-- New function zap-up-to-char, behaves like zap-to-char in Emacs 18
+-- Toolbar fixes from Andy Piper
+-- Miscellaneous MS Windows fixes from Kirill Katsnelson
+-- vertical divider shadow thickness specifier from Didier Verna
+-- More device metrics from Kirill Katsnelson
+-- Minibuffer synch with FSF Emacs from Michael Sperber
+-- DnD fixes from Oliver Graf
+-- decode-path cleanup from Hrvoje Niksic
+-- Miscellaneous patches from Hrvoje Niksic
+-- clear region bg pixmap fixes from Andy Piper
+-- Various cleanup patches from Martin Buchholz
+-- miscellaneous code cleanup
+-- with-display-help-buffer fixes from Hrvoje Niksic
+-- Draggable vertical dividers from Kirill Katsnelson
+-- More MS Windows DnD support from Jonathan Harris
+-- Reversion to old key descriptions from Hrvoje Niksic
+-- DnD updates from Oliver Graf
+-- Fix mouse(-pixel)?-position from Kirill Katsnelson
+-- More device metrics fixes from Kirill Katsnelson
+-- background pixmaps for MS Windows from Andy Piper
+-- various build fixes from SAKIYAMA Nobuo and Kirill Katsnelson
+-- Fix for non-interruptible re_search from Hrvoje Niksic
+-- miscellaneous fixes from Hrvoje Niksic
+-- focus frame fixes from Hrvoje Niksic
+-- Really apply Kyle Jones' realpath fixes (sorry).
+
+to 21.0 beta39 "Russian White"
+-- DnD fixes from Oliver Graf and Jonathan Harris
+-- scrollbar visibility and placement specifiers from of Kirill Katsnelson
+-- x-toolbar.el and x-menubar.el renamed to toolbar-items.el and
+   menubar-items.el
+-- Device metrics from Kirill Katsnelson
+-- Frame redraw smoothing fix from Kirill Katsnelson
+-- MS Windows transparency handling from Andy Piper
+-- XEmacs FAQ update from Christian Nybo
+-- MS Windows build fix for minimal tagbits, etc. from Kirill Katsnelson
+-- Fix cancelling directory creation prompt from Hrvoje Niksic
+-- cygwin build fixes from Andy Piper
+-- Restore oo-browser etags.c as ootags.c
+-- Socket connections for Windows from Kirill Katsnelson
+-- region limiting fixes from Hrvoje Niksic
+-- cleanup focus-follows-mouse handling from Greg Klanderman
+-- mswindows cursor support from Andy Piper
+-- elimination of bzero from Michael Sperber
+-- build fix from Jeff Miller
+-- xpm button fix from Andy Piper
+-- add optional `norecord' arg to select-window from Greg Klanderman
+-- regexp quote fix from Hrvoje Niksic
+-- early frame title update from Jan Vroonhof
+-- Make character 0240 display as space from Kyle Jones
+-- 0 argument printing fix from Hrvoje Niksic
+-- revert recent changes to etags.c
+-- dump clean up, removal of Lisp reader macros
+-- spelling fix from Jonathan Harris
+-- MS Windows build fix from Kirill Katsnelson
+-- sound fixes from Kyle Jones
+-- LDAP updates from Oscar Figueiredo
+-- Drag and drop update from Oliver Graf
+-- rename XEmacs internal realpath from Kyle Jones
+-- rangetab cleanup from Martin Buchholz
+-- etags fix
+-- miscellaneous bug fixes
+
+to 21.0 beta38 "Repartida"
+-- apropos.el modernization
+-- Documentation updates from Hrvoje Niksic
+-- range table fix from Olivier Galibert
+-- Various changes from Andy Piper
+-- Magic specifier fixes from Kirill Katsnelson
+-- Various changes from Hrvoje Niksic
+-- print changes/find-file changes from Hrvoje Niksic
+-- source formatting changes from Martin Buchholz
+-- font handling for W3 under MS Windows from Andy Piper
+-- Xpm color symbol support for MS Windows from Andy Piper
+-- keyboard macro fixes from Hrvoje Niksic
+-- MS Windows Signal fix from Kirill Katsnelson
+-- All GIFs in core distribution converted to PNGs -- screw Unisys
+-- More build tweaks
+-- Make line-number-mode/column-number-mode appear in minor mode menu from
+   Jim Radford
+-- General toolbar fixes from Kirill Katsnelson
+-- Selection patches from Andy Piper
+-- background pixmaps in MS Windows from Andy Piper
+-- Startup patches from Michael Sperber
+-- Signalling support for MS Windows from Kirill Katsnelson
+-- Startup tweaks
+-- PNG crash fix from Jareth Hein
+-- Keyboard Focus sanity from Greg Klanderman
+-- LDAP fixes from Oscar Figueiredo
+-- Fix Lisp union type on MS Windows from Andy Piper
+-- Miscellaneous patches from Jonathan Harris, Kirill Katsnelson
+-- Build clean up
+
+to 21.0 beta37 "Pygmy"
+-- Bug fixes, generalization of image code from Andy Piper
+-- Installation/startup fixes from Michael Sperber
+-- Irix 5.3 dumping fix from Olivier Galibert
+-- Bug fixes from Martin Buchholz, Michael Sperber and Bob Weiner
+-- miscellaneous bug fixes
+-- More fixes from Didier Verna for Customization of options menu
+-- Miscellaneous patches from Kirill Katsnelson and Hrvoje Niksic
+-- More MS Windows toolbar stuffs from Kirill Katsnelson
+-- Custom-ization of the options menu from Didier Verna
+-- MS Windows toolbar stuffs from Andy Piper
+-- MS Windows build fixes from Kirill Katsnelson
+-- MS Windows process fixes from Kirill Katsnelson
+-- miscellaneous patches from Michael Sperber, Hrvoje Niksic, Martin Buchholz
+-- Gnuclient/gnudoit stdin support from Jan Vroonhof
+-- eldap fixes from Oscar Figueiredo
+-- Synching with InfoDock 3.7
+-- info fixes from Oscar Figueiredo 
+-- removed --sitelispdir configure option
+-- miscellaneous bug fixes
+
+to 21.0 beta36 "Philippine"
+-- Xpm for MS Windows from Jonathan Harris
+-- print stream fix from Hrvoje Niksic
+-- etags.c fix from Andreas Jaeger
+-- dll fixes from Hrvoje Niksic
+-- etags.c synched with InfoDock
+-- ghost specifiers from Kirill Katsnelson
+-- DLL fix from Hrvoje Niksic
+-- cygwin installation fix from Andy Piper
+-- cygwin process fix from Andy Piper
+-- More startup changes from Michael Sperber
+-- new version of LDAP code from Oscar Figueiredo
+-- path debugging patches from Michael Sperber
+-- more fixes from Hrvoje Niksic
+-- miscellaneous patches from Kirill Katsnelson
+-- Toolbar support for MS Windows from Andy Piper
+-- Changes by FUKUI Kaoru for PPC/Linux
+-- various fixes from Martin Buchholz
+-- various patches from Hrvoje Niksic
+-- s/*.h cleanup from Olivier Galibert
+-- display fixes from Greg Klanderman
+-- More MS Windows process patches from Kirill Katsnelson
+-- More path searching fixes from Michael Sperber
+-- path searching changes from Michael Sperber
+-- MS Windows fixes from Kirill Katsnelson
+
+to 21.0 beta35 "Peacock Goat"
+-- info fixes from Oscar Figueiredo
+-- Various fixes from Hrvoje Niksic
+-- More clean up patches from Martin Buchholz
+-- MS Windows processes patches from Kirill Katsnelson
+-- path searching patches from Michael Sperber
+-- clean up patches from Martin Buchholz
+-- Various fixes from Hrvoje Niksic
+-- BSD fixes from IENAGA Kazuyuki
+-- glyphs-x.c cleanup from Colin Rafferty
+-- MS windows fixes from Kirill Katsnelson
+-- toolbar clean up from Jeff Miller
+-- Hunt the Wumpus 64 bit cleanness patches from Olivier Galibert
+-- miscellaneous bug fixes
+-- info updates from Oscar Figueiredo
+-- Various patches from Andreas Jaegar, Olivier Galibert, Karl Hegbloom,
+   and Amir Katz
+-- FAQ update from Christian Nyb,Ax(B
+-- miscellaneous fixes from Martin Buchholz
+-- package-get-base.el updated
+
+to 21.0 beta34 "Oberhasli"
+-- defsymbol cleanup from Martin Buchholz
+-- miscellaneous patches from Martin Buchholz
+-- MS Windows fixes from Andy Piper
+-- various motion changes from Greg Klanderman
+-- dynamic info dir/localdir courtesy of Oscar Figueiredo
+-- Various patches from Kyle Jones and Hrvoje Niksic
+-- package path startup fixes from Michael Sperber
+-- Speed fix/MS Windows cleanup patches from Kirill Katsnelson
+-- Martin patches
+-- miscellaneous bug fixes
+
+to 21.0 beta33 "Nigerian Dwarf"
+-- Various MS Windows patches from Kirill Katsnelson, Andy Piper and
+   Jonathon Harris
+-- Startup fixes from Michael Sperber
+-- Various fixes from Hrvoje Niksic
+-- Various fixes from Kyle Jones
+-- miscellaneous bug fixes
+
+to 21.0 beta32 "Nachi"
+-- NT image support from Andy Piper
+-- Various fixes from Hrvoje Niksic
+-- Canna detection now looks for includes in /usr/local/canna
+-- load-gc renamed to pureload
+-- itimer.el-1.07 courtesy of Kyle Jones
+-- package-path searching fixes courtesy of Michael Sperber
+-- buffer overrun prevention patches from Hrvoje Niksic, and Jan Vroonhof
+-- various patches from Hrvoje Niksic
+-- Miscellaneous patches from Kyle Jones, Kirill Katsnelson,
+-- decode-path-internal added as lisp level interface to decode_path
+-- parse-colon-path restored to files.el
+-- miscellaneous startup fixes
+-- DLL fixes from William Perry
+-- PNG autodetectin update
+
+to 20.5 beta31 "Myotonic"
+-- modules directory with dll examples courtesy of William Perry
+-- Upside-down TIFF fix from Jareth Hein
+-- ldap/eudc fixes from Oscar Figueiredo
+-- file coding changes/cleanup from Kirill Katsnelson
+-- separation of internal motion commands from user keystroke motion commands
+   from Kyle Jones
+-- miscellaneous cursor bug fixes from Kyle Jones
+-- More bug fixes from Kirill Katsnelson
+-- Better error message for unbound major modes from Pete Ware
+-- Updates on DLL support from William Perry
+-- New GIF support from Jareth Hein
+-- Miscellaneous MS windows fixes from Kirill Katsnelson
+-- Scrollable modeline deferred until 21.1
+-- 20.5 is renamed to 21.0
+-- TMPDIR fixes from Glynn Clements
+-- cygwin dll detection fixes from Andy Piper
+-- NT .wav sound support from Andy Piper
+-- Cygwin configuration fixes from Andy Piper
+-- mouse-4, mouse-5 portability keysyms
+-- Options -> Browse Faces now calls customize-face from Kyle Jones
+-- miscellaneous bug fixes
+-- DLL configuration and portability fixes from William Perry
+-- Marker and sound fixes from Hrvoje Niksic
+-- face initialization bug fixes from Kyle Jones
+-- static initializer fix from Kyle Jones
+
+to 20.5 beta30 "Moxot,As(B"
+-- find-gc.el fixes courtesy of Markus Linnala
+-- mousewheel support courtesy of William Perry
+-- Mule tty initialization courtesy of Kazuyuki IENAGA
+-- backspace mapping fixing from Kyle Jones
+-- New function `temp-directory' courtesy of Glynn Clements
+-- miscellaneous patches from Jens UH Petersen, Greg Klanderman, Kirill
+   Katsnelson and Kyle Jones
+-- miscellaneous cygwin cleanup from Andy Piper
+-- dired in C changes courtesy of Darryl Okahata
+-- process abstraction changes courtesy of Kirill Katsnelson
+-- Added an example of a DLL
+-- Coding system cleanup courtesy of Andy Piper
+-- Build fixes for --srcdir
+-- Miscellaneous fixes
+-- Fix localized menubars to work when the application class changes name.
+
+to 20.5 beta29 "Loashan"
+-- Add autodetection of DLL support
+-- bug fixes from Kyle Jones
+-- miscellaneous bug fixes
+-- `make all' really remakes everything 
+-- Installation file changes format:
+   XEmacs version is printed
+   Previous versions are now deleted by default
+-- --with-dlmalloc configure option added
+-- fix multicast support courtesy of Didier Verna
+-- LDAP fixes courtesy of Oscar Figueiredo
+
+to 20.5 beta28 "LaMancha"
+-- eudc/LDAP stuffs courtesy of Oscar Figueiredo
+-- file-coding separation from Mule courtesy of Andy Piper
+-- Various fixes from Kyle Jones
+-- Support for multicasting courtesy of Didier Verna
+-- Fix for respecting tty-erase-char courtesy of Glynn Clements
+-- Miscellaneous patches from Karl Hegbloom
+-- Miscellaneous patches from Greg Klanderman
+-- Allow `XEmacs' to be used in X resources courtesy of Greg Klanderman
+-- menu fixes courtesy of Aki Vehtari
+-- gnu(serv|client) can use TMPDIR if set courtesy of Glynn Clements
+-- miscellaneous fixes from Greg Klanderman
+-- Various modeline fixes courtesy of Didier Verna
+-- Miscellaneous doc fixes courtesy of Karl Hegbloom
+-- Miscellaneous bug fixes
+-- Glyph changes when dragging modeline courtesy of Didier Verna
+
+to 20.5 beta27 "Kinder"
+-- Locale fix courtesy of Kazuyuki IENAGA
+-- Fix for TZSET problem on Sun via Jens Krinke
+-- Another try at modeline scroll, courtesy of Didier Verna
+-- Miscellaneous bug fixes
+
+to 20.5 beta26 "Kiko"
+-- MS Windows patches courtesy of Kirill Katsnelson
+-- Various patches from Kyle Jones
+-- Modeline scrolling courtesy of Dider Verna
+-- various patches from Christoph Wedler
+-- Fixes for Linux/alpha courtesy of Aki Vehtari
+-- Mouse scrolling fix courtesy of Didier Verna
+-- files.el fix courtesy of Kyle Jones
+-- (Not so) Experimental support for Doug Lea Malloc
+-- XEmacs/Mule in a tty works courtesy of Kazuyuki IENAGA
+-- Miscellaneous bug fixes
+
+to 20.5 beta25 "Kamori"
+-- Dead key fixes courtesy of Martin Buchholz
+-- Make count-* functions work sensibly courtesy of Hrvoje Niksic
+-- SGI unexec fixes courtesy of Olivier Galibert
+-- Miscellaneous bug fixes
+
+to 20.5 beta24 "Kaghani"
+-- source commentary censored
+-- Miscellaneous MS Windows patches from Kirill Katsnelson
+-- Miscellaneous MS Windows patches from Jonathan Harris
+-- Miscellaneous patches from Martin Buchholz and Hrvoje Niksic
+-- Cygwin patches courtesy of Andy Piper
+-- Fix for integer 0 plist problem on Linux courtesy of Olivier Galibert
+-- Miscellaneous bug fixes
+
+to 20.5 beta23 "Jining Grey"
+-- MS Windows DnD stuffs courtesy of Jonathon Harris
+-- Miscellaneous bug fixes
+
+to 20.5 beta22 "Grison's Striped"
+-- Port to mklinux courtesy of Kaoru Fukui
+-- Miscellaneous bug fixes
+
+to 20.5 beta21 "Golden Guernsey"
+-- Package interface standard 1.0
+-- Cygwin stuffs from Andy Piper
+-- Miscellaneous patches from Kyle Jones
+-- Miscellaneous patches from Martin Buchholz
+-- Experimental Shared Library support courtesy of Joshua Rowe, and integration
+   courtesy of Hrvoje Niksic
+-- Miscellaneous patches from Hrvoje Niksic
+-- Miscellaneous bug fixes
+
+to 20.5 beta20 "Don"
+-- Miscellaneous patches from Damon Lipparelli, Jens Petersen, Karl Hegbloom,
+   and Christoph Wedler
+-- overlay.el has been packaged (xemacs-base)
+-- Configure changes from Martin Buchholz
+-- Hashing changes from Hrvoje Niksic
+-- IBM AIX build fix to work with MIT X11 courtesy of Michael Sperber
+-- Miscellaneous bug fixes
+
+to 20.5 beta19 "Damani"
+-- Package building update
+-- Hash and profile patches from Hrvoje Niksic
+-- Miscellaneous bug fixes
+
+to 20.5 beta18 "Daera Din Panah"
+-- Miscellaneous and sundry fixes for 20.4 merged
+-- MS Windows updates from Kirill Katsnelson and Andy Piper
+-- New command line arg `-no-autoloads' to suppress auto-autoloads loading
+   at startup (also implies -vanilla)
+-- auto-autoloads are not dumped
+-- Miscellaneous bug fixes
+
+to 20.5 beta17 "Chapar"
+-- Tutorial menubar support courtesy of Didier Verna
+-- Package-get refined courtesy of Pete Ware
+-- Package related build fixes
+
+to 20.5 beta16 "Canind,Ai(B"
+-- Package interface updates
+-- Reload updated and new auto-autoloads files at startup
+-- Miscellaneous bug fixes
+
+to 20.5 beta15 "British Alpine"
+-- MS Windows menu fixes courtesy of Kirill Katsnelson
+-- autoloads are now loaded into impure storage and can be deleted at runtime
+-- loadhist.el is now dumped with XEmacs
+-- XEmacs running in place as a login shell now works
+-- loadhist.el unpackaged
+-- COMPILED_FUNCTION_ANNOTATION disabled
+-- Added new compile time symbols -- LOADHIST_DUMPED and LOADHIST_BUILTIN
+   adapted from code originally by Tomasz Cholewo
+
+to 20.5 beta14 "Booted Goat"
+-- help.el update courtesy of Jens Petersen
+-- Image error handling courtesy of Jareth Hein
+-- MS Windows menubar support courtesy of Kirill Katsnelson
+-- Compile time/but not run-time support for cygwin courtesy of Andy Piper
+-- Miscellaneous bug fixes
+
+to 20.5 beta13 "Boer"
+-- Run time dependencies on x-win*.el removed.
+-- Total package upgrade
+-- Miscellaneous bug fixes
+-- Documentation fixes
+
+to 20.5 beta12 "Bhuj"
+-- MS Windows NT patches courtesy of Jeff Sparkes and Kirill Katsnelson
+-- userlock.el is now unpackaged
+-- New file callers-of-rpt.el (dependency generator) courtesy of Karl Hegbloom
+-- Gnats is now packaged
+-- SKK is now packaged
+-- Egg/Its is now packaged
+-- FAQ update courtesy of Andreas Kaempf and Aki Vehtari
+-- 20.4 renumbered to 20.5
+-- Miscellaneous bug fixes
+
+to 20.5 beta11 "Beetal"
+-- Patches and bugfixes from Hrvoje Niksic and Kyle Jones
+-- MS Windows updates courtesy of Kirill Katsnelson and Jeff Sparkes
+-- Localized French menus courtesy of Olivier Galibert
+-- Localized Japanese menu update courtesy of IENAGA Kazuyuki
+-- Miscellaneous bug fixes
+
+to 20.5 beta10 "Barbari"
+-- MS Windows NT updates courtesy of Kirill M. Katsnelson
+-- etags.el update courtesy of Hrvoje Niksic
+-- Miscellaneous bug fixes
+
+to 20.5 beta9 "Australian Goat"
+-- MS Windows patches for clipboard courtesy of Jonathon Harris
+-- ImageMagick support displays images now courtesy of Jareth Hein
+-- Untested support for kWnn and cWnn (Korean and Chinese input with Egg and
+   Wnn added).
+-- Miscellaneous bug fixes
+
+to 20.5 beta8 "Arapawa Island"
+-- build-report 1.35 courtesy of Adrian Aichner
+-- MS Windows stuffs from David Hobley, Jonathon Harris, August Hill,
+   Jeff Sparkes
+-- various patches from Jareth Hein
+-- refcard update courtesy of Aki Vehtari
+-- Egg-SJ3 Input Method support ported
+-- SKK Input Method added
+-- Various patches from Kyle Jones and Hrvoje Niksic
+-- Various fixes to build in minimal configuration
+-- Fixes to x-menubar.el to guard against possibly absent packages
+-- Miscellaneous bug fixes
+
+to 20.5 beta7 "Appenzell"
+-- Miscellaneous MS Windows patches from David Hobley and Jeff Sparkes
+-- ImageMagick is not autodetected by configure courtesy of IENAGA Kazuyuki
+-- (broken) energize support has been removed courtesy of Jeff Miller
+-- lisp/eos has been packaged
+-- lisp/sunpro has been packaged
+-- lisp/tooltak has been packaged
+-- abbrevlist.el has been packaged
+-- advice.el has been packaged
+-- annotations.el has been packaged
+-- assoc.el has been packaged
+-- atomic-extents.el has been packaged
+-- bench.el has been packaged
+-- browse-url.el has been packaged
+-- edit-toolbar.el has been packaged
+-- edmacro.el has been packaged
+-- eldoc.el has been packaged
+-- facemenu.el has been packaged
+-- floating-toolbar.el has been packaged
+-- foldout.el has been packaged
+-- frame-icon.el has been packaged
+-- hippie-exp.el has been packaged
+-- live-icon.el has been packaged
+-- loadhist.el has been packaged
+-- passwd.el has been packaged
+-- ph.el has been packaged
+-- pp.el has been packaged
+-- pretty-print.el has been packaged
+-- redo.el has been packaged
+-- regexp-opt.el has been packaged
+-- regi.el has been packaged
+-- reporter.el has been packaged
+-- ring.el has been packaged
+-- savehist.el has been packaged
+-- shadowfile.el has been packaged
+-- skeleton.el has been packaged
+-- symbol-syntax.el has been packaged
+-- sysdep.el has been packaged
+-- thing.el has been packaged
+-- timezone.el has been packaged
+-- toolbar-utils.el has been packaged
+-- tree-menu.el has been packaged
+-- xbm-button.el has been packaged
+-- xpm-button.el has been packaged
+-- advocacy.el has been packaged
+-- case-table.el has been packaged
+-- debug.el has been packaged
+-- disp-table.el has been packaged
+-- env.el has been packaged
+-- find-func.el has been packaged
+-- lisp-file-db.el has been packaged
+-- macros.el has been packaged
+-- novice.el has been packaged
+-- options.el has been removed
+-- overlay.el has been packaged
+-- profile.el has been packaged
+-- rect.el has been packaged
+-- reposition.el has been packaged
+-- sort.el has been packaged
+-- tabify.el has been packaged
+-- userlock.el has been packaged
+-- elp.el has been packaged
+-- highlight-headers.el has been packaged
+-- id-select.el has been packaged
+-- rfc822.el has been packaged
+-- smtp.el has been packaged
+-- soundex.el has been packaged
+-- tq.el has been packaged
+-- trace.el has been packaged
+-- uniquify.el has been packaged
+-- cmdloop1.el has been removed
+-- inc-vers.el has been removed
+-- icomplete.el has been packaged
+-- igrep.el has been packaged
+-- informat.el has been packaged
+-- iswitchb.el has been packaged
+-- jka-compr.el has been packaged
+-- makeinfo.el has been packaged
+-- makesum.el has been packaged
+-- man.el has been packaged
+-- metamail.el has been packaged
+-- mic-paren.el has been packaged
+-- mode-motion+.el has been packaged
+-- rcompile.el has been packaged
+-- recent-files.el has been packaged
+-- refbib.el has been packaged
+-- reportmail.el has been packaged
+-- resume.el has been packaged
+-- generic-sc.el has been packaged
+-- gopher.el has been packaged
+-- hexl.el has been packaged
+-- fast-lock.el has been packaged
+-- feedmail.el has been packaged
+-- file-part.el has been packaged
+-- filladapt.el has been packaged
+-- func-menu.el has been packaged
+-- saveconf.el has been packaged
+-- saveplace.el has been packaged
+-- scroll-in-place.el has been packaged
+-- shell-font.el has been packaged
+-- spell.el has been packaged
+-- supercite.el has been packaged
+-- page-ext.el has been packaged
+-- paren.el has been packaged
+-- pending-del.el has been packaged
+-- ps-print.el has been packaged
+-- edit-faces.el has been packaged
+-- emacsbug.el has been packaged
+-- emerge.el has been packaged
+-- lazy-lock.el has been packaged
+-- ledit.el has been packaged
+-- lispm-fonts.el has been packaged
+-- lpr.el has been packaged
+-- tar-mode.el has been packaged
+-- terminal.el has been packaged
+-- tex-latin1.el has been packaged
+-- texinfmt.el has been packaged
+-- texnfo-tex.el has been packaged
+-- texnfo-upd.el has been packaged
+-- time-stamp.el has been packaged
+-- time.el has been packaged
+-- uncompress.el has been packaged
+-- underline.el has been packaged
+-- upd-copyr.el has been packaged
+-- webjump.el has been packaged
+-- webster-www.el has been packaged
+-- xscheme.el has been packaged
+-- dabbrev.el has been packaged
+-- desktop.el has been packaged
+-- detexinfo.el has been packaged
+-- diff.el has been packaged
+-- doctex.el has been packaged
+-- chistory.el has been packaged
+-- cmuscheme.el has been packaged
+-- compare-w.el has been packaged
+-- compile.el has been packaged
+-- completion.el has been packaged
+-- crypt.el has been packaged
+-- bookmark.el has been packaged
+-- blink-paren.el has been packaged
+-- blink-cursor.el has been packaged
+-- big-menubar.el has been packaged
+-- balloon-help.el has been packaged
+-- backup-dir.el has been packaged
+-- avoid.el has been packaged
+-- autoinsert.el has been packaged
+-- array.el has been packaged
+-- add-log.el has been packaged
+-- oobr has been packaged
+-- mail-extr.el, mail-utils.el have been packaged
+-- view-process has been packaged
+-- vhdl-mode has been packaged
+-- texinfo.el has been packaged
+-- tex-mode.el has been packaged
+-- sendmail.el has been packaged
+-- sgml-mode.el has been packaged
+-- scribe.el has been packaged
+-- scheme.el has been packaged
+-- rsz-minibuf.el has been packaged
+-- rexx-mode.el has been packaged
+-- reftex.el has been packaged
+-- python-mode.el has been packaged
+-- prolog.el has been packaged
+-- postscript.el has been packaged
+-- picture.el has been packaged
+-- perl-mode.el has been packaged
+-- pascal.el has been packaged
+-- outline.el has been packaged
+-- outl-mouse.el has been packaged
+-- nroff-mode.el has been packaged
+-- modula2.el has been packaged
+-- make-mode.el has been packaged
+-- mail-abbrevs.el has been packaged
+-- lisp-mnt.el has been packaged
+-- linuxdoc-sgml.el has been packaged
+-- lazy-shot.el has been packaged
+-- image-mode.el has been packaged
+-- icon.el has been packaged
+-- hideshow.el has been packaged
+-- hideif.el has been packaged
+-- executable.el has been packaged
+-- enriched.el has been packaged
+-- eiffel3.el has been packaged
+-- cperl-mode.el has been packaged
+-- cmacexp.el has been packaged
+-- cl-indent.el has been packaged
+-- c-style.el has been packged
+-- c-fill.el has been packaged
+-- c-comment.el has been packaged
+-- bibtex.el has been packaged
+-- bib-mode.el has been packaged
+-- awk-mode.el has been packaged
+-- autoconf-mode.el has been packaged
+-- Miscellaneous bug fixes
+
+to 20.5 beta6 "Angora"
+-- New package-path syntax.  A null package indicates where the default lisp
+   should go.  This allows specifying packages that must be appended to the
+   package path.  Courtesy of Colin Rafferty
+-- `-flags' and `-?' are no longer command flags
+-- MS Windows updates from David Hobley, Jonathon Harris, and Marc Paquette
+-- Mule/enriched.el update courtesy of MORIOKA Tomohiko
+-- FAQ updates courtesy of Hrvoje Niksic and Aki Vehtari
+-- crisp.el-1.26 courtesy of Gary Foster
+-- Egg update courtesy of Jareth Hein
+-- Update to Norwegian TUTORIAL courtesy of Stig Bj,Ax(Brlykke
+-- Polish translation of the TUTORIAL courtesy of Remek Trzaska, update and
+   corrections courtesy of Rysiek Kubiak
+-- Toolbar improvements courtesy of Kyle Jones
+-- Miscellaneous bug fixes
+
+to 20.5 beta5 "Anglo-Nubian"
+-- CCL synched with Emacs 20.2 courtesy of Olivier Galibert
+-- various updates from Hrvoje Niksic and Kyle Jones
+-- MS Windows updates from Marc Paquette and Jonathon Harris
+-- FAQ update courtesy of Andreas Kaempf
+-- miscellaneous bug fixes
+
+to 20.5 beta4 "American Cashmere"
+-- Major changes in portable dumping/Lisp_Object code courtesy of Kyle Jones
+-- Miscellaneous patches from Kyle Jones, Hrvoje Niksic
+-- various build tweaks
+-- help-macro ported from Emacs 20 courtesy of Hrvoje Niksic
+-- Fix compiler warnings
+-- MS Windows patches from Marc Paquette and Darryl Okahata
+-- Change pointer glyph over custom buttons courtesy of Hrvoje Niksic
+-- New Lisp variable:  last-command-event-time courtesy of Kyle Jones
+-- miscellaneous bug fixes
+
+to 20.5 beta3 "Altai Mountain"
+-- query-replace and query-replace-regexp will only replace the region if the
+   zmacs region is active.
+-- iso-acc.el has been packaged
+-- iso-ascii.el has been packaged
+-- iso-cvt.el has been packaged
+-- iso-insert.el has been packaged
+-- iso-swed.el has been packaged
+-- iso-syntax.el has been packaged
+-- swedish.el has been packaged
+-- edebug has been packaged
+-- ebuff-menu.el has been packaged
+-- echistory.el has been packaged
+-- ehelp.el has been packaged
+-- electric.el has been packaged
+-- helper.el has been packaged
+-- arc-mode.el has been packaged
+-- ada-stmt.el has been packaged
+-- ada-mode.el has been packaged
+-- fortran.el has been packaged
+-- fortran-misc.el has been packaged
+-- f90.el has been packaged
+-- ksh-mode.el has been packaged
+-- m4-mode.el has been packaged
+-- strokes.el has been packaged
+-- sh-script.el has been packaged
+-- simula.el has been packaged
+-- tcl.el has been packaged
+-- verilog-mode.el has been packaged
+-- view.el has been packaged
+-- vrml-mode.el has been packaged
+-- whitespace-mode.el has been packaged
+-- winmgr-mode.el has been packaged
+-- xpm-mode.el has been packaged
+-- xrdb-mode.el has been packaged
+-- Suppress shadowing message if no shadows were found.
+-- Moved dumped lisp into top-level lisp directory
+-- bug fixes from Didier Verna, Jens-Ulrik Holger Petersen, Martin Buchholz,
+   and Tomasz Cholewo.
+-- Lazy shot updates from Jan Vroonhof
+-- Numerous bug fixes from Hrvoje Niksic
+-- Numerous bug fixes from Kyle Jones
+-- Mule changes courtesy of MORIOKA Tomohiko
+-- speedbar has been packaged (and updated courtesy of Hrvoje Niksic)
+-- Initial Native MS Windows support courtesy of Jonathan Harris
+-- comint has been packaged
+-- pcl-cvs has been packaged
+-- cc-mode has been packaged
+-- ilisp has been packaged
+-- apel has been packaged
+-- hyperbole has been packaged
+-- eterm has been packaged
+-- Elimination of broken VMS code courtesy of Andreas Jaeger
+-- Miscellaneous bug fixes
+
+to 20.5 beta2 "Alpine"
+-- hm--html-mode has been packaged
+-- viper has been packaged
+-- ediff has been packaged
+-- EFS has been packaged
+-- Mailcrypt has been packaged
+-- VM has been packaged
+-- Mule updates, elimination of dead languages courtesy of MORIOKA Tomohiko
+-- Phase one of graphics conversion to ImageMagic courtesy of William Perry
+-- Miscellaneous menu hacking courtesy of Kyle Jones
+-- Reorganization of Lisp type & type bits courtesy of Kyle Jones
+-- reftex.el 3.7 courtesy of Carsten Dominik
+-- Norwegian tutorial update courtesy of Stig Bjorlykkee
+-- ediff & viper updates courtesy of Michael Kifer
+-- Canna & Wnn integrated with LEIM courtesy of Stephen Turnbull
+-- Berkeley DB 2.x support courtesy of Andreas Jaeger
+-- tm has been packaged
+-- calendar has been packaged
+-- Build tweak: finder-inf is not aggressively rebuilt
+-- New versions of TUTORIAL:
+--   Croatian - Hrvoje Niksic
+--   French - Didier Verna
+--   German - Adrian Aichner
+--   Norwegian - Stig Bjorlykke
+--   Japanese, Korean, Thai - Imported from Emacs 20.1
+-- Disable puresize statistics unless --debug is in effect
+-- about.el hacking
+-- New command line options -no-packages, -vanilla
+-- psgml has been packaged
+-- Move lisp types into lrecords for portability courtesy of Kyle Jones
+-- yow.el has been packaged
+-- xmine.el has been packaged
+-- tetris.el has been packaged
+-- hanoi.el has been packaged
+-- hide-copyleft.el has been packaged
+-- flow-ctrl.el has been packaged
+-- find-gc.el has been packaged
+-- detached-minibuf.el has been packaged
+-- crontab.el has been packaged
+-- browse-cltl2.el has been packaged
+-- studly.el has been packaged
+-- spook.el has been packaged
+-- mpuz.el has been packaged
+-- life.el has been packaged
+-- gomoku.el has been packaged
+-- flame.el has been packaged
+-- dunnet.el has been packaged
+-- doctor.el has been packaged
+-- dissociate.el has been packaged
+-- decipher.el has been packaged
+-- cookie1.el has been packaged
+-- conx.el has been packaged
+-- blackbox.el has been packaged
+-- NeXTify.el has been packaged
+-- Support for conses and vectors to be lrecords
+-- autoloads found in User packages loaded at start up
+-- reftex.el update courtesy of Carsten Dominik
+-- crisp.el-1.21 courtesy of Gary Foster
+-- lazy-shot.el update from Jan Vroonhof
+-- XEmacs/BETA logo courtesy of Mark Borges & Didier Verna
+-- Oliver Graf OffiX patches
+-- Mule patches from MORIOKA Tomohiko
+-- xemacs-build-report-1.33 courtesy of Adrian Aichner
+-- Hrvoje Niksic updates
+-- Miscellaneous bug fixes
+
+to 20.5 beta1 "Century"
+-- Version fork, package work will be carried on in this branch
+-- Miscellaneous bug fixes
+
+to 20.3 beta28 "Reykjavik"
+-- about.el additions and updates
+-- See etc/BETA for initial package documentation
+-- Miscellaneous patches from Martin Buchholz, Kyle Jones and Hrvoje Niksic
+-- info changes from Karl Hegbloom (see etc/NEWS for details)
+-- delbs.el is now a single file package
+-- New package adding utility scripts added to lib-src
+-- docref.el is now a single file package
+-- cc-mode-5.19 Courtesy of Barry Warsaw
+-- standardize on const as CONST, register as REGISTER
+-- mh-e is now an XEmacs package
+-- Rmail is now an XEmacs package
+-- Miscellaneous bug fixes
+
+to 20.3 beta27 "Skopje"
+-- register declarations nuked by default
+-- Miscellaneous patches from Martin Buchholz, Karl Hegbloom and Hrvoje Niksic
+-- VC is now an XEmacs package
+-- W3 is now an XEmacs package
+-- Miscellaneous bug fixes
+
+to 20.3 beta26 "Riga"
+-- register declarations nuked by default
+-- Miscellaneous patches from Martin Buchholz, Karl Hegbloom and Hrvoje Niksic
+-- VC is now an XEmacs package
+-- W3 is now an XEmacs package
+-- Miscellaneous bug fixes
+
+to 20.3 beta25 "Prague"
+-- Ediff 2.671 Courtesy of Michael Kifer
+-- Viper 3.001 Courtesy of Michael Kifer
+-- OffiX DnD now binds to XEmacs events and doesn't use an external library
+   Courtesy of Oliver Graf
+-- New file xemacs-build-report.el courtesy of Adrian Aichner
+-- Synch to Emacs 20.2 by MORIOKA Tomohiko
+-- Various patches from Hrvoje Niksic
+-- Miscellaneous bug fixes
+
+to 20.3 beta24 "Ljubljana"
+-- Interface change:  custom-loads now snarfed separately from autoloads.
+-- custom snarfing code rewritten
+-- iswitchb.el added from Emacs 20.2
+-- NT DOC file fix from David Hobley
+-- jpeg detection corrected
+-- bytecode fix to char-syntax
+-- gnuserv.el reverted to 3.09
+-- Various patches/Emacs 20.1 synchs from Hrvoje Niksic
+-- Miscellaneous bug fixes
+
+to 20.3 beta23 "Sarajevo"
+-- Other new and older Hrvoje Niksic patches
+-- 20.1 synching by Hrvoje Niksic
+-- gnuserv.el-3.10 courtesy of Hrvoje Niksic
+-- custom-1.9960
+-- Build changes to info tree
+-- cperl-mode.el-1.35-1 (XEmacs conversion by Karl Hegbloom)
+-- shadow.el -- imported from Emacs 20.1
+-- Miscellaneous bug fixes
+
+to 20.3 beta22 "Minsk"
+-- Miscellaneous (small) bug fixes
+-- Autoloads regenerated from scratch
+
+to 20.3 beta21 "Bern"
+-- Artificial event creation from Hrvoje Niksic
+-- cl-extra.elc and cl-seq.elc are now dumped with XEmacs
+-- custom-1.9958 Courtesy of Per Abrahamsen
+-- W3-3.0.104 Courtesy of William Perry
+-- one-shot extent hooks added -- someone please send me the current
+   shotlock.el
+-- Custom initialization rework from Hrvoje Niksic
+-- cc-mode-5.18 courtesy of Barry Warsaw
+-- VM-6.34 courtesy of Kyle Jones
+-- Miscellaneous clean up patches from Hrvoje Niksic
+-- Miscellaneous bug fixes
+
+to 20.3 beta20 "Tirana"
+-- Miscellaneous patches from Martin and Hrvoje
+-- tetris.el-1.8
+-- viper update courtesy of Michael Kifer
+-- ediff updates courtesy of Michael Kifer
+-- strokes.el-2.4-beta
+-- cc-mode-5.17
+-- edmacro.el-3.19 courtesy of Hrvoje Niksic
+-- Miscellaneous bug fixes
+
+to 20.3 beta19 "Kyiv"
+-- Mega Martin Buchholz patch
+-- Major Viper update, Viper is now Mule aware
+-- ediff updates courtesy of Michael Kifer
+-- tpu-edt.el/tpu-extras.el synched with Emacs 19.34/XEmacs 19.16 courtesy of
+   Kevin Oberman
+-- strokes.el-2.4beta
+-- crisp.el-1.20 courtesy of Gary D. Foster
+-- New regex syntax changes courtesy of Michael Cook
+-- improved color terminal detection
+-- tetris.el-1.4 Courtesy of Glynn Clements
+-- Custom-1.9956
+-- Miscellaneous bug fixes
+-- W3-3.0.103
+
+to 20.3 beta18 "Bratislava"
+-- enhancements to help.el courtesy of Jens Petersen
+-- Mega Martin Buchholz patch
+-- edit-toolbar.el-1.02 courtesy of Mike Scheidler
+-- cc-mode-5.16
+-- DOC file generation clean up
+-- Miscellaneous bug fixes
+
+to 20.3 beta17 "Bucharest"
+-- ediff-2.67
+-- viper-2.96
+-- cc-mode-5.15
+-- Various patches by Karl Hegbloom
+   Interface change:  info mode now behaves like Emacs by default.
+-- Custom-1.9954
+-- texinfo documentation updated from texinfo-3.11
+-- Miscellaneous bug fixes
+
+to 20.3 beta16 "Budapest"
+-- New lisp finding functions courtesy of Jens Petersen
+   New keybindings:  C-c f -- find-function
+		     C-x 4 F -- find-function-other-window
+		     C-x 5 F -- find-function-other-frame
+-- vhdl-mode.el-2.74 Courtesy of Rod Whitby
+-- Custom-1.9953
+-- OffiX DnD extensions courtesy of Oliver Graf
+-- Miscellaneous bug fixes
+
+to 20.3 beta15 "Berlin"
+-- cc-mode-5.14
+-- hm--html-menus-5.8
+-- Gnus-5.4.64 is packaged
+-- AUCTeX-9.7p is packaged
+-- Initial implementation of Packages
+-- Handling of printing circular objects synched with Emacs 19.34
+-- mel-6.10.1 [Formerly part of tm] Courtesy of MORIOKA Tomohiko
+-- apel-3.4 [Formerly part of tm] Courtesy of MORIOKA Tomohiko
+-- Fix for installing XEmacs with separate --prefix, --exec-prefix directories
+-- New configure option --pkg-dir [list] enabled, contents available via
+   the Lisp variable `package-path' (default is "/etc/xemacs:~/.xemacs))
+-- Advisory message added to *scratch* at startup
+-- Gnus-5.4.64
+-- strokes.el-2.3
+-- Miscellaneous bug fixes
+
+to 20.3 beta14 "Vienna"
+-- VM-6.33
+-- Miscellaneous Martin Buchholz patches to configure
+-- viper-2.95
+-- ediff-2.66
+-- cc-mode-5.13
+-- Texinfo files updated from Texinfo-3.9e.
+-- Menubar accelerators courtesy of Joel Peterson
+-- Miscellaneous bug fixes
+
+to 20.3 beta13 "Brussels"
+-- W3-3.0.94
+-- ph.el-2.6 courtesy of Oscar Figueiredo
+-- Miscellaneous Configure changes from Martin and Hrvoje.
+-- crisp.el-1.19 courtesy of Gary Foster
+-- Gnus-5.4.63
+-- Major and sundry changes by Martin Buchholz
+-- gnuserv.el-3.9 (Add done button on menubar) courtesy of Hrvoje Niksic
+-- edit-toolbar.el-1.01 courtesy of Peter Pezaris
+-- toolbar-utils.el courtesy of Jeff Miller (was called toolbar-func.el on
+   xemacs-beta)
+-- Miscellaneous build fixes
+-- Custom-1.9951
+-- Miscellaneous bug fixes
+
+to 20.3 beta12 "Helsinki"
+-- cc-mode-5.12.
+-- ~/.xemacs --> ~/.xemacs/init.el
+-- ~/.xemacs-custom -> ~/.xemacs/options.el
+-- Fix lossage in lwlib-Xm.c
+-- Miscellaneous bug fixes
+
+to 20.3 beta11 "Stockholm"
+-- Try #2 with LOSING_BYTECODE disabled.
+-- Interface change: value of `system-type' is provided as a feature
+-- Gnus-5.4.62
+-- W3-3.0.93
+-- Custom-1.9946
+-- New user variable `errors-deactivate-region'
+-- Miscellaneous bug fixes.
+-- iso-acc.el-1.15  (Mule fixes)
+-- autoloads/custom loads generation in build updated
+-- Fix for frozen messages in message area from Kyle Jones.
+
+to 20.3 beta10 "Athens"
+-- Linuxdoc-sgml.el courtesy of Arun Sharma.
+-- rewritten abbreviations from Hrvoje Niksic
+-- Gnus-5.4.60
+-- New file image-mode.el (Major mode for displaying image files)
+-- Miscellaneous Mule patches from MORIOKA Tomohiko
+-- Miscellaneous Hrvoje Niksic patches
+-- Configure/tree-x patches from Martin Buchholz
+-- Restore Show Message Log in Edit menu.
+-- `make autoloads' updated and should now work without Mule [untested].
+-- New boolean variable `x-seppuku-on-epipe' to handle case of X Server going
+   away and XEmacs not exiting.  Set to `t' to force immediate exit
+-- custom-1.9940
+-- gnuserv.el-3.6
+-- speedbar-0.5 courtesy of Eric Ludlam
+-- Internals change -- Use fork() instead of vfork() for invoking
+   subprocesses
+-- Miscellaneous bug fixes
+
+to 20.3 beta9 "Sofia".
+-- cc-mode-5.11
+-- custom-1.9937
+-- Mule Updates/Quail/Synch with Emacs/Mule zeta courtesy of MORIOKA Tomohiko
+-- lazy-lock.el reverted to 1.14 as per Ben Wing's instructions.
+-- ph.el-2.1
+-- W3-3.0.92 courtesy of William Perry
+-- reftex.el-2.14
+-- Lots of Miscellaneous Hrvoje Niksic patches
+-- view-process 2.4 -- Courtesy of Heiko Muenkel
+-- time.el-1.17
+-- Miscellaneous bug fixes
+
+to 20.3 beta8 "Copenhagen".
+-- Custom changes now saved in ~/.xemacs-custom and loaded automatically at
+   startup
+-- oobr support binaries moved from lisp hierarchy to new top level
+   directory `pkg-src'
+-- Viper-2.94 Courtesy of Michael Kifer
+-- Customizations from Hrvoje Niksic
+-- FAQ update from Andreas Kaempf
+-- New graphic cbx.gif added to etc, courtesy of Jens Lautenbacher,
+   `Created by XEmacs' suitable for adorning a web page.
+-- save-some-buffers now has an option to preview dirty buffers as
+   they are being offered for save.  Courtesy of David Bakhash
+-- XEmacs compiles in 64 bit SGI environment courtesy of Olivier Galibert
+-- Hardcoded -I/usr/local/include, -L/usr/local/include removed
+-- edmacro.el-3.16
+-- mapvector is now a subr courtesy of Hrvoje Niksic
+-- new function archive-quit in arc-mode.el courtesy of Karl Hegbloom
+-- debug-on-error (round 2) courtesy of Hrvoje Niksic
+-- Gnus-5.4.59
+-- Build no longer depends on a list of .elc files listed in src/Makefile.in.in
+   (only important to developers)
+-- If a .xemacs file exists, use it in preference to .emacs.  If no .xemacs
+   use .emacs as usual.  The file loaded is left in `user-init-file'
+-- Overhaul of XEmacs startup code, Part II
+-- custom-1.9931
+-- Miscellaneous Ebola fixes
+-- New internal autoload generating function `batch-update-directory'
+-- New file hippie-exp.el from Emacs/Mule zeta
+-- Miscellaneous bug fixes
+
+to 20.3 beta7 "Oslo".
+-- Miscellaneous Ebola fixes
+-- hyper-apropos update courtesy of Hrvoje Niksic
+-- Make lib-complete deal with compressed .el files when not using Mule.
+   (Patch based on code from Jonathan Doughty)
+-- Gnus refcard update courtesy of Vladimir Alexiev
+-- Various fixes from Kyle Jones
+-- ph.el-1.2.1.1 Courtesy of Oscar Figueiredo
+-- custom-1.9916
+-- `with-current-buffer', etc. ported from Emacs 20.1 courtesy of Hrvoje
+   Niksic
+-- Miscellaneous bug fixes
+
+to 20.3 beta6 "Moscow".
+-- Configure updates courtesy of Martin Buchholz
+-- Mule updates courtesy of MORIOKA Tomohiko
+-- Lots of Ebola cleanup, but much remains
+-- Miscellaneous bug fixes
+
+to 20.3 beta5 "Zagreb".
+-- Configure patches continued from Martin Buchholz
+-- Miscellaneous Bug Fixes from various people (see ChangeLogs)
+-- custom-1.9908
+-- Moved mule-doc/demo to etc/HELLO for the mule menu.
+
+to 20.3 beta4 "Warsaw".
+-- miscellaneous bug fixes
+-- various about.el additions & updates
+-- edmacro.el-3.15
+-- Configure patches courtesy of Martin Buchholz
+-- about.el-2.2 courtesy of Hrvoje Niksic
+-- New function eval-when-feature from Emacs 20
+-- Toolbar buttons now take arbitrary lisp functions for callback
+-- webjump.el-1.5 courtesy of Neal W. Van Dyke
+-- reftex.el-2.13 courtesy of Carsten Dominik
+-- Initial synch with InfoDock 3.5
+-- Give defcustom the same special treatment defvar gets when evaluated with
+   `eval-last-sexp' (C-x C-e)
+-- "These patches make XEmacs run under NT!" - David Hobley
+-- Initial port of LEIM courtesy of MORIOKA Tomohiko
+-- tm-7.108 courtey of MORIOKA Tomohiko
+-- Custom-1.9907
+-- VM-6.32
+-- Gnus-5.4.56
+-- ediff & viper updates courtesy of Michael Kifer
+-- icomplete.el-4.10 courtesy of Ken Manheimer
+-- gdb-highlight.el courtesy of Jamie Zawinski
+-- New function `narrow-to-defun' bound to `C-x n d', from Emacs 19.35
+-- Oops, sorry.  gnudoit script restored
+-- New function `kill-buffer-and-window' bound to `C-x 4 0', from Emacs 19.34
+-- Cleanup of dumped packages to eliminate bytecompiler warnings
+
+to 20.3 beta3.
+-- miscellaneous bug fixes
+-- iso-acc.el-1.14 courtesy of Alexandre Oliva
+-- custom-load.el renamed to cus-load.el and is no longer dumped
+-- Configure patches courtesy of Martin Buchholz
+-- etags.c-12.7
+-- Old packages removed:  modes/old-c-mode.el, modes/old-c++-mode.el,
+   modes/two-column.el.
+   emulators/mlconvert.el, emulators/mlsupport.el.
+   energize/*.el.
+   eos/loaddefs-eos.el.
+   packages/generic-sc.el, packages/mime-compose.el, packages/netunam.el,
+   packages/sccs.el, packages/server.el.
+   utils/mailpost.el, utils/meese.el.
+-- dynodump hierarchy restored to distribution
+-- ssh.el-1.3 courtesy of Noah Friedman
+-- AUC TeX-9.7p courtesy of Per Abrahamsen
+-- savehist.el-0.2 courtesy of Hrvoje Niksic
+-- GPM support courtesy of William Perry
+-- Custom-1.98
+-- hm--html-menus-5.7 courtesy of Heiko Muenkel
+-- Gnus-5.4.55
+
+to 20.3 beta2.
+-- mega configure patches courtesy of Martin Buchholz
+-- edmacro.el-3.14
+-- eldoc.el-1.13 courtesy of Noah Friedman
+-- strokes.el-2.2 courtesy of David Bakhash
+-- eterm updates courtesy of Per Bothner
+-- add-log.el gets new mode type variables for lisp-like, c-like, and tex-like
+   modes courtesy of Erik Naggum
+-- add-log.el synched with Emacs 20.0
+-- gnudoit removed, Gnuserv updated courtesy of Hrvoje Niksic
+-- miscellaneous bug fixes
+-- Fix for multiple frame `cursor lockstep' bug courtesy of Kyle Jones
+-- Continued configure/build cleanup
+-- obsolete dynodump directories removed
+-- Gnus-5.4.53 courtesy of Lars Magne Ingebrigtsen
+-- vc-hooks.el, vc.el synched up with Emacs 19.34.94.
+-- Bytecompiler optimization hacking courtesy of Jamie Zawinski
+
+to 20.3 beta1.
+-- Custom-1.97 courtesy of Per Abrahamsen
+-- Obsolete files emacstool.c, emacsclient.c, emacsserver.c removed
+-- etags.c-11.90 courtesy of Francesco Potorti`
+-- Dragable modeline courtesy of Kyle Jones
+-- Gnuserv.el 3.1 & upgrade of gnuclient courtesy of Hrvoje Niksic
+-- Upgrade to configure 2.12 courtesy of Martin Buchholz
+-- New variable `Info-button1-follows-hyperlink' to allow disabling the
+   feature.
+-- Restore Gosling Emacs transpose-chars implementation as an option
--- a/ChangeLog	Mon Aug 13 10:49:52 2007 +0200
+++ b/ChangeLog	Mon Aug 13 10:50:39 2007 +0200
@@ -1,3 +1,19 @@
+1999-03-05  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.0.65 is released
+
+1999-03-03  Martin Buchholz  <martin@xemacs.org>
+
+	* configure.in:
+	`uname -v` -> "`uname -v`":
+	backquoted expressions need additional double
+	quotes to be a single token.
+	Use separate if's to avoid extra process invocations.
+
+1999-01-05  Gunnar Evermann  <ge204@eng.cam.ac.uk>
+
+	* PROBLEMS: Document crashes on SPARC with gcc 2.8.1. 
+
 1999-03-01  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.0.64 is released
--- a/PROBLEMS	Mon Aug 13 10:49:52 2007 +0200
+++ b/PROBLEMS	Mon Aug 13 10:50:39 2007 +0200
@@ -30,6 +30,12 @@
 ===============================
 
 ** General
+*** Don't use -O2 with gcc 2.8.1 and egcs 1.0 under SPARC architectures
+without also using `-fno-schedule-insns'.
+
+gcc will generate incorrect code otherwise, typically resulting in
+crashes in the function skip-syntax-backward.
+
 *** egcs-1.1
 
 There have been reports of egcs-1.1 not compiling XEmacs correctly on
--- a/configure	Mon Aug 13 10:49:52 2007 +0200
+++ b/configure	Mon Aug 13 10:50:39 2007 +0200
@@ -2,7 +2,7 @@
 
 #### Configuration script for XEmacs.  Largely divergent from FSF.
 #### Guess values for system-dependent variables and create Makefiles.
-#### Generated automatically using autoconf version 2.13 
+#### Generated automatically using autoconf version 2.12 
 #### Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #### Copyright (C) 1993-1995 Board of Trustees, University of Illinois.
 #### Copyright (C) 1996, 1997 Sun Microsystems, Inc.
@@ -198,8 +198,6 @@
 ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
 cross_compiling=no
 
-ac_exeext=
-ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -745,7 +743,7 @@
 
 if test -z "$configuration"; then
   echo $ac_n "checking "host system type"""... $ac_c" 1>&6
-echo "configure:749: checking "host system type"" >&5
+echo "configure:747: checking "host system type"" >&5
     if configuration=`${CONFIG_SHELL-/bin/sh} $srcdir/config.guess | \
     sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'` ; then
     echo "$ac_t""$configuration" 1>&6
@@ -759,7 +757,7 @@
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:763: checking whether ln -s works" >&5
+echo "configure:761: checking whether ln -s works" >&5
 
 rm -f conftestdata
 if ln -s X conftestdata 2>/dev/null
@@ -984,7 +982,7 @@
 
 
 echo "checking "the configuration name"" 1>&6
-echo "configure:988: checking "the configuration name"" >&5
+echo "configure:986: checking "the configuration name"" >&5
 internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'`
 if canonical=`$srcdir/config.sub "$internal_configuration"` ; then : ; else
   exit $?
@@ -1477,14 +1475,13 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1481: checking for $ac_word" >&5
+echo "configure:1479: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_CC="gcc"
@@ -1504,15 +1501,14 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1508: checking for $ac_word" >&5
+echo "configure:1505: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
   ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
@@ -1546,42 +1542,11 @@
   echo "$ac_t""no" 1>&6
 fi
 
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1556: checking for $ac_word" >&5
-
-if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1585: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1550: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -1592,14 +1557,12 @@
 ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
 cross_compiling=no
 
-cat > conftest.$ac_ext << EOF
-
-#line 1598 "configure"
-#include "confdefs.h"
-
+cat > conftest.$ac_ext <<EOF
+#line 1562 "configure"
+#include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1613,33 +1576,25 @@
   ac_cv_prog_cc_works=no
 fi
 rm -fr conftest*
-ac_ext=c
-xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
-xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
-xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
-ac_cpp='$CPP '"$xe_cppflags"
-ac_compile='${CC-cc} -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
-cross_compiling=no
 
 echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
 if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1631: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1586: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1636: checking whether we are using GNU C" >&5
+echo "configure:1591: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1643: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1649,15 +1604,11 @@
 
 if test $ac_cv_prog_gcc = yes; then
   GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1661: checking whether ${CC-cc} accepts -g" >&5
+  ac_test_CFLAGS="${CFLAGS+set}"
+  ac_save_CFLAGS="$CFLAGS"
+  CFLAGS=
+  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:1612: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -1669,20 +1620,16 @@
 
 
 echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
+  if test "$ac_test_CFLAGS" = set; then
+    CFLAGS="$ac_save_CFLAGS"
+  elif test $ac_cv_prog_cc_g = yes; then
     CFLAGS="-g -O2"
   else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
     CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
+  fi
+else
+  GCC=
+  test "${CFLAGS+set}" = set || CFLAGS="-g"
 fi
  
 if   test "$with_gcc" = "no"  -a "$GCC" = "yes"; then
@@ -1690,14 +1637,13 @@
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1694: checking for $ac_word" >&5
+echo "configure:1641: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_CC="gcc"
@@ -1717,15 +1663,14 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1721: checking for $ac_word" >&5
+echo "configure:1667: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
   ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
@@ -1759,42 +1704,11 @@
   echo "$ac_t""no" 1>&6
 fi
 
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1769: checking for $ac_word" >&5
-
-if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1798: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1712: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -1805,14 +1719,12 @@
 ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
 cross_compiling=no
 
-cat > conftest.$ac_ext << EOF
-
-#line 1811 "configure"
-#include "confdefs.h"
-
+cat > conftest.$ac_ext <<EOF
+#line 1724 "configure"
+#include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1826,33 +1738,25 @@
   ac_cv_prog_cc_works=no
 fi
 rm -fr conftest*
-ac_ext=c
-xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
-xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
-xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
-ac_cpp='$CPP '"$xe_cppflags"
-ac_compile='${CC-cc} -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
-cross_compiling=no
 
 echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
 if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1844: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1748: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1849: checking whether we are using GNU C" >&5
+echo "configure:1753: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1862,15 +1766,11 @@
 
 if test $ac_cv_prog_gcc = yes; then
   GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1874: checking whether ${CC-cc} accepts -g" >&5
+  ac_test_CFLAGS="${CFLAGS+set}"
+  ac_save_CFLAGS="$CFLAGS"
+  CFLAGS=
+  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:1774: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -1882,20 +1782,16 @@
 
 
 echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
+  if test "$ac_test_CFLAGS" = set; then
+    CFLAGS="$ac_save_CFLAGS"
+  elif test $ac_cv_prog_cc_g = yes; then
     CFLAGS="-g -O2"
   else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
     CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
+  fi
+else
+  GCC=
+  test "${CFLAGS+set}" = set || CFLAGS="-g"
 fi
 
 elif test "$with_gcc" = "yes" -a "$GCC" != "yes" ; then
@@ -1903,14 +1799,13 @@
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1907: checking for $ac_word" >&5
+echo "configure:1803: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_CC="gcc"
@@ -1930,15 +1825,14 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1934: checking for $ac_word" >&5
+echo "configure:1829: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
   ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
@@ -1972,42 +1866,11 @@
   echo "$ac_t""no" 1>&6
 fi
 
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1982: checking for $ac_word" >&5
-
-if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2011: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1874: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -2018,14 +1881,12 @@
 ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
 cross_compiling=no
 
-cat > conftest.$ac_ext << EOF
-
-#line 2024 "configure"
-#include "confdefs.h"
-
+cat > conftest.$ac_ext <<EOF
+#line 1886 "configure"
+#include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:2029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -2039,33 +1900,25 @@
   ac_cv_prog_cc_works=no
 fi
 rm -fr conftest*
-ac_ext=c
-xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
-xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
-xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
-ac_cpp='$CPP '"$xe_cppflags"
-ac_compile='${CC-cc} -c $CFLAGS '"$xe_cppflags"' conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
-cross_compiling=no
 
 echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
 if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2057: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1910: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2062: checking whether we are using GNU C" >&5
+echo "configure:1915: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -2075,15 +1928,11 @@
 
 if test $ac_cv_prog_gcc = yes; then
   GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2087: checking whether ${CC-cc} accepts -g" >&5
+  ac_test_CFLAGS="${CFLAGS+set}"
+  ac_save_CFLAGS="$CFLAGS"
+  CFLAGS=
+  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:1936: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -2095,20 +1944,16 @@
 
 
 echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
+  if test "$ac_test_CFLAGS" = set; then
+    CFLAGS="$ac_save_CFLAGS"
+  elif test $ac_cv_prog_cc_g = yes; then
     CFLAGS="-g -O2"
   else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
     CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
+  fi
+else
+  GCC=
+  test "${CFLAGS+set}" = set || CFLAGS="-g"
 fi
 
 fi
@@ -2120,7 +1965,7 @@
 test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP"
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2124: checking how to run the C preprocessor" >&5
+echo "configure:1969: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2133,14 +1978,14 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2137 "configure"
+#line 1982 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:1988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
 else
@@ -2150,31 +1995,14 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2154 "configure"
+#line 1999 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 2171 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:2005: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
 else
@@ -2187,8 +2015,6 @@
 rm -f conftest*
 fi
 rm -f conftest*
-fi
-rm -f conftest*
   ac_cv_prog_CPP="$CPP"
   CPP="$ac_cv_prog_CPP"
 else
@@ -2198,9 +2024,9 @@
 
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:2202: checking for AIX" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2204 "configure"
+echo "configure:2028: checking for AIX" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2030 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -2227,9 +2053,9 @@
 
 
 echo $ac_n "checking for GNU libc""... $ac_c" 1>&6
-echo "configure:2231: checking for GNU libc" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2233 "configure"
+echo "configure:2057: checking for GNU libc" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2059 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
@@ -2241,7 +2067,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_glibc=yes
 else
@@ -2263,7 +2089,7 @@
 
 
 cat > conftest.$ac_ext <<EOF
-#line 2267 "configure"
+#line 2093 "configure"
 #include "confdefs.h"
 int main () {
 #if defined __SUNPRO_C
@@ -2275,7 +2101,7 @@
 #endif
 }
 EOF
-if { (eval echo configure:2279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:2105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -2545,7 +2371,7 @@
  fi
 
 echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:2549: checking for dynodump" >&5
+echo "configure:2375: checking for dynodump" >&5
 if test "$unexec" != "unexsol2.o"; then
   echo "$ac_t""no" 1>&6
 else
@@ -2583,12 +2409,12 @@
   done
   
 echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6
-echo "configure:2587: checking for terminateAndUnload in -lC" >&5
+echo "configure:2413: checking for terminateAndUnload in -lC" >&5
 ac_lib_var=`echo C'_'terminateAndUnload | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lC "
 cat > conftest.$ac_ext <<EOF
-#line 2592 "configure"
+#line 2418 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2599,7 +2425,7 @@
 terminateAndUnload()
 ; return 0; }
 EOF
-if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2683,7 +2509,7 @@
 
 if test "$add_runtime_path" = "yes"; then
       echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:2687: checking "for runtime libraries flag"" >&5
+echo "configure:2513: checking "for runtime libraries flag"" >&5
   case "$opsys" in
     sol2 ) dash_r="-R" ;;
     decosf* | linux* | irix*) dash_r="-rpath " ;;
@@ -2705,14 +2531,14 @@
   done
 fi
         cat > conftest.$ac_ext <<EOF
-#line 2709 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+#line 2535 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:2542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   dash_r="$try_dash_r"
 else
@@ -2813,10 +2639,10 @@
 fi
 after_morecore_hook_exists=yes
 echo $ac_n "checking for malloc_get_state""... $ac_c" 1>&6
-echo "configure:2817: checking for malloc_get_state" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2820 "configure"
+echo "configure:2643: checking for malloc_get_state" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2646 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_get_state(); below.  */
@@ -2839,7 +2665,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_malloc_get_state=yes"
 else
@@ -2859,10 +2685,10 @@
 fi
 
 echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
-echo "configure:2863: checking for malloc_set_state" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2866 "configure"
+echo "configure:2689: checking for malloc_set_state" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2692 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_set_state(); below.  */
@@ -2885,7 +2711,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_malloc_set_state=yes"
 else
@@ -2905,16 +2731,16 @@
 fi
 
 echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
-echo "configure:2909: checking whether __after_morecore_hook exists" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2911 "configure"
+echo "configure:2735: checking whether __after_morecore_hook exists" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2737 "configure"
 #include "confdefs.h"
 extern void (* __after_morecore_hook)();
 int main() {
 __after_morecore_hook = 0
 ; return 0; }
 EOF
-if { (eval echo configure:2918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -2973,14 +2799,13 @@
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2977: checking for $ac_word" >&5
+echo "configure:2803: checking for $ac_word" >&5
 
 if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_RANLIB="ranlib"
@@ -3023,28 +2848,26 @@
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:3032: checking for a BSD compatible install" >&5
+echo "configure:2856: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 
-  IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
+  IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
   for ac_dir in $PATH; do
     # Account for people who put trailing slashes in PATH elements.
     case "$ac_dir/" in
     /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
     *)
       # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
+      for ac_prog in ginstall installbsd scoinst install; do
         if test -f $ac_dir/$ac_prog; then
 	  if test $ac_prog = install &&
             grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
+	    # OSF/1 installbsd also uses dspmsg, but is usable.
 	    :
 	  else
 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
@@ -3073,8 +2896,6 @@
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 for ac_prog in 'bison -y' byacc
@@ -3082,14 +2903,13 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3086: checking for $ac_word" >&5
+echo "configure:2907: checking for $ac_word" >&5
 
 if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
 else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       ac_cv_prog_YACC="$ac_prog"
@@ -3114,16 +2934,16 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3118: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3121 "configure"
+echo "configure:2938: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2941 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:2946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -3155,16 +2975,16 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3159: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3162 "configure"
+echo "configure:2979: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2982 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:2987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -3196,16 +3016,16 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3200: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3203 "configure"
+echo "configure:3020: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3023 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3208: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:3028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -3234,10 +3054,10 @@
 done
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3238: checking for sys/wait.h that is POSIX.1 compatible" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3241 "configure"
+echo "configure:3058: checking for sys/wait.h that is POSIX.1 compatible" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3061 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3253,7 +3073,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -3277,10 +3097,10 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3281: checking for ANSI C header files" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3284 "configure"
+echo "configure:3101: checking for ANSI C header files" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3104 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3288,8 +3108,8 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:3112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   ac_cv_header_stdc=yes
@@ -3305,7 +3125,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 <<EOF
-#line 3309 "configure"
+#line 3129 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3323,7 +3143,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 <<EOF
-#line 3327 "configure"
+#line 3147 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3341,7 +3161,7 @@
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
 cat > conftest.$ac_ext <<EOF
-#line 3345 "configure"
+#line 3165 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3352,7 +3172,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:3356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -3378,10 +3198,10 @@
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3382: checking whether time.h and sys/time.h may both be included" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3385 "configure"
+echo "configure:3202: checking whether time.h and sys/time.h may both be included" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3205 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3390,7 +3210,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -3414,10 +3234,10 @@
 fi
 
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:3418: checking for sys_siglist declaration in signal.h or unistd.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3421 "configure"
+echo "configure:3238: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3241 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3429,7 +3249,7 @@
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:3433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -3454,9 +3274,9 @@
 
 
 echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6
-echo "configure:3458: checking for struct utimbuf" >&5
-cat > conftest.$ac_ext <<EOF
-#line 3460 "configure"
+echo "configure:3278: checking for struct utimbuf" >&5
+cat > conftest.$ac_ext <<EOF
+#line 3280 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -3475,7 +3295,7 @@
 static struct utimbuf x; x.actime = x.modtime;
 ; return 0; }
 EOF
-if { (eval echo configure:3479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF
@@ -3495,10 +3315,10 @@
 rm -f conftest*
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3499: checking return type of signal handlers" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3502 "configure"
+echo "configure:3319: checking return type of signal handlers" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3322 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3515,7 +3335,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -3537,10 +3357,10 @@
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3541: checking for size_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3544 "configure"
+echo "configure:3361: checking for size_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3364 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3549,7 +3369,7 @@
 #endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
   rm -rf conftest*
   ac_cv_type_size_t=yes
 else
@@ -3571,10 +3391,10 @@
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3575: checking for pid_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3578 "configure"
+echo "configure:3395: checking for pid_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3398 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3583,7 +3403,7 @@
 #endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  egrep "pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
   rm -rf conftest*
   ac_cv_type_pid_t=yes
 else
@@ -3605,10 +3425,10 @@
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3609: checking for uid_t in sys/types.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3612 "configure"
+echo "configure:3429: checking for uid_t in sys/types.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3432 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -3644,10 +3464,10 @@
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:3648: checking for mode_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3651 "configure"
+echo "configure:3468: checking for mode_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3471 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3656,7 +3476,7 @@
 #endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  egrep "mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
   rm -rf conftest*
   ac_cv_type_mode_t=yes
 else
@@ -3678,10 +3498,10 @@
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3682: checking for off_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3685 "configure"
+echo "configure:3502: checking for off_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3505 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3690,7 +3510,7 @@
 #endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
   rm -rf conftest*
   ac_cv_type_off_t=yes
 else
@@ -3713,9 +3533,9 @@
 
 
 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:3717: checking for struct timeval" >&5
-cat > conftest.$ac_ext <<EOF
-#line 3719 "configure"
+echo "configure:3537: checking for struct timeval" >&5
+cat > conftest.$ac_ext <<EOF
+#line 3539 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -3731,7 +3551,7 @@
 static struct timeval x; x.tv_sec = x.tv_usec;
 ; return 0; }
 EOF
-if { (eval echo configure:3735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3555: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
   HAVE_TIMEVAL=yes
@@ -3753,10 +3573,10 @@
 rm -f conftest*
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:3757: checking whether struct tm is in sys/time.h or time.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3760 "configure"
+echo "configure:3577: checking whether struct tm is in sys/time.h or time.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3580 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -3764,7 +3584,7 @@
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:3768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3588: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -3788,10 +3608,10 @@
 fi
 
 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:3792: checking for tm_zone in struct tm" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3795 "configure"
+echo "configure:3612: checking for tm_zone in struct tm" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3615 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -3799,7 +3619,7 @@
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:3803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_zone=yes
 else
@@ -3822,10 +3642,10 @@
 
 else
   echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:3826: checking for tzname" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3829 "configure"
+echo "configure:3646: checking for tzname" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3649 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -3835,7 +3655,7 @@
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:3839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_var_tzname=yes
 else
@@ -3861,10 +3681,10 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3865: checking for working const" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3868 "configure"
+echo "configure:3685: checking for working const" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3688 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3913,7 +3733,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -3938,7 +3758,7 @@
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:3942: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:3762: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 
 cat > conftestmake <<\EOF
@@ -3963,12 +3783,12 @@
 
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3967: checking whether byte ordering is bigendian" >&5
+echo "configure:3787: checking whether byte ordering is bigendian" >&5
 
 ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 3972 "configure"
+#line 3792 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3979,11 +3799,11 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 3987 "configure"
+#line 3807 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3994,7 +3814,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -4011,7 +3831,7 @@
 rm -f conftest*
 if test $ac_cv_c_bigendian = unknown; then
 cat > conftest.$ac_ext <<EOF
-#line 4015 "configure"
+#line 3835 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -4024,7 +3844,7 @@
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:4028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_bigendian=no
 else
@@ -4051,10 +3871,10 @@
 
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:4055: checking size of short" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4058 "configure"
+echo "configure:3875: checking size of short" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3878 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4065,7 +3885,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -4093,10 +3913,10 @@
   exit 1
 fi
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4097: checking size of int" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4100 "configure"
+echo "configure:3917: checking size of int" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3920 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4107,7 +3927,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -4129,10 +3949,10 @@
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4133: checking size of long" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4136 "configure"
+echo "configure:3953: checking size of long" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3956 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4143,7 +3963,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -4165,10 +3985,10 @@
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4169: checking size of long long" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4172 "configure"
+echo "configure:3989: checking size of long long" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3992 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4179,7 +3999,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -4201,10 +4021,10 @@
 
 
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:4205: checking size of void *" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4208 "configure"
+echo "configure:4025: checking size of void *" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4028 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4215,7 +4035,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_void_p=`cat conftestval`
 else
@@ -4238,7 +4058,7 @@
 
 
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:4242: checking for long file names" >&5
+echo "configure:4062: checking for long file names" >&5
 
 ac_cv_sys_long_file_names=yes
 # Test for long file names in all the places we know might matter:
@@ -4285,12 +4105,12 @@
 
 
 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:4289: checking for sin in -lm" >&5
+echo "configure:4109: checking for sin in -lm" >&5
 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lm "
 cat > conftest.$ac_ext <<EOF
-#line 4294 "configure"
+#line 4114 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4301,7 +4121,7 @@
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:4305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4343,14 +4163,14 @@
 
 
 cat > conftest.$ac_ext <<EOF
-#line 4347 "configure"
+#line 4167 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
 return atanh(1.0) + asinh(1.0) + acosh(1.0); 
 ; return 0; }
 EOF
-if { (eval echo configure:4354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_INVERSE_HYPERBOLIC
@@ -4367,7 +4187,7 @@
 rm -f conftest*
 
 echo "checking type of mail spool file locking" 1>&6
-echo "configure:4371: checking type of mail spool file locking" >&5
+echo "configure:4191: checking type of mail spool file locking" >&5
 test -z "$mail_locking" -a "$mail_use_flock" = "yes" && mail_locking=flock
 test -z "$mail_locking" -a "$mail_use_lockf" = "yes" && mail_locking=lockf
 if   test "$mail_locking" = "lockf"; then { test "$extra_verbose" = "yes" && cat << \EOF
@@ -4391,12 +4211,12 @@
 
 
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:4395: checking for kstat_open in -lkstat" >&5
+echo "configure:4215: checking for kstat_open in -lkstat" >&5
 ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lkstat "
 cat > conftest.$ac_ext <<EOF
-#line 4400 "configure"
+#line 4220 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4407,7 +4227,7 @@
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:4411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4441,12 +4261,12 @@
 
 
 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:4445: checking for kvm_read in -lkvm" >&5
+echo "configure:4265: checking for kvm_read in -lkvm" >&5
 ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lkvm "
 cat > conftest.$ac_ext <<EOF
-#line 4450 "configure"
+#line 4270 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4457,7 +4277,7 @@
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:4461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4492,12 +4312,12 @@
 case "$opsys" in decosf*)
   
 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:4496: checking for cma_open in -lpthreads" >&5
+echo "configure:4316: checking for cma_open in -lpthreads" >&5
 ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpthreads "
 cat > conftest.$ac_ext <<EOF
-#line 4501 "configure"
+#line 4321 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4508,7 +4328,7 @@
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:4512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4544,7 +4364,7 @@
 esac
 
 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:4548: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:4368: checking whether the -xildoff compiler flag is required" >&5
 if   ${CC-cc} '-###' -xildon  no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then
   if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ;
     then echo "$ac_t""no" 1>&6;
@@ -4555,7 +4375,7 @@
 
 if test "$opsys" = "sol2" && test "$OS_RELEASE" -ge 56; then
   echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:4559: checking for \"-z ignore\" linker flag" >&5
+echo "configure:4379: checking for \"-z ignore\" linker flag" >&5
   case "`ld -h 2>&1`" in
     *-z\ ignore\|record* ) echo "$ac_t""yes" 1>&6
       ld_switch_site="-z ignore $ld_switch_site" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-z ignore\" to \$ld_switch_site"; fi ;;
@@ -4565,7 +4385,7 @@
 
 
 echo "checking "for specified window system"" 1>&6
-echo "configure:4569: checking "for specified window system"" >&5
+echo "configure:4389: checking "for specified window system"" >&5
 
 if test "$with_x11" != "no"; then
     test "$x_includes $x_libraries" != "NONE NONE" && \
@@ -4598,7 +4418,7 @@
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:4602: checking for X" >&5
+echo "configure:4422: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -4658,13 +4478,13 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 4662 "configure"
+#line 4482 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4667: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:4487: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   # We can compile using X headers with no special include directory.
@@ -4732,14 +4552,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4736 "configure"
+#line 4556 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:4743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -4848,17 +4668,17 @@
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:4852: checking whether -R must be followed by a space" >&5
+echo "configure:4672: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 4855 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:4862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+#line 4675 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:4682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -4874,14 +4694,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 4878 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:4885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+#line 4698 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:4705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -4917,12 +4737,12 @@
 else
 
 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:4921: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:4741: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldnet "
 cat > conftest.$ac_ext <<EOF
-#line 4926 "configure"
+#line 4746 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4933,7 +4753,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:4937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4957,12 +4777,12 @@
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       
 echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:4961: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:4781: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldnet_stub "
 cat > conftest.$ac_ext <<EOF
-#line 4966 "configure"
+#line 4786 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4973,7 +4793,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:4977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5002,10 +4822,10 @@
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:5006: checking for gethostbyname" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5009 "configure"
+echo "configure:4826: checking for gethostbyname" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4829 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -5028,7 +4848,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -5049,12 +4869,12 @@
     if test $ac_cv_func_gethostbyname = no; then
       
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:5053: checking for gethostbyname in -lnsl" >&5
+echo "configure:4873: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lnsl "
 cat > conftest.$ac_ext <<EOF
-#line 5058 "configure"
+#line 4878 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5065,7 +4885,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:5069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5095,10 +4915,10 @@
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:5099: checking for connect" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5102 "configure"
+echo "configure:4919: checking for connect" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4922 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -5121,7 +4941,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -5144,12 +4964,12 @@
 xe_msg_checking="for connect in -lsocket"
 test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:5148: checking "$xe_msg_checking"" >&5
+echo "configure:4968: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lsocket $X_EXTRA_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5153 "configure"
+#line 4973 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5160,7 +4980,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:5164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5184,10 +5004,10 @@
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:5188: checking for remove" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5191 "configure"
+echo "configure:5008: checking for remove" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5011 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -5210,7 +5030,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -5231,12 +5051,12 @@
     if test $ac_cv_func_remove = no; then
       
 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:5235: checking for remove in -lposix" >&5
+echo "configure:5055: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lposix "
 cat > conftest.$ac_ext <<EOF
-#line 5240 "configure"
+#line 5060 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5247,7 +5067,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:5251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5271,10 +5091,10 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:5275: checking for shmat" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5278 "configure"
+echo "configure:5095: checking for shmat" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5098 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -5297,7 +5117,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -5318,12 +5138,12 @@
     if test $ac_cv_func_shmat = no; then
       
 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:5322: checking for shmat in -lipc" >&5
+echo "configure:5142: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lipc "
 cat > conftest.$ac_ext <<EOF
-#line 5327 "configure"
+#line 5147 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5334,7 +5154,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:5338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5367,15 +5187,13 @@
   # libraries we check for below, so use a different variable.
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
   
-xe_msg_checking="for IceConnectionNumber in -lICE"
-test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
-echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:5374: checking "$xe_msg_checking"" >&5
+echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
+echo "configure:5192: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 
-xe_check_libs=" -lICE $X_EXTRA_LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 5379 "configure"
+xe_check_libs=" -lICE "
+cat > conftest.$ac_ext <<EOF
+#line 5197 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5386,7 +5204,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:5390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5555,7 +5373,7 @@
 
 
     echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:5559: checking for X defines extracted by xmkmf" >&5
+echo "configure:5377: checking for X defines extracted by xmkmf" >&5
   rm -fr conftestdir
   if mkdir conftestdir; then
     cd conftestdir
@@ -5587,16 +5405,16 @@
 
     ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:5591: checking for X11/Intrinsic.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5594 "configure"
+echo "configure:5409: checking for X11/Intrinsic.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5412 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:5417: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -5619,12 +5437,12 @@
 
       
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:5623: checking for XOpenDisplay in -lX11" >&5
+echo "configure:5441: checking for XOpenDisplay in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 5628 "configure"
+#line 5446 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5635,7 +5453,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:5639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5660,12 +5478,12 @@
 xe_msg_checking="for XGetFontProperty in -lX11"
 test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:5664: checking "$xe_msg_checking"" >&5
+echo "configure:5482: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lX11 -b i486-linuxaout"
 cat > conftest.$ac_ext <<EOF
-#line 5669 "configure"
+#line 5487 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5676,7 +5494,7 @@
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:5680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5703,12 +5521,12 @@
 
     
 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:5707: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:5525: checking for XShapeSelectInput in -lXext" >&5
 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXext "
 cat > conftest.$ac_ext <<EOF
-#line 5712 "configure"
+#line 5530 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5719,7 +5537,7 @@
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:5723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5742,12 +5560,12 @@
 
     
 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:5746: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:5564: checking for XtOpenDisplay in -lXt" >&5
 ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXt "
 cat > conftest.$ac_ext <<EOF
-#line 5751 "configure"
+#line 5569 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5758,7 +5576,7 @@
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:5762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5781,14 +5599,14 @@
 
 
   echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:5785: checking the version of X11 being used" >&5
+echo "configure:5603: checking the version of X11 being used" >&5
   cat > conftest.$ac_ext <<EOF
-#line 5787 "configure"
+#line 5605 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
     int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:5792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:5610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest foobar; x11_release=$?
 else
@@ -5813,16 +5631,16 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5817: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5820 "configure"
+echo "configure:5635: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5638 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:5643: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -5852,7 +5670,7 @@
 
 
     echo $ac_n "checking for XFree86""... $ac_c" 1>&6
-echo "configure:5856: checking for XFree86" >&5
+echo "configure:5674: checking for XFree86" >&5
   if test -d "/usr/X386/include" -o \
           -f "/etc/XF86Config"    -o \
 	  -f "/etc/X11/XF86Config" -o \
@@ -5872,12 +5690,12 @@
 
     test -z "$with_xmu" && { 
 echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:5876: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:5694: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
 ac_lib_var=`echo Xmu'_'XmuReadBitmapDataFromFile | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXmu "
 cat > conftest.$ac_ext <<EOF
-#line 5881 "configure"
+#line 5699 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5888,7 +5706,7 @@
 XmuReadBitmapDataFromFile()
 ; return 0; }
 EOF
-if { (eval echo configure:5892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5927,19 +5745,19 @@
 
       
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:5931: checking for main in -lXbsd" >&5
+echo "configure:5749: checking for main in -lXbsd" >&5
 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXbsd "
 cat > conftest.$ac_ext <<EOF
-#line 5936 "configure"
+#line 5754 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5976,22 +5794,22 @@
 fi 
 if test "$with_msw" != "no"; then
   echo "checking for MS-Windows" 1>&6
-echo "configure:5980: checking for MS-Windows" >&5
+echo "configure:5798: checking for MS-Windows" >&5
   
 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:5983: checking for main in -lgdi32" >&5
+echo "configure:5801: checking for main in -lgdi32" >&5
 ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgdi32 "
 cat > conftest.$ac_ext <<EOF
-#line 5988 "configure"
+#line 5806 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6056,12 +5874,12 @@
  fi
     fi
         cat > conftest.$ac_ext <<EOF
-#line 6060 "configure"
+#line 5878 "configure"
 #include "confdefs.h"
 #include <fcntl.h>
     int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
 EOF
-if { (eval echo configure:6065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:5883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MSG_SELECT
@@ -6140,7 +5958,7 @@
 esac
 
 echo "checking for session-management option" 1>&6
-echo "configure:6144: checking for session-management option" >&5;
+echo "configure:5962: checking for session-management option" >&5;
 if test "$with_session" != "no"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_SESSION
@@ -6155,16 +5973,16 @@
 test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
 test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6
-echo "configure:6159: checking for X11/Xauth.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6162 "configure"
+echo "configure:5977: checking for X11/Xauth.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5980 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:5985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -6186,12 +6004,12 @@
  }
 test -z "$with_xauth" && { 
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:6190: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:6008: checking for XauGetAuthByAddr in -lXau" >&5
 ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXau "
 cat > conftest.$ac_ext <<EOF
-#line 6195 "configure"
+#line 6013 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6202,7 +6020,7 @@
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:6206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6247,16 +6065,16 @@
       for dir in "" "Tt/" "desktop/" ; do
     ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6
-echo "configure:6251: checking for ${dir}tt_c.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6254 "configure"
+echo "configure:6069: checking for ${dir}tt_c.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6072 "configure"
 #include "confdefs.h"
 #include <${dir}tt_c.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:6077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -6291,12 +6109,12 @@
 xe_msg_checking="for tt_message_create in -ltt"
 test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6295: checking "$xe_msg_checking"" >&5
+echo "configure:6113: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ltt $extra_libs"
 cat > conftest.$ac_ext <<EOF
-#line 6300 "configure"
+#line 6118 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6307,7 +6125,7 @@
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:6311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6364,16 +6182,16 @@
 
 test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6
-echo "configure:6368: checking for Dt/Dt.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6371 "configure"
+echo "configure:6186: checking for Dt/Dt.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6189 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:6194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -6395,12 +6213,12 @@
  }
 test -z "$with_cde" && { 
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:6399: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:6217: checking for DtDndDragStart in -lDtSvc" >&5
 ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lDtSvc "
 cat > conftest.$ac_ext <<EOF
-#line 6404 "configure"
+#line 6222 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6411,7 +6229,7 @@
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:6415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6480,7 +6298,7 @@
 fi
 
 echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
-echo "configure:6484: checking if drag and drop API is needed" >&5
+echo "configure:6302: checking if drag and drop API is needed" >&5
 if test "$with_dragndrop" != "no" ; then
   if test -n "$dragndrop_proto" ; then
     with_dragndrop=yes
@@ -6501,19 +6319,19 @@
 fi
 
 echo "checking for LDAP" 1>&6
-echo "configure:6505: checking for LDAP" >&5
+echo "configure:6323: checking for LDAP" >&5
 test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ldap.h""... $ac_c" 1>&6
-echo "configure:6508: checking for ldap.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6511 "configure"
+echo "configure:6326: checking for ldap.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6329 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:6334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -6535,16 +6353,16 @@
  }
 test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for lber.h""... $ac_c" 1>&6
-echo "configure:6539: checking for lber.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6542 "configure"
+echo "configure:6357: checking for lber.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6360 "configure"
 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:6365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -6569,12 +6387,12 @@
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6573: checking "$xe_msg_checking"" >&5
+echo "configure:6391: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap -llber"
 cat > conftest.$ac_ext <<EOF
-#line 6578 "configure"
+#line 6396 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6585,7 +6403,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:6589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6608,12 +6426,12 @@
  }
   test "$with_umich_ldap" = "no" && { 
 echo $ac_n "checking for ldap_set_option in -lldap10""... $ac_c" 1>&6
-echo "configure:6612: checking for ldap_set_option in -lldap10" >&5
+echo "configure:6430: checking for ldap_set_option in -lldap10" >&5
 ac_lib_var=`echo ldap10'_'ldap_set_option | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap10 "
 cat > conftest.$ac_ext <<EOF
-#line 6617 "configure"
+#line 6435 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6624,7 +6442,7 @@
 ldap_set_option()
 ; return 0; }
 EOF
-if { (eval echo configure:6628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6688,15 +6506,15 @@
 
 if test "$window_system" != "none"; then
   echo "checking for graphics libraries" 1>&6
-echo "configure:6692: checking for graphics libraries" >&5
+echo "configure:6510: checking for graphics libraries" >&5
 
     xpm_problem=""
   if test -z "$with_xpm"; then
     echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:6697: checking for Xpm - no older than 3.4f" >&5
+echo "configure:6515: checking for Xpm - no older than 3.4f" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 6700 "configure"
+#line 6518 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
     int main(int c, char **v) {
@@ -6704,7 +6522,7 @@
       XpmIncludeVersion != XpmLibraryVersion() ? 1 :
       XpmIncludeVersion < 30406 ? 2 : 0 ;}
 EOF
-if { (eval echo configure:6708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest dummy_arg; xpm_status=$?;
       if test "$xpm_status" = "0"; then
@@ -6746,17 +6564,17 @@
 
     libs_x="-lXpm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXpm\" to \$libs_x"; fi
     echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6
-echo "configure:6750: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:6568: checking for \"FOR_MSW\" xpm" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 6753 "configure"
+#line 6571 "configure"
 #include "confdefs.h"
 
 int main() {
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:6760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   xpm_for_msw=no
 else
@@ -6798,12 +6616,12 @@
       if test "$with_png $with_tiff" != "no no"; then
     
 echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
-echo "configure:6802: checking for inflate in -lc" >&5
+echo "configure:6620: checking for inflate in -lc" >&5
 ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lc "
 cat > conftest.$ac_ext <<EOF
-#line 6807 "configure"
+#line 6625 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6814,7 +6632,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:6818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6833,12 +6651,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:6837: checking for inflate in -lz" >&5
+echo "configure:6655: checking for inflate in -lz" >&5
 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lz "
 cat > conftest.$ac_ext <<EOF
-#line 6842 "configure"
+#line 6660 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6849,7 +6667,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:6853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6868,12 +6686,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:6872: checking for inflate in -lgz" >&5
+echo "configure:6690: checking for inflate in -lgz" >&5
 ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgz "
 cat > conftest.$ac_ext <<EOF
-#line 6877 "configure"
+#line 6695 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6884,7 +6702,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:6888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6914,16 +6732,16 @@
 
     test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:6918: checking for jpeglib.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6921 "configure"
+echo "configure:6736: checking for jpeglib.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6739 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:6744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -6945,12 +6763,12 @@
  }
   test -z "$with_jpeg" && { 
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:6949: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:6767: checking for jpeg_destroy_decompress in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ljpeg "
 cat > conftest.$ac_ext <<EOF
-#line 6954 "configure"
+#line 6772 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6961,7 +6779,7 @@
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:6965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6997,10 +6815,10 @@
 
     png_problem=""
   test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:7001: checking for pow" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7004 "configure"
+echo "configure:6819: checking for pow" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6822 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pow(); below.  */
@@ -7023,7 +6841,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_pow=yes"
 else
@@ -7044,16 +6862,16 @@
  }
   test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:7048: checking for png.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7051 "configure"
+echo "configure:6866: checking for png.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6869 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:6874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -7075,12 +6893,12 @@
  }
   test -z "$with_png" && { 
 echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:7079: checking for png_read_image in -lpng" >&5
+echo "configure:6897: checking for png_read_image in -lpng" >&5
 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpng "
 cat > conftest.$ac_ext <<EOF
-#line 7084 "configure"
+#line 6902 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7091,7 +6909,7 @@
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:7095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7114,10 +6932,10 @@
  }
   if test -z "$with_png"; then
     echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:7118: checking for workable png version information" >&5
+echo "configure:6936: checking for workable png version information" >&5
     xe_check_libs="-lpng -lz"
     cat > conftest.$ac_ext <<EOF
-#line 7121 "configure"
+#line 6939 "configure"
 #include "confdefs.h"
 #include <png.h>
     int main(int c, char **v) {
@@ -7125,7 +6943,7 @@
     if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1;
     return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}
 EOF
-if { (eval echo configure:7129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest dummy_arg; png_status=$?;
       if test "$png_status" = "0"; then
@@ -7168,16 +6986,16 @@
 
     test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:7172: checking for tiffio.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7175 "configure"
+echo "configure:6990: checking for tiffio.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6993 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:6998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -7199,12 +7017,12 @@
  }
   test -z "$with_tiff" && { 
 echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7203: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:7021: checking for TIFFClientOpen in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ltiff "
 cat > conftest.$ac_ext <<EOF
-#line 7208 "configure"
+#line 7026 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7215,7 +7033,7 @@
 TIFFClientOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:7219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7254,20 +7072,20 @@
 if test "$with_x11" = "yes"; then
 
   echo "checking for X11 graphics libraries" 1>&6
-echo "configure:7258: checking for X11 graphics libraries" >&5
+echo "configure:7076: checking for X11 graphics libraries" >&5
 
     test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:7262: checking for compface.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7265 "configure"
+echo "configure:7080: checking for compface.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7083 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:7088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -7289,12 +7107,12 @@
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:7293: checking for UnGenFace in -lcompface" >&5
+echo "configure:7111: checking for UnGenFace in -lcompface" >&5
 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcompface "
 cat > conftest.$ac_ext <<EOF
-#line 7298 "configure"
+#line 7116 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7305,7 +7123,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:7309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7341,12 +7159,12 @@
 
     
 echo $ac_n "checking for XawScrollbarSetThumb in -lXaw""... $ac_c" 1>&6
-echo "configure:7345: checking for XawScrollbarSetThumb in -lXaw" >&5
+echo "configure:7163: checking for XawScrollbarSetThumb in -lXaw" >&5
 ac_lib_var=`echo Xaw'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXaw "
 cat > conftest.$ac_ext <<EOF
-#line 7350 "configure"
+#line 7168 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7357,7 +7175,7 @@
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:7361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7381,16 +7199,16 @@
                     
     ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:7385: checking for Xm/Xm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7388 "configure"
+echo "configure:7203: checking for Xm/Xm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7206 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:7211: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -7406,12 +7224,12 @@
   echo "$ac_t""yes" 1>&6
   
 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:7410: checking for XmStringFree in -lXm" >&5
+echo "configure:7228: checking for XmStringFree in -lXm" >&5
 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF
-#line 7415 "configure"
+#line 7233 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7422,7 +7240,7 @@
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:7426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7451,9 +7269,9 @@
 
   if test "$have_motif" = "yes"; then
         echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:7455: checking for Lesstif" >&5
+echo "configure:7273: checking for Lesstif" >&5
     cat > conftest.$ac_ext <<EOF
-#line 7457 "configure"
+#line 7275 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 #ifdef LESSTIF_VERSION
@@ -7737,7 +7555,7 @@
 
 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
-echo "configure:7741: checking for Mule-related features" >&5
+echo "configure:7559: checking for Mule-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
@@ -7762,16 +7580,16 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7766: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7769 "configure"
+echo "configure:7584: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7587 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7774: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:7592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -7801,12 +7619,12 @@
 
   
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:7805: checking for strerror in -lintl" >&5
+echo "configure:7623: checking for strerror in -lintl" >&5
 ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lintl "
 cat > conftest.$ac_ext <<EOF
-#line 7810 "configure"
+#line 7628 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7817,7 +7635,7 @@
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:7821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7850,18 +7668,18 @@
 
 
   echo "checking for Mule input methods" 1>&6
-echo "configure:7854: checking for Mule input methods" >&5
+echo "configure:7672: checking for Mule input methods" >&5
         case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6
-echo "configure:7857: checking for XIM" >&5
+echo "configure:7675: checking for XIM" >&5
     
 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:7860: checking for XOpenIM in -lX11" >&5
+echo "configure:7678: checking for XOpenIM in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenIM | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 7865 "configure"
+#line 7683 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7872,7 +7690,7 @@
 XOpenIM()
 ; return 0; }
 EOF
-if { (eval echo configure:7876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7896,12 +7714,12 @@
         if test "$have_motif $have_lesstif" = "yes no"; then
       
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:7900: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:7718: checking for XmImMbLookupString in -lXm" >&5
 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF
-#line 7905 "configure"
+#line 7723 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7912,7 +7730,7 @@
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:7916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7977,15 +7795,15 @@
 
     if test "$with_xfs" = "yes" ; then
     echo "checking for XFontSet" 1>&6
-echo "configure:7981: checking for XFontSet" >&5
+echo "configure:7799: checking for XFontSet" >&5
     
 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:7984: checking for XmbDrawString in -lX11" >&5
+echo "configure:7802: checking for XmbDrawString in -lX11" >&5
 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 7989 "configure"
+#line 7807 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7996,7 +7814,7 @@
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:8000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8036,16 +7854,16 @@
     test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
   test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6
-echo "configure:8040: checking for wnn/jllib.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8043 "configure"
+echo "configure:7858: checking for wnn/jllib.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7861 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:7866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -8069,10 +7887,10 @@
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8073: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8076 "configure"
+echo "configure:7891: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7894 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8095,7 +7913,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8124,12 +7942,12 @@
 
     test "$ac_cv_func_crypt" != "yes" && { 
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:8128: checking for crypt in -lcrypt" >&5
+echo "configure:7946: checking for crypt in -lcrypt" >&5
 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcrypt "
 cat > conftest.$ac_ext <<EOF
-#line 8133 "configure"
+#line 7951 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8140,7 +7958,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:8144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8175,12 +7993,12 @@
     if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
     
 echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6
-echo "configure:8179: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:7997: checking for jl_dic_list_e in -lwnn" >&5
 ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn "
 cat > conftest.$ac_ext <<EOF
-#line 8184 "configure"
+#line 8002 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8191,7 +8009,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:8195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8209,12 +8027,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6
-echo "configure:8213: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:8031: checking for jl_dic_list_e in -lwnn4" >&5
 ac_lib_var=`echo wnn4'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn4 "
 cat > conftest.$ac_ext <<EOF
-#line 8218 "configure"
+#line 8036 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8225,7 +8043,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:8229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8243,12 +8061,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6
-echo "configure:8247: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:8065: checking for jl_dic_list_e in -lwnn6" >&5
 ac_lib_var=`echo wnn6'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn6 "
 cat > conftest.$ac_ext <<EOF
-#line 8252 "configure"
+#line 8070 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8259,7 +8077,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:8263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8277,12 +8095,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6
-echo "configure:8281: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:8099: checking for dic_list_e in -lwnn6_fromsrc" >&5
 ac_lib_var=`echo wnn6_fromsrc'_'dic_list_e | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn6_fromsrc "
 cat > conftest.$ac_ext <<EOF
-#line 8286 "configure"
+#line 8104 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8293,7 +8111,7 @@
 dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:8297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8341,12 +8159,12 @@
     if test "$with_wnn6" != "no"; then
       
 echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6
-echo "configure:8345: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:8163: checking for jl_fi_dic_list in -l$libwnn" >&5
 ac_lib_var=`echo $libwnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$libwnn "
 cat > conftest.$ac_ext <<EOF
-#line 8350 "configure"
+#line 8168 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8357,7 +8175,7 @@
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:8361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8392,16 +8210,16 @@
   if test "$with_canna" != "no"; then
     ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:8396: checking for canna/jrkanji.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8399 "configure"
+echo "configure:8214: checking for canna/jrkanji.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8217 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:8222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -8427,16 +8245,16 @@
     c_switch_site="$c_switch_site -I/usr/local/canna/include"
     ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:8431: checking for canna/jrkanji.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8434 "configure"
+echo "configure:8249: checking for canna/jrkanji.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8252 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:8257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -8463,16 +8281,16 @@
 
   test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6
-echo "configure:8467: checking for canna/RK.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8470 "configure"
+echo "configure:8285: checking for canna/RK.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8288 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:8293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -8494,12 +8312,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:8498: checking for RkBgnBun in -lRKC" >&5
+echo "configure:8316: checking for RkBgnBun in -lRKC" >&5
 ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lRKC "
 cat > conftest.$ac_ext <<EOF
-#line 8503 "configure"
+#line 8321 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8510,7 +8328,7 @@
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:8514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8533,12 +8351,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:8537: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:8355: checking for jrKanjiControl in -lcanna" >&5
 ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcanna "
 cat > conftest.$ac_ext <<EOF
-#line 8542 "configure"
+#line 8360 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8549,7 +8367,7 @@
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:8553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8598,12 +8416,12 @@
   libs_x="-lXm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXm\" to \$libs_x"; fi
     
 echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6
-echo "configure:8602: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:8420: checking for layout_object_getvalue in -li18n" >&5
 ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -li18n "
 cat > conftest.$ac_ext <<EOF
-#line 8607 "configure"
+#line 8425 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8614,7 +8432,7 @@
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:8618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8700,10 +8518,10 @@
 for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf strcasecmp strerror tzset ulimit usleep utimes waitpid vsnprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8704: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8707 "configure"
+echo "configure:8522: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8525 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8726,7 +8544,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8767,10 +8585,10 @@
       * ) for ac_func in realpath
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8771: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8774 "configure"
+echo "configure:8589: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8592 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8793,7 +8611,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8827,16 +8645,16 @@
 esac
 
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:8831: checking whether netdb declares h_errno" >&5
-cat > conftest.$ac_ext <<EOF
-#line 8833 "configure"
+echo "configure:8649: checking whether netdb declares h_errno" >&5
+cat > conftest.$ac_ext <<EOF
+#line 8651 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:8840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF
@@ -8856,16 +8674,16 @@
 rm -f conftest*
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:8860: checking for sigsetjmp" >&5
-cat > conftest.$ac_ext <<EOF
-#line 8862 "configure"
+echo "configure:8678: checking for sigsetjmp" >&5
+cat > conftest.$ac_ext <<EOF
+#line 8680 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:8869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF
@@ -8885,11 +8703,11 @@
 rm -f conftest*
 
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:8889: checking whether localtime caches TZ" >&5
+echo "configure:8707: checking whether localtime caches TZ" >&5
 
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 8893 "configure"
+#line 8711 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
@@ -8924,7 +8742,7 @@
   exit (0);
 }
 EOF
-if { (eval echo configure:8928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
@@ -8954,9 +8772,9 @@
 
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:8958: checking whether gettimeofday accepts one or two arguments" >&5
-cat > conftest.$ac_ext <<EOF
-#line 8960 "configure"
+echo "configure:8776: checking whether gettimeofday accepts one or two arguments" >&5
+cat > conftest.$ac_ext <<EOF
+#line 8778 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -8978,7 +8796,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""two" 1>&6
 else
@@ -9000,19 +8818,19 @@
 
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:9004: checking for inline" >&5
+echo "configure:8822: checking for inline" >&5
 
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 9009 "configure"
+#line 8827 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:9016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8834: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -9062,17 +8880,17 @@
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:9066: checking for working alloca.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9069 "configure"
+echo "configure:8884: checking for working alloca.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8887 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:9076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -9096,28 +8914,23 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:9100: checking for alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9103 "configure"
+echo "configure:8918: checking for alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8921 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
 # define alloca __builtin_alloca
 #else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
+# if HAVE_ALLOCA_H
+#  include <alloca.h>
 # else
-#  if HAVE_ALLOCA_H
-#   include <alloca.h>
+#  ifdef _AIX
+ #pragma alloca
 #  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
+#   ifndef alloca /* predefined by HP cc +Olibcalls */
 char *alloca ();
-#    endif
 #   endif
 #  endif
 # endif
@@ -9127,7 +8940,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:9131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -9155,7 +8968,7 @@
   # that cause trouble.  Some versions do not even contain alloca or
   # contain a buggy version.  If you still want to use their alloca,
   # use ar to extract alloca.o from them instead of compiling alloca.c.
-  ALLOCA=alloca.${ac_objext}
+  ALLOCA=alloca.o
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining C_ALLOCA
 EOF
@@ -9166,10 +8979,10 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:9170: checking whether alloca needs Cray hooks" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9173 "configure"
+echo "configure:8983: checking whether alloca needs Cray hooks" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8986 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -9193,10 +9006,10 @@
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9197: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9200 "configure"
+echo "configure:9010: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9013 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -9219,7 +9032,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:9223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -9249,10 +9062,10 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:9253: checking stack direction for C alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9256 "configure"
+echo "configure:9066: checking stack direction for C alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9069 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -9271,7 +9084,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:9275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
@@ -9300,16 +9113,16 @@
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:9304: checking for vfork.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9307 "configure"
+echo "configure:9117: checking for vfork.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9120 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9312: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:9125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -9336,10 +9149,10 @@
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:9340: checking for working vfork" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9343 "configure"
+echo "configure:9153: checking for working vfork" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9156 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -9434,7 +9247,7 @@
   }
 }
 EOF
-if { (eval echo configure:9438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_vfork_works=yes
 else
@@ -9460,10 +9273,10 @@
 
 
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:9464: checking for working strcoll" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9467 "configure"
+echo "configure:9277: checking for working strcoll" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9280 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -9473,7 +9286,7 @@
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:9477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
@@ -9501,10 +9314,10 @@
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9505: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9508 "configure"
+echo "configure:9318: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9321 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -9527,7 +9340,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:9531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -9555,10 +9368,10 @@
 done
 
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:9559: checking whether getpgrp takes no argument" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9562 "configure"
+echo "configure:9372: checking whether getpgrp takes no argument" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9375 "configure"
 #include "confdefs.h"
 
 /*
@@ -9613,7 +9426,7 @@
 }
 
 EOF
-if { (eval echo configure:9617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_getpgrp_void=yes
 else
@@ -9640,10 +9453,10 @@
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:9644: checking for working mmap" >&5
+echo "configure:9457: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 9647 "configure"
+#line 9460 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -9676,7 +9489,7 @@
   return 1;
 }
 EOF
-if { (eval echo configure:9680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   have_mmap=yes
 else
@@ -9701,16 +9514,16 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9705: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9708 "configure"
+echo "configure:9518: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9521 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:9526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -9741,10 +9554,10 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9745: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9748 "configure"
+echo "configure:9558: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9561 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -9767,7 +9580,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:9771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -9795,10 +9608,10 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:9799: checking for working mmap" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9802 "configure"
+echo "configure:9612: checking for working mmap" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9615 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -9938,7 +9751,7 @@
 }
 
 EOF
-if { (eval echo configure:9942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -9976,16 +9789,16 @@
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:9980: checking for termios.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9983 "configure"
+echo "configure:9793: checking for termios.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9796 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:9801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -10027,16 +9840,16 @@
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termio.h""... $ac_c" 1>&6
-echo "configure:10031: checking for termio.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10034 "configure"
+echo "configure:9844: checking for termio.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9847 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:9852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -10067,10 +9880,10 @@
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:10071: checking for socket" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10074 "configure"
+echo "configure:9884: checking for socket" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9887 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -10093,7 +9906,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -10108,16 +9921,16 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6
-echo "configure:10112: checking for netinet/in.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10115 "configure"
+echo "configure:9925: checking for netinet/in.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9928 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10120: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:9933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -10133,16 +9946,16 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6
-echo "configure:10137: checking for arpa/inet.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10140 "configure"
+echo "configure:9950: checking for arpa/inet.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9953 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:9958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -10166,9 +9979,9 @@
 }
 
       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:10170: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:9983: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 10172 "configure"
+#line 9985 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -10179,7 +9992,7 @@
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:10183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_SOCKADDR_SUN_LEN
@@ -10197,9 +10010,9 @@
 fi
 rm -f conftest*
       echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:10201: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:10014: checking "for ip_mreq struct in netinet/in.h"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 10203 "configure"
+#line 10016 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -10209,7 +10022,7 @@
 static struct ip_mreq x;
 ; return 0; }
 EOF
-if { (eval echo configure:10213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MULTICAST
@@ -10240,10 +10053,10 @@
 
 
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:10244: checking for msgget" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10247 "configure"
+echo "configure:10057: checking for msgget" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10060 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
@@ -10266,7 +10079,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_msgget=yes"
 else
@@ -10281,16 +10094,16 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6
-echo "configure:10285: checking for sys/ipc.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10288 "configure"
+echo "configure:10098: checking for sys/ipc.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10101 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:10106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -10306,16 +10119,16 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
-echo "configure:10310: checking for sys/msg.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10313 "configure"
+echo "configure:10123: checking for sys/msg.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10126 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:10131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -10352,16 +10165,16 @@
 
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:10356: checking for dirent.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10359 "configure"
+echo "configure:10169: checking for dirent.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10172 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:10177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -10387,16 +10200,16 @@
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6
-echo "configure:10391: checking for sys/dir.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10394 "configure"
+echo "configure:10204: checking for sys/dir.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10207 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:10212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -10428,16 +10241,16 @@
 
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:10432: checking for nlist.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10435 "configure"
+echo "configure:10245: checking for nlist.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10248 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:10253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -10466,7 +10279,7 @@
 
 
 echo "checking "for sound support"" 1>&6
-echo "configure:10470: checking "for sound support"" >&5
+echo "configure:10283: checking "for sound support"" >&5
 case "$with_sound" in
   native | both ) with_native_sound=yes;;
   nas    | no   ) with_native_sound=no;;
@@ -10477,16 +10290,16 @@
     if test -n "$native_sound_lib"; then
     ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6
-echo "configure:10481: checking for multimedia/audio_device.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10484 "configure"
+echo "configure:10294: checking for multimedia/audio_device.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10297 "configure"
 #include "confdefs.h"
 #include <multimedia/audio_device.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:10302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -10533,12 +10346,12 @@
       if test -z "$native_sound_lib"; then
         
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:10537: checking for ALopenport in -laudio" >&5
+echo "configure:10350: checking for ALopenport in -laudio" >&5
 ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -laudio "
 cat > conftest.$ac_ext <<EOF
-#line 10542 "configure"
+#line 10355 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10549,7 +10362,7 @@
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:10553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10580,12 +10393,12 @@
       if test -z "$native_sound_lib"; then
 	
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:10584: checking for AOpenAudio in -lAlib" >&5
+echo "configure:10397: checking for AOpenAudio in -lAlib" >&5
 ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lAlib "
 cat > conftest.$ac_ext <<EOF
-#line 10589 "configure"
+#line 10402 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10596,7 +10409,7 @@
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:10600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10634,16 +10447,16 @@
     for dir in "machine" "sys" "linux"; do
       ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6
-echo "configure:10638: checking for ${dir}/soundcard.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10641 "configure"
+echo "configure:10451: checking for ${dir}/soundcard.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10454 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:10459: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -10712,7 +10525,7 @@
  fi
   libs_x="-laudio $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-laudio\" to \$libs_x"; fi
       cat > conftest.$ac_ext <<EOF
-#line 10716 "configure"
+#line 10529 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
@@ -10739,7 +10552,7 @@
 
 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:10743: checking for TTY-related features" >&5
+echo "configure:10556: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
@@ -10755,12 +10568,12 @@
     if test -z "$with_ncurses"; then
     
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:10759: checking for tgetent in -lncurses" >&5
+echo "configure:10572: checking for tgetent in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lncurses "
 cat > conftest.$ac_ext <<EOF
-#line 10764 "configure"
+#line 10577 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10771,7 +10584,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:10775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10804,16 +10617,16 @@
 
     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:10808: checking for ncurses/curses.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10811 "configure"
+echo "configure:10621: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10624 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:10629: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -10834,16 +10647,16 @@
 
     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:10838: checking for ncurses/term.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10841 "configure"
+echo "configure:10651: checking for ncurses/term.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10654 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:10659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -10872,16 +10685,16 @@
       c_switch_site="$c_switch_site -I/usr/include/ncurses"
       ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:10876: checking for ncurses/curses.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10879 "configure"
+echo "configure:10689: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10692 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:10697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -10915,12 +10728,12 @@
 	for lib in curses termlib termcap; do
 	  
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:10919: checking for tgetent in -l$lib" >&5
+echo "configure:10732: checking for tgetent in -l$lib" >&5
 ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$lib "
 cat > conftest.$ac_ext <<EOF
-#line 10924 "configure"
+#line 10737 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10931,7 +10744,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:10935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10962,12 +10775,12 @@
       else
 	
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:10966: checking for tgetent in -lcurses" >&5
+echo "configure:10779: checking for tgetent in -lcurses" >&5
 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcurses "
 cat > conftest.$ac_ext <<EOF
-#line 10971 "configure"
+#line 10784 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10978,7 +10791,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:10982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10996,12 +10809,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:11000: checking for tgetent in -ltermcap" >&5
+echo "configure:10813: checking for tgetent in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ltermcap "
 cat > conftest.$ac_ext <<EOF
-#line 11005 "configure"
+#line 10818 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11012,7 +10825,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:11016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11060,16 +10873,16 @@
 
     test -z "$with_gpm" && { ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for gpm.h""... $ac_c" 1>&6
-echo "configure:11064: checking for gpm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11067 "configure"
+echo "configure:10877: checking for gpm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10880 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:10885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -11091,12 +10904,12 @@
  }
   test -z "$with_gpm" && { 
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:11095: checking for Gpm_Open in -lgpm" >&5
+echo "configure:10908: checking for Gpm_Open in -lgpm" >&5
 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgpm "
 cat > conftest.$ac_ext <<EOF
-#line 11100 "configure"
+#line 10913 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11107,7 +10920,7 @@
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:11111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11156,21 +10969,21 @@
 
 
 echo "checking for database support" 1>&6
-echo "configure:11160: checking for database support" >&5
+echo "configure:10973: checking for database support" >&5
 
 if test "$with_database_gnudbm $with_database_dbm" != "no no"; then
   ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6
-echo "configure:11165: checking for ndbm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11168 "configure"
+echo "configure:10978: checking for ndbm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10981 "configure"
 #include "confdefs.h"
 #include <ndbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:10986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -11199,12 +11012,12 @@
 if test "$with_database_gnudbm" != "no"; then
   
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:11203: checking for dbm_open in -lgdbm" >&5
+echo "configure:11016: checking for dbm_open in -lgdbm" >&5
 ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgdbm "
 cat > conftest.$ac_ext <<EOF
-#line 11208 "configure"
+#line 11021 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11215,7 +11028,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:11219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11243,10 +11056,10 @@
 
 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:11247: checking for dbm_open" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11250 "configure"
+echo "configure:11060: checking for dbm_open" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11063 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -11269,7 +11082,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else
@@ -11288,12 +11101,12 @@
 
     
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:11292: checking for dbm_open in -ldbm" >&5
+echo "configure:11105: checking for dbm_open in -ldbm" >&5
 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldbm "
 cat > conftest.$ac_ext <<EOF
-#line 11297 "configure"
+#line 11110 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11304,7 +11117,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:11308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11346,10 +11159,10 @@
 
 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:11350: checking for Berkeley db.h" >&5
+echo "configure:11163: checking for Berkeley db.h" >&5
   for path in "db/db.h" "db.h"; do
     cat > conftest.$ac_ext <<EOF
-#line 11353 "configure"
+#line 11166 "configure"
 #include "confdefs.h"
 #ifdef HAVE_INTTYPES_H
 #define __BIT_TYPES_DEFINED__
@@ -11367,7 +11180,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_path="$path"; break
 else
@@ -11383,9 +11196,9 @@
 
   if test "$with_database_berkdb" != "no"; then
     echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:11387: checking for Berkeley DB version" >&5
+echo "configure:11200: checking for Berkeley DB version" >&5
     cat > conftest.$ac_ext <<EOF
-#line 11389 "configure"
+#line 11202 "configure"
 #include "confdefs.h"
 #include <$db_h_path>
 #if DB_VERSION_MAJOR > 1
@@ -11404,10 +11217,10 @@
 rm -f conftest*
 
     echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:11408: checking for $dbfunc" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11411 "configure"
+echo "configure:11221: checking for $dbfunc" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11224 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $dbfunc(); below.  */
@@ -11430,7 +11243,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$dbfunc=yes"
 else
@@ -11449,12 +11262,12 @@
 
     
 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:11453: checking for $dbfunc in -ldb" >&5
+echo "configure:11266: checking for $dbfunc in -ldb" >&5
 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldb "
 cat > conftest.$ac_ext <<EOF
-#line 11458 "configure"
+#line 11271 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11465,7 +11278,7 @@
 $dbfunc()
 ; return 0; }
 EOF
-if { (eval echo configure:11469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11529,12 +11342,12 @@
 if test "$with_socks" = "yes"; then
   
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:11533: checking for SOCKSinit in -lsocks" >&5
+echo "configure:11346: checking for SOCKSinit in -lsocks" >&5
 ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lsocks "
 cat > conftest.$ac_ext <<EOF
-#line 11538 "configure"
+#line 11351 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11545,7 +11358,7 @@
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:11549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11604,16 +11417,16 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11608: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11611 "configure"
+echo "configure:11421: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11424 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+{ (eval echo configure:11429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -11643,12 +11456,12 @@
 
 test -z "$with_shlib" && test ! -z "$have_dlfcn" && { 
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:11647: checking for dlopen in -ldl" >&5
+echo "configure:11460: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldl "
 cat > conftest.$ac_ext <<EOF
-#line 11652 "configure"
+#line 11465 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11659,7 +11472,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:11663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11688,12 +11501,12 @@
  }
 test -z "$with_shlib" && test ! -z "$have_dlfcn" && { 
 echo $ac_n "checking for _dlopen in -lc""... $ac_c" 1>&6
-echo "configure:11692: checking for _dlopen in -lc" >&5
+echo "configure:11505: checking for _dlopen in -lc" >&5
 ac_lib_var=`echo c'_'_dlopen | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lc "
 cat > conftest.$ac_ext <<EOF
-#line 11697 "configure"
+#line 11510 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11704,7 +11517,7 @@
 _dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:11708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11733,12 +11546,12 @@
  }
 test -z "$with_shlib" && test ! -z "$have_dlfcn" && { 
 echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:11737: checking for dlopen in -lc" >&5
+echo "configure:11550: checking for dlopen in -lc" >&5
 ac_lib_var=`echo c'_'dlopen | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lc "
 cat > conftest.$ac_ext <<EOF
-#line 11742 "configure"
+#line 11555 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11749,7 +11562,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:11753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11778,12 +11591,12 @@
  }
 test -z "$with_shlib" && { 
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:11782: checking for shl_load in -ldld" >&5
+echo "configure:11595: checking for shl_load in -ldld" >&5
 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldld "
 cat > conftest.$ac_ext <<EOF
-#line 11787 "configure"
+#line 11600 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11794,7 +11607,7 @@
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:11798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11823,12 +11636,12 @@
  }
 test -z "$with_shlib" && { 
 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:11827: checking for dld_init in -ldld" >&5
+echo "configure:11640: checking for dld_init in -ldld" >&5
 ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldld "
 cat > conftest.$ac_ext <<EOF
-#line 11832 "configure"
+#line 11645 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11839,7 +11652,7 @@
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:11843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11889,7 +11702,7 @@
 dll_oflags="-o "
 
 echo $ac_n "checking how to build a shared library""... $ac_c" 1>&6
-echo "configure:11893: checking how to build a shared library" >&5
+echo "configure:11706: checking how to build a shared library" >&5
 case `uname -rs` in
 	UNIX_SV*|UNIX_System_V*)
 		dll_lflags="-G"
@@ -11980,10 +11793,10 @@
   for ac_func in dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11984: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11987 "configure"
+echo "configure:11797: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11800 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12006,7 +11819,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -12042,11 +11855,11 @@
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 12046 "configure"
+#line 11859 "configure"
 #include "confdefs.h"
 int main(int c,char *v[]){return 0;}
 EOF
-if { (eval echo configure:12050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -12685,12 +12498,12 @@
 case "$with_dialogs" in
   motif    )
     echo "  Using Motif dialog boxes."
-    if test "$unexec" = "unexaix.o" -a `uname -v` = 4 -a `uname -r` -ge 3; then
+    if test "$unexec" = "unexaix.o"; then if test "`uname -v`" = 4 -a "`uname -r`" -ge 3; then
       echo "  *WARNING*  The Motif dialog boxes cause problems on AIX 4.3 and higher."
       echo "             We recommend using the Athena dialog boxes instead."
       echo "             Install libXaw and re-run configure with --with-dialogs='athena'."
       echo "             Read the PROBLEMS file for more information."
-    fi	
+    fi; fi
     ;;
   athena   ) echo "  Using Athena dialog boxes."    ;;
   athena3d ) echo "  Using Athena-3d dialog boxes." ;;
@@ -12784,7 +12597,7 @@
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
+    echo "$CONFIG_STATUS generated by autoconf version 2.12"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -12804,11 +12617,9 @@
  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
 $ac_vpsub
 $extrasub
-s%@SHELL@%$SHELL%g
 s%@CFLAGS@%$CFLAGS%g
 s%@CPPFLAGS@%$CPPFLAGS%g
 s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
 s%@DEFS@%$DEFS%g
 s%@LDFLAGS@%$LDFLAGS%g
 s%@LIBS@%$LIBS%g
@@ -12838,7 +12649,6 @@
 s%@lib_gcc@%$lib_gcc%g
 s%@RANLIB@%$RANLIB%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@YACC@%$YACC%g
 s%@SET_MAKE@%$SET_MAKE%g
--- a/configure.in	Mon Aug 13 10:49:52 2007 +0200
+++ b/configure.in	Mon Aug 13 10:50:39 2007 +0200
@@ -4057,12 +4057,12 @@
 case "$with_dialogs" in
   motif    )
     echo "  Using Motif dialog boxes."
-    if test "$unexec" = "unexaix.o" -a `uname -v` = 4 -a `uname -r` -ge 3; then
+    if test "$unexec" = "unexaix.o"; then if test "`uname -v`" = 4 -a "`uname -r`" -ge 3; then
       echo "  *WARNING*  The Motif dialog boxes cause problems on AIX 4.3 and higher."
       echo "             We recommend using the Athena dialog boxes instead."
       echo "             Install libXaw and re-run configure with --with-dialogs='athena'."
       echo "             Read the PROBLEMS file for more information."
-    fi	
+    fi; fi
     ;;
   athena   ) echo "  Using Athena dialog boxes."    ;;
   athena3d ) echo "  Using Athena-3d dialog boxes." ;;
--- a/etc/package-index.LATEST.pgp	Mon Aug 13 10:49:52 2007 +0200
+++ b/etc/package-index.LATEST.pgp	Mon Aug 13 10:50:39 2007 +0200
@@ -3,19 +3,19 @@
 (package-get-update-base-entry (quote
 (ediff
   (standards-version 1.0
-   version "1.17"
+   version "1.18"
    author-version "2.72"
-   date "1999-02-16"
-   build-date "1999-03-01"
+   date "1999-03-03"
+   build-date "1999-03-05"
    maintainer "Michael Kifer <kifer@cs.sunysb.edu>"
    distribution stable
    priority medium
    category "prog"
    dump nil
    description "Interface over GNU patch."
-   filename "ediff-1.17-pkg.tar.gz"
-   md5sum "b69c621d1943a9b668374f0babd243f3"
-   size 281481
+   filename "ediff-1.18-pkg.tar.gz"
+   md5sum "ece3aca382d80a7c03d71766987b9f2f"
+   size 281635
    provides (ediff)
    requires (pcl-cvs elib dired xemacs-base)
    type regular
@@ -157,19 +157,19 @@
 (package-get-update-base-entry (quote
 (locale
   (standards-version 1.0
-   version "1.11"
-   author-version "21.0b62"
-   date "1998-07-24"
-   build-date "1999-02-02"
+   version "1.12"
+   author-version "21.0b64"
+   date "1999-02-02"
+   build-date "1999-03-05"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority high
    category "mule"
    dump nil
    description "Localized menubars and localized splash screens."
-   filename "locale-1.11-pkg.tar.gz"
-   md5sum "245f5110c2adb4411e3f4e2db014c4bc"
-   size 32690
+   filename "locale-1.12-pkg.tar.gz"
+   md5sum "fbdb329b8e57e5eaf8c8fb9488357312"
+   size 33900
    provides ()
    requires (mule-base)
    type regular
@@ -311,19 +311,19 @@
 (package-get-update-base-entry (quote
 (psgml
   (standards-version 1.0
-   version "1.11"
+   version "1.12"
    author-version "1.01"
-   date "1998-07-06"
-   build-date "1999-02-02"
+   date "1999-03-05"
+   build-date "1999-03-05"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority medium
    category "oa"
    dump nil
    description "Validated HTML/SGML editing."
-   filename "psgml-1.11-pkg.tar.gz"
-   md5sum "e6d5a593138aa8861a5a178097c05594"
-   size 425005
+   filename "psgml-1.12-pkg.tar.gz"
+   md5sum "7303b3a604659b64f24b0847b3a686d5"
+   size 425458
    provides (psgml sgml)
    requires (edit-utils)
    type regular
@@ -619,19 +619,19 @@
 (package-get-update-base-entry (quote
 (viper
   (standards-version 1.0
-   version "1.13"
+   version "1.14"
    author-version "3.061"
-   date "1999-02-17"
-   build-date "1999-03-01"
+   date "1999-03-03"
+   build-date "1999-03-05"
    maintainer "Michael Kifer <kifer@cs.sunysb.edu>"
    distribution stable
    priority low
    category "wp"
    dump nil
    description "VI emulation support."
-   filename "viper-1.13-pkg.tar.gz"
-   md5sum "b369c53c499c3ab2e1478031ddaf6071"
-   size 317868
+   filename "viper-1.14-pkg.tar.gz"
+   md5sum "0e118822906e195dc352f28c8efc01e0"
+   size 317899
    provides (viper)
    requires (xemacs-base)
    type regular
@@ -707,19 +707,19 @@
 (package-get-update-base-entry (quote
 (reftex
   (standards-version 1.0
-   version "1.11"
-   author-version "3.42"
-   date "1998-08-11"
-   build-date "1999-02-02"
+   version "1.12"
+   author-version "3.43"
+   date "1999-03-01"
+   build-date "1999-03-02"
    maintainer "Carsten Dominik <dominik@strw.LeidenUniv.nl>"
    distribution stable
    priority medium
    category "wp"
    dump nil
    description "Emacs support for LaTeX cross-references, citations.."
-   filename "reftex-1.11-pkg.tar.gz"
-   md5sum "efe43ac8ef52b9f8cf949783e30bb4a9"
-   size 209331
+   filename "reftex-1.12-pkg.tar.gz"
+   md5sum "73efb58d055143d9322024d97fcca479"
+   size 215874
    provides (reftex)
    requires (fsf-compat xemacs-base)
    type regular
@@ -971,19 +971,19 @@
 (package-get-update-base-entry (quote
 (c-support
   (standards-version 1.0
-   version "1.11"
-   author-version "21.0b63"
-   date "1999-02-06"
-   build-date "1999-03-01"
+   version "1.12"
+   author-version "21.0b64"
+   date "1999-03-02"
+   build-date "1999-03-02"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution contrib
    priority low
    category "prog"
    dump nil
    description "Basic single-file add-ons for editing C code."
-   filename "c-support-1.11-pkg.tar.gz"
-   md5sum "d93566b09c3d9e79ac12a644250e7ca0"
-   size 69876
+   filename "c-support-1.12-pkg.tar.gz"
+   md5sum "a793cd83bb595d34771332a46d2abfd4"
+   size 69913
    provides (c-comment-edit cmacexp ctypes hideif hideshow)
    requires (cc-mode xemacs-base)
    type regular
@@ -1059,19 +1059,19 @@
 (package-get-update-base-entry (quote
 (misc-games
   (standards-version 1.0
-   version "1.09"
-   author-version "21.0b62"
-   date "1998-03-22"
-   build-date "1999-02-02"
+   version "1.10"
+   author-version "21.0b64"
+   date "1999-03-04"
+   build-date "1999-03-05"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
    category "games"
    dump nil
    description "Other amusements and diversions."
-   filename "misc-games-1.09-pkg.tar.gz"
-   md5sum "a4e7e18e7cf3ce771ad65dae24967603"
-   size 165698
+   filename "misc-games-1.10-pkg.tar.gz"
+   md5sum "d5d5c6c074fab908ba48a8a6ccdc4273"
+   size 165902
    provides (decipher gomoku hanoi life morse rot13)
    requires (xemacs-base)
    type single
@@ -1235,19 +1235,19 @@
 (package-get-update-base-entry (quote
 (gnus
   (standards-version 1.0
-   version "1.38"
-   author-version "5.6.45"
+   version "1.39"
+   author-version "5.6.45x1"
    date "1999-02-17"
-   build-date "1999-03-01"
+   build-date "1999-03-05"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority medium
    category "comm"
    dump nil
    description "The Gnus Newsreader and Mailreader."
-   filename "gnus-1.38-pkg.tar.gz"
-   md5sum "22f00c391c4680d0a4fe53a5e6b85f40"
-   size 1869217
+   filename "gnus-1.39-pkg.tar.gz"
+   md5sum "5413e7508693bfcb16c5a4a0e0bce7c7"
+   size 1869261
    provides (gnus message)
    requires (gnus tm apel w3 mh-e mailcrypt rmail mail-lib xemacs-base)
    type regular
@@ -1433,19 +1433,19 @@
 (package-get-update-base-entry (quote
 (w3
   (standards-version 1.0
-   version "1.12"
-   author-version "4.0pre39"
-   date "1999-01-08"
-   build-date "1999-03-01"
+   version "1.13"
+   author-version "4.0pre39x1"
+   date "1999-03-02"
+   build-date "1999-03-02"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution experimental
    priority high
    category "comm"
    dump nil
    description "A Web browser."
-   filename "w3-1.12-pkg.tar.gz"
-   md5sum "e7afce350e99f71dfde7ec752290670c"
-   size 679826
+   filename "w3-1.13-pkg.tar.gz"
+   md5sum "8e9f70ef2c4b43090cfbf86974517c66"
+   size 682040
    provides (w3 url)
    requires (w3 mail-lib xemacs-base)
    type regular
@@ -1455,19 +1455,19 @@
 (package-get-update-base-entry (quote
 (vm
   (standards-version 1.0
-   version "1.16"
+   version "1.17"
    author-version "6.67"
    date "1998-09-22"
-   build-date "1999-03-01"
+   build-date "1999-03-05"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority medium
    category "comm"
    dump nil
    description "An Emacs mailer."
-   filename "vm-1.16-pkg.tar.gz"
-   md5sum "e5ad7011473b17f7d1e9521407199b64"
-   size 603773
+   filename "vm-1.17-pkg.tar.gz"
+   md5sum "9a95c6264135124db979bce745bf0e07"
+   size 609688
    provides (vm)
    requires (mail-lib xemacs-base)
    type regular
@@ -1477,19 +1477,19 @@
 (package-get-update-base-entry (quote
 (sounds-wav
   (standards-version 1.0
-   version "1.06"
-   author-version "21.0b62"
-   date "1998-06-30"
-   build-date "1999-02-02"
+   version "1.07"
+   author-version "21.0b64"
+   date "1999-02-02"
+   build-date "1999-03-05"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority high
    category "libs"
    dump nil
    description "XEmacs Microsoft sound files."
-   filename "sounds-wav-1.06-pkg.tar.gz"
-   md5sum "7f3dfd84e88b418ea58233bde7d859fc"
-   size 148545
+   filename "sounds-wav-1.07-pkg.tar.gz"
+   md5sum "60a70b85e8711fb1c9a1c7d0f4bf8ee0"
+   size 149045
    provides ()
    requires ()
    type regular
@@ -1499,19 +1499,19 @@
 (package-get-update-base-entry (quote
 (sounds-au
   (standards-version 1.0
-   version "1.06"
-   author-version "21.0b62"
-   date "1998-06-30"
-   build-date "1999-02-02"
+   version "1.07"
+   author-version "21.0b64"
+   date "1999-02-02"
+   build-date "1999-03-05"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority high
    category "libs"
    dump nil
    description "XEmacs Sun sound files."
-   filename "sounds-au-1.06-pkg.tar.gz"
-   md5sum "aa4a6080061e802b72156f4ce59e9561"
-   size 125744
+   filename "sounds-au-1.07-pkg.tar.gz"
+   md5sum "4b5acd296b50102e50565650d9d7ec0b"
+   size 126184
    provides ()
    requires ()
    type regular
@@ -1697,19 +1697,19 @@
 (package-get-update-base-entry (quote
 (mail-lib
   (standards-version 1.0
-   version "1.21"
-   author-version "21.0b62"
-   date "1999-01-20"
-   build-date "1999-02-02"
+   version "1.22"
+   author-version "21.0b64"
+   date "1999-03-05"
+   build-date "1999-03-05"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority medium
    category "libs"
    dump nil
    description "Fundamental lisp files for providing email support."
-   filename "mail-lib-1.21-pkg.tar.gz"
-   md5sum "4011698f9a440406af74ee1694e5539b"
-   size 131218
+   filename "mail-lib-1.22-pkg.tar.gz"
+   md5sum "70a947a1980887430c53032e3dfcbe4f"
+   size 131476
    provides (browse-url highlight-headers mail-abbrevs mail-extr mail-utils reporter rfc822 rmail-mini rmailout sendmail smtpmail)
    requires (xemacs-base)
    type regular
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lib-src/.cvsignore	Mon Aug 13 10:50:39 2007 +0200
@@ -0,0 +1,22 @@
+ootags
+gnuclient
+ctags
+etags
+mmencode
+gnuserv
+b2m
+hexl
+yow
+fakemail
+cvtmail
+movemail
+sorted-doc
+digest-doc
+make-docfile
+Makefile
+profile
+wakeup
+make-path
+config.values
+Makefile.in
+DOC
--- a/lib-src/ChangeLog	Mon Aug 13 10:49:52 2007 +0200
+++ b/lib-src/ChangeLog	Mon Aug 13 10:50:39 2007 +0200
@@ -1,3 +1,7 @@
+1999-03-05  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.0.65 is released
+
 1999-03-01  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.0.64 is released
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/.cvsignore	Mon Aug 13 10:50:39 2007 +0200
@@ -0,0 +1,1 @@
+finder-inf.el
--- a/lisp/ChangeLog	Mon Aug 13 10:49:52 2007 +0200
+++ b/lisp/ChangeLog	Mon Aug 13 10:50:39 2007 +0200
@@ -1,3 +1,40 @@
+1999-03-05  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.0.65 is released
+
+1999-03-05  SL Baur  <steve@xemacs.org>
+
+	* menubar-items.el (default-menubar): Add kfm browsing support.
+	From Neal Becker <nbecker@fred.net>
+
+1999-02-12  Didier Verna  <verna@inf.enst.fr>
+
+	* info.el (Info-build-node-completions): unconditionally widen the
+	tag table buffer.
+
+1999-02-19  Paul Stodghill  <stodghil@cs.cornell.edu>
+
+	* x-faces.el (x-init-face-from-resources):
+	Only set fonts in the 'x locale.
+
+1999-03-04  Adrian Aichner  <aichner@ecf.teradyne.com>
+
+	* package-ui.el (pui-install-selected-packages): Don't throw on
+	`package-admin-delete-binary-package' returning nil since it's
+	normal.  Reindent function.
+	(pui-add-required-packages): Handle case where packages selected
+	for installation have never been installed.
+
+1999-03-03  Steven Baur  <steve@gneiss.etl.go.jp>
+
+	* font-lock.el (font-lock-revert-cleanup): Null out to avoid repeated
+	calls to font-lock during buffer reversion.
+	
+1999-03-03  Martin Buchholz  <martin@xemacs.org>
+
+	* menubar-items.el (default-menubar): 
+	Implement the ``Mule->Set coding system of process'' menu item.
+
 1999-03-01  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.0.64 is released
--- a/lisp/font-lock.el	Mon Aug 13 10:49:52 2007 +0200
+++ b/lisp/font-lock.el	Mon Aug 13 10:50:39 2007 +0200
@@ -1537,7 +1537,12 @@
 
 ;; If the buffer has just been reverted, normally that turns off
 ;; Font Lock mode.  So turn the mode back on if necessary.
-(defalias 'font-lock-revert-cleanup 'turn-on-font-lock)
+;; sb 1999-03-03 -- The above comment no longer appears to be operative as
+;; the first call to normal-mode *will* restore the font-lock state and
+;; this call forces a second font-locking to occur when reverting a buffer,
+;; which is wasteful at best.
+;(defalias 'font-lock-revert-cleanup 'turn-on-font-lock)
+(defun font-lock-revert-cleanup ())
 
 
 ;; Various functions.
--- a/lisp/info.el	Mon Aug 13 10:49:52 2007 +0200
+++ b/lisp/info.el	Mon Aug 13 10:50:39 2007 +0200
@@ -1537,6 +1537,7 @@
       (let ((compl (Info-build-annotation-completions)))
 	(save-excursion
 	  (save-restriction
+	    (widen)
 	    (if (marker-buffer Info-tag-table-marker)
 		(progn
 		  (set-buffer (marker-buffer Info-tag-table-marker))
@@ -1546,7 +1547,6 @@
 			  (cons (list (buffer-substring (match-beginning 1)
 							(match-end 1)))
 				compl))))
-	      (widen)
 	      (goto-char (point-min))
 	      (while (search-forward "\n\^_" nil t)
 		(forward-line 1)
--- a/lisp/menubar-items.el	Mon Aug 13 10:49:52 2007 +0200
+++ b/lisp/menubar-items.el	Mon Aug 13 10:50:39 2007 +0200
@@ -156,9 +156,9 @@
 	      ;; not implemented yet
 	      ["Set coding system of keyboard"
 	       set-keyboard-coding-system :active nil]
-	      ;; not implemented yet
 	      ["Set coding system of process"
-	       set-current-process-coding-system :active nil]
+	       set-buffer-process-coding-system
+	       :active (get-buffer-process (current-buffer))]
 	      "--"
 	      ["Show character table" view-charset-by-menu]
 	      ;; not implemented yet
@@ -810,6 +810,14 @@
 		       (eq browse-url-browser-function 'browse-url-grail))
 	:active (and (boundp 'browse-url-browser-function)
 		     (fboundp 'browse-url-grail))]
+       ["Kfm" 
+	(customize-set-variable 'browse-url-browser-function
+				'browse-url-kfm)
+	:style radio
+	:selected (and (boundp 'browse-url-browser-function)
+		       (eq browse-url-browser-function 'browse-url-kfm))
+	:active (and (boundp 'browse-url-browser-function)
+		     (fboundp 'browse-url-kfm))]
        )
       "-----"
       ["Edit Faces..." (customize-face nil)]
--- a/lisp/package-ui.el	Mon Aug 13 10:49:52 2007 +0200
+++ b/lisp/package-ui.el	Mon Aug 13 10:50:39 2007 +0200
@@ -362,27 +362,22 @@
 					       (symbol-name pkg)
 					       )
 					    pui-deleted-packages)
-					'string<)
-				       :activate-callback nil
-				       :help-string "Packages selected for removal:\n"
-				       :completion-string t
-				       ))
-	    (setq tmpbuf (get-buffer-create tmpbuf))
-	    (display-buffer tmpbuf)
-	    (setq do-delete (yes-or-no-p "Remove these packages? "))
-	    (kill-buffer tmpbuf))	    
+				    'string<)
+				   :activate-callback nil
+				   :help-string "Packages selected for removal:\n"
+				   :completion-string t
+				   ))
+	(setq tmpbuf (get-buffer-create tmpbuf))
+	(display-buffer tmpbuf)
+	(setq do-delete (yes-or-no-p "Remove these packages? "))
+	(kill-buffer tmpbuf))	    
       (when do-delete
 	(message "Deleting selected packages ...") (sit-for 0)
-	(when (catch 'done
-		(mapcar (lambda (pkg)
-			  (if (not
-			       (package-admin-delete-binary-package
-				  pkg (package-admin-get-install-dir pkg nil)))
-				    (throw 'done nil)))
-			      pui-deleted-packages)
-		      t)
-	  (message "Packages deleted")
-	  ))))
+	(mapcar (lambda (pkg)
+		  (package-admin-delete-binary-package
+		   pkg (package-admin-get-install-dir pkg nil)))
+		pui-deleted-packages)
+	(message "Packages deleted"))))
 	 
   (let ( (tmpbuf "*Packages-To-Install*") do-install)
     (if pui-selected-packages
@@ -430,8 +425,8 @@
 		      (message "Packages installed")
 		      ))
 		)
-	      (clear-message)
-	      )
+	    (clear-message)
+	    )
 	  )
       (if pui-deleted-packages
 	  (pui-list-packages)
@@ -454,12 +449,13 @@
                                      (package-get-info-find-package
                                       package-get-base pkg) nil)
                                     'version)))
-                              (if (< (if (stringp installed)
+                              (if (or (null installed)
+                                     (< (if (stringp installed)
                                          (string-to-number installed)
                                        installed)
                                      (if (stringp current)
                                          (string-to-number current)
-                                       current))
+                                       current)))
                                   pkg
                                 nil)))
                           (package-get-dependencies pui-selected-packages)))))
--- a/lisp/x-faces.el	Mon Aug 13 10:49:52 2007 +0200
+++ b/lisp/x-faces.el	Mon Aug 13 10:50:39 2007 +0200
@@ -506,7 +506,7 @@
 	;; globally.  This means we should override global
 	;; defaults for all X device classes.
 	(remove-specifier (face-font face) locale x-tag-set nil))
-      (set-face-font face fn locale nil append))
+      (set-face-font face fn locale 'x append))
     ;; Kludge-o-rooni.  Set the foreground and background resources for
     ;; X devices only -- otherwise things tend to get all messed up
     ;; if you start up an X frame and then later create a TTY frame.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lwlib/.cvsignore	Mon Aug 13 10:50:39 2007 +0200
@@ -0,0 +1,3 @@
+Makefile
+config.h
+Makefile.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lwlib/ChangeLog	Mon Aug 13 10:50:39 2007 +0200
@@ -0,0 +1,9 @@
+1999-03-05  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.0.65 is released
+
+1999-02-18  Martin Buchholz  <martin@xemacs.org>
+
+	* lwlib/xlwmenu.c (massage_resource_name): Fix compiler warning
+	- Have to toupper ((int) (unsigned char) x) to be portable.
+
--- a/lwlib/xlwmenu.c	Mon Aug 13 10:49:52 2007 +0200
+++ b/lwlib/xlwmenu.c	Mon Aug 13 10:50:39 2007 +0200
@@ -483,7 +483,8 @@
       char ch = massaged_resource_char[(unsigned char) *in++];
       if (ch)
 	{
-	  *out++ = firstp ? tolower (ch) : toupper (ch);
+	  int int_ch = (int) (unsigned char) ch;
+	  *out++ = firstp ? tolower (int_ch) : toupper (int_ch);
 	  firstp = False;
 	  while ((ch = massaged_resource_char[(unsigned char) *in++]) != '\0')
 	    *out++ = ch;
--- a/man/ChangeLog	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/ChangeLog	Mon Aug 13 10:50:39 2007 +0200
@@ -1,3 +1,7 @@
+1999-03-05  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.0.65 is released
+
 1999-03-01  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.0.64 is released
--- a/man/lispref/extents.texi	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/lispref/extents.texi	Mon Aug 13 10:50:39 2007 +0200
@@ -546,7 +546,7 @@
 the extent.  This takes precedence over the @code{text-pointer-glyph}
 and @code{nontext-pointer-glyph} variables.  If for any reason this
 glyph is an invalid pointer, the standard glyphs will be used as
-fallbacks.  @xref{Mouse Pointer}
+fallbacks.  @xref{Mouse Pointer}.
 
 @item detachable
 (Boolean) Whether this extent becomes detached when all of the text it
--- a/man/lispref/faces.texi	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/lispref/faces.texi	Mon Aug 13 10:50:39 2007 +0200
@@ -28,7 +28,7 @@
 which allows it to have separate values in particular buffers, frames,
 windows, and devices and to further vary according to device type
 (X or TTY) and device class (color, mono, or grayscale).
-@xref{Specifiers} for more information.
+@xref{Specifiers}, for more information.
 
 The face named @code{default} is used for ordinary text.  The face named
 @code{modeline} is used for displaying the modeline.  The face named
--- a/man/lispref/glyphs.texi	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/lispref/glyphs.texi	Mon Aug 13 10:50:39 2007 +0200
@@ -62,7 +62,7 @@
 turn is tried until an image is successfully produced), a cons of a
 locale (frame, buffer, etc.) and an instantiator, a list of such conses,
 or any other form accepted by @code{canonicalize-spec-list}.
-@xref{Specifiers} for more information about specifiers.
+@xref{Specifiers}, for more information about specifiers.
 
 @var{type} specifies the type of the glyph, which specifies in which
 contexts the glyph can be used, and controls the allowable image types
@@ -448,7 +448,7 @@
 @code{color-pixmap} can be generated by @code{xpm}, @code{gif},
 @code{jpeg}, etc.).
 
-  @xref{Image Instances} for a more detailed discussion of image
+  @xref{Image Instances}, for a more detailed discussion of image
 instance types.
 
   An image instantiator should be a string or a vector of the form
--- a/man/lispref/markers.texi	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/lispref/markers.texi	Mon Aug 13 10:50:39 2007 +0200
@@ -668,7 +668,7 @@
 concept of an @dfn{active region} exists.  The region is active when the
 corresponding mark is active.  Note that only one active region at a
 time can exist -- i.e. only one buffer's region is active at a time.
-@xref{The Mark} for more information about active regions.
+@xref{The Mark}, for more information about active regions.
 
 @defopt zmacs-regions
 If non-@code{nil} (the default), active regions are used.  @xref{The Mark},
--- a/man/lispref/menus.texi	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/lispref/menus.texi	Mon Aug 13 10:50:39 2007 +0200
@@ -518,7 +518,7 @@
 @end defun
 
 @defun buffers-menu-filter menu-items
-This function sets up the Buffers menu.  @xref{Buffers Menu} for
+This function sets up the Buffers menu.  @xref{Buffers Menu}, for
 more information.
 @end defun
 
--- a/man/lispref/objects.texi	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/lispref/objects.texi	Mon Aug 13 10:50:39 2007 +0200
@@ -1059,7 +1059,7 @@
   A string can hold extents and properties of the text it contains, in
 addition to the characters themselves.  This enables programs that copy
 text between strings and buffers to preserve the extents and properties
-with no special effort.  @xref{Extents}; @xref{Text Properties}.
+with no special effort.  @xref{Extents}, @xref{Text Properties}.
 
   Note that FSF GNU Emacs has a special read and print syntax for
 strings with text properties, but XEmacs does not currently implement
--- a/man/lispref/positions.texi	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/lispref/positions.texi	Mon Aug 13 10:50:39 2007 +0200
@@ -82,7 +82,7 @@
 This function returns the maximum accessible value of point in
 @var{buffer}.  This is @code{(1+ (buffer-size buffer))}, unless
 narrowing is in effect, in which case it is the position of the end of
-the region that you narrowed to. (@xref{Narrowing}).  @var{buffer}
+the region that you narrowed to. (@pxref{Narrowing}).  @var{buffer}
 defaults to the current buffer if omitted.
 @end defun
 
--- a/man/lispref/sequences.texi	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/lispref/sequences.texi	Mon Aug 13 10:50:39 2007 +0200
@@ -91,7 +91,7 @@
 and text properties in the copy are also copied, not shared with the
 original. (This means that modifying the extents or text properties of
 the original will not affect the copy.) However, the actual values of
-the properties are shared.  @xref{Extents}; @xref{Text Properties}.
+the properties are shared.  @xref{Extents}, @xref{Text Properties}.
 
 See also @code{append} in @ref{Building Lists}, @code{concat} in
 @ref{Creating Strings}, @code{vconcat} in @ref{Vectors}, and
@@ -272,7 +272,7 @@
 as characters.
 
 @item
-Strings can hold extent and text properties.  @xref{Extents}; @xref{Text
+Strings can hold extent and text properties.  @xref{Extents}, @xref{Text
 Properties}.
 
 @item
--- a/man/lispref/specifiers.texi	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/lispref/specifiers.texi	Mon Aug 13 10:50:39 2007 +0200
@@ -325,7 +325,7 @@
 @item toolbar
 The valid instantiators are toolbar descriptors, which are lists
 of toolbar-button descriptors (each of which is a vector of two
-or four elements).  @xref{Toolbar} for more information.
+or four elements).  @xref{Toolbar}, for more information.
 @end table
 
 Color and font instance objects can also be used in turn as
@@ -335,9 +335,9 @@
 device.  If the devices differ, the base color or font of the
 instantiating object is effectively used instead as the instantiator.
 
-@xref{Faces and Window-System Objects} for more information on fonts,
-colors, and face-boolean specifiers.  @xref{Glyphs} for more information
-about image specifiers.  @xref{Toolbar} for more information on toolbar
+@xref{Faces and Window-System Objects}, for more information on fonts,
+colors, and face-boolean specifiers.  @xref{Glyphs}, for more information
+about image specifiers.  @xref{Toolbar}, for more information on toolbar
 specifiers.
 
 @defun specifier-type specifier
--- a/man/lispref/strings.texi	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/lispref/strings.texi	Mon Aug 13 10:50:39 2007 +0200
@@ -967,7 +967,7 @@
 
 The definition of a word is any sequence of consecutive characters that
 are assigned to the word constituent syntax class in the current syntax
-table (@xref{Syntax Class Table}).
+table (@pxref{Syntax Class Table}).
 
 When the argument to @code{capitalize} is a character, @code{capitalize}
 has the same result as @code{upcase}.
--- a/man/lispref/toolbar.texi	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/lispref/toolbar.texi	Mon Aug 13 10:50:39 2007 +0200
@@ -180,7 +180,7 @@
 and query them with @code{specifier-specs} or @code{specifier-instance}.
 You will get an error if you try to set them using @code{setq}.  The
 valid instantiators for these specifiers are toolbar descriptors, as
-described above.  @xref{Specifiers} for more information.
+described above.  @xref{Specifiers}, for more information.
 
 Most of the time, you will set @code{default-toolbar}, which allows
 the user to choose where the toolbar should go.
--- a/man/new-users-guide/modes.texi	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/new-users-guide/modes.texi	Mon Aug 13 10:50:39 2007 +0200
@@ -241,7 +241,7 @@
 Do not add the "-mode" to it.  You can also select the @b{Paren
 Highlighting} option from the @b{Options} menu. After you enable this
 command, put your cursor on one of the left parenthesis. The other
-matching parenthesis will start blinking. @xref{Options Menu,} for more
+matching parenthesis will start blinking. @xref{Options Menu}, for more
 information on the @b{Paren Highlighting} option.
 @end table
 
--- a/man/new-users-guide/region.texi	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/new-users-guide/region.texi	Mon Aug 13 10:50:39 2007 +0200
@@ -156,7 +156,7 @@
   The most common way to move or copy text in Emacs is through
 @dfn{killing} or @samp{cutting} it and then @dfn{yanking} or
 @samp{pasting} it. You can also use the @b{Cut} or @b{Copy} option from
-the @b{Edit} menu for killing and copying respectively. @xref{Edit menu} 
+the @b{Edit} menu for killing and copying respectively. @xref{Edit menu}, 
 for reviewing the commands for killing text. All the killed text
 in Emacs is recorded in the @dfn{kill ring}. Since there is only one
 kill ring in Emacs, you can kill text in one buffer and yank it in
--- a/man/termcap.texi	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/termcap.texi	Mon Aug 13 10:50:39 2007 +0200
@@ -2417,7 +2417,7 @@
 @samp{so} magic cookie on the screen.  (It may also be possible to remove a
 cookie which is not at the beginning of a line by clearing that line.)  The
 @samp{xt} capability also has implications for the use of tab characters,
-but in that regard it is obsolete (@xref{Cursor Motion}).
+but in that regard it is obsolete (@pxref{Cursor Motion}).
 
 @table @samp
 @item so
--- a/man/texinfo.texi	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/texinfo.texi	Mon Aug 13 10:50:39 2007 +0200
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
-@c $Id: texinfo.texi,v 1.8 1998/06/30 06:35:31 steve Exp $
+@c $Id: texinfo.texi,v 1.9 1999/03/04 15:44:45 steveb Exp $
 @c %**start of header
 
 @c All text is ignored before the setfilename.
@@ -648,8 +648,8 @@
 
 How to Obtain @TeX{}
 
-* New Texinfo Mode Commands::   The updating commands are especially useful.
-* New Commands::                Many newly described @@-commands.
+@c * New Texinfo Mode Commands::   The updating commands are especially useful.
+@c * New Commands::                Many newly described @@-commands.
 @end detailmenu
 @end menu
 
--- a/man/xemacs-faq.texi	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/xemacs-faq.texi	Mon Aug 13 10:50:39 2007 +0200
@@ -7,7 +7,7 @@
 @finalout
 @titlepage
 @title XEmacs FAQ
-@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 1998/06/30 06:35:33 $
+@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 1999/03/04 15:44:47 $
 @sp 1
 @author Tony Rossini <arossini@@stat.sc.edu>
 @author Ben Wing <wing@@666.com>
@@ -972,7 +972,7 @@
 @node Q1.3.3, Q1.3.4, Q1.3.2, Introduction
 @unnumberedsubsec Q1.3.3: How do I type non-ASCII characters?
 
-See question 3.5.7 (@xref{Q3.5.7}) in part 3 of this FAQ.
+See question 3.5.7 (@pxref{Q3.5.7}) in part 3 of this FAQ.
 
 @node Q1.3.4, Q1.3.5, Q1.3.3, Introduction
 @unnumberedsubsec Q1.3.4: Can XEmacs messages come out in a different language?
@@ -1877,7 +1877,7 @@
 
 It's possible that a core file didn't get produced, in which case you're
 out of luck.  Go complain to your system administrator and tell him not
-to disable core files by default.  Also @xref{Q2.1.15} for tips and
+to disable core files by default.  Also @xref{Q2.1.15}, for tips and
 techniques for dealing with a debugger.
 
 When making a problem report make sure that:
@@ -3304,7 +3304,7 @@
 
 This is fine if you only need a few functions within the lambda body.
 If you're doing more it's cleaner to define a separate function as in
-question 3.5.3 (@xref{Q3.5.3}).
+question 3.5.3 (@pxref{Q3.5.3}).
 
 @node Q3.5.2, Q3.5.3, Q3.5.1, Customization
 @unnumberedsubsec Q3.5.2: How can I stop down-arrow from adding empty lines to the bottom of my buffers?
@@ -3338,7 +3338,7 @@
 
 The key point is that you can only bind simple functions to keys; you
 can not bind a key to a function that you're also passing arguments to.
-(@xref{Q3.5.1} for a better answer).
+(@pxref{Q3.5.1} for a better answer).
 
 @node Q3.5.4, Q3.5.5, Q3.5.3, Customization
 @unnumberedsubsec Q3.5.4: Globally binding @kbd{Delete}?
@@ -4413,7 +4413,7 @@
 
 VM supports MIME natively.
 
-You probably want to use the Tools for MIME (tm).  @xref{Q4.3.2} for
+You probably want to use the Tools for MIME (tm).  @xref{Q4.3.2}, for
 details.
 
 @email{trey@@cs.berkeley.edu, Trey Jackson} has an Emacs & MIME web page at
@@ -5291,7 +5291,7 @@
 
 @quotation
 The standard TeX modes leave much to be desired, and are somewhat
-leniently maintained.  Serious TeX users use AUC TeX (@xref{Q4.7.1}).
+leniently maintained.  Serious TeX users use AUC TeX (@pxref{Q4.7.1}).
 @end quotation
 
 @node Q5.0.20, Q5.1.1, Q5.0.19, Miscellaneous
@@ -5740,7 +5740,7 @@
 @node Q5.2.3, Q5.2.4, Q5.2.2, Miscellaneous
 @unnumberedsubsec Q5.2.3: What's NAS, how do I get it?
 
-@xref{Q2.0.3} for an explanation of the @dfn{Network Audio System}.
+@xref{Q2.0.3}, for an explanation of the @dfn{Network Audio System}.
 
 @node Q5.2.4, Q5.3.1, Q5.2.3, Miscellaneous
 @unnumberedsubsec Q5.2.4: Sunsite sounds don't play.
--- a/man/xemacs/custom.texi	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/xemacs/custom.texi	Mon Aug 13 10:50:39 2007 +0200
@@ -2206,7 +2206,7 @@
 
 @table @asis
 @item @code{geometry} (class @code{Geometry}): string
-Initial geometry for the frame.  @xref{Geometry Resources} for a
+Initial geometry for the frame.  @xref{Geometry Resources}, for a
 complete discussion of how this works.
 
 @item @code{iconic} (class @code{Iconic}): boolean
--- a/man/xemacs/keystrokes.texi	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/xemacs/keystrokes.texi	Mon Aug 13 10:50:39 2007 +0200
@@ -440,7 +440,7 @@
 @section Representation of Characters
 
 This section briefly discusses how characters are represented in Emacs
-buffers.  @xref{Key Sequences} for information on representing key
+buffers.  @xref{Key Sequences}, for information on representing key
 sequences to create key bindings. 
 
   ASCII graphic characters in Emacs buffers are displayed with their
@@ -481,8 +481,8 @@
 Lisp Reference Manual}.
 
   The bindings between keys and functions are recorded in various tables
-called @dfn{keymaps}.  @xref{Key Bindings} for more information on key
-sequences you can bind commands to.  @xref{Keymaps} for information on
+called @dfn{keymaps}.  @xref{Key Bindings}, for more information on key
+sequences you can bind commands to.  @xref{Keymaps}, for information on
 creating keymaps.
 
   When we say  ``@kbd{C-n} moves down vertically one line'' we are
--- a/man/xemacs/mark.texi	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/xemacs/mark.texi	Mon Aug 13 10:50:39 2007 +0200
@@ -115,7 +115,7 @@
 the variable @code{zmacs-regions} to @code{t}. This makes the current
 region (defined by point and mark) highlight and makes it available as
 the X clipboard selection, which means you can use the menu bar items on
-it.  @xref{Active Regions} for more information.
+it.  @xref{Active Regions}, for more information.
  
   @kbd{C-x C-x} is also useful when you are satisfied with the location of
 point but want to move the mark; do @kbd{C-x C-x} to put point there and
--- a/man/xemacs/menus.texi	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/xemacs/menus.texi	Mon Aug 13 10:50:39 2007 +0200
@@ -69,8 +69,8 @@
 cannot invoke items that are faded.  For example, many commands on the
 @b{Edit} menu appear faded until you select text on which they are to
 operate; after you select a block of text, edit commands are enabled.
-@xref{Mouse Selection} for information on using the mouse to select
-text.  @xref{Using X Selections} for related information.
+@xref{Mouse Selection}, for information on using the mouse to select
+text.  @xref{Using X Selections}, for related information.
 
 There are also @kbd{M-x} equivalents for each menu item.  To find the
 equivalent for any left-button menu item, do the following:
@@ -398,7 +398,7 @@
 @cindex Buffers menu
 The @b{Buffers} menu provides a selection of up to ten buffers and the
 item @b{List All Buffers}, which provides a Buffer List. @xref{List
-Buffers} for more information.  
+Buffers}, for more information.  
 
 @node Tools Menu
 @subsection The Tools Menu
@@ -417,7 +417,7 @@
 
 The Help Menu gives you access to Emacs Info and provides a menu
 equivalent for each of the choices you have when using @kbd{C-h}. 
-@xref{Help} for more information. 
+@xref{Help}, for more information. 
 
 The Help menu also gives access to UNIX online manual pages via the
 @b{UNIX Manual Page} option.  
--- a/man/xemacs/startup.texi	Mon Aug 13 10:49:52 2007 +0200
+++ b/man/xemacs/startup.texi	Mon Aug 13 10:50:39 2007 +0200
@@ -125,7 +125,7 @@
 During installation, all of these directories may also reside directly
 under @file{<root>}, because that is where they are in the XEmacs tarball.
 
-If XEmacs runs with the @code{-debug-paths} option (@xref{Command
+If XEmacs runs with the @code{-debug-paths} option (@pxref{Command
 Switches}), it will print the values of these variables, hopefully
 aiding in debugging any problems which come up.
 
--- a/nt/ChangeLog	Mon Aug 13 10:49:52 2007 +0200
+++ b/nt/ChangeLog	Mon Aug 13 10:50:39 2007 +0200
@@ -1,3 +1,22 @@
+1999-03-05  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.0.65 is released
+
+1999-03-03  SL Baur  <steve@gneiss.etl.go.jp>
+
+	* compface.mak, README, xemacs.mak:  Revert previous change.
+
+1999-02-01  Gleb Arshinov  <gleb@cs.stanford.edu>
+
+	* README: Document the X-Face build option.
+
+	* compface.mak: New file
+	  Makefile for building compface library under MSVC.  Build
+	  library only, not executables.  Should be extended to build
+	  executables and propagated upstream, if possible.
+
+	* xemacs.mak: Link in X-Face/Compface for NT native build.
+
 1999-03-01  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.0.64 is released
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/.cvsignore	Mon Aug 13 10:50:39 2007 +0200
@@ -0,0 +1,11 @@
+xemacs
+temacs
+xemacs.RUNNING
+update-elc.stamp
+sheap-adjust.h
+Makefile
+puresize-adjust.h
+Emacs.ad.h
+config.h
+paths.h
+Makefile.in
--- a/src/ChangeLog	Mon Aug 13 10:49:52 2007 +0200
+++ b/src/ChangeLog	Mon Aug 13 10:50:39 2007 +0200
@@ -1,3 +1,20 @@
+1999-03-05  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.0.65 is released
+
+1999-03-02  Paul Keusemann  <pkeusem@visi.com>
+
+	* database.c (berkdb_map): Add flags argument to cursor call (must
+	  be 0 according to docs) required for Berkeley DB 2.6.4 and later.
+
+1999-03-03  Martin Buchholz  <martin@xemacs.org>
+
+	* console.h (struct console_methods): Always use full ANSI prototypes
+
+	* dgif_lib.c (BitSize): Make static.
+
+	* emacs.c (__sti__iflPNGFile_c___): Always use full ANSI prototypes
+
 1999-03-01  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.0.64 is released
--- a/src/console.h	Mon Aug 13 10:49:52 2007 +0200
+++ b/src/console.h	Mon Aug 13 10:50:39 2007 +0200
@@ -89,7 +89,7 @@
   void (*mark_device_method) (struct device *, void (*)(Lisp_Object));
   void (*asynch_device_change_method) (void);
   Lisp_Object (*device_system_metrics_method) (struct device *, enum device_metrics);
-  unsigned int (*device_implementation_flags_method) ();
+  unsigned int (*device_implementation_flags_method) (void);
 
   /* frame methods */
   Lisp_Object *device_specific_frame_props;
--- a/src/database.c	Mon Aug 13 10:49:52 2007 +0200
+++ b/src/database.c	Mon Aug 13 10:50:39 2007 +0200
@@ -502,7 +502,11 @@
   xzero (keydatum);
   xzero (valdatum);
 
+#if DB_VERSION_MAJOR > 2 || DB_VERSION_MINOR >=6
+  status = dbp->cursor (dbp, NULL, &dbcp, 0);
+#else
   status = dbp->cursor (dbp, NULL, &dbcp);
+#endif
   for (status = dbcp->c_get (dbcp, &keydatum, &valdatum, DB_FIRST);
        status == 0;
        status = dbcp->c_get (dbcp, &keydatum, &valdatum, DB_NEXT))
--- a/src/depend	Mon Aug 13 10:49:52 2007 +0200
+++ b/src/depend	Mon Aug 13 10:50:39 2007 +0200
@@ -82,6 +82,7 @@
 debug.o: $(LISP_H) bytecode.h debug.h lisp-disunion.h lisp-union.h lrecord.h symeval.h symsinit.h
 device-tty.o: $(LISP_H) buffer.h bufslots.h conslots.h console-stream.h console-tty.h console.h device.h events.h faces.h frame.h frameslots.h lisp-disunion.h lisp-union.h lrecord.h lstream.h mule-charset.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h sysdep.h syssignal.h systime.h systty.h toolbar.h
 device.o: $(LISP_H) buffer.h bufslots.h conslots.h console.h device.h elhash.h events.h faces.h frame.h frameslots.h keymap.h lisp-disunion.h lisp-union.h lrecord.h mule-charset.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h sysdep.h syssignal.h systime.h toolbar.h window.h winslots.h
+dgif_lib.o: gifrlib.h
 dialog.o: $(LISP_H) conslots.h console.h device.h frame.h frameslots.h lisp-disunion.h lisp-union.h lrecord.h scrollbar.h specifier.h symeval.h symsinit.h toolbar.h
 dired.o: $(LISP_H) buffer.h bufslots.h commands.h elhash.h lisp-disunion.h lisp-union.h lrecord.h mule-charset.h ndir.h opaque.h regex.h symeval.h symsinit.h sysdir.h sysfile.h
 dll.o: $(LISP_H) buffer.h bufslots.h lisp-disunion.h lisp-union.h lrecord.h mule-charset.h symeval.h symsinit.h sysdll.h
@@ -91,7 +92,7 @@
 dynarr.o: $(LISP_H) lisp-disunion.h lisp-union.h lrecord.h symeval.h symsinit.h
 ecrt0.o: config.h
 editfns.o: $(LISP_H) buffer.h bufslots.h commands.h conslots.h console.h device.h events.h extents.h frame.h frameslots.h insdel.h line-number.h lisp-disunion.h lisp-union.h lrecord.h mule-charset.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h sysdep.h syspwd.h systime.h toolbar.h window.h winslots.h
-eldap.o: $(LISP_H) eldap.h lisp-disunion.h lisp-union.h lrecord.h opaque.h symeval.h symsinit.h sysdep.h
+eldap.o: $(LISP_H) buffer.h bufslots.h eldap.h lisp-disunion.h lisp-union.h lrecord.h mule-charset.h opaque.h symeval.h symsinit.h sysdep.h
 elhash.o: $(LISP_H) bytecode.h elhash.h hash.h lisp-disunion.h lisp-union.h lrecord.h symeval.h symsinit.h
 emacs.o: $(LISP_H) backtrace.h buffer.h bufslots.h commands.h conslots.h console.h lisp-disunion.h lisp-union.h lrecord.h mule-charset.h paths.h process.h symeval.h symsinit.h sysdep.h sysdll.h sysfile.h syssignal.h systime.h systty.h
 eval.o: $(LISP_H) backtrace.h buffer.h bufslots.h bytecode.h commands.h conslots.h console.h lisp-disunion.h lisp-union.h lrecord.h mule-charset.h opaque.h symeval.h symsinit.h
@@ -114,7 +115,8 @@
 free-hook.o: $(LISP_H) hash.h lisp-disunion.h lisp-union.h lrecord.h symeval.h symsinit.h
 general.o: $(LISP_H) lisp-disunion.h lisp-union.h lrecord.h symeval.h symsinit.h
 getloadavg.o: $(LISP_H) lisp-disunion.h lisp-union.h lrecord.h symeval.h symsinit.h sysfile.h
-glyphs-eimage.o: $(LISP_H) buffer.h bufslots.h conslots.h console.h device.h file-coding.h frame.h frameslots.h glyphs.h imgproc.h insdel.h lisp-disunion.h lisp-union.h lrecord.h lstream.h mule-charset.h objects.h opaque.h scrollbar.h specifier.h symeval.h symsinit.h sysfile.h toolbar.h
+gif_io.o: gifrlib.h
+glyphs-eimage.o: $(LISP_H) buffer.h bufslots.h conslots.h console.h device.h faces.h file-coding.h frame.h frameslots.h gifrlib.h glyphs.h imgproc.h insdel.h lisp-disunion.h lisp-union.h lrecord.h lstream.h mule-charset.h objects.h opaque.h scrollbar.h specifier.h symeval.h symsinit.h sysfile.h toolbar.h
 glyphs.o: $(LISP_H) buffer.h bufslots.h conslots.h console.h device.h elhash.h faces.h frame.h frameslots.h glyphs.h insdel.h lisp-disunion.h lisp-union.h lrecord.h mule-charset.h objects.h redisplay.h scrollbar.h specifier.h symeval.h symsinit.h toolbar.h window.h winslots.h
 gmalloc.o: config.h getpagesize.h
 gpmevent.o: $(LISP_H) conslots.h console-tty.h console.h device.h events-mod.h events.h gpmevent.h lisp-disunion.h lisp-union.h lrecord.h symeval.h symsinit.h sysdep.h syssignal.h systime.h systty.h
@@ -199,7 +201,7 @@
 unexhp9k3.o: config.h sysdep.h
 unexhp9k800.o: config.h
 unexmips.o: config.h getpagesize.h
-unexnt.o: ntheap.h
+unexnt.o: config.h ntheap.h
 unexsunos4.o: config.h
 vm-limit.o: $(LISP_H) lisp-disunion.h lisp-union.h lrecord.h mem-limits.h symeval.h symsinit.h
 widget.o: $(LISP_H) buffer.h bufslots.h insdel.h lisp-disunion.h lisp-union.h lrecord.h mule-charset.h symeval.h symsinit.h
--- a/src/device-x.c	Mon Aug 13 10:49:52 2007 +0200
+++ b/src/device-x.c	Mon Aug 13 10:50:39 2007 +0200
@@ -351,7 +351,7 @@
    * Break apart the old XtOpenDisplay call into XOpenDisplay and
    * XtDisplayInitialize so we can figure out whether there
    * are any XEmacs resources in the resource database before
-   * we intitialize Xt.  This is so we can automagically support
+   * we initialize Xt.  This is so we can automagically support
    * both `Emacs' and `XEmacs' application classes.
    */
   slow_down_interrupts ();
--- a/src/dgif_lib.c	Mon Aug 13 10:49:52 2007 +0200
+++ b/src/dgif_lib.c	Mon Aug 13 10:50:39 2007 +0200
@@ -912,7 +912,7 @@
 * Miscellaneous utility functions					      *
 ******************************************************************************/
 
-int BitSize(int n)
+static int BitSize(int n)
 /* return smallest bitfield size n will fit in */
 {
     register	int i;
--- a/src/emacs.c	Mon Aug 13 10:49:52 2007 +0200
+++ b/src/emacs.c	Mon Aug 13 10:50:39 2007 +0200
@@ -3051,6 +3051,7 @@
  * cores on us when re-started from the dumped executable.
  * This will have to go for 21.1  -- OG.
  */
+void __sti__iflPNGFile_c___(void);
 void __sti__iflPNGFile_c___()
 {
 }
--- a/src/xselect.c	Mon Aug 13 10:49:52 2007 +0200
+++ b/src/xselect.c	Mon Aug 13 10:50:39 2007 +0200
@@ -1358,9 +1358,8 @@
 			    type == DEVICE_XATOM_COMPOUND_TEXT (d)
 			    ? FORMAT_CTEXT : FORMAT_BINARY);
 
-  /* Convert a single atom to a Lisp Symbol.  Convert a set of atoms to
-     a vector of symbols.
-   */
+  /* Convert a single atom to a Lisp Symbol.
+     Convert a set of atoms to a vector of symbols. */
   else if (type == XA_ATOM)
     {
       if (size == sizeof (Atom))
--- a/version.sh	Mon Aug 13 10:49:52 2007 +0200
+++ b/version.sh	Mon Aug 13 10:50:39 2007 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 emacs_major_version=21
 emacs_minor_version=0
-emacs_beta_version=64
+emacs_beta_version=65
 xemacs_codename="20"
 infodock_major_version=4
 infodock_minor_version=0