# HG changeset patch
# User ben
# Date 1044513377 0
# Node ID 465bd3c7d932b8a18f56b545b59e3ffabd2ed8cc
# Parent  278c9cd3435e4b4bb4e8a9164c42384ef12b121d
[xemacs-hg @ 2003-02-06 06:35:47 by ben]
various bug fixes


mule/cyril-util.el: Fix compile warning.

loadup.el, make-docfile.el, update-elc-2.el, update-elc.el: Set stack-trace-on-error, load-always-display-messages so we
	get better debug results.
update-elc-2.el: Fix typo in name of lisp/mule, leading to compile failure.
simple.el: Omit M-S-home/end from motion keys.
update-elc.el: Overhaul:
	-- allow list of "early-compile" files to be specified, not hardcoded
	-- fix autoload checking to include all .el files, not just dumped ones
	-- be smarter about regenerating autoloads, so we don't need to use
	   loadup-el if not necessary
	-- use standard methods for loading/not loading auto-autoloads.el
	   (maybe fixes "Already loaded" error?)
	-- rename misleading NOBYTECOMPILE flag file.
window-xemacs.el: Fix bug in default param.
window-xemacs.el: Fix compile warnings.

lwlib-Xm.c: Fix compile warning.

lispref/mule.texi: Lots of Mule rewriting.

internals/internals.texi: Major fixup.  Correct for new names of Bytebpos, Ichar, etc. and
	lots of Mule rewriting.

config.inc.samp: Various fixups.

Makefile.in.in: NOBYTECOMPILE -> BYTECOMPILE_CHANGE.
esd.c: Warning fixes.
fns.c: Eliminate bogus require-prints-loading-message; use already
	existent load-always-display-messages instead.  Make sure `load'
	knows we are coming from `require'.
lread.c: Turn on `load-warn-when-source-newer' by default.  Change loading
	message to indicate when we are `require'ing.  Eliminate
	purify_flag hacks to display more messages; instead, loadup and
	friends specify this explicitly with
	`load-always-display-messages'.  Add spaces when batch to clearly
	indicate recursive loading.  Fassoc() does not GC so no need to
	gcpro.
gui-x.c, gui-x.h, menubar-x.c: Fix up crashes when selecting menubar items due to lack of GCPROing
	of callbacks in lwlib structures.
eval.c, lisp.h, print.c: Don't canonicalize to selected-frame when noninteractive, or
	backtraces get all screwed up as some values are printed through
	the stream console and some aren't.  Export
	canonicalize_printcharfun() and use in Fbacktrace().

diff -r 278c9cd3435e -r 465bd3c7d932 configure
--- a/configure	Wed Feb 05 22:53:04 2003 +0000
+++ b/configure	Thu Feb 06 06:36:17 2003 +0000
@@ -4601,7 +4601,6 @@
 #line 4602 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4610,7 +4609,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -4638,13 +4637,12 @@
   exit 1
 fi
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4642: checking size of int" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4645 "configure"
+echo "configure:4641: checking size of int" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4644 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4653,7 +4651,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -4675,13 +4673,12 @@
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4679: checking size of long" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4682 "configure"
+echo "configure:4677: checking size of long" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4680 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4690,7 +4687,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -4712,13 +4709,12 @@
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4716: checking size of long long" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4719 "configure"
+echo "configure:4713: checking size of long long" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4716 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4727,7 +4723,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4727: \"$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
@@ -4749,13 +4745,12 @@
 
 
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:4753: checking size of void *" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4756 "configure"
+echo "configure:4749: checking size of void *" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4752 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4764,7 +4759,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4763: \"$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
@@ -4787,7 +4782,7 @@
 
 
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:4791: checking for long file names" >&5
+echo "configure:4786: 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:
@@ -4833,10 +4828,10 @@
 
 
 echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:4837: checking for sin" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4840 "configure"
+echo "configure:4832: checking for sin" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4835 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sin(); below.  */
@@ -4859,7 +4854,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_sin=yes"
 else
@@ -4877,12 +4872,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:4881: checking for sin in -lm" >&5
+echo "configure:4876: 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 4886 "configure"
+#line 4881 "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
@@ -4893,7 +4888,7 @@
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:4897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4928,14 +4923,14 @@
 
 
 cat > conftest.$ac_ext <<EOF
-#line 4932 "configure"
+#line 4927 "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:4939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_INVERSE_HYPERBOLIC
@@ -4954,10 +4949,10 @@
 for ac_func in mkstemp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4958: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4961 "configure"
+echo "configure:4953: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4956 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4980,7 +4975,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5009,14 +5004,14 @@
 
 
 echo "checking type of mail spool file locking" 1>&6
-echo "configure:5013: checking type of mail spool file locking" >&5
+echo "configure:5008: checking type of mail spool file locking" >&5
 for ac_func in lockf flock
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5017: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5020 "configure"
+echo "configure:5012: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5015 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5039,7 +5034,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5121,12 +5116,12 @@
 case "$opsys" in decosf*)
   
 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:5125: checking for cma_open in -lpthreads" >&5
+echo "configure:5120: 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 5130 "configure"
+#line 5125 "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
@@ -5137,7 +5132,7 @@
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:5141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5174,7 +5169,7 @@
 
 
 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:5178: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:5173: 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;
@@ -5186,7 +5181,7 @@
 if test "$opsys" = "sol2"; then
   if test "$os_release" -ge 56; then
     echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:5190: checking for \"-z ignore\" linker flag" >&5
+echo "configure:5185: 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 ;;
@@ -5197,7 +5192,7 @@
 
 
 echo "checking "for specified window system"" 1>&6
-echo "configure:5201: checking "for specified window system"" >&5
+echo "configure:5196: checking "for specified window system"" >&5
 
 
 GNOME_CONFIG=no
@@ -5205,7 +5200,7 @@
 
 if test "$with_gnome" != "no"; then
    echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6
-echo "configure:5209: checking for GNOME configuration script" >&5
+echo "configure:5204: checking for GNOME configuration script" >&5
    for possible in gnome-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5236,7 +5231,7 @@
 
 if test "$with_gtk" != "no";then
    echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6
-echo "configure:5240: checking for GTK configuration script" >&5
+echo "configure:5235: checking for GTK configuration script" >&5
    for possible in gtk12-config gtk14-config gtk-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5258,18 +5253,18 @@
 
 if test "${GTK_CONFIG}" != "no"; then
       echo $ac_n "checking gtk version""... $ac_c" 1>&6
-echo "configure:5262: checking gtk version" >&5
+echo "configure:5257: checking gtk version" >&5
       GTK_VERSION=`${GTK_CONFIG} --version`
       echo "$ac_t""${GTK_VERSION}" 1>&6
 
       echo $ac_n "checking gtk libs""... $ac_c" 1>&6
-echo "configure:5267: checking gtk libs" >&5
+echo "configure:5262: checking gtk libs" >&5
       GTK_LIBS=`${GTK_CONFIG} --libs`
       libs_gtk="$libs_gtk ${GTK_LIBS}" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"${GTK_LIBS}\" to \$libs_gtk"; fi
       echo "$ac_t""${GTK_LIBS}" 1>&6
 
       echo $ac_n "checking gtk cflags""... $ac_c" 1>&6
-echo "configure:5273: checking gtk cflags" >&5
+echo "configure:5268: checking gtk cflags" >&5
       GTK_CFLAGS=`${GTK_CONFIG} --cflags`
       if test "$GCC" = "yes"; then
       	GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow"
@@ -5279,19 +5274,19 @@
 
       
 echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6
-echo "configure:5283: checking for main in -lgdk_imlib" >&5
+echo "configure:5278: checking for main in -lgdk_imlib" >&5
 ac_lib_var=`echo gdk_imlib'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgdk_imlib "
 cat > conftest.$ac_ext <<EOF
-#line 5288 "configure"
+#line 5283 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5313,12 +5308,12 @@
 
       
 echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6
-echo "configure:5317: checking for Imlib_init in -lImlib" >&5
+echo "configure:5312: checking for Imlib_init in -lImlib" >&5
 ac_lib_var=`echo Imlib'_'Imlib_init | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lImlib "
 cat > conftest.$ac_ext <<EOF
-#line 5322 "configure"
+#line 5317 "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
@@ -5329,7 +5324,7 @@
 Imlib_init()
 ; return 0; }
 EOF
-if { (eval echo configure:5333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5352,10 +5347,10 @@
       for ac_func in gdk_imlib_init
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5356: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5359 "configure"
+echo "configure:5351: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5354 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5378,7 +5373,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5444,15 +5439,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5448: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5451 "configure"
+echo "configure:5443: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5446 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5451: \"$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
   rm -rf conftest*
@@ -5483,19 +5478,19 @@
 
       
 echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6
-echo "configure:5487: checking for main in -lxml" >&5
+echo "configure:5482: checking for main in -lxml" >&5
 ac_lib_var=`echo xml'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lxml "
 cat > conftest.$ac_ext <<EOF
-#line 5492 "configure"
+#line 5487 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5517,19 +5512,19 @@
 
       
 echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6
-echo "configure:5521: checking for main in -lglade" >&5
+echo "configure:5516: checking for main in -lglade" >&5
 ac_lib_var=`echo glade'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lglade "
 cat > conftest.$ac_ext <<EOF
-#line 5526 "configure"
+#line 5521 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5551,19 +5546,19 @@
 
       
 echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6
-echo "configure:5555: checking for main in -lglade-gnome" >&5
+echo "configure:5550: checking for main in -lglade-gnome" >&5
 ac_lib_var=`echo glade-gnome'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lglade-gnome "
 cat > conftest.$ac_ext <<EOF
-#line 5560 "configure"
+#line 5555 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5584,7 +5579,7 @@
 
 
       cat > conftest.$ac_ext <<EOF
-#line 5588 "configure"
+#line 5583 "configure"
 #include "confdefs.h"
 #include <glade/glade-xml.h>
 EOF
@@ -5643,7 +5638,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:5647: checking for X" >&5
+echo "configure:5642: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -5703,12 +5698,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 5707 "configure"
+#line 5702 "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:5712: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5707: \"$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
   rm -rf conftest*
@@ -5777,14 +5772,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5781 "configure"
+#line 5776 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:5788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -5893,17 +5888,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:5897: checking whether -R must be followed by a space" >&5
+echo "configure:5892: 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 5900 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:5907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+#line 5895 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:5902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -5919,14 +5914,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 5923 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:5930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+#line 5918 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:5925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -5962,12 +5957,12 @@
 else
 
 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:5966: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:5961: 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 5971 "configure"
+#line 5966 "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
@@ -5978,7 +5973,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6002,12 +5997,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:6006: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:6001: 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 6011 "configure"
+#line 6006 "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
@@ -6018,7 +6013,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:6022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6047,10 +6042,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:6051: checking for gethostbyname" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6054 "configure"
+echo "configure:6046: checking for gethostbyname" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6049 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -6073,7 +6068,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -6094,12 +6089,12 @@
     if test $ac_cv_func_gethostbyname = no; then
       
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:6098: checking for gethostbyname in -lnsl" >&5
+echo "configure:6093: 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 6103 "configure"
+#line 6098 "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
@@ -6110,7 +6105,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:6114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6140,10 +6135,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:6144: checking for connect" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6147 "configure"
+echo "configure:6139: checking for connect" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6142 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -6166,7 +6161,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -6189,12 +6184,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:6193: checking "$xe_msg_checking"" >&5
+echo "configure:6188: 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 6198 "configure"
+#line 6193 "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
@@ -6205,7 +6200,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:6209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6229,10 +6224,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:6233: checking for remove" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6236 "configure"
+echo "configure:6228: checking for remove" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6231 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -6255,7 +6250,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -6276,12 +6271,12 @@
     if test $ac_cv_func_remove = no; then
       
 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:6280: checking for remove in -lposix" >&5
+echo "configure:6275: 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 6285 "configure"
+#line 6280 "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
@@ -6292,7 +6287,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:6296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6316,10 +6311,10 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:6320: checking for shmat" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6323 "configure"
+echo "configure:6315: checking for shmat" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6318 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -6342,7 +6337,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -6363,12 +6358,12 @@
     if test $ac_cv_func_shmat = no; then
       
 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:6367: checking for shmat in -lipc" >&5
+echo "configure:6362: 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 6372 "configure"
+#line 6367 "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
@@ -6379,7 +6374,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:6383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6415,12 +6410,12 @@
 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:6419: checking "$xe_msg_checking"" >&5
+echo "configure:6414: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lICE $X_EXTRA_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6424 "configure"
+#line 6419 "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
@@ -6431,7 +6426,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:6435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6598,7 +6593,7 @@
 
 
     echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:6602: checking for X defines extracted by xmkmf" >&5
+echo "configure:6597: checking for X defines extracted by xmkmf" >&5
   rm -fr conftestdir
   if mkdir conftestdir; then
     cd conftestdir
@@ -6647,15 +6642,15 @@
 
     ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:6651: checking for X11/Intrinsic.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6654 "configure"
+echo "configure:6646: checking for X11/Intrinsic.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6649 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6654: \"$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
   rm -rf conftest*
@@ -6679,12 +6674,12 @@
 
       
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:6683: checking for XOpenDisplay in -lX11" >&5
+echo "configure:6678: 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 6688 "configure"
+#line 6683 "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
@@ -6695,7 +6690,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6720,12 +6715,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:6724: checking "$xe_msg_checking"" >&5
+echo "configure:6719: 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 6729 "configure"
+#line 6724 "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
@@ -6736,7 +6731,7 @@
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:6740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6763,12 +6758,12 @@
 
     
 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:6767: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:6762: 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 6772 "configure"
+#line 6767 "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
@@ -6779,7 +6774,7 @@
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:6783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6802,12 +6797,12 @@
 
     
 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:6806: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:6801: 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 6811 "configure"
+#line 6806 "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
@@ -6818,7 +6813,7 @@
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6841,14 +6836,14 @@
 
 
   echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:6845: checking the version of X11 being used" >&5
+echo "configure:6840: checking the version of X11 being used" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6847 "configure"
+#line 6842 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
     int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:6852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest foobar; x11_release=$?
 else
@@ -6879,10 +6874,10 @@
   for ac_func in XConvertCase
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6883: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6886 "configure"
+echo "configure:6878: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6881 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6905,7 +6900,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6937,15 +6932,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6941: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6944 "configure"
+echo "configure:6936: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6939 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6949: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6944: \"$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
   rm -rf conftest*
@@ -6978,10 +6973,10 @@
     for ac_func in XRegisterIMInstantiateCallback
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6982: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6985 "configure"
+echo "configure:6977: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6980 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7004,7 +6999,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7032,9 +7027,9 @@
 done
 
   echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6
-echo "configure:7036: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+echo "configure:7031: checking for standard XRegisterIMInstantiateCallback prototype" >&5
   cat > conftest.$ac_ext <<EOF
-#line 7038 "configure"
+#line 7033 "configure"
 #include "confdefs.h"
 
 #define NeedFunctionPrototypes 1
@@ -7046,7 +7041,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7045: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -7067,12 +7062,12 @@
 
     test -z "$with_xmu" && { 
 echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:7071: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:7066: 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 7076 "configure"
+#line 7071 "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
@@ -7083,7 +7078,7 @@
 XmuReadBitmapDataFromFile()
 ; return 0; }
 EOF
-if { (eval echo configure:7087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7122,19 +7117,19 @@
 
       
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:7126: checking for main in -lXbsd" >&5
+echo "configure:7121: 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 7131 "configure"
+#line 7126 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7171,22 +7166,22 @@
 fi 
 if test "$with_msw" != "no"; then
   echo "checking for MS-Windows" 1>&6
-echo "configure:7175: checking for MS-Windows" >&5
+echo "configure:7170: checking for MS-Windows" >&5
   
 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:7178: checking for main in -lgdi32" >&5
+echo "configure:7173: 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 7183 "configure"
+#line 7178 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7237,12 +7232,12 @@
       test "$with_widgets"    != "no" && with_widgets=msw
     fi
         cat > conftest.$ac_ext <<EOF
-#line 7241 "configure"
+#line 7236 "configure"
 #include "confdefs.h"
 #include <fcntl.h>
     int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
 EOF
-if { (eval echo configure:7246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7241: \"$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
@@ -7303,15 +7298,15 @@
 if test "$with_x11" = "yes"; then
   ac_safe=`echo "X11/extensions/shape.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6
-echo "configure:7307: checking for X11/extensions/shape.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7310 "configure"
+echo "configure:7302: checking for X11/extensions/shape.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7305 "configure"
 #include "confdefs.h"
 #include <X11/extensions/shape.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7310: \"$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
   rm -rf conftest*
@@ -7361,7 +7356,7 @@
 esac
 
 echo "checking for WM_COMMAND option" 1>&6
-echo "configure:7365: checking for WM_COMMAND option" >&5;
+echo "configure:7360: checking for WM_COMMAND option" >&5;
 if test "$with_wmcommand" != "no"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_WMCOMMAND
@@ -7376,15 +7371,15 @@
 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:7380: checking for X11/Xauth.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7383 "configure"
+echo "configure:7375: checking for X11/Xauth.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7378 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7383: \"$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
   rm -rf conftest*
@@ -7407,12 +7402,12 @@
  }
 test -z "$with_xauth" && { 
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:7411: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:7406: 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 7416 "configure"
+#line 7411 "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
@@ -7423,7 +7418,7 @@
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:7427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7470,22 +7465,22 @@
 
 if test "$with_modules" != "no"; then
   echo "checking for module support" 1>&6
-echo "configure:7474: checking for module support" >&5
+echo "configure:7469: checking for module support" >&5
 
     if test "$with_msw" = "yes"; then
     have_dl=yes;
   else
         ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:7481: checking for dlfcn.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7484 "configure"
+echo "configure:7476: checking for dlfcn.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7479 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7484: \"$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
   rm -rf conftest*
@@ -7502,16 +7497,16 @@
   echo "$ac_t""yes" 1>&6
   
       echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:7506: checking for dlopen in -lc" >&5
+echo "configure:7501: checking for dlopen in -lc" >&5
       cat > conftest.$ac_ext <<EOF
-#line 7508 "configure"
+#line 7503 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:7515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -7520,18 +7515,18 @@
   rm -rf conftest*
   
       echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:7524: checking for dlopen in -ldl" >&5
+echo "configure:7519: checking for dlopen in -ldl" >&5
       ac_save_LIBS="$LIBS"
       LIBS="-ldl $LIBS"
       cat > conftest.$ac_ext <<EOF
-#line 7528 "configure"
+#line 7523 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:7535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -7560,12 +7555,12 @@
     else
       
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:7564: checking for shl_load in -ldld" >&5
+echo "configure:7559: 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 7569 "configure"
+#line 7564 "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
@@ -7576,7 +7571,7 @@
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:7580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7603,12 +7598,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:7607: checking for dld_init in -ldld" >&5
+echo "configure:7602: 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 7612 "configure"
+#line 7607 "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
@@ -7619,7 +7614,7 @@
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:7623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7664,7 +7659,7 @@
 xealias=$internal_configuration
 
 echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:7668: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:7663: checking how to build dynamic libraries for ${xehost}" >&5
 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
 case "$xehost" in
 *-*-linux-gnu*) ;;
@@ -7692,9 +7687,9 @@
   XEGCC=yes
 else
   echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:7696: checking checking whether we are using GNU C" >&5
+echo "configure:7691: checking checking whether we are using GNU C" >&5
   cat > conftest.$ac_ext <<EOF
-#line 7698 "configure"
+#line 7693 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -7716,7 +7711,7 @@
 fi
 
 echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:7720: checking how to produce PIC code" >&5
+echo "configure:7715: checking how to produce PIC code" >&5
 wl=
 
 can_build_shared=yes
@@ -7822,18 +7817,18 @@
 
   # Check to make sure the dll_cflags actually works.
   echo $ac_n "checking if PIC flag ${dll_cflags} really works""... $ac_c" 1>&6
-echo "configure:7826: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:7821: checking if PIC flag ${dll_cflags} really works" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $dll_cflags -DPIC"
   cat > conftest.$ac_ext <<EOF
-#line 7830 "configure"
+#line 7825 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:7837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
     # On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also
@@ -7868,7 +7863,7 @@
 xldf=
 xcldf=
 echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:7872: checking if C compiler can produce shared libraries" >&5
+echo "configure:7867: checking if C compiler can produce shared libraries" >&5
 if test "$XEGCC" = yes; then
   xcldf="-shared"
   xldf="-shared"
@@ -7919,14 +7914,14 @@
   xe_libs=
   ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
   cat > conftest.$ac_ext <<EOF
-#line 7923 "configure"
+#line 7918 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:7930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cc_produces_so=yes
 else
@@ -7951,7 +7946,7 @@
   if test "$XEGCC" = yes; then
     # Check if gcc -print-prog-name=ld gives a path.
     echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:7955: checking for ld used by GCC" >&5
+echo "configure:7950: checking for ld used by GCC" >&5
     ac_prog=`($CC -print-prog-name=ld) 2>&5`
     case "$ac_prog" in
     # Accept absolute paths.
@@ -7977,7 +7972,7 @@
     esac
   else
     echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:7981: checking for GNU ld" >&5
+echo "configure:7976: checking for GNU ld" >&5
   fi
 
   if test -z "$LTLD"; then
@@ -8015,7 +8010,7 @@
 
 # Check to see if it really is or isn't GNU ld.
 echo $ac_n "checking if the linker is GNU ld""... $ac_c" 1>&6
-echo "configure:8019: checking if the linker is GNU ld" >&5
+echo "configure:8014: checking if the linker is GNU ld" >&5
 # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
   xe_gnu_ld=yes
@@ -8043,7 +8038,7 @@
   # OK - only NOW do we futz about with ld.
   # See if the linker supports building shared libraries.
   echo $ac_n "checking whether the linker supports shared libraries""... $ac_c" 1>&6
-echo "configure:8047: checking whether the linker supports shared libraries" >&5
+echo "configure:8042: checking whether the linker supports shared libraries" >&5
   dll_ld=$CC
   dll_ldflags=$LDFLAGS
   ld_shlibs=yes
@@ -8251,10 +8246,10 @@
     for ac_func in dlerror _dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8255: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8258 "configure"
+echo "configure:8250: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8253 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8277,7 +8272,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8339,15 +8334,15 @@
       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:8343: checking for ${dir}tt_c.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8346 "configure"
+echo "configure:8338: checking for ${dir}tt_c.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8341 "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:8351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8346: \"$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
   rm -rf conftest*
@@ -8383,12 +8378,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:8387: checking "$xe_msg_checking"" >&5
+echo "configure:8382: 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 8392 "configure"
+#line 8387 "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
@@ -8399,7 +8394,7 @@
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:8403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8453,15 +8448,15 @@
 
 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:8457: checking for Dt/Dt.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8460 "configure"
+echo "configure:8452: checking for Dt/Dt.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8455 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8460: \"$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
   rm -rf conftest*
@@ -8484,12 +8479,12 @@
  }
 test -z "$with_cde" && { 
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:8488: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:8483: 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 8493 "configure"
+#line 8488 "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
@@ -8500,7 +8495,7 @@
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:8504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8581,7 +8576,7 @@
 
 if test "$with_dragndrop" != "no" ; then
   echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
-echo "configure:8585: checking if drag and drop API is needed" >&5
+echo "configure:8580: checking if drag and drop API is needed" >&5
   if test -n "$dragndrop_proto" ; then
     with_dragndrop=yes
     echo "$ac_t""yes (${dragndrop_proto} )" 1>&6
@@ -8601,19 +8596,19 @@
 fi
 
 echo "checking for LDAP" 1>&6
-echo "configure:8605: checking for LDAP" >&5
+echo "configure:8600: checking for LDAP" >&5
 ldap_libs=
 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:8609: checking for ldap.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8612 "configure"
+echo "configure:8604: checking for ldap.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8607 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8617: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8612: \"$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
   rm -rf conftest*
@@ -8636,15 +8631,15 @@
  }
 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:8640: checking for lber.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8643 "configure"
+echo "configure:8635: checking for lber.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8638 "configure"
 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8648: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8643: \"$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
   rm -rf conftest*
@@ -8668,12 +8663,12 @@
 if test "$with_ldap" != "no"; then
   
 echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
-echo "configure:8672: checking for ldap_search in -lldap" >&5
+echo "configure:8667: checking for ldap_search in -lldap" >&5
 ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap "
 cat > conftest.$ac_ext <<EOF
-#line 8677 "configure"
+#line 8672 "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
@@ -8684,7 +8679,7 @@
 ldap_search()
 ; return 0; }
 EOF
-if { (eval echo configure:8688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8709,12 +8704,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:8713: checking "$xe_msg_checking"" >&5
+echo "configure:8708: 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 8718 "configure"
+#line 8713 "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
@@ -8725,7 +8720,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:8729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8750,12 +8745,12 @@
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber -lkrb" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:8754: checking "$xe_msg_checking"" >&5
+echo "configure:8749: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap -llber -lkrb"
 cat > conftest.$ac_ext <<EOF
-#line 8759 "configure"
+#line 8754 "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
@@ -8766,7 +8761,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:8770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8791,12 +8786,12 @@
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber -lkrb -ldes" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb -ldes"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:8795: checking "$xe_msg_checking"" >&5
+echo "configure:8790: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap -llber -lkrb -ldes"
 cat > conftest.$ac_ext <<EOF
-#line 8800 "configure"
+#line 8795 "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
@@ -8807,7 +8802,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:8811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8856,10 +8851,10 @@
   for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8860: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8863 "configure"
+echo "configure:8855: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8858 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8882,7 +8877,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8921,20 +8916,20 @@
 postgresql_libs=
 if test "$with_postgresql" != "no"; then
   echo "checking for PostgreSQL" 1>&6
-echo "configure:8925: checking for PostgreSQL" >&5
+echo "configure:8920: checking for PostgreSQL" >&5
 
   for header_dir in "" "pgsql/" "postgresql/"; do
     ac_safe=`echo "${header_dir}libpq-fe.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${header_dir}libpq-fe.h""... $ac_c" 1>&6
-echo "configure:8930: checking for ${header_dir}libpq-fe.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8933 "configure"
+echo "configure:8925: checking for ${header_dir}libpq-fe.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8928 "configure"
 #include "confdefs.h"
 #include <${header_dir}libpq-fe.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8933: \"$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
   rm -rf conftest*
@@ -8958,12 +8953,12 @@
 
   test -n "$libpq_fe_h_file" && { 
 echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:8962: checking for PQconnectdb in -lpq" >&5
+echo "configure:8957: checking for PQconnectdb in -lpq" >&5
 ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpq "
 cat > conftest.$ac_ext <<EOF
-#line 8967 "configure"
+#line 8962 "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
@@ -8974,7 +8969,7 @@
 PQconnectdb()
 ; return 0; }
 EOF
-if { (eval echo configure:8978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9007,12 +9002,12 @@
 
     
 echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
-echo "configure:9011: checking for PQconnectStart in -lpq" >&5
+echo "configure:9006: checking for PQconnectStart in -lpq" >&5
 ac_lib_var=`echo pq'_'PQconnectStart | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpq "
 cat > conftest.$ac_ext <<EOF
-#line 9016 "configure"
+#line 9011 "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
@@ -9023,7 +9018,7 @@
 PQconnectStart()
 ; return 0; }
 EOF
-if { (eval echo configure:9027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9074,7 +9069,7 @@
 
 if test "$window_system" != "none"; then
   echo "checking for graphics libraries" 1>&6
-echo "configure:9078: checking for graphics libraries" >&5
+echo "configure:9073: checking for graphics libraries" >&5
 
       libpath_xpm=
   incpath_xpm=
@@ -9100,10 +9095,10 @@
     CFLAGS=""$incpath_xpm" $CFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
     LDFLAGS=""$libpath_xpm" $LDFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
     echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:9104: checking for Xpm - no older than 3.4f" >&5
+echo "configure:9099: checking for Xpm - no older than 3.4f" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 9107 "configure"
+#line 9102 "configure"
 #include "confdefs.h"
 #define XPM_NUMBERS
 #include <X11/xpm.h>
@@ -9112,7 +9107,7 @@
       XpmIncludeVersion != XpmLibraryVersion() ? 1 :
       XpmIncludeVersion < 30406 ? 2 : 0 ;}
 EOF
-if { (eval echo configure:9116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9111: \"$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
@@ -9156,17 +9151,17 @@
     libs_x="-lXpm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXpm\" to \$libs_x"; fi
     CFLAGS=""$incpath_xpm" $CFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
     echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6
-echo "configure:9160: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:9155: checking for \"FOR_MSW\" xpm" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 9163 "configure"
+#line 9158 "configure"
 #include "confdefs.h"
 
 int main() {
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:9170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   xpm_for_msw=no
 else
@@ -9192,15 +9187,15 @@
 
     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:9196: checking for compface.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9199 "configure"
+echo "configure:9191: checking for compface.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9194 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9199: \"$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
   rm -rf conftest*
@@ -9223,12 +9218,12 @@
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:9227: checking for UnGenFace in -lcompface" >&5
+echo "configure:9222: 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 9232 "configure"
+#line 9227 "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
@@ -9239,7 +9234,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:9243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9288,12 +9283,12 @@
       if test "$with_png $with_tiff" != "no no"; then
     
 echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
-echo "configure:9292: checking for inflate in -lc" >&5
+echo "configure:9287: 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 9297 "configure"
+#line 9292 "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
@@ -9304,7 +9299,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:9308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9323,12 +9318,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:9327: checking for inflate in -lz" >&5
+echo "configure:9322: 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 9332 "configure"
+#line 9327 "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
@@ -9339,7 +9334,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:9343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9358,12 +9353,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:9362: checking for inflate in -lgz" >&5
+echo "configure:9357: 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 9367 "configure"
+#line 9362 "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
@@ -9374,7 +9369,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:9378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9404,15 +9399,15 @@
 
     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:9408: checking for jpeglib.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9411 "configure"
+echo "configure:9403: checking for jpeglib.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9406 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9411: \"$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
   rm -rf conftest*
@@ -9435,12 +9430,12 @@
  }
   test -z "$with_jpeg" && { 
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:9439: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:9434: 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 9444 "configure"
+#line 9439 "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
@@ -9451,7 +9446,7 @@
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:9455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9487,10 +9482,10 @@
 
     png_problem=""
   test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:9491: checking for pow" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9494 "configure"
+echo "configure:9486: checking for pow" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9489 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pow(); below.  */
@@ -9513,7 +9508,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:9517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_pow=yes"
 else
@@ -9534,15 +9529,15 @@
  }
   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:9538: checking for png.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9541 "configure"
+echo "configure:9533: checking for png.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9536 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9546: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9541: \"$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
   rm -rf conftest*
@@ -9565,12 +9560,12 @@
  }
   test -z "$with_png" && { 
 echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:9569: checking for png_read_image in -lpng" >&5
+echo "configure:9564: 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 9574 "configure"
+#line 9569 "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
@@ -9581,7 +9576,7 @@
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:9585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9604,10 +9599,10 @@
  }
   if test -z "$with_png"; then
     echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:9608: checking for workable png version information" >&5
+echo "configure:9603: checking for workable png version information" >&5
     xe_check_libs="-lpng -lz"
     cat > conftest.$ac_ext <<EOF
-#line 9611 "configure"
+#line 9606 "configure"
 #include "confdefs.h"
 #include <png.h>
     int main(int c, char **v) {
@@ -9615,7 +9610,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:9619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9614: \"$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
@@ -9658,15 +9653,15 @@
 
     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:9662: checking for tiffio.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9665 "configure"
+echo "configure:9657: checking for tiffio.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9660 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9670: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9665: \"$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
   rm -rf conftest*
@@ -9689,12 +9684,12 @@
  }
   test -z "$with_tiff" && { 
 echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:9693: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:9688: 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 9698 "configure"
+#line 9693 "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
@@ -9705,7 +9700,7 @@
 TIFFClientOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:9709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9744,15 +9739,15 @@
 if test "$with_gtk" = "yes"; then
     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:9748: checking for compface.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9751 "configure"
+echo "configure:9743: checking for compface.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9746 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9751: \"$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
   rm -rf conftest*
@@ -9775,12 +9770,12 @@
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:9779: checking for UnGenFace in -lcompface" >&5
+echo "configure:9774: 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 9784 "configure"
+#line 9779 "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
@@ -9791,7 +9786,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:9795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9830,7 +9825,7 @@
 
 if test "$with_x11" = "yes"; then
   echo "checking for X11 graphics libraries" 1>&6
-echo "configure:9834: checking for X11 graphics libraries" >&5
+echo "configure:9829: checking for X11 graphics libraries" >&5
 fi
 
 case "$with_widgets" in
@@ -9840,7 +9835,7 @@
 
 if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then
   echo "checking for the Athena widgets" 1>&6
-echo "configure:9844: checking for the Athena widgets" >&5
+echo "configure:9839: checking for the Athena widgets" >&5
 
     case "$with_athena" in
         "xaw" | "")	athena_variant=Xaw	athena_3d=no  ;;
@@ -9854,12 +9849,12 @@
     if test "$athena_3d" = "no"; then
     
 echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9858: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:9853: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 9863 "configure"
+#line 9858 "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
@@ -9870,7 +9865,7 @@
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:9874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9886,12 +9881,12 @@
   echo "$ac_t""yes" 1>&6
           
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9890: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:9885: checking for threeDClassRec in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 9895 "configure"
+#line 9890 "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
@@ -9902,7 +9897,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:9906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9933,12 +9928,12 @@
   else
         
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9937: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:9932: checking for threeDClassRec in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 9942 "configure"
+#line 9937 "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
@@ -9949,7 +9944,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:9953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9967,12 +9962,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6
-echo "configure:9971: checking for threeDClassRec in -lXaw" >&5
+echo "configure:9966: checking for threeDClassRec in -lXaw" >&5
 ac_lib_var=`echo Xaw'_'threeDClassRec | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXaw "
 cat > conftest.$ac_ext <<EOF
-#line 9976 "configure"
+#line 9971 "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
@@ -9983,7 +9978,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:9987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10014,15 +10009,15 @@
     if test "$athena_3d" = "no"; then
     ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10018: checking for X11/Xaw/ThreeD.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10021 "configure"
+echo "configure:10013: checking for X11/Xaw/ThreeD.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10016 "configure"
 #include "confdefs.h"
 #include <X11/Xaw/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10021: \"$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
   rm -rf conftest*
@@ -10042,15 +10037,15 @@
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "X11/Xaw/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw/XawInit.h""... $ac_c" 1>&6
-echo "configure:10046: checking for X11/Xaw/XawInit.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10049 "configure"
+echo "configure:10041: checking for X11/Xaw/XawInit.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10044 "configure"
 #include "confdefs.h"
 #include <X11/Xaw/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10049: \"$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
   rm -rf conftest*
@@ -10076,15 +10071,15 @@
   else
             ac_safe=`echo "X11/$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/$athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:10080: checking for X11/$athena_variant/XawInit.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10083 "configure"
+echo "configure:10075: checking for X11/$athena_variant/XawInit.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10078 "configure"
 #include "confdefs.h"
 #include <X11/$athena_variant/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10083: \"$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
   rm -rf conftest*
@@ -10101,15 +10096,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "X11/$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/$athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10105: checking for X11/$athena_variant/ThreeD.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10108 "configure"
+echo "configure:10100: checking for X11/$athena_variant/ThreeD.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10103 "configure"
 #include "confdefs.h"
 #include <X11/$athena_variant/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10108: \"$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
   rm -rf conftest*
@@ -10137,15 +10132,15 @@
         if test -z "$athena_h_path"; then
       ac_safe=`echo "$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:10141: checking for $athena_variant/XawInit.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10144 "configure"
+echo "configure:10136: checking for $athena_variant/XawInit.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10139 "configure"
 #include "confdefs.h"
 #include <$athena_variant/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10144: \"$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
   rm -rf conftest*
@@ -10162,15 +10157,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10166: checking for $athena_variant/ThreeD.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10169 "configure"
+echo "configure:10161: checking for $athena_variant/ThreeD.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10164 "configure"
 #include "confdefs.h"
 #include <$athena_variant/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10169: \"$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
   rm -rf conftest*
@@ -10199,15 +10194,15 @@
         if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
       ac_safe=`echo "X11/Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:10203: checking for X11/Xaw3d/XawInit.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10206 "configure"
+echo "configure:10198: checking for X11/Xaw3d/XawInit.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10201 "configure"
 #include "confdefs.h"
 #include <X11/Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10211: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10206: \"$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
   rm -rf conftest*
@@ -10224,15 +10219,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "X11/Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10228: checking for X11/Xaw3d/ThreeD.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10231 "configure"
+echo "configure:10223: checking for X11/Xaw3d/ThreeD.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10226 "configure"
 #include "confdefs.h"
 #include <X11/Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10231: \"$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
   rm -rf conftest*
@@ -10264,15 +10259,15 @@
         if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
       ac_safe=`echo "Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:10268: checking for Xaw3d/XawInit.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10271 "configure"
+echo "configure:10263: checking for Xaw3d/XawInit.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10266 "configure"
 #include "confdefs.h"
 #include <Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10271: \"$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
   rm -rf conftest*
@@ -10289,15 +10284,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10293: checking for Xaw3d/ThreeD.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10296 "configure"
+echo "configure:10288: checking for Xaw3d/ThreeD.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10291 "configure"
 #include "confdefs.h"
 #include <Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10296: \"$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
   rm -rf conftest*
@@ -10329,15 +10324,15 @@
             if test -z "$athena_h_path"; then
       ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10333: checking for X11/Xaw/ThreeD.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10336 "configure"
+echo "configure:10328: checking for X11/Xaw/ThreeD.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10331 "configure"
 #include "confdefs.h"
 #include <X11/Xaw/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10336: \"$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
   rm -rf conftest*
@@ -10376,15 +10371,15 @@
 if test "$with_x11" = "yes"; then
     ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:10380: checking for Xm/Xm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10383 "configure"
+echo "configure:10375: checking for Xm/Xm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10378 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10383: \"$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
   rm -rf conftest*
@@ -10401,12 +10396,12 @@
   echo "$ac_t""yes" 1>&6
   
 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:10405: checking for XmStringFree in -lXm" >&5
+echo "configure:10400: 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 10410 "configure"
+#line 10405 "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
@@ -10417,7 +10412,7 @@
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:10421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10446,9 +10441,9 @@
 
   if test "$have_motif" = "yes"; then
         echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:10450: checking for Lesstif" >&5
+echo "configure:10445: checking for Lesstif" >&5
     cat > conftest.$ac_ext <<EOF
-#line 10452 "configure"
+#line 10447 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 #ifdef LESSTIF_VERSION
@@ -10821,7 +10816,7 @@
 
 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
-echo "configure:10825: checking for Mule-related features" >&5
+echo "configure:10820: checking for Mule-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
@@ -10835,15 +10830,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10839: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10842 "configure"
+echo "configure:10834: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10837 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10842: \"$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
   rm -rf conftest*
@@ -10874,12 +10869,12 @@
 
   
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:10878: checking for strerror in -lintl" >&5
+echo "configure:10873: 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 10883 "configure"
+#line 10878 "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
@@ -10890,7 +10885,7 @@
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:10894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10923,18 +10918,18 @@
 
 
   echo "checking for Mule input methods" 1>&6
-echo "configure:10927: checking for Mule input methods" >&5
+echo "configure:10922: checking for Mule input methods" >&5
         case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6
-echo "configure:10930: checking for XIM" >&5
+echo "configure:10925: checking for XIM" >&5
     
 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:10933: checking for XOpenIM in -lX11" >&5
+echo "configure:10928: 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 10938 "configure"
+#line 10933 "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
@@ -10945,7 +10940,7 @@
 XOpenIM()
 ; return 0; }
 EOF
-if { (eval echo configure:10949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10969,12 +10964,12 @@
         if test "$have_motif $have_lesstif" = "yes no"; then
       
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:10973: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:10968: 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 10978 "configure"
+#line 10973 "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
@@ -10985,7 +10980,7 @@
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:10989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11050,15 +11045,15 @@
 
     if test "$with_xfs" = "yes" ; then
     echo "checking for XFontSet" 1>&6
-echo "configure:11054: checking for XFontSet" >&5
+echo "configure:11049: checking for XFontSet" >&5
     
 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:11057: checking for XmbDrawString in -lX11" >&5
+echo "configure:11052: 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 11062 "configure"
+#line 11057 "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
@@ -11069,7 +11064,7 @@
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:11073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11109,15 +11104,15 @@
     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:11113: checking for wnn/jllib.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11116 "configure"
+echo "configure:11108: checking for wnn/jllib.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11111 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11121: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11116: \"$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
   rm -rf conftest*
@@ -11140,15 +11135,15 @@
  }
     test -z "$with_wnn" && { ac_safe=`echo "wnn/commonhd.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for wnn/commonhd.h""... $ac_c" 1>&6
-echo "configure:11144: checking for wnn/commonhd.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11147 "configure"
+echo "configure:11139: checking for wnn/commonhd.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11142 "configure"
 #include "confdefs.h"
 #include <wnn/commonhd.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11147: \"$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
   rm -rf conftest*
@@ -11173,10 +11168,10 @@
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11177: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11180 "configure"
+echo "configure:11172: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11175 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11199,7 +11194,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11228,12 +11223,12 @@
 
     test "$ac_cv_func_crypt" != "yes" && { 
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:11232: checking for crypt in -lcrypt" >&5
+echo "configure:11227: 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 11237 "configure"
+#line 11232 "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
@@ -11244,7 +11239,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:11248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11279,12 +11274,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:11283: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:11278: 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 11288 "configure"
+#line 11283 "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
@@ -11295,7 +11290,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:11299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11313,12 +11308,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:11317: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:11312: 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 11322 "configure"
+#line 11317 "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
@@ -11329,7 +11324,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:11333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11347,12 +11342,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:11351: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:11346: 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 11356 "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
@@ -11363,7 +11358,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:11367: \"$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${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11381,12 +11376,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:11385: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:11380: 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 11390 "configure"
+#line 11385 "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
@@ -11397,7 +11392,7 @@
 dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:11401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11442,12 +11437,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:11446: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:11441: 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 11451 "configure"
+#line 11446 "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
@@ -11458,7 +11453,7 @@
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:11462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11493,15 +11488,15 @@
   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:11497: checking for canna/jrkanji.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11500 "configure"
+echo "configure:11492: checking for canna/jrkanji.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11495 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11500: \"$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
   rm -rf conftest*
@@ -11528,15 +11523,15 @@
     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:11532: checking for canna/jrkanji.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11535 "configure"
+echo "configure:11527: checking for canna/jrkanji.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11530 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11535: \"$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
   rm -rf conftest*
@@ -11564,15 +11559,15 @@
 
   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:11568: checking for canna/RK.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11571 "configure"
+echo "configure:11563: checking for canna/RK.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11566 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11571: \"$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
   rm -rf conftest*
@@ -11595,12 +11590,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:11599: checking for RkBgnBun in -lRKC" >&5
+echo "configure:11594: 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 11604 "configure"
+#line 11599 "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
@@ -11611,7 +11606,7 @@
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:11615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11634,12 +11629,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:11638: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:11633: 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 11643 "configure"
+#line 11638 "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
@@ -11650,7 +11645,7 @@
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:11654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11696,12 +11691,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:11700: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:11695: 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 11705 "configure"
+#line 11700 "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
@@ -11712,7 +11707,7 @@
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:11716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11799,10 +11794,10 @@
 for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror strlwr strupr symlink tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask wcslen wcscmp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11803: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11806 "configure"
+echo "configure:11798: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11801 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11825,7 +11820,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11866,10 +11861,10 @@
 for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11870: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11873 "configure"
+echo "configure:11865: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11868 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11892,7 +11887,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11921,10 +11916,10 @@
 
 
 echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:11925: checking for openpty" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11928 "configure"
+echo "configure:11920: checking for openpty" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11923 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char openpty(); below.  */
@@ -11947,7 +11942,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_openpty=yes"
 else
@@ -11966,12 +11961,12 @@
 
   
 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:11970: checking for openpty in -lutil" >&5
+echo "configure:11965: checking for openpty in -lutil" >&5
 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lutil "
 cat > conftest.$ac_ext <<EOF
-#line 11975 "configure"
+#line 11970 "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
@@ -11982,7 +11977,7 @@
 openpty()
 ; return 0; }
 EOF
-if { (eval echo configure:11986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12017,15 +12012,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12021: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12024 "configure"
+echo "configure:12016: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12019 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12024: \"$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
   rm -rf conftest*
@@ -12062,15 +12057,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12066: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12069 "configure"
+echo "configure:12061: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12064 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12069: \"$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
   rm -rf conftest*
@@ -12103,15 +12098,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12107: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12110 "configure"
+echo "configure:12102: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12105 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12110: \"$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
   rm -rf conftest*
@@ -12144,15 +12139,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12148: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12151 "configure"
+echo "configure:12143: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12146 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12156: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12151: \"$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
   rm -rf conftest*
@@ -12188,15 +12183,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12192: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12195 "configure"
+echo "configure:12187: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12190 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12195: \"$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
   rm -rf conftest*
@@ -12229,10 +12224,10 @@
   for ac_func in isastream
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12233: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12236 "configure"
+echo "configure:12228: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12231 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12255,7 +12250,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -12286,15 +12281,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12290: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12293 "configure"
+echo "configure:12285: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12288 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12298: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12293: \"$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
   rm -rf conftest*
@@ -12327,10 +12322,10 @@
 for ac_func in getloadavg
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12331: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12334 "configure"
+echo "configure:12326: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12329 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12353,7 +12348,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -12386,15 +12381,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12390: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12393 "configure"
+echo "configure:12385: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12388 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12393: \"$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
   rm -rf conftest*
@@ -12430,12 +12425,12 @@
 
     
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:12434: checking for kstat_open in -lkstat" >&5
+echo "configure:12429: 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 12439 "configure"
+#line 12434 "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
@@ -12446,7 +12441,7 @@
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:12450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12481,15 +12476,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12485: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12488 "configure"
+echo "configure:12480: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12483 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12488: \"$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
   rm -rf conftest*
@@ -12521,12 +12516,12 @@
 
     
 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:12525: checking for kvm_read in -lkvm" >&5
+echo "configure:12520: 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 12530 "configure"
+#line 12525 "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
@@ -12537,7 +12532,7 @@
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:12541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12571,16 +12566,16 @@
 fi
 
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:12575: checking whether netdb declares h_errno" >&5
-cat > conftest.$ac_ext <<EOF
-#line 12577 "configure"
+echo "configure:12570: checking whether netdb declares h_errno" >&5
+cat > conftest.$ac_ext <<EOF
+#line 12572 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:12584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF
@@ -12600,16 +12595,16 @@
 rm -f conftest*
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:12604: checking for sigsetjmp" >&5
-cat > conftest.$ac_ext <<EOF
-#line 12606 "configure"
+echo "configure:12599: checking for sigsetjmp" >&5
+cat > conftest.$ac_ext <<EOF
+#line 12601 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:12613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12608: \"$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
@@ -12629,11 +12624,11 @@
 rm -f conftest*
 
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:12633: checking whether localtime caches TZ" >&5
+echo "configure:12628: checking whether localtime caches TZ" >&5
 
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 12637 "configure"
+#line 12632 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
@@ -12668,7 +12663,7 @@
   exit (0);
 }
 EOF
-if { (eval echo configure:12672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
@@ -12698,9 +12693,9 @@
 
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:12702: checking whether gettimeofday accepts one or two arguments" >&5
-cat > conftest.$ac_ext <<EOF
-#line 12704 "configure"
+echo "configure:12697: checking whether gettimeofday accepts one or two arguments" >&5
+cat > conftest.$ac_ext <<EOF
+#line 12699 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -12721,7 +12716,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""two" 1>&6
 else
@@ -12743,19 +12738,19 @@
 
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:12747: checking for inline" >&5
+echo "configure:12742: checking for inline" >&5
 
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 12752 "configure"
+#line 12747 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:12759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12754: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -12796,17 +12791,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:12800: checking for working alloca.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12803 "configure"
+echo "configure:12795: checking for working alloca.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12798 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:12810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -12830,10 +12825,10 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:12834: checking for alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12837 "configure"
+echo "configure:12829: checking for alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12832 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -12861,7 +12856,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:12865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -12900,10 +12895,10 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:12904: checking whether alloca needs Cray hooks" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12907 "configure"
+echo "configure:12899: checking whether alloca needs Cray hooks" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12902 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -12927,10 +12922,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:12931: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12934 "configure"
+echo "configure:12926: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12929 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12953,7 +12948,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -12983,10 +12978,10 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:12987: checking stack direction for C alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12990 "configure"
+echo "configure:12982: checking stack direction for C alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12985 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -13005,7 +13000,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:13009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
@@ -13034,10 +13029,10 @@
 fi
 
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:13038: checking for working strcoll" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13041 "configure"
+echo "configure:13033: checking for working strcoll" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13036 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -13047,7 +13042,7 @@
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:13051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
@@ -13075,10 +13070,10 @@
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13079: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13082 "configure"
+echo "configure:13074: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13077 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -13101,7 +13096,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -13129,10 +13124,10 @@
 done
 
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:13133: checking whether getpgrp takes no argument" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13136 "configure"
+echo "configure:13128: checking whether getpgrp takes no argument" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13131 "configure"
 #include "confdefs.h"
 
 /*
@@ -13187,7 +13182,7 @@
 }
 
 EOF
-if { (eval echo configure:13191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_getpgrp_void=yes
 else
@@ -13214,10 +13209,10 @@
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:13218: checking for working mmap" >&5
+echo "configure:13213: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 13221 "configure"
+#line 13216 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -13250,7 +13245,7 @@
   return 1;
 }
 EOF
-if { (eval echo configure:13254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   have_mmap=yes
 else
@@ -13279,9 +13274,9 @@
 if test "$rel_alloc $have_mmap" = "default yes"; then
   if test "$doug_lea_malloc" = "yes"; then
         echo $ac_n "checking for M_MMAP_THRESHOLD""... $ac_c" 1>&6
-echo "configure:13283: checking for M_MMAP_THRESHOLD" >&5
+echo "configure:13278: checking for M_MMAP_THRESHOLD" >&5
     cat > conftest.$ac_ext <<EOF
-#line 13285 "configure"
+#line 13280 "configure"
 #include "confdefs.h"
 #include <malloc.h>
 int main() {
@@ -13293,7 +13288,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   rel_alloc=no; echo "$ac_t""yes" 1>&6;
 else
@@ -13318,15 +13313,15 @@
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:13322: checking for termios.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13325 "configure"
+echo "configure:13317: checking for termios.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13320 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13325: \"$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
   rm -rf conftest*
@@ -13369,15 +13364,15 @@
   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:13373: checking for termio.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13376 "configure"
+echo "configure:13368: checking for termio.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13371 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13376: \"$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
   rm -rf conftest*
@@ -13409,10 +13404,10 @@
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:13413: checking for socket" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13416 "configure"
+echo "configure:13408: checking for socket" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13411 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -13435,7 +13430,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -13450,15 +13445,15 @@
   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:13454: checking for netinet/in.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13457 "configure"
+echo "configure:13449: checking for netinet/in.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13452 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13457: \"$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
   rm -rf conftest*
@@ -13475,15 +13470,15 @@
   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:13479: checking for arpa/inet.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13482 "configure"
+echo "configure:13474: checking for arpa/inet.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13477 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13487: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13482: \"$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
   rm -rf conftest*
@@ -13508,9 +13503,9 @@
 }
 
       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:13512: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:13507: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 13514 "configure"
+#line 13509 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13521,7 +13516,7 @@
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:13525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_SOCKADDR_SUN_LEN
@@ -13539,9 +13534,9 @@
 fi
 rm -f conftest*
       echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:13543: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:13538: checking "for ip_mreq struct in netinet/in.h"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 13545 "configure"
+#line 13540 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13551,7 +13546,7 @@
 static struct ip_mreq x;
 ; return 0; }
 EOF
-if { (eval echo configure:13555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MULTICAST
@@ -13582,10 +13577,10 @@
 
 
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:13586: checking for msgget" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13589 "configure"
+echo "configure:13581: checking for msgget" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13584 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
@@ -13608,7 +13603,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_msgget=yes"
 else
@@ -13623,15 +13618,15 @@
   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:13627: checking for sys/ipc.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13630 "configure"
+echo "configure:13622: checking for sys/ipc.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13625 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13635: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13630: \"$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
   rm -rf conftest*
@@ -13648,15 +13643,15 @@
   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:13652: checking for sys/msg.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13655 "configure"
+echo "configure:13647: checking for sys/msg.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13650 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13655: \"$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
   rm -rf conftest*
@@ -13694,15 +13689,15 @@
 
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:13698: checking for dirent.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13701 "configure"
+echo "configure:13693: checking for dirent.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13696 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13701: \"$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
   rm -rf conftest*
@@ -13729,15 +13724,15 @@
   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:13733: checking for sys/dir.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13736 "configure"
+echo "configure:13728: checking for sys/dir.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13731 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13736: \"$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
   rm -rf conftest*
@@ -13770,15 +13765,15 @@
 
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:13774: checking for nlist.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13777 "configure"
+echo "configure:13769: checking for nlist.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13772 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13777: \"$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
   rm -rf conftest*
@@ -13808,22 +13803,22 @@
 
 
 echo "checking "for sound support"" 1>&6
-echo "configure:13812: checking "for sound support"" >&5
+echo "configure:13807: checking "for sound support"" >&5
 test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes
 
 if test "$with_native_sound" != "no"; then
     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:13819: checking for multimedia/audio_device.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13822 "configure"
+echo "configure:13814: checking for multimedia/audio_device.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13817 "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:13827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13822: \"$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
   rm -rf conftest*
@@ -13871,12 +13866,12 @@
       if test -z "$native_sound_lib"; then
         
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:13875: checking for ALopenport in -laudio" >&5
+echo "configure:13870: 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 13880 "configure"
+#line 13875 "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
@@ -13887,7 +13882,7 @@
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:13891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13918,12 +13913,12 @@
       if test -z "$native_sound_lib"; then
 	
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:13922: checking for AOpenAudio in -lAlib" >&5
+echo "configure:13917: 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 13927 "configure"
+#line 13922 "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
@@ -13934,7 +13929,7 @@
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:13938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13982,15 +13977,15 @@
     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:13986: checking for ${dir}/soundcard.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13989 "configure"
+echo "configure:13981: checking for ${dir}/soundcard.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13984 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13989: \"$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
   rm -rf conftest*
@@ -14044,15 +14039,15 @@
 if test "$with_nas_sound" != "no"; then
   ac_safe=`echo "audio/audiolib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for audio/audiolib.h""... $ac_c" 1>&6
-echo "configure:14048: checking for audio/audiolib.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 14051 "configure"
+echo "configure:14043: checking for audio/audiolib.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14046 "configure"
 #include "confdefs.h"
 #include <audio/audiolib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14051: \"$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
   rm -rf conftest*
@@ -14070,12 +14065,12 @@
   
     
 echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6
-echo "configure:14074: checking for AuOpenServer in -laudio" >&5
+echo "configure:14069: checking for AuOpenServer in -laudio" >&5
 ac_lib_var=`echo audio'_'AuOpenServer | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -laudio "
 cat > conftest.$ac_ext <<EOF
-#line 14079 "configure"
+#line 14074 "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
@@ -14086,7 +14081,7 @@
 AuOpenServer()
 ; return 0; }
 EOF
-if { (eval echo configure:14090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14125,7 +14120,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 14129 "configure"
+#line 14124 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
@@ -14156,7 +14151,7 @@
   # Extract the first word of "esd-config", so it can be a program name with args.
 set dummy esd-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14160: checking for $ac_word" >&5
+echo "configure:14155: checking for $ac_word" >&5
 
 if test -n "$have_esd_config"; then
   ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test.
@@ -14185,10 +14180,10 @@
     c_switch_site="$c_switch_site `esd-config --cflags`" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi
     LIBS="`esd-config --libs` $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"`esd-config --libs`\" to \$LIBS"; fi
     echo $ac_n "checking for esd_play_stream""... $ac_c" 1>&6
-echo "configure:14189: checking for esd_play_stream" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 14192 "configure"
+echo "configure:14184: checking for esd_play_stream" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14187 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char esd_play_stream(); below.  */
@@ -14211,7 +14206,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_esd_play_stream=yes"
 else
@@ -14262,7 +14257,7 @@
 
 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:14266: checking for TTY-related features" >&5
+echo "configure:14261: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
@@ -14275,12 +14270,12 @@
     if test -z "$with_ncurses"; then
     
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:14279: checking for tgetent in -lncurses" >&5
+echo "configure:14274: 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 14284 "configure"
+#line 14279 "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
@@ -14291,7 +14286,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:14295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14324,15 +14319,15 @@
 
     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:14328: checking for ncurses/curses.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 14331 "configure"
+echo "configure:14323: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14326 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14336: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14331: \"$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
   rm -rf conftest*
@@ -14354,15 +14349,15 @@
 
     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:14358: checking for ncurses/term.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 14361 "configure"
+echo "configure:14353: checking for ncurses/term.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14356 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14361: \"$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
   rm -rf conftest*
@@ -14392,15 +14387,15 @@
       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:14396: checking for ncurses/curses.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 14399 "configure"
+echo "configure:14391: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14394 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14399: \"$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
   rm -rf conftest*
@@ -14435,12 +14430,12 @@
 	for lib in curses termlib termcap; do
 	  
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:14439: checking for tgetent in -l$lib" >&5
+echo "configure:14434: 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 14444 "configure"
+#line 14439 "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
@@ -14451,7 +14446,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:14455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14482,12 +14477,12 @@
       else
 	
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:14486: checking for tgetent in -lcurses" >&5
+echo "configure:14481: 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 14491 "configure"
+#line 14486 "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
@@ -14498,7 +14493,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:14502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14516,12 +14511,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:14520: checking for tgetent in -ltermcap" >&5
+echo "configure:14515: 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 14525 "configure"
+#line 14520 "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
@@ -14532,7 +14527,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:14536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14580,15 +14575,15 @@
 
     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:14584: checking for gpm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 14587 "configure"
+echo "configure:14579: checking for gpm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14582 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14587: \"$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
   rm -rf conftest*
@@ -14611,12 +14606,12 @@
  }
   test -z "$with_gpm" && { 
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:14615: checking for Gpm_Open in -lgpm" >&5
+echo "configure:14610: 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 14620 "configure"
+#line 14615 "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
@@ -14627,7 +14622,7 @@
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:14631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14670,20 +14665,20 @@
 
 test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
   != "no no no" && echo "checking for database support" 1>&6
-echo "configure:14674: checking for database support" >&5
+echo "configure:14669: checking for database support" >&5
 
 if test "$with_database_gdbm $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:14679: checking for ndbm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 14682 "configure"
+echo "configure:14674: checking for ndbm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14677 "configure"
 #include "confdefs.h"
 #include <ndbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14687: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14682: \"$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
   rm -rf conftest*
@@ -14713,12 +14708,12 @@
 if test "$with_database_gdbm" != "no"; then
   
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:14717: checking for dbm_open in -lgdbm" >&5
+echo "configure:14712: 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 14722 "configure"
+#line 14717 "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
@@ -14729,7 +14724,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:14733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14757,10 +14752,10 @@
 
 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:14761: checking for dbm_open" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 14764 "configure"
+echo "configure:14756: checking for dbm_open" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14759 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -14783,7 +14778,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else
@@ -14802,12 +14797,12 @@
 
     
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:14806: checking for dbm_open in -ldbm" >&5
+echo "configure:14801: 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 14811 "configure"
+#line 14806 "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
@@ -14818,7 +14813,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:14822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14859,10 +14854,10 @@
 
 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:14863: checking for Berkeley db.h" >&5
+echo "configure:14858: checking for Berkeley db.h" >&5
   for header in "db/db.h" "db.h"; do
     cat > conftest.$ac_ext <<EOF
-#line 14866 "configure"
+#line 14861 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14884,7 +14879,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_file="$header"; break
 else
@@ -14900,9 +14895,9 @@
 
   if test "$with_database_berkdb" != "no"; then
     echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:14904: checking for Berkeley DB version" >&5
+echo "configure:14899: checking for Berkeley DB version" >&5
     cat > conftest.$ac_ext <<EOF
-#line 14906 "configure"
+#line 14901 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 1
@@ -14914,7 +14909,7 @@
   egrep "yes" >/dev/null 2>&1; then
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 14918 "configure"
+#line 14913 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 2
@@ -14941,10 +14936,10 @@
 rm -f conftest*
 
     echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:14945: checking for $dbfunc" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 14948 "configure"
+echo "configure:14940: checking for $dbfunc" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14943 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $dbfunc(); below.  */
@@ -14967,7 +14962,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$dbfunc=yes"
 else
@@ -14986,12 +14981,12 @@
 
     
 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:14990: checking for $dbfunc in -ldb" >&5
+echo "configure:14985: 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 14995 "configure"
+#line 14990 "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
@@ -15002,7 +14997,7 @@
 $dbfunc()
 ; return 0; }
 EOF
-if { (eval echo configure:15006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15063,12 +15058,12 @@
 if test "$with_socks" = "yes"; then
   
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:15067: checking for SOCKSinit in -lsocks" >&5
+echo "configure:15062: 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 15072 "configure"
+#line 15067 "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
@@ -15079,7 +15074,7 @@
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:15083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15133,11 +15128,11 @@
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 15137 "configure"
+#line 15132 "configure"
 #include "confdefs.h"
 int main(int c,char *v[]){return 0;}
 EOF
-if { (eval echo configure:15141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:15136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
diff -r 278c9cd3435e -r 465bd3c7d932 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Feb 05 22:53:04 2003 +0000
+++ b/lisp/ChangeLog	Thu Feb 06 06:36:17 2003 +0000
@@ -1,3 +1,55 @@
+2003-02-05  Ben Wing  <ben@xemacs.org>
+
+	* mule/cyril-util.el:
+	* mule/cyril-util.el (standard-display-table):
+	* mule/cyril-util.el (standard-display-table)): New.
+	Fix compile warning.
+
+2003-02-05  Ben Wing  <ben@xemacs.org>
+
+	* loadup.el:
+	* loadup.el (really-early-error-handler):
+	* loadup.el (load-warn-when-source-only):
+	* loadup.el ((member "dump" command-line-args)):
+	* make-docfile.el:
+	* update-elc-2.el:
+	* update-elc.el:
+	Set stack-trace-on-error, load-always-display-messages so we
+	get better debug results.
+
+	* update-elc-2.el (batch-update-elc-2):
+	Fix typo in name of lisp/mule, leading to compile failure.
+
+	* simple.el:
+	* simple.el (motion-keys-for-shifted-motion):
+	Omit M-S-home/end from motion keys.
+	
+	* update-elc.el (undumped-exe): New.
+	* update-elc.el (dumped-exe): New.
+	* update-elc.el (dumped-exe-out-of-date-wrt-dump-files): New.
+	* update-elc.el (dumped-exe-out-of-date-wrt-undumped-exe): New.
+	* update-elc.el ("very-early-lisp.el"):
+	* update-elc.el (lisp-files-needed-for-byte-compilation): New.
+	* update-elc.el (lisp-files-needing-early-byte-compilation): New.
+	* update-elc.el (unbytecompiled-lisp-files): New.
+	* update-elc.el ((preloaded-file-list site-load-packages files-to-process)):
+	Overhaul:
+
+	-- allow list of "early-compile" files to be specified, not hardcoded
+	-- fix autoload checking to include all .el files, not just dumped ones
+	-- be smarter about regenerating autoloads, so we don't need to use
+	   loadup-el if not necessary
+	-- use standard methods for loading/not loading auto-autoloads.el
+	   (maybe fixes "Already loaded" error?)
+	-- rename misleading NOBYTECOMPILE flag file.
+	
+	* window-xemacs.el (window-list):
+	Fix bug in default param.
+	
+	* window-xemacs.el (really-set-window-configuration):
+	* window-xemacs.el (restore-saved-window-parameters):
+	Fix compile warnings.
+
 2003-02-02  Steve Youngs  <youngs@xemacs.org>
 
 	* about.el (xemacs-hackers): Add Jerry, Ville, Rendhalver
diff -r 278c9cd3435e -r 465bd3c7d932 lisp/loadup.el
--- a/lisp/loadup.el	Wed Feb 05 22:53:04 2003 +0000
+++ b/lisp/loadup.el	Thu Feb 06 06:36:17 2003 +0000
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1985, 1986, 1992, 1994, 1997 Free Software Foundation, Inc.
 ;; Copyright (C) 1996 Richard Mlynarik.
-;; Copyright (C) 1995, 1996 Ben Wing.
+;; Copyright (C) 1995, 1996, 2003 Ben Wing.
 
 ;; Maintainer: XEmacs Development Team
 ;; Keywords: internal, dumped
@@ -28,12 +28,17 @@
 
 ;;; Commentary:
 
-;; Please do not edit this file.  Use site-init.el or site-load.el instead.
+;; If you are wanting to add files to be dumped into your local version of
+;; XEmacs, DO NOT add them here.  Use site-init.el or site-load.el instead.
 
 ;; This is loaded into a bare XEmacs to make a dumpable one.
 
 ;;; Code:
 
+;; Help debug problems.
+(setq stack-trace-on-error t
+      load-always-display-messages t)
+
 (when (fboundp 'error)
   (error "loadup.el already loaded!"))
 
@@ -53,6 +58,10 @@
        (if (and purify-flag
 		(not (memq 'quick-build internal-error-checking)))
 	   30000 3000000)))
+
+;; really-early-error-handler outputs a stack trace so let's not do it
+;; twice.
+(let ((stack-trace-on-error nil))
   
 ;; This is awfully damn early to be getting an error, right?
 (call-with-condition-handler 'really-early-error-handler
@@ -85,7 +94,7 @@
 	(buffer-disable-undo (get-buffer "*scratch*"))
 
 	;; Load our first bootstrap support
-	(load "very-early-lisp" nil t)
+	(load "very-early-lisp.el")
 
 	;; lread.c (or src/Makefile.in.in) has prepended
 	;; "${srcdir}/../lisp/" to load-path, which is how this file
@@ -102,8 +111,7 @@
 				 (cons (file-name-as-directory temp-path)
 				       load-path))))
 
-	(setq load-warn-when-source-newer t ; Used to be set to nil at the end
-	      load-warn-when-source-only  t) ; Set to nil at the end
+	(setq load-warn-when-source-only  t) ; Set to nil at the end
 
 	;; garbage collect after loading every file in an attempt to
 	;; minimize the size of the dumped image (if we don't do this,
@@ -146,13 +154,14 @@
 	(packages-load-package-dumped-lisps late-package-load-path)
 
 	)) ;; end of call-with-condition-handler
+
+) ; (let ((stack-trace-on-error nil)))
 
 ;; Fix up the preloaded file list
 (setq preloaded-file-list (mapcar #'file-name-sans-extension
 				  preloaded-file-list))
 
-(setq load-warn-when-source-newer t ; set to t at top of file
-      load-warn-when-source-only nil)
+(setq load-warn-when-source-only nil)
 
 (setq debugger 'debug)
 
@@ -163,8 +172,8 @@
 ;; doc strings kept in the DOC file rather than in core,
 ;; you may load them with a "site-load.el" file.
 ;; But you must also cause them to be scanned when the DOC file
-;; is generated.  For VMS, you must edit ../../vms/makedoc.com.
-;; For other systems, you must edit ../../src/Makefile.in.in.
+;; is generated.  For MS Windows, you must edit ../nt/xemacs.mak.
+;; For other systems, you must edit ../src/Makefile.in.in.
 (when (load "site-load" t)
   (garbage-collect)
 )
@@ -202,7 +211,7 @@
 ;;; At this point, we're ready to resume undo recording for scratch.
 (buffer-enable-undo "*scratch*")
 
-) ;; frequent garbage collection
+) ;; (let ((gc-cons-threshold [frequent garbage collection when dumping])))
 
 ;(stop-profiling)
 
@@ -276,6 +285,9 @@
   ;; (condition-case () (delete-file "xemacs") (file-error nil))
   (when (fboundp 'really-free)
     (really-free))
+  ;; Make sure we don't dump with debugging messages turned on.
+  (setq stack-trace-on-error nil
+	load-always-display-messages nil)
   (dump-emacs
    (cond
     ((featurep 'infodock) "infodock")
diff -r 278c9cd3435e -r 465bd3c7d932 lisp/make-docfile.el
--- a/lisp/make-docfile.el	Wed Feb 05 22:53:04 2003 +0000
+++ b/lisp/make-docfile.el	Thu Feb 06 06:36:17 2003 +0000
@@ -34,6 +34,10 @@
 
 ;;; Code:
 
+;; Help debug problems.
+(setq stack-trace-on-error t
+      load-always-display-messages t)
+
 (defvar options nil)
 (defvar processed nil)
 (defvar docfile nil)
@@ -79,18 +83,14 @@
 (let ((build-root (expand-file-name ".." invocation-directory)))
   (setq load-path (list (expand-file-name "lisp" build-root))))
 
-(load "very-early-lisp" nil t)
-
 ;; Then process the autoloads
 (setq autoload-file-name "auto-autoloads.elc")
+(load "very-early-lisp.el")
 (load "find-paths.el")
 (load "packages.el")
 (load "setup-paths.el")
 (load "dump-paths.el")
-(require 'custom)
-(load "process")
-;; need for stuff called from C by process code
-(if (featurep 'windows-nt) (load "win32-native"))
+(load "raw-process.el")
 
 (let (preloaded-file-list)
   (load (expand-file-name "../lisp/dumped-lisp.el"))
diff -r 278c9cd3435e -r 465bd3c7d932 lisp/mule/cyril-util.el
--- a/lisp/mule/cyril-util.el	Wed Feb 05 22:53:04 2003 +0000
+++ b/lisp/mule/cyril-util.el	Thu Feb 06 06:36:17 2003 +0000
@@ -48,6 +48,8 @@
 	    '("Russian") '("Serbian") '("Ukrainian"))
       "*List of known cyrillic languages")
 
+(defvar standard-display-table)
+
 ;;;###autoload
 (defun standard-display-cyrillic-translit (&optional cyrillic-language)
   "Display a cyrillic buffer using a transliteration.
diff -r 278c9cd3435e -r 465bd3c7d932 lisp/simple.el
--- a/lisp/simple.el	Wed Feb 05 22:53:04 2003 +0000
+++ b/lisp/simple.el	Thu Feb 06 06:36:17 2003 +0000
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1985-7, 1993-5, 1997 Free Software Foundation, Inc.
 ;; Copyright (C) 1995 Tinker Systems and INS Engineering Corp.
-;; Copyright (C) 2000, 2001, 2002 Ben Wing.
+;; Copyright (C) 2000, 2001, 2002, 2003 Ben Wing.
 
 ;; Maintainer: XEmacs Development Team
 ;; Keywords: lisp, extensions, internal, dumped
@@ -1999,8 +1999,12 @@
   :group 'editing-basics)
 
 (defcustom motion-keys-for-shifted-motion
-  '(left right up down home end prior next
-	 kp-left kp-right kp-up kp-down kp-home kp-end kp-prior kp-next)
+  ;; meta-shift-home/end are NOT shifted motion commands.
+  '(left right up down (home) (control home) (meta control home)
+    (end) (control end) (meta control end) prior next
+    kp-left kp-right kp-up kp-down (kp-home) (control kp-home)
+    (meta control kp-home) (kp-end) (control kp-end) (meta control kp-end)
+    kp-prior kp-next)
   "*List of keys considered motion keys for the purpose of shifted selection.
 When one of these keys is pressed along with the Shift key, and the
 command invoked moves the cursor and preserves the active region (see
@@ -2021,11 +2025,20 @@
 either a character or a symbol, uppercase or lowercase."
   :type '(repeat (choice (const :tag "normal cursor-pad (\"gray\") keys"
 				:inline t
-				(left right up down home end prior next))
+				(left
+				 right up down
+				 (home) (control home) (meta control home)
+				 (end) (control end) (meta control end)
+				 prior next))
 			 (const :tag "keypad motion keys"
 				:inline t
-				(kp-left kp-right kp-up kp-down
-					 kp-home kp-end kp-prior kp-next))
+				(kp-left
+				 kp-right kp-up kp-down
+				 (kp-home) (control kp-home)
+				 (meta control kp-home)
+				 (kp-end) (control kp-end)
+				 (meta control kp-end)
+				 kp-prior kp-next))
 			 (const :tag "alphabetic motion keys"
 				:inline t
 				((control b) (control f)
diff -r 278c9cd3435e -r 465bd3c7d932 lisp/update-elc-2.el
--- a/lisp/update-elc-2.el	Wed Feb 05 22:53:04 2003 +0000
+++ b/lisp/update-elc-2.el	Thu Feb 06 06:36:17 2003 +0000
@@ -1,7 +1,7 @@
 ;;; update-elc-2.el --- Recompile remaining .el files, post-dumping
 
 ;; Copyright (C) 1997 by Free Software Foundation, Inc.
-;; Copyright (C) 2000 Ben Wing.
+;; Copyright (C) 2000, 2003 Ben Wing.
 
 ;; Author: Ben Wing <ben@xemacs.org>, based on cleantree.el by
 ;;         Steven L Baur <steve@xemacs.org>
@@ -46,6 +46,10 @@
 
 ;;; Code:
 
+;; Help debug problems.
+(setq stack-trace-on-error t
+      load-always-display-messages t)
+
 (defvar update-elc-ignored-dirs
   `("." ".." "CVS" "SCCS" "RCS" ,@(unless (featurep 'mule) '("mule"))))
 
@@ -162,7 +166,7 @@
 	 t)
 	(byte-recompile-file generated-autoload-file 0)))
     (when (featurep 'mule)
-      (let* ((muledir (expand-file-name "../modules" (file-truename dir)))
+      (let* ((muledir (expand-file-name "../lisp/mule" (file-truename dir)))
 	     (generated-autoload-file
 	      (expand-file-name "auto-autoloads.el" muledir))
 	     (autoload-package-name "mule")) ; feature prefix
diff -r 278c9cd3435e -r 465bd3c7d932 lisp/update-elc.el
--- a/lisp/update-elc.el	Wed Feb 05 22:53:04 2003 +0000
+++ b/lisp/update-elc.el	Thu Feb 06 06:36:17 2003 +0000
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1997 Free Software Foundation, Inc.
 ;; Copyright (C) 1996 Sun Microsystems, Inc.
-;; Copyright (C) 2001 Ben Wing.
+;; Copyright (C) 2001, 2003 Ben Wing.
 
 ;; Author: Ben Wing <ben@xemacs.org>
 ;; Based On: Original by Steven L Baur <steve@xemacs.org>
@@ -31,6 +31,8 @@
 ;;; Commentary:
 
 ;; Byte compile the .EL files necessary to dump out xemacs.
+;; Also update the auto-autoloads.el files.
+
 ;; Use this file like this:
 
 ;; temacs -batch -l ../lisp/update-elc.el $lisp
@@ -46,12 +48,20 @@
 
 ;;; Code:
 
+;; Help debug problems.
+(setq stack-trace-on-error t
+      load-always-display-messages t)
+
 (defvar processed nil)
 (defvar update-elc-files-to-compile nil)
 (defvar need-to-rebuild-autoloads nil)
 (defvar need-to-rebuild-mule-autoloads nil)
 (defvar need-to-recompile-autoloads nil)
 (defvar need-to-recompile-mule-autoloads nil)
+(defvar undumped-exe nil)
+(defvar dumped-exe nil)
+(defvar dumped-exe-out-of-date-wrt-dump-files nil)
+(defvar dumped-exe-out-of-date-wrt-undumped-exe nil)
 
 ;(setq update-elc-files-to-compile
 ;      (delq nil
@@ -71,12 +81,36 @@
 (let ((build-root (expand-file-name ".." invocation-directory)))
   (setq load-path (list (expand-file-name "lisp" build-root))))
 
-(load "very-early-lisp" nil t)
-
+(load "very-early-lisp.el")
 (load "find-paths.el")
 (load "packages.el")
 (load "setup-paths.el")
-(load "dump-paths.el")
+(load "dump-paths.el") ;; #### take out in my fixup ws
+
+;; Lisp files loaded in order to byte compile anything.  If any are out of
+;; date, we need to load them as .el's, byte compile them, and reload as
+;; .elc's.
+(defvar lisp-files-needed-for-byte-compilation
+  '("bytecomp"
+    "byte-optimize"))
+
+;; "Lisp files, other than those in
+;; `lisp-files-needing-early-byte-compilation',packages that need early
+;; byte compilation.  These are files loaded by update-elc.el in order to
+;; do the compilation of all the rest of the files.
+(defvar lisp-files-needing-early-byte-compilation
+  '(;"easy-mmode"
+    "autoload"
+    "shadow"
+    "cl-macs"))
+
+(defvar unbytecompiled-lisp-files
+  '("paths.el"
+    "dumped-lisp.el"
+    "dumped-pkg-lisp.el"
+    "version.el"
+    "very-early-lisp.el")
+  "Lisp files that should not be byte compiled.")
 
 (defun update-elc-chop-extension (file)
   (if (string-match "\\.elc?$" file)
@@ -87,8 +121,7 @@
 ;; we need to handle each autoload file differently and there are only
 ;; two of them.
 
-(let (preloaded-file-list site-load-packages need-to-dump dumped-exe
-			  files-to-process)
+(let (preloaded-file-list site-load-packages files-to-process)
   
   (load (expand-file-name "../lisp/dumped-lisp.el"))
 
@@ -97,6 +130,31 @@
 	      ((file-exists-p "../src/xemacs") "../src/xemacs")
 	      (t nil)))
 
+  (let ((temacs-exe
+	 (cond ((file-exists-p "../src/temacs.exe") "../src/temacs.exe")
+	       ((file-exists-p "../src/temacs") "../src/temacs")
+	       (t nil)))
+	(data-file
+	 (cond ((file-exists-p "../src/xemacs.dmp") "../src/xemacs.dmp")
+	       (t nil))))
+
+    ;; two setups here:
+    ;; (1) temacs.exe is undumped, dumped into xemacs.exe.  Happens with
+    ;;     unexec, but also with pdump under MS Windows native, since
+    ;;     the dumped data is stored as a resource in the xemacs.exe
+    ;;     executable.
+    ;; (2) xemacs.exe is dumped or undumped.  Running `xemacs -nd' gets
+    ;;     you the equivalent of `temacs'.  Dumping creates a file
+    ;;     `xemacs.dmp'.
+
+    (setq dumped-exe-out-of-date-wrt-undumped-exe
+	  (cond ((not dumped-exe) t)
+		(temacs-exe (file-newer-than-file-p temacs-exe dumped-exe))
+		((not data-file) t)
+		(t (file-newer-than-file-p dumped-exe data-file))))
+    )
+                                                              
+
   ;; Path setup
   (let ((package-preloaded-file-list
 	 (packages-collect-package-dumped-lisps late-package-load-path)))
@@ -111,9 +169,11 @@
 	(append packages-hardcoded-lisp
 		preloaded-file-list
 		site-load-packages))
-  ;; bytecomp, byte-optimize, and autoload are mentioned in
-  ;; packages-useful-lisp.
-  (setq files-to-process (append packages-useful-lisp preloaded-file-list))
+  ;; bytecomp, byte-optimize, autoload, etc. are mentioned specially
+  ;; in the lisp-files-need* variables.
+  (setq files-to-process (append lisp-files-needed-for-byte-compilation
+				 lisp-files-needing-early-byte-compilation
+				 preloaded-file-list))
   (while files-to-process
     (let* ((arg (car files-to-process))
 	   (arg-is-preloaded (member arg preloaded-file-list))
@@ -123,6 +183,7 @@
 	    (if (null full-arg)
 		(progn
 		  (print (format "Error: Library file %s not found" arg))
+		  (backtrace)
 		  ;; Uncomment in case of trouble
 		  ;;(print (format "late-packages: %S" late-packages))
                   ;;(print (format "guessed-roots: %S"
@@ -132,9 +193,7 @@
 	      (update-elc-chop-extension full-arg)))
 	   (full-arg-el (concat full-arg-sans-extension ".el"))
 	   (full-arg-elc (concat full-arg-sans-extension ".elc"))
-	   (full-arg-dir (file-name-directory full-arg-el))
-	   (autoload-file (expand-file-name "auto-autoloads.el" full-arg-dir))
-	   (autoload-is-mule (string-match "[/\\]mule[/\\]$" full-arg-dir)))
+	   (full-arg-dir (file-name-directory full-arg-el)))
 	   
       ;; (print full-arg-el)
 
@@ -145,17 +204,10 @@
 			  (file-newer-than-file-p full-arg-el dumped-exe))
 		     (and (file-exists-p full-arg-elc)
 			  (file-newer-than-file-p full-arg-elc dumped-exe))))
-	(setq need-to-dump t))
-
-      (when (or (not (file-exists-p autoload-file))
-		(and (file-exists-p full-arg-el)
-		     (file-newer-than-file-p full-arg-el autoload-file)))
-	(if autoload-is-mule
-	    (setq need-to-rebuild-mule-autoloads t)
-	  (setq need-to-rebuild-autoloads t)))
+	(setq dumped-exe-out-of-date-wrt-dump-files t))
 
       (if (and (not (member (file-name-nondirectory arg)
-			    packages-unbytecompiled-lisp))
+			    unbytecompiled-lisp-files))
 	       (not (member full-arg-el processed))
 	       (file-exists-p full-arg-el)
 	       (or (not (file-exists-p full-arg-elc))
@@ -164,7 +216,28 @@
 
       (setq files-to-process (cdr files-to-process))))
 
-  (if need-to-dump
+  ;; Check if we need to rebuild the auto-autoloads.el files -- that is,
+  ;; if ANY .el files have changed.
+  (let ((dirs-to-check '("../lisp" "../lisp/mule")))
+    (while dirs-to-check
+      (let* ((dir (car dirs-to-check))
+	     (full-dir (expand-file-name dir))
+	     (all-files-in-dir (directory-files full-dir t "\\.el$" nil t))
+	     (autoload-file
+	      (expand-file-name "auto-autoloads.el" full-dir))
+	     (autoload-is-mule (equal dir "../lisp/mule")))
+	(while all-files-in-dir
+	  (let* ((full-arg (car all-files-in-dir)))
+	    (when (or (not (file-exists-p autoload-file))
+		      (and (file-exists-p full-arg)
+			   (file-newer-than-file-p full-arg autoload-file)))
+	      (if autoload-is-mule
+		  (setq need-to-rebuild-mule-autoloads t)
+		(setq need-to-rebuild-autoloads t))))
+	  (setq all-files-in-dir (cdr all-files-in-dir))))
+      (setq dirs-to-check (cdr dirs-to-check))))
+
+  (if dumped-exe-out-of-date-wrt-dump-files
       (condition-case nil
 	  (write-region-internal "foo" nil "../src/NEEDTODUMP")
 	(file-error nil)))
@@ -193,74 +266,127 @@
 (setq update-elc-files-to-compile (append update-elc-files-to-compile
 					  (nreverse processed)))
 
-;; (print update-elc-files-to-compile)
+;(print update-elc-files-to-compile)
 
-(if (and (not update-elc-files-to-compile)
-	 (not need-to-rebuild-autoloads)
-	 (not need-to-rebuild-mule-autoloads)
-	 (not need-to-recompile-autoloads)
-	 (not need-to-recompile-mule-autoloads))
-    (condition-case nil
-	(delete-file "../src/NOBYTECOMPILE")
-      (file-error nil))
-  (let* (
-	 (bytecomp-arg (concat (update-elc-chop-extension
-				(locate-library "bytecomp")) ".el"))
-	 (byte-opt-arg (concat (update-elc-chop-extension
-				(locate-library "byte-optimize")) ".el"))
-	 (autoload-arg (concat (update-elc-chop-extension
-				(locate-library "autoload")) ".el"))
-	 )
-    (setq inhibit-autoloads t)
-    (setq command-line-args
-	  (append
-	   '("-l" "loadup-el.el" "run-temacs" "-batch" "-q" "-no-site-file")
+(let ((do-autoload-commands
+       (append
+	(if (or need-to-rebuild-autoloads
+		need-to-rebuild-mule-autoloads)
+	    '("-l" "autoload"))
+	(if need-to-rebuild-autoloads
+	    '("-f" "autoload-update-directory-autoloads"
+	      "auto" "../lisp"))
+	(if need-to-rebuild-mule-autoloads
+	    '("-f" "autoload-update-directory-autoloads"
+	      "mule" "../lisp/mule"))
+	(if need-to-recompile-autoloads
+	    '("-f" "batch-byte-compile-one-file"
+	      "../lisp/auto-autoloads.el"))
+	(if need-to-recompile-mule-autoloads
+	    '("-f" "batch-byte-compile-one-file"
+		   "../lisp/mule/auto-autoloads.el")))))
+  (cond ((and (not update-elc-files-to-compile)
+	      (not need-to-rebuild-autoloads)
+	      (not need-to-rebuild-mule-autoloads)
+	      (not need-to-recompile-autoloads)
+	      (not need-to-recompile-mule-autoloads))
+	 ;; (1) Nothing to do at all.  BYTECOMPILE_CHANGE is used (only by
+	 ;;     the Unix makefile) to indicate whether some files needed
+	 ;;     for dump got recompiled, and hence the executable must be
+	 ;;     redumped.  We remove it if there were no files to compile.
+	 (condition-case nil
+	     (delete-file "../src/BYTECOMPILE_CHANGE")
+	   (file-error nil)))
+	 ;; (1) Nothing to do at all.  BYTECOMPILE_CHANGE is used (only by
+	 ;;     the Unix makefile) to indicate whether some files needed
+	 ;;     for dump got recompiled, and hence the executable must be
+	 ;;     redumped.  We remove it if there were no files to compile.
+	((and (not update-elc-files-to-compile)
+	      (not dumped-exe-out-of-date-wrt-dump-files)
+	      (not dumped-exe-out-of-date-wrt-undumped-exe))
+	 ;; (2) We have no files to byte-compile, but we do need to
+	 ;;     regenerate and compile the auto-autoloads file. (This will
+	 ;;     be needed to be up-to-date before we run update-elc-2.)
+	 ;;     If the dumped exe exists and is up-to-date, both with
+	 ;;     respect to the undumped exe and the files that will be dumped
+	 ;;     into it, then we can use the dumped exe to rebuild the
+	 ;;     autoloads.  Else, we have to do it the "hard way" by loading
+	 ;;     raw temacs, running loadup, then regenerating the autoloads.
+	 ;;     #### We should see whether it's possible to load up a
+	 ;;     minimal number of files in order to get autoload.el to work.
+	 (load "raw-process.el")
+	 (apply 'call-process-internal dumped-exe nil t nil
+		(append
+		 '("-batch -no-autoloads -no-packages")
+		 do-autoload-commands))
+	 (condition-case nil
+	     (delete-file "../src/BYTECOMPILE_CHANGE")
+	   (file-error nil)))
+	(t
+	 (let ((bc-bootstrap
+		(mapcar #'(lambda (arg) 
+			    (concat (update-elc-chop-extension
+				     (locate-library arg)) ".el"))
+			lisp-files-needed-for-byte-compilation))
+	       (bootstrap-other
+		(mapcar #'(lambda (arg) 
+			    (concat (update-elc-chop-extension
+				     (locate-library arg)) ".el"))
+			lisp-files-needing-early-byte-compilation)))
+	   (setq inhibit-autoloads t)
 	   ;; if bytecomp or byte-optimize need recompiling, then load
 	   ;; the .el version of them first, recompile them, and reload
 	   ;; the .elc versions to recompile everything else (so we won't
 	   ;; be waiting until the cows come home).  we need to set
 	   ;; load-ignore-elc-files because byte-optimize gets autoloaded
 	   ;; from bytecomp.
-	   (if (or (member bytecomp-arg update-elc-files-to-compile)
-		   (member byte-opt-arg update-elc-files-to-compile))
-	       (append
-		'("-eval" "(setq load-ignore-elc-files t)" "-l" "bytecomp")
-		(if (member bytecomp-arg update-elc-files-to-compile)
-		    (append '("-f" "batch-byte-compile-one-file")
-			    (list bytecomp-arg)))
-		(if (member byte-opt-arg update-elc-files-to-compile)
-		    (append '("-f" "batch-byte-compile-one-file")
-			    (list byte-opt-arg)))
-		'("-eval" "(setq load-ignore-elc-files nil)")))
-	   '("-l" "bytecomp")
-	   ;; likewise, recompile autoload.el if out-of-date.
-	   (if (member autoload-arg update-elc-files-to-compile)
-	       (append '("-f" "batch-byte-compile-one-file")
-		       (list autoload-arg)))
-	   ;; then generate autoloads for lisp and maybe lisp/mule.
-	   (if (or need-to-rebuild-autoloads
-		   need-to-rebuild-mule-autoloads)
-	       '("-l" "autoload"))
-	   (if need-to-rebuild-autoloads
-	       '("-f" "autoload-update-directory-autoloads" "auto" "../lisp"))
-	   (if need-to-rebuild-mule-autoloads
-	       '("-f" "autoload-update-directory-autoloads"
-		 "mule" "../lisp/mule"))
-	   (if need-to-recompile-autoloads
-	       '("-f" "batch-byte-compile-one-file"
-		 "../lisp/auto-autoloads.el"))
-	   (if need-to-recompile-mule-autoloads
-	       '("-f" "batch-byte-compile-one-file"
-		 "../lisp/mule/auto-autoloads.el"))
-	   ;; now load the autoloads and compile alles anderes.
-	   '("-eval" "(setq inhibit-autoloads nil)"
-	     "-f" "startup-load-autoloads"
-	     "-f" "batch-byte-compile")
-	   (delete autoload-arg
-		   (delete byte-opt-arg
-			   (delete bytecomp-arg
-				   update-elc-files-to-compile))))))
-  (load "loadup-el.el"))
+	   (let ((recompile-bc-bootstrap
+		  (apply #'nconc
+			 (mapcar
+			  #'(lambda (arg)
+			      (when (member arg update-elc-files-to-compile)
+				(append '("-f" "batch-byte-compile-one-file")
+					(list arg))))
+			  bc-bootstrap)))
+		 (recompile-bootstrap-other
+		  (apply #'nconc
+			 (mapcar
+			  #'(lambda (arg)
+			      (when (member arg update-elc-files-to-compile)
+				(append '("-f" "batch-byte-compile-one-file")
+					(list arg))))
+			  bootstrap-other))))
+	     (mapc-internal
+	      #'(lambda (arg)
+		  (setq update-elc-files-to-compile
+			(delete arg update-elc-files-to-compile)))
+	      (append bc-bootstrap bootstrap-other))
+	     (setq command-line-args
+		   (append
+		    '("-l" "loadup-el.el" "run-temacs"
+		      "-batch" "-no-packages" "-no-autoloads"
+		      "-eval" "(setq stack-trace-on-error t)"
+		      "-eval" "(setq load-always-display-messages t)")
+		    (when recompile-bc-bootstrap
+		      (append
+		       '("-eval" "(setq load-ignore-elc-files t)"
+			 "-l" "bytecomp")
+		       recompile-bc-bootstrap
+		       '("-eval" "(setq load-ignore-elc-files nil)")))
+		    '("-l" "bytecomp")
+		    ;; likewise, recompile autoload.el etc. if out-of-date.
+		    recompile-bootstrap-other
+		    ;; then generate autoloads for lisp and maybe lisp/mule.
+		    do-autoload-commands
+		    ;; now load the autoloads and compile alles anderes.
+		    '("-eval" "(setq inhibit-autoloads nil)"
+		      "-f" "startup-load-autoloads"
+		      "-f" "batch-byte-compile")
+		    update-elc-files-to-compile
+		    ))))
+
+	 ;;(print command-line-args)
+	 (load "loadup-el.el"))))
 
 (kill-emacs)
 
diff -r 278c9cd3435e -r 465bd3c7d932 lisp/window-xemacs.el
--- a/lisp/window-xemacs.el	Wed Feb 05 22:53:04 2003 +0000
+++ b/lisp/window-xemacs.el	Thu Feb 06 06:36:17 2003 +0000
@@ -74,8 +74,8 @@
 Optional second arg MINIBUF t means count the minibuffer window
 even if not active.  If MINIBUF is neither t nor nil it means
 not to count the minibuffer even if it is active."
-  (setq window (or window (selected-window))
-	frame (or frame (selected-frame)))
+  (setq frame (or frame (selected-frame))
+	window (or window (selected-window frame)))
   (if (not (eq (window-frame window) frame))
       (error "Window must be on frame."))
   (let ((current-frame (selected-frame))
@@ -298,6 +298,7 @@
     (select-window (minibuffer-window frame))
 
     (let ((window-configuration-current-window nil))
+      (declare (special window-configuration-current-window))
       (restore-saved-window configuration
 			    root-window
 			    (window-configuration-saved-root-window configuration)
@@ -373,6 +374,7 @@
 
 (defun restore-saved-window-parameters (configuration window saved-window)
   "Restore the window parameters stored in SAVED-WINDOW on WINDOW."
+  (declare (special window-configuration-current-window))
   (let ((buffer (saved-window-buffer saved-window)))
     (if (and buffer (buffer-live-p buffer))
 	(progn
diff -r 278c9cd3435e -r 465bd3c7d932 lwlib/ChangeLog
--- a/lwlib/ChangeLog	Wed Feb 05 22:53:04 2003 +0000
+++ b/lwlib/ChangeLog	Thu Feb 06 06:36:17 2003 +0000
@@ -1,3 +1,10 @@
+2003-02-05  Ben Wing  <ben@xemacs.org>
+
+	* lwlib-Xm.c:
+	* lwlib-Xm.c (xm_pop_down_callback):
+	* lwlib-Xm.c (xm_pull_down_callback):
+	Fix compile warning.
+
 2002-12-16  Ben Wing  <ben@xemacs.org>
 
 	* lwlib-Xlw.c (xlw_update_one_widget):
diff -r 278c9cd3435e -r 465bd3c7d932 lwlib/lwlib-Xm.c
--- a/lwlib/lwlib-Xm.c	Wed Feb 05 22:53:04 2003 +0000
+++ b/lwlib/lwlib-Xm.c	Thu Feb 06 06:36:17 2003 +0000
@@ -72,7 +72,7 @@
 #endif
 static void xm_internal_update_other_instances (Widget, XtPointer,
 						XtPointer);
-static void xm_pop_down_callback (Widget, XtPointer, XtPointer);
+/* static void xm_pop_down_callback (Widget, XtPointer, XtPointer); */
 static void xm_generic_callback (Widget, XtPointer, XtPointer);
 static void mark_dead_instance_destroyed (Widget widget, XtPointer closure,
 					  XtPointer call_data);
@@ -2071,11 +2071,13 @@
   do_call (widget, closure, selection);
 }
 
+#if 0 /* Caller above is commented out */
 static void
 xm_pop_down_callback (Widget widget, XtPointer closure, XtPointer call_data)
 {
   do_call (widget, closure, post_activate);
 }
+#endif /* 0 */
 
 #ifdef LWLIB_MENUBARS_MOTIF
 
diff -r 278c9cd3435e -r 465bd3c7d932 man/ChangeLog
--- a/man/ChangeLog	Wed Feb 05 22:53:04 2003 +0000
+++ b/man/ChangeLog	Thu Feb 06 06:36:17 2003 +0000
@@ -1,3 +1,30 @@
+2003-02-05  Ben Wing  <ben@xemacs.org>
+
+	* lispref/mule.texi (Internationalization Terminology):
+	Lots of Mule rewriting.
+
+2003-02-05  Ben Wing  <ben@xemacs.org>
+
+	* internals/internals.texi (Top):
+	* internals/internals.texi (Coding for Mule):
+	* internals/internals.texi (Character-Related Data Types):
+	* internals/internals.texi (Working With Character and Byte Positions):
+	* internals/internals.texi (Conversion to and from External Data):
+	* internals/internals.texi (General Guidelines for Writing Mule-Aware Code):
+	* internals/internals.texi (An Example of Mule-Aware Code):
+	* internals/internals.texi (Mule-izing Code):
+	* internals/internals.texi (help): New.
+	* internals/internals.texi (Buffers and Textual Representation):
+	* internals/internals.texi (The Text in a Buffer):
+	* internals/internals.texi (Markers and Extents):
+	* internals/internals.texi (MULE Character Sets and Encodings):
+	* internals/internals.texi (Lstream Functions):
+	* internals/internals.texi (Lstream Methods):
+	* internals/internals.texi (Format of the Extent Info):
+	* internals/internals.texi (Mathematics of Extent Ordering):
+	Major fixup.  Correct for new names of Bytebpos, Ichar, etc. and
+	lots of Mule rewriting.
+
 2003-02-05  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* xemacs/startup.texi (Startup Paths): Clarification of package
diff -r 278c9cd3435e -r 465bd3c7d932 man/internals/internals.texi
--- a/man/internals/internals.texi	Wed Feb 05 22:53:04 2003 +0000
+++ b/man/internals/internals.texi	Thu Feb 06 06:36:17 2003 +0000
@@ -267,7 +267,7 @@
 * The Text in a Buffer::        Representation of the text in a buffer.
 * Buffer Lists::                Keeping track of all buffers.
 * Markers and Extents::         Tagging locations within a buffer.
-* Bufbytes and Emchars::        Representation of individual characters.
+* Ibytes and Ichars::        Representation of individual characters.
 * The Buffer Object::           The Lisp object corresponding to a buffer.
 
 MULE Character Sets and Encodings
@@ -2748,6 +2748,7 @@
 * Conversion to and from External Data::
 * General Guidelines for Writing Mule-Aware Code::
 * An Example of Mule-Aware Code::
+* Mule-izing Code::
 @end menu
 
 @node Character-Related Data Types
@@ -2756,77 +2757,90 @@
 @cindex data types, character-related
 
 First, let's review the basic character-related datatypes used by
-XEmacs.  Note that the separate @code{typedef}s are not mandatory in the
-current implementation (all of them boil down to @code{unsigned char} or
-@code{int}), but they improve clarity of code a great deal, because one
+XEmacs.  Note that some of the separate @code{typedef}s are not
+mandatory, but they improve clarity of code a great deal, because one
 glance at the declaration can tell the intended use of the variable.
 
 @table @code
-@item Emchar
-@cindex Emchar
-An @code{Emchar} holds a single Emacs character.
+@item Ichar
+@cindex Ichar
+An @code{Ichar} holds a single Emacs character.
 
 Obviously, the equality between characters and bytes is lost in the Mule
 world.  Characters can be represented by one or more bytes in the
-buffer, and @code{Emchar} is the C type large enough to hold any
+buffer, and @code{Ichar} is the C type large enough to hold any
 character.
 
-Without Mule support, an @code{Emchar} is equivalent to an
+Without Mule support, an @code{Ichar} is equivalent to an
 @code{unsigned char}.
 
-@item Bufbyte
-@cindex Bufbyte
+@item Ibyte
+@cindex Ibyte
 The data representing the text in a buffer or string is logically a set
-of @code{Bufbyte}s.
+of @code{Ibyte}s.
 
 XEmacs does not work with the same character formats all the time; when
 reading characters from the outside, it decodes them to an internal
-format, and likewise encodes them when writing.  @code{Bufbyte} (in fact
+format, and likewise encodes them when writing.  @code{Ibyte} (in fact
 @code{unsigned char}) is the basic unit of XEmacs internal buffers and
-strings format.  A @code{Bufbyte *} is the type that points at text
+strings format.  A @code{Ibyte *} is the type that points at text
 encoded in the variable-width internal encoding.
 
-One character can correspond to one or more @code{Bufbyte}s.  In the
+One character can correspond to one or more @code{Ibyte}s.  In the
 current Mule implementation, an ASCII character is represented by the
-same @code{Bufbyte}, and other characters are represented by a sequence
-of two or more @code{Bufbyte}s.
+same @code{Ibyte}, and other characters are represented by a sequence
+of two or more @code{Ibyte}s.
 
 Without Mule support, there are exactly 256 characters, implicitly
-Latin-1, and each character is represented using one @code{Bufbyte}, and
-there is a one-to-one correspondence between @code{Bufbyte}s and
-@code{Emchar}s.
-
-@item Bufpos
+Latin-1, and each character is represented using one @code{Ibyte}, and
+there is a one-to-one correspondence between @code{Ibyte}s and
+@code{Ichar}s.
+
+@item Charxpos
+@item Charbpos
 @itemx Charcount
-@cindex Bufpos
+@cindex Charxpos
+@cindex Charbpos
 @cindex Charcount
-A @code{Bufpos} represents a character position in a buffer or string.
-A @code{Charcount} represents a number (count) of characters.
-Logically, subtracting two @code{Bufpos} values yields a
-@code{Charcount} value.  Although all of these are @code{typedef}ed to
+A @code{Charbpos} represents a character position in a buffer.  A
+@code{Charcount} represents a number (count) of characters.  Logically,
+subtracting two @code{Charbpos} values yields a @code{Charcount} value.
+When representing a character position in a string, we just use
+@code{Charcount} directly.  The reason for having a separate typedef for
+buffer positions is that they are 1-based, whereas string positions are
+0-based and hence string counts and positions can be freely intermixed (a
+string position is equivalent to the count of characters from the
+beginning).  When representing a character position that could be either
+in a buffer or string (for example, in the extent code), @code{Charxpos}
+is used.  Although all of these are @code{typedef}ed to
 @code{EMACS_INT}, we use them in preference to @code{EMACS_INT} to make
 it clear what sort of position is being used.
 
-@code{Bufpos} and @code{Charcount} values are the only ones that are
-ever visible to Lisp.
-
-@item Bytind
+@code{Charxpos}, @code{Charbpos} and @code{Charcount} values are the
+only ones that are ever visible to Lisp.
+
+@item Bytexpos
 @itemx Bytecount
-@cindex Bytind
+@cindex Bytebpos
 @cindex Bytecount
-A @code{Bytind} represents a byte position in a buffer or string.  A
-@code{Bytecount} represents the distance between two positions, in bytes.
-The relationship between @code{Bytind} and @code{Bytecount} is the same
-as the relationship between @code{Bufpos} and @code{Charcount}.
+A @code{Bytebpos} represents a byte position in a buffer.  A
+@code{Bytecount} represents the distance between two positions, in
+bytes.  Byte positions in strings use @code{Bytecount}, and for byte
+positions that can be either in a buffer or string, @code{Bytexpos} is
+used.  The relationship between @code{Bytexpos}, @code{Bytebpos} and
+@code{Bytecount} is the same as the relationship between
+@code{Charxpos}, @code{Charbpos} and @code{Charcount}.
 
 @item Extbyte
-@itemx Extcount
 @cindex Extbyte
-@cindex Extcount
 When dealing with the outside world, XEmacs works with @code{Extbyte}s,
-which are equivalent to @code{unsigned char}.  Obviously, an
-@code{Extcount} is the distance between two @code{Extbyte}s.  Extbytes
-and Extcounts are not all that frequent in XEmacs code.
+which are equivalent to @code{char}.  The distance between two
+@code{Extbyte}s is a @code{Bytecount}, since external text is a
+byte-by-byte encoding.  Extbytes occur mainly at the transition point
+between internal text and external functions.  XEmacs code should not,
+if it can possibly avoid it, do any actual manipulation using external
+text, since its format is completely unpredictable (it might not even be
+ASCII-compatible).
 @end table
 
 @node Working With Character and Byte Positions
@@ -2843,8 +2857,8 @@
 learn about them.
 
 @table @code
-@item MAX_EMCHAR_LEN
-@cindex MAX_EMCHAR_LEN
+@item MAX_ICHAR_LEN
+@cindex MAX_ICHAR_LEN
 This preprocessor constant is the maximum number of buffer bytes to
 represent an Emacs character in the variable width internal encoding.
 It is useful when allocating temporary strings to keep a known number of
@@ -2857,75 +2871,75 @@
   ...
   @{
     /* Allocate place for @var{cclen} characters. */
-    Bufbyte *buf = (Bufbyte *)alloca (cclen * MAX_EMCHAR_LEN);
+    Ibyte *buf = (Ibyte *) alloca (cclen * MAX_ICHAR_LEN);
 ...
 @end group
 @end example
 
 If you followed the previous section, you can guess that, logically,
-multiplying a @code{Charcount} value with @code{MAX_EMCHAR_LEN} produces
+multiplying a @code{Charcount} value with @code{MAX_ICHAR_LEN} produces
 a @code{Bytecount} value.
 
-In the current Mule implementation, @code{MAX_EMCHAR_LEN} equals 4.
+In the current Mule implementation, @code{MAX_ICHAR_LEN} equals 4.
 Without Mule, it is 1.
 
-@item charptr_emchar
-@itemx set_charptr_emchar
-@cindex charptr_emchar
-@cindex set_charptr_emchar
-The @code{charptr_emchar} macro takes a @code{Bufbyte} pointer and
-returns the @code{Emchar} stored at that position.  If it were a
+@item itext_ichar
+@itemx set_itext_ichar
+@cindex itext_ichar
+@cindex set_itext_ichar
+The @code{itext_ichar} macro takes a @code{Ibyte} pointer and
+returns the @code{Ichar} stored at that position.  If it were a
 function, its prototype would be:
 
 @example
-Emchar charptr_emchar (Bufbyte *p);
-@end example
-
-@code{set_charptr_emchar} stores an @code{Emchar} to the specified byte
+Ichar itext_ichar (Ibyte *p);
+@end example
+
+@code{set_itext_ichar} stores an @code{Ichar} to the specified byte
 position.  It returns the number of bytes stored:
 
 @example
-Bytecount set_charptr_emchar (Bufbyte *p, Emchar c);
-@end example
-
-It is important to note that @code{set_charptr_emchar} is safe only for
+Bytecount set_itext_ichar (Ibyte *p, Ichar c);
+@end example
+
+It is important to note that @code{set_itext_ichar} is safe only for
 appending a character at the end of a buffer, not for overwriting a
 character in the middle.  This is because the width of characters
-varies, and @code{set_charptr_emchar} cannot resize the string if it
+varies, and @code{set_itext_ichar} cannot resize the string if it
 writes, say, a two-byte character where a single-byte character used to
 reside.
 
-A typical use of @code{set_charptr_emchar} can be demonstrated by this
+A typical use of @code{set_itext_ichar} can be demonstrated by this
 example, which copies characters from buffer @var{buf} to a temporary
-string of Bufbytes.
+string of Ibytes.
 
 @example
 @group
 @{
-  Bufpos pos;
+  Charbpos pos;
   for (pos = beg; pos < end; pos++)
     @{
-      Emchar c = BUF_FETCH_CHAR (buf, pos);
-      p += set_charptr_emchar (buf, c);
+      Ichar c = BUF_FETCH_CHAR (buf, pos);
+      p += set_itext_ichar (buf, c);
     @}
 @}
 @end group
 @end example
 
-Note how @code{set_charptr_emchar} is used to store the @code{Emchar}
+Note how @code{set_itext_ichar} is used to store the @code{Ichar}
 and increment the counter, at the same time.
 
-@item INC_CHARPTR
-@itemx DEC_CHARPTR
-@cindex INC_CHARPTR
-@cindex DEC_CHARPTR
-These two macros increment and decrement a @code{Bufbyte} pointer,
+@item INC_IBYTEPTR
+@itemx DEC_IBYTEPTR
+@cindex INC_IBYTEPTR
+@cindex DEC_IBYTEPTR
+These two macros increment and decrement an @code{Ibyte} pointer,
 respectively.  They will adjust the pointer by the appropriate number of
 bytes according to the byte length of the character stored there.  Both
 macros assume that the memory address is located at the beginning of a
 valid character.
 
-Without Mule support, @code{INC_CHARPTR (p)} and @code{DEC_CHARPTR (p)}
+Without Mule support, @code{INC_IBYTEPTR (p)} and @code{DEC_IBYTEPTR (p)}
 simply expand to @code{p++} and @code{p--}, respectively.
 
 @item bytecount_to_charcount
@@ -2934,7 +2948,7 @@
 equivalent length in characters.
 
 @example
-Charcount bytecount_to_charcount (Bufbyte *p, Bytecount bc);
+Charcount bytecount_to_charcount (Ibyte *p, Bytecount bc);
 @end example
 
 @item charcount_to_bytecount
@@ -2943,16 +2957,16 @@
 equivalent length in bytes.
 
 @example
-Bytecount charcount_to_bytecount (Bufbyte *p, Charcount cc);
-@end example
-
-@item charptr_n_addr
-@cindex charptr_n_addr
+Bytecount charcount_to_bytecount (Ibyte *p, Charcount cc);
+@end example
+
+@item itext_n_addr
+@cindex itext_n_addr
 Return a pointer to the beginning of the character offset @var{cc} (in
 characters) from @var{p}.
 
 @example
-Bufbyte *charptr_n_addr (Bufbyte *p, Charcount cc);
+Ibyte *itext_n_addr (Ibyte *p, Charcount cc);
 @end example
 @end table
 
@@ -2962,7 +2976,7 @@
 @cindex external data, conversion to and from
 
 When an external function, such as a C library function, returns a
-@code{char} pointer, you should almost never treat it as @code{Bufbyte}.
+@code{char} pointer, you should almost never treat it as @code{Ibyte}.
 This is because these returned strings may contain 8bit characters which
 can be misinterpreted by XEmacs, and cause a crash.  Likewise, when
 exporting a piece of internal text to the outside world, you should
@@ -2976,8 +2990,9 @@
 these macros.  The coding system alias mechanism is used to create the
 following logical coding systems, which replace the fixed external
 formats.  The (dontusethis-set-symbol-value-handler) mechanism was
-enhanced to make this possible (more work on that is needed - like
-remove the @code{dontusethis-} prefix).
+enhanced to make this possible (more work on that is needed).
+
+Example useful coding systems:
 
 @table @code
 @item Qbinary
@@ -3000,26 +3015,35 @@
 characters are converted into `~'.
 @end enumerate
 
-@item Qfile_name
-Format used for filenames.  This is user-definable via either the
-@code{file-name-coding-system} or @code{pathname-coding-system} (now
-obsolete) variables.
-
 @item Qnative
 Format used for the external Unix environment---@code{argv[]}, stuff
 from @code{getenv()}, stuff from the @file{/etc/passwd} file, etc.
-Currently this is the same as Qfile_name.  The two should be
-distinguished for clarity and possible future separation.
+This is encoded according to the encoding specified by the current locale.
+
+@item Qfile_name
+Format used for filenames.  This is normally the same as @code{Qnative},
+but the two should be distinguished for clarity and possible future
+separation -- and also because @code{Qfile_name} can be changed using either
+the @code{file-name-coding-system} or @code{pathname-coding-system} (now
+obsolete) variables.
 
 @item Qctext
-Compound--text format.  This is the standard X11 format used for data
+Compound-text format.  This is the standard X11 format used for data
 stored in properties, selections, and the like.  This is an 8-bit
 no-lock-shift ISO2022 coding system.  This is a real coding system,
-unlike Qfile_name, which is user-definable.
+unlike @code{Qfile_name}, which is user-definable.
+
+@item Qmswindows_tstr
+Used for external data in all MS Windows functions that are declared to
+accept data of type @code{LPTSTR} or @code{LPCSTR}.  This maps to either
+@code{Qmswindows_multibyte} (a locale-specific encoding, same as
+@code{Qnative}) or @code{Qmswindows_unicode}, depending on whether
+XEmacs is being run under Windows 9X or Windows NT/2000/XP.
 @end table
 
 There are two fundamental macros to convert between external and
-internal format.
+internal format, as well as various convenience macros to simplify the
+most common operations.
 
 @code{TO_INTERNAL_FORMAT} converts external data to internal format, and
 @code{TO_EXTERNAL_FORMAT} converts the other way around.  The arguments
@@ -3067,7 +3091,7 @@
 @item @code{C_STRING_MALLOC, ptr,}
 equivalent to @code{MALLOC (ptr, len_ignored)} on output
 @item @code{C_STRING, ptr,}
-equivalent to @code{DATA, (ptr, strlen (ptr) + 1)} on input
+equivalent to @code{DATA, (ptr, strlen/wcslen (ptr))} on input
 @item @code{LISP_STRING, string,}
 input or output is a Lisp_Object of type string
 @item @code{LISP_BUFFER, buffer,}
@@ -3078,16 +3102,20 @@
 input or output is a Lisp_Object of type opaque
 @end table
 
-Often, the data is being converted to a '\0'-byte-terminated string,
-which is the format required by many external system C APIs.  For these
-purposes, a source type of @code{C_STRING} or a sink type of
-@code{C_STRING_ALLOCA} or @code{C_STRING_MALLOC} is appropriate.
-Otherwise, we should try to keep XEmacs '\0'-byte-clean, which means
-using (ptr, len) pairs.
+A source type of @code{C_STRING} or a sink type of
+@code{C_STRING_ALLOCA} or @code{C_STRING_MALLOC} is appropriate where
+the external API is not '\0'-byte-clean -- i.e. it expects strings to be
+terminated with a null byte.  For external API's that are in fact
+'\0'-byte-clean, we should of course not use these.
 
 The sinks to be specified must be lvalues, unless they are the lisp
 object types @code{LISP_LSTREAM} or @code{LISP_BUFFER}.
 
+There is no problem using the same lvalue for source and sink.
+
+Garbage collection is inhibited during these conversion operations, so
+it is OK to pass in data from Lisp strings using @code{XSTRING_DATA}.
+
 For the sink types @code{ALLOCA} and @code{C_STRING_ALLOCA}, the
 resulting text is stored in a stack-allocated buffer, which is
 automatically freed on returning from the function.  However, the sink
@@ -3099,6 +3127,42 @@
 for @code{TO_INTERNAL_FORMAT} or a sink for @code{TO_EXTERNAL_FORMAT}.
 You'll get an assertion failure if you try.
 
+99% of conversions involve raw data or Lisp strings as both source and
+sink, and usually data is output as @code{alloca()}, or sometimes
+@code{xmalloc()}.  For this reason, convenience macros are defined for
+many types of conversions involving raw data and/or Lisp strings,
+especially when the output is an @code{alloca()}ed string. (When the
+destination is a Lisp string, there are other functions that should be
+used instead -- @code{build_ext_string()} and @code{make_ext_string()},
+for example.) The convenience macros are of two types -- the older kind
+that store the result into a specified variable, and the newer kind that
+return the result.  The newer kind of macros don't exist when the output
+is sized data, because that would have two return values.  NOTE: All
+convenience macros are ultimately defined in terms of
+@code{TO_EXTERNAL_FORMAT} and @code{TO_INTERNAL_FORMAT}.  Thus, any
+comments above about the workings of these macros also apply to all
+convenience macros.
+
+A typical old-style convenience macro is
+
+@example
+  C_STRING_TO_EXTERNAL (in, out, codesys);
+@end example
+
+This is equivalent to
+
+@example
+  TO_EXTERNAL_FORMAT (C_STRING, in, C_STRING_ALLOCA, out, codesys);
+@end example
+
+but is easier to write and somewhat clearer, since it clearly identifies
+the arguments without the clutter of having the preprocessor types mixed
+in.
+
+The new-style equivalent is @code{NEW_C_STRING_TO_EXTERNAL (src,
+codesys)}, which @emph{returns} the converted data (still in
+@code{alloca()} space).  This is far more convenient for most
+operations.
 
 @node General Guidelines for Writing Mule-Aware Code
 @subsection General Guidelines for Writing Mule-Aware Code
@@ -3113,20 +3177,22 @@
 @item Never use @code{char} and @code{char *}.
 In XEmacs, the use of @code{char} and @code{char *} is almost always a
 mistake.  If you want to manipulate an Emacs character from ``C'', use
-@code{Emchar}.  If you want to examine a specific octet in the internal
-format, use @code{Bufbyte}.  If you want a Lisp-visible character, use a
+@code{Ichar}.  If you want to examine a specific octet in the internal
+format, use @code{Ibyte}.  If you want a Lisp-visible character, use a
 @code{Lisp_Object} and @code{make_char}.  If you want a pointer to move
-through the internal text, use @code{Bufbyte *}.  Also note that you
-almost certainly do not need @code{Emchar *}.
-
-@item Be careful not to confuse @code{Charcount}, @code{Bytecount}, and @code{Bufpos}.
+through the internal text, use @code{Ibyte *}.  Also note that you
+almost certainly do not need @code{Ichar *}.  Other typedefs to clarify
+the use of @code{char} are @code{Char_ASCII}, @code{Char_Binary},
+@code{UChar_Binary}, and @code{CIbyte}.
+
+@item Be careful not to confuse @code{Charcount}, @code{Bytecount}, @code{Charbpos} and @code{Bytebpos}.
 The whole point of using different types is to avoid confusion about the
 use of certain variables.  Lest this effect be nullified, you need to be
 careful about using the right types.
 
 @item Always convert external data
 It is extremely important to always convert external data, because
-XEmacs can crash if unexpected 8bit sequences are copied to its internal
+XEmacs can crash if unexpected 8-bit sequences are copied to its internal
 buffers literally.
 
 This means that when a system function, such as @code{readdir}, returns
@@ -3134,25 +3200,30 @@
 described in the previous chapter, before passing it further to Lisp.
 
 Actually, most of the basic system functions that accept '\0'-terminated
-string arguments, like @code{stat()} and @code{open()}, have been
-@strong{encapsulated} so that they are they @code{always} do internal to
-external conversion themselves.  This means you must pass internally
-encoded data, typically the @code{XSTRING_DATA} of a Lisp_String to
-these functions.  This is actually a design bug, since it unexpectedly
-changes the semantics of the system functions.  A better design would be
-to provide separate versions of these system functions that accepted
-Lisp_Objects which were lisp strings in place of their current
-@code{char *} arguments.
-
-@example
-int stat_lisp (Lisp_Object path, struct stat *buf); /* Implement me */
-@end example
+string arguments, like @code{stat()} and @code{open()}, have
+@strong{encapsulated} equivalents that do the internal to external
+conversion themselves.  The encapsulated equivalents have a @code{qxe_}
+prefix and have string arguments of type @code{Ibyte *}, and you can
+pass internally encoded data to them, often from a Lisp string using
+@code{XSTRING_DATA}. (A better design might be to provide versions that
+accept Lisp strings directly.)
 
 Also note that many internal functions, such as @code{make_string},
-accept Bufbytes, which removes the need for them to convert the data
-they receive.  This increases efficiency because that way external data
-needs to be decoded only once, when it is read.  After that, it is
-passed around in internal format.
+accept Ibytes, which removes the need for them to convert the data they
+receive.  This increases efficiency because that way external data needs
+to be decoded only once, when it is read.  After that, it is passed
+around in internal format.
+
+@item Do all work in internal format
+External-formatted data is completely unpredictable in its format.  It
+may be Unicode (non-ASCII compatible); it may be a modal encoding, in
+which case some occurrences of (e.g.) the slash character may be part of
+two-byte Asian-language characters, and a naive attempt to split apart a
+pathname by slashes will fail; etc.  Internal-format text should be
+converted to external format only at the point where an external API is
+actually called, and the first thing done after receiving
+external-format text from an external API should be to convert it to
+internal text.
 @end table
 
 @node An Example of Mule-Aware Code
@@ -3171,14 +3242,14 @@
 */
        (int nargs, Lisp_Object *args))
 @{
-  Bufbyte *storage = alloca_array (Bufbyte, nargs * MAX_EMCHAR_LEN);
-  Bufbyte *p = storage;
+  Ibyte *storage = alloca_array (Ibyte, nargs * MAX_ICHAR_LEN);
+  Ibyte *p = storage;
 
   for (; nargs; nargs--, args++)
     @{
       Lisp_Object lisp_char = *args;
       CHECK_CHAR_COERCE_INT (lisp_char);
-      p += set_charptr_emchar (p, XCHAR (lisp_char));
+      p += set_itext_ichar (p, XCHAR (lisp_char));
     @}
   return make_string (storage, p - storage);
 @}
@@ -3188,17 +3259,17 @@
 Now we can analyze the source line by line.
 
 Obviously, string will be as long as there are arguments to the
-function.  This is why we allocate @code{MAX_EMCHAR_LEN} * @var{nargs}
+function.  This is why we allocate @code{MAX_ICHAR_LEN} * @var{nargs}
 bytes on the stack, i.e. the worst-case number of bytes for @var{nargs}
-@code{Emchar}s to fit in the string.
+@code{Ichar}s to fit in the string.
 
 Then, the loop checks that each element is a character, converting
 integers in the process.  Like many other functions in XEmacs, this
 function silently accepts integers where characters are expected, for
 historical and compatibility reasons.  Unless you know what you are
 doing, @code{CHECK_CHAR} will also suffice.  @code{XCHAR (lisp_char)}
-extracts the @code{Emchar} from the @code{Lisp_Object}, and
-@code{set_charptr_emchar} stores it to storage, increasing @code{p} in
+extracts the @code{Ichar} from the @code{Lisp_Object}, and
+@code{set_itext_ichar} stores it to storage, increasing @code{p} in
 the process.
 
 Other instructive examples of correct coding under Mule can be found all
@@ -3207,6 +3278,37 @@
 understood this section of the manual and studied the examples, you can
 proceed writing new Mule-aware code.
 
+@node Mule-izing Code
+@subsection Mule-izing Code
+
+A lot of code is written without Mule in mind, and needs to be made
+Mule-correct or "Mule-ized".  There is really no substitute for
+line-by-line analysis when doing this, but the following checklist can
+help:
+
+@itemize @bullet
+@item
+Check all uses of @code{XSTRING_DATA}.
+@item
+Check all uses of @code{build_string} and @code{make_string}.
+@item
+Check all uses of @code{tolower} and @code{toupper}.
+@item
+Check object print methods.
+@item
+Check for use of functions such as @code{write_c_string},
+@code{write_fmt_string}, @code{stderr_out}, @code{stdout_out}.
+@item
+Check all occurrences of @code{char} and correct to one of the other
+typedefs described above.
+@item
+Check all existing uses of @code{TO_EXTERNAL_FORMAT},
+@code{TO_INTERNAL_FORMAT}, and any convenience macros (grep for
+@samp{EXTERNAL_TO}, @samp{TO_EXTERNAL}, and @samp{TO_SIZED_EXTERNAL}).
+@item
+In Windows code, string literals may need to be encapsulated with @code{XETEXT}.
+@end itemize
+
 @node Techniques for XEmacs Developers
 @section Techniques for XEmacs Developers
 @cindex techniques for XEmacs developers
@@ -8011,7 +8113,7 @@
 * The Text in a Buffer::        Representation of the text in a buffer.
 * Buffer Lists::                Keeping track of all buffers.
 * Markers and Extents::         Tagging locations within a buffer.
-* Bufbytes and Emchars::        Representation of individual characters.
+* Ibytes and Ichars::        Representation of individual characters.
 * The Buffer Object::           The Lisp object corresponding to a buffer.
 @end menu
 
@@ -8087,7 +8189,7 @@
 has some shape that defines how it typically appears (e.g. as an
 uppercase A). (The exact way in which a character appears depends on the
 font used to display the character.) The internal type of characters in
-the C code is an @code{Emchar}; this is just an @code{int}, but using a
+the C code is an @code{Ichar}; this is just an @code{int}, but using a
 symbolic type makes the code clearer.
 
   Between every character in a buffer is a @dfn{buffer position} or
@@ -8104,12 +8206,12 @@
 valid.  If there are N characters in a buffer, then buffer
 position N+1 is after the last one, and position N+2 is not valid.
 
-  The internal makeup of the Emchar integer varies depending on whether
-we have compiled with MULE support.  If not, the Emchar integer is an
+  The internal makeup of the Ichar integer varies depending on whether
+we have compiled with MULE support.  If not, the Ichar integer is an
 8-bit integer with possible values from 0 - 255.  0 - 127 are the
 standard ASCII characters, while 128 - 255 are the characters from the
 ISO-8859-1 character set.  If we have compiled with MULE support, an
-Emchar is a 19-bit integer, with the various bits having meanings
+Ichar is a 19-bit integer, with the various bits having meanings
 according to a complex scheme that will be detailed later.  The
 characters numbered 0 - 255 still have the same meanings as for the
 non-MULE case, though.
@@ -8148,14 +8250,14 @@
 noticeable speed penalty.)
 
   Astute readers may notice that the text in a buffer is represented as
-an array of @emph{bytes}, while (at least in the MULE case) an Emchar is
+an array of @emph{bytes}, while (at least in the MULE case) an Ichar is
 a 19-bit integer, which clearly cannot fit in a byte.  This means (of
 course) that the text in a buffer uses a different representation from
-an Emchar: specifically, the 19-bit Emchar becomes a series of one to
+an Ichar: specifically, the 19-bit Ichar becomes a series of one to
 four bytes.  The conversion between these two representations is complex
 and will be described later.
 
-  In the non-MULE case, everything is very simple: An Emchar
+  In the non-MULE case, everything is very simple: An Ichar
 is an 8-bit value, which fits neatly into one byte.
 
   If we are given a buffer position and want to retrieve the
@@ -8180,7 +8282,7 @@
 @item
 Fetch the appropriate bytes at the determined memory position.
 @item
-Convert these bytes into an Emchar.
+Convert these bytes into an Ichar.
 @end enumerate
 
   In the non-Mule case, (3) and (4) boil down to a simple one-byte
@@ -8190,11 +8292,11 @@
 
 @enumerate
 @item
-@dfn{buffer positions} or @dfn{character positions}, typedef @code{Bufpos}
-@item
-@dfn{byte indices}, typedef @code{Bytind}
-@item
-@dfn{memory indices}, typedef @code{Memind}
+@dfn{buffer positions} or @dfn{character positions}, typedef @code{Charbpos}
+@item
+@dfn{byte indices}, typedef @code{Bytebpos}
+@item
+@dfn{memory indices}, typedef @code{Membpos}
 @end enumerate
 
   All three typedefs are just @code{int}s, but defining them this way makes
@@ -8205,8 +8307,8 @@
 not know that byte indices or memory indices exist.
 
   Finally, we have a typedef for the bytes in a buffer.  This is a
-@code{Bufbyte}, which is an unsigned char.  Referring to them as
-Bufbytes underscores the fact that we are working with a string of bytes
+@code{Ibyte}, which is an unsigned char.  Referring to them as
+Ibytes underscores the fact that we are working with a string of bytes
 in the internal Emacs buffer representation rather than in one of a
 number of possible alternative representations (e.g. EUC-encoded text,
 etc.).
@@ -8276,7 +8378,7 @@
 buffer positions in them as integers, and every time text is inserted or
 deleted, these positions must be updated.  In order to minimize the
 amount of shuffling that needs to be done, the positions in markers and
-extents (there's one per marker, two per extent) are stored in Meminds.
+extents (there's one per marker, two per extent) are stored in Membpos's.
 This means that they only need to be moved when the text is physically
 moved in memory; since the gap structure tries to minimize this, it also
 minimizes the number of marker and extent indices that need to be
@@ -8290,10 +8392,10 @@
 (which could happen as a result of text being deleted) or the buffer is
 deleted, and primitives do exist to enumerate the extents in a buffer.
 
-@node Bufbytes and Emchars
-@section Bufbytes and Emchars
-@cindex Bufbytes and Emchars
-@cindex Emchars, Bufbytes and
+@node Ibytes and Ichars
+@section Ibytes and Ichars
+@cindex Ibytes and Ichars
+@cindex Ichars, Ibytes and
 
   Not yet documented.
 
@@ -8404,9 +8506,9 @@
 
   Recall that there are two primary ways that text is represented in
 XEmacs.  The @dfn{buffer} representation sees the text as a series of
-bytes (Bufbytes), with a variable number of bytes used per character.
+bytes (Ibytes), with a variable number of bytes used per character.
 The @dfn{character} representation sees the text as a series of integers
-(Emchars), one per character.  The character representation is a cleaner
+(Ichars), one per character.  The character representation is a cleaner
 representation from a theoretical standpoint, and is thus used in many
 cases when lots of manipulations on a string need to be done.  However,
 the buffer representation is the standard representation used in both
@@ -9039,18 +9141,18 @@
 Function equivalents of the above macros.
 @end deftypefun
 
-@deftypefun ssize_t Lstream_read (Lstream *@var{stream}, void *@var{data}, size_t @var{size})
+@deftypefun Bytecount Lstream_read (Lstream *@var{stream}, void *@var{data}, Bytecount @var{size})
 Read @var{size} bytes of @var{data} from the stream.  Return the number
 of bytes read.  0 means EOF. -1 means an error occurred and no bytes
 were read.
 @end deftypefun
 
-@deftypefun ssize_t Lstream_write (Lstream *@var{stream}, void *@var{data}, size_t @var{size})
+@deftypefun Bytecount Lstream_write (Lstream *@var{stream}, void *@var{data}, Bytecount @var{size})
 Write @var{size} bytes of @var{data} to the stream.  Return the number
 of bytes written.  -1 means an error occurred and no bytes were written.
 @end deftypefun
 
-@deftypefun void Lstream_unread (Lstream *@var{stream}, void *@var{data}, size_t @var{size})
+@deftypefun void Lstream_unread (Lstream *@var{stream}, void *@var{data}, Bytecount @var{size})
 Push back @var{size} bytes of @var{data} onto the input queue.  The next
 call to @code{Lstream_read()} with the same size will read the same
 bytes back.  Note that this will be the case even if there is other
@@ -9076,7 +9178,7 @@
 @section Lstream Methods
 @cindex lstream methods
 
-@deftypefn {Lstream Method} ssize_t reader (Lstream *@var{stream}, unsigned char *@var{data}, size_t @var{size})
+@deftypefn {Lstream Method} Bytecount reader (Lstream *@var{stream}, unsigned char *@var{data}, Bytecount @var{size})
 Read some data from the stream's end and store it into @var{data}, which
 can hold @var{size} bytes.  Return the number of bytes read.  A return
 value of 0 means no bytes can be read at this time.  This may be because
@@ -9093,7 +9195,7 @@
 This function can be @code{NULL} if the stream is output-only.
 @end deftypefn
 
-@deftypefn {Lstream Method} ssize_t writer (Lstream *@var{stream}, const unsigned char *@var{data}, size_t @var{size})
+@deftypefn {Lstream Method} Bytecount writer (Lstream *@var{stream}, const unsigned char *@var{data}, Bytecount @var{size})
 Send some data to the stream's end.  Data to be sent is in @var{data}
 and is @var{size} bytes.  Return the number of bytes sent.  This
 function can send and return fewer bytes than is passed in; in that
@@ -9694,7 +9796,7 @@
 string.) So use the @code{_force} version if you need the extent_info
 structure to be there.
 
-  A list of extents is maintained as a double gap array: one gap array
+  A list of extents is maintained as a double gap array: One gap array
 is ordered by start index (the @dfn{display order}) and the other is
 ordered by end index (the @dfn{e-order}).  Note that positions in an
 extent list should logically be conceived of as referring @emph{to} a
@@ -9704,6 +9806,34 @@
 array, except for the fact that positions are integers (this should be
 generalized to handle integers and linked list equally well).
 
+A gap array is the same structure used by buffer text: an array of
+elements with a "gap" somewhere in the middle.  Insertion and deletion
+happens by moving the gap to the insertion/deletion point, and then
+expanding/contracting as necessary.  Gap arrays have a number of
+useful properties:
+
+@enumerate
+@item
+They are space efficient, as there is no need for next/previous pointers.
+
+@item
+If the items in them are sorted, locating an item is fast -- @math{O(log N)}.
+
+@item
+Insertion and deletion is very fast (constant time, essentially) if the
+gap is near (which favors localized operations, as will usually be the
+case).  Even if not, it requires only a block move of memory, which is
+generally a highly optimized operation on modern processors.
+
+@item
+Code to manipulate them is relatively simple to write.
+@end enumerate
+
+An alternative would be a balanced binary trees, which have guaranteed
+@math{O(log N)} time for all operations (although the constant factors
+are not as good, and repeated localized operations will be slower than
+for a gap array).  Such code is quite tricky to write, however.
+
 @node Zero-Length Extents
 @section Zero-Length Extents
 @cindex zero-length extents
@@ -9831,24 +9961,17 @@
 
   Therefore, @math{F} can be found in the same amount of time as
 operation (1), i.e. the time that it takes to locate where an extent
-would go if inserted into the e-order list.
-
-  If the lists were stored as balanced binary trees, then operation (1)
-would take logarithmic time, which is usually quite fast.  However,
-currently they're stored as simple doubly-linked lists, and instead we
-do some caching to try to speed things up.
+would go if inserted into the e-order list.  This is @math{O(log N)},
+since we are using gap arrays to manage extents.
 
   Define a @dfn{stack of extents} (or @dfn{SOE}) as the set of extents
-(ordered in the display order) that overlap an index @math{I}, together
-with the SOE's @dfn{previous} extent, which is an extent that precedes
-@math{I} in the e-order. (Hopefully there will not be very many extents
-between @math{I} and the previous extent.)
+(ordered in display order and e-order, just like for normal extent
+lists) that overlap an index @math{I}.
 
 Now:
 
 Let @math{I} be an index, let @math{S} be the stack of extents on
-@math{I}, let @math{F} be the first extent in @math{S}, and let @math{P}
-be @math{S}'s previous extent.
+@math{I} and let @math{F} be the first extent in @math{S}.
 
 Theorem 3: The first extent in @math{S} is the first extent that overlaps
 any range @math{[I, J]}.
diff -r 278c9cd3435e -r 465bd3c7d932 man/lispref/mule.texi
--- a/man/lispref/mule.texi	Wed Feb 05 22:53:04 2003 +0000
+++ b/man/lispref/mule.texi	Thu Feb 06 06:36:17 2003 +0000
@@ -39,7 +39,8 @@
 used in Japanese Kanji, Chinese Hanzi, and Korean Hanja; typically there
 are thousands of such ideographs in each language), etc.  The basic
 property of a character is that it is the smallest unit of text with
-semantic significance in text processing.
+semantic significance in text processing---i.e., characters are abstract
+units defined by their meaning, not by their exact appearance.
 
   Human beings normally process text visually, so to a first approximation
 a character may be identified with its shape.  Note that the same
@@ -98,62 +99,100 @@
 but the difference in ordering can cause great headaches when the same
 thousands of characters are used by different cultures as in the Hanzi.)
 
-  A code point may be broken into a number of @dfn{position codes}.  The
-number of position codes required to index a particular character in a
-character set is called the @dfn{dimension} of the character set.  For
-practical purposes, a position code may be thought of as a byte-sized
-index.  The printing characters of ASCII, being a relatively small
-character set, is of dimension one, and each character in the set is
-indexed using a single position code, in the range 1 through 94.  Use of
-this unusual range, rather than the familiar 33 through 126, is an
-intentional abstraction; to understand the programming issues you must
-break the equation between character sets and encodings.
-
-  JIS X 0208, i.e. Japanese Kanji, has thousands of characters, and is
-of dimension two -- every character is indexed by two position codes,
-each in the range 1 through 94.  (This number ``94'' is not a
-coincidence; we shall see that the JIS position codes were chosen so
-that JIS kanji could be encoded without using codes that in ASCII are
-associated with device control functions.)  Note that the choice of the
-range here is somewhat arbitrary.  You could just as easily index the
-printing characters in ASCII using numbers in the range 0 through 93, 2
-through 95, 3 through 96, etc.  In fact, the standardized
-@emph{encoding} for the ASCII @emph{character set} uses the range 33
-through 126.
+  It's important to understand that a character is defined not by any
+number attached to it, but by its meaning.  For example, ASCII and
+EBCDIC are two charsets containing exactly the same characters
+(lowercase and uppercase letters, numbers 0 through 9, particular
+punctuation marks) but with different numberings.  The @samp{comma}
+character in ASCII and EBCDIC, for instance, is the same character
+despite having a different numbering.  Conversely, when comparing ASCII
+and JIS-Roman, which look the same except that the latter has a yen sign
+substituted for the backslash, we would say that the backslash and yen
+sign are @emph{not} the same characters, despite having the same number
+(95) and despite the fact that all other characters are present in both
+charsets, with the same numbering.  ASCII and JIS-Roman, then, do
+@emph{not} have exactly the same characters in them (ASCII has a
+backslash character but no yen-sign character, and vice-versa for
+JIS-Roman), unlike ASCII and EBCDIC, even though the numberings in ASCII
+and JIS-Roman are closer.
+
+  Sometimes, a code point is not a single number, but instead a group of
+numbers, called @dfn{position codes}.  In such cases, the number of
+position codes required to index a particular character in a character
+set is called the @dfn{dimension} of the character set.  Character sets
+indexed by more than one position code typically use byte-sized position
+codes.  Small character sets, e.g. ASCII, invariably use a single
+position code, but for larger character sets, the choice of whether to
+use multiple position codes or a single large (16-bit or 32-bit) number
+is arbitrary.  Unicode typically uses a single large number, but
+language-specific or "national" character sets often use multiple
+(usually two) position codes.  For example, JIS X 0208, i.e. Japanese
+Kanji, has thousands of characters, and is of dimension two -- every
+character is indexed by two position codes, each in the range 1 through
+94.  (This number ``94'' is not a coincidence; it is the same as the
+number of printable characters in ASCII, and was chosen so that JIS
+characters could be directly encoded using two printable ASCII
+characters.)  Note that the choice of the range here is somewhat
+arbitrary -- it could just as easily be 0 through 93, 2 through 95, etc.
+In fact, the range for JIS position codes (and for other character sets
+modeled after it) is often given as range 33 through 126, so as to
+directly match ASCII printing characters.
 
   An @dfn{encoding} is a way of numerically representing characters from
 one or more character sets into a stream of like-sized numerical values
-called @dfn{words}; typically these are 8-bit, 16-bit, or 32-bit
-quantities.  If an encoding encompasses only one character set, then the
-position codes for the characters in that character set could be used
-directly.  (This is the case with the trivial cipher used by children,
-assigning 1 to `A', 2 to `B', and so on.)  However, even with ASCII,
-other considerations intrude.  For example, why are the upper- and
-lowercase alphabets separated by 8 characters?  Why do the digits start
-with `0' being assigned the code 48?  In both cases because semantically
-interesting operations (case conversion and numerical value extraction)
-become convenient masking operations.  Other artificial aspects (the
-control characters being assigned to codes 0--31 and 127) are historical
-accidents.  (The use of 127 for @samp{DEL} is an artifact of the "punch
-once" nature of paper tape, for example.)
-
-  Naive use of the position code is not possible, however, if more than
-one character set is to be used in the encoding.  For example, printed
+called @dfn{words} -- typically 8-bit bytes, but sometimes 16-bit or
+32-bit quantities.  It's very important to clearly distinguish between
+charsets and encodings.  For a simple charset like ASCII, there is only
+one encoding normally used -- each character is represented by a single
+byte, with the same value as its code point.  For more complicated
+charsets, however, or when a single encoding needs to represent more
+than charset, things are not so obvious.  Unicode version 2, for
+example, is a large charset with thousands of characters, each indexed
+by a 16-bit number, often represented in hex, e.g. 0x05D0 for the Hebrew
+letter "aleph".  One obvious encoding (actually two encodings, depending
+on which of the two possible byte orderings is chosen) simply uses two
+bytes per character.  This encoding is convenient for internal
+processing of Unicode text; however, it's incompatible with ASCII, and
+thus external text (files, e-mail, etc.) that is encoded this way is
+completely uninterpretable by programs lacking Unicode support.  For
+this reason, a different, ASCII-compatible encoding, e.g. UTF-8, is
+usually used for external text.  UTF-8 represents Unicode characters
+with one to three bytes (often extended to six bytes to handle
+characters with up to 31-bit indices).  Unicode characters 00 to 7F
+(identical with ASCII) are directly represented with one byte, and other
+characters with two or more bytes, each in the range 80 to FF.
+Applications that don't understand Unicode will still be able to process
+ASCII characters represented in UTF-8-encoded text, and will typically
+ignore (and hopefully preserve) the high-bit characters.
+
+  Naive use of code points is also not possible if more than one
+character set is to be used in the encoding.  For example, printed
 Japanese text typically requires characters from multiple character sets
 -- ASCII, JIS X 0208, and JIS X 0212, to be specific.  Each of these is
-indexed using one or more position codes in the range 1 through 94, so
-the position codes could not be used directly or there would be no way
-to tell which character was meant.  Different Japanese encodings handle
-this differently -- JIS uses special escape characters to denote
-different character sets; EUC sets the high bit of the position codes
-for JIS X 0208 and JIS X 0212, and puts a special extra byte before each
-JIS X 0212 character; etc.  (JIS, EUC, and most of the other encodings
-you will encounter in files are 7-bit or 8-bit encodings.  There is one
-common 16-bit encoding, which is Unicode; this strives to represent all
-the world's characters in a single large character set.  32-bit
-encodings are often used internally in programs, such as XEmacs with
-MULE support, to simplify the code that manipulates them; however, they
-are not used externally because they are not very space-efficient.)
+indexed using one or more position codes in the range 1 through 94 (or
+33 through 126), so the position codes could not be used directly or
+there would be no way to tell which character was meant.  Different
+Japanese encodings handle this differently -- JIS uses special escape
+characters to denote different character sets; EUC sets the high bit of
+the position codes for JIS X 0208 and JIS X 0212, and puts a special
+extra byte before each JIS X 0212 character; etc.
+
+  The encodings described above are all 7-bit or 8-bit encodings.  The
+fixed-width Unicode encoding previous described, however, is sometimes
+considered to be a 16-bit encoding, in which case the issue of byte
+ordering does not come up. (Imagine, for example, that the text is
+represented as an array of shorts.) Similarly, Unicode version 3 (which
+has characters with indices above 0xFFFF), and other very large
+character sets, may be represented internally as 32-bit encodings,
+i.e. arrays of ints.  However, it does not make too much sense to talk
+about 16-bit or 32-bit encodings for external data, since nowadays 8-bit
+data is a universal standard -- the closest you can get is fixed-width
+encodings using two or four bytes to encode 16-bit or 32-bit values. (A
+"7-bit" encoding is used when it cannot be guaranteed that the high bit
+of 8-bit data will be correctly preserved.  Some e-mail gateways, for
+example, strip the high bit of text passing through them.  These same
+gateways often handle non-printable characters incorrectly, and so 7-bit
+encodings usually avoid using bytes with such values.)
 
   A general method of handling text using multiple character sets
 (whether for multilingual text, or simply text in an extremely
diff -r 278c9cd3435e -r 465bd3c7d932 nt/ChangeLog
--- a/nt/ChangeLog	Wed Feb 05 22:53:04 2003 +0000
+++ b/nt/ChangeLog	Thu Feb 06 06:36:17 2003 +0000
@@ -1,3 +1,16 @@
+2003-02-05  Ben Wing  <ben@xemacs.org>
+
+	* config.inc.samp (GTK_DIR):
+	* config.inc.samp (XPM_DIR):
+	* config.inc.samp (HAVE_GIF):
+	* config.inc.samp (ZLIB_DIR):
+	* config.inc.samp (TIFF_DIR):
+	* config.inc.samp (JPEG_DIR):
+	* config.inc.samp (COMPFACE_DIR):
+	* config.inc.samp (USE_PORTABLE_DUMPER):
+	* config.inc.samp (USE_KKCC):
+	Various fixups.
+
 2002-12-16  Ben Wing  <ben@xemacs.org>
 
 	* README (NOTE):
diff -r 278c9cd3435e -r 465bd3c7d932 nt/config.inc.samp
--- a/nt/config.inc.samp	Wed Feb 05 22:53:04 2003 +0000
+++ b/nt/config.inc.samp	Thu Feb 06 06:36:17 2003 +0000
@@ -35,29 +35,38 @@
 ############################################################################
 
 # Set this to enable XPM support (virtually mandatory), and specify
-# the directory containing xpm.
+# the directory containing xpm.  Get the library from
+# http://ftp.xemacs.org/aux/xpm-3.4k.tar.gz.
 HAVE_XPM=1
 XPM_DIR=c:\src\xpm-3.4k
 
-# Set this to enable GIF support.
+# Set this to enable GIF support (built-in).
 HAVE_GIF=1
 
 # Set this to enable PNG support (virtually mandatory), and specify
-# the directories containing png and zlib.
+# the directories containing png and zlib.  Get the latest version from
+# ftp://ftp.uu.net/graphics/png/.  You will have to rename the zlib directory
+# from zlib-1.1.3 or whatever to just `zlib' for the build to work.
 HAVE_PNG=1
-PNG_DIR=c:\src\libpng-1.0.9
+PNG_DIR=c:\src\libpng-1.0.12
 ZLIB_DIR=c:\src\zlib
 
 # Set this to enable TIFF support, and specify the directory containing tiff.
+# Get the latest version from ftp://ftp.uu.net/graphics/tiff/.  Not on by
+# default since TIFF isn't really very important and those TIFF wankers
+# couldn't be bothered to incorporate minimal MS-Windows patches they've
+# had sitting around for years, so getting it to build is a major pain in
+# the ass.
 HAVE_TIFF=0
-TIFF_DIR=
+TIFF_DIR=c:\src\tiff-v3.4
 
 # Set this to enable JPEG support, and specify the directory containing jpeg.
+# Get the latest version from ftp://ftp.uu.net/graphics/jpeg/.
 HAVE_JPEG=1
 JPEG_DIR=c:\src\jpeg-6b
 
 # Set this to enable XFace support, and specify the directory containing
-# compface.
+# compface.  Get the library from http://ftp.xemacs.org/aux/compface.tar.gz.
 HAVE_XFACE=0
 COMPFACE_DIR=
 
@@ -69,8 +78,9 @@
 # attempt to use its built-in, much slower texinfo support when building
 # info files.) If you are building XEmacs yourself, you probably have
 # Cygwin sitting around already.  If not, you should.  Cygwin provides a
-# `makeinfo.exe' in /usr/bin/makeinfo.
-MAKEINFO=c:\cygwin\usr\bin\makeinfo.exe
+# `makeinfo.exe' in /usr/bin/makeinfo (/usr/bin is virtual, it's /bin in
+# the actual file system).
+MAKEINFO=c:\cygwin\bin\makeinfo.exe
 
 # Set this to turn on optimization when compiling.
 OPTIMIZED_BUILD=0
@@ -125,7 +135,8 @@
 # routines, instead of the older "unexec" routines in unexnt.c.
 USE_PORTABLE_DUMPER=1
 
-# Set this to use new experimental GC algorithms.
+# Set this to use the new experimental garbage-collection routines instead
+# of the traditional XEmacs garbage-collection routines.
 USE_KKCC=0
 
 # Set this to turn on the use of the union type, which gets you improved
diff -r 278c9cd3435e -r 465bd3c7d932 src/ChangeLog
--- a/src/ChangeLog	Wed Feb 05 22:53:04 2003 +0000
+++ b/src/ChangeLog	Thu Feb 06 06:36:17 2003 +0000
@@ -1,3 +1,52 @@
+2003-02-05  Ben Wing  <ben@xemacs.org>
+
+	* Makefile.in.in (update-elc.stamp):
+	NOBYTECOMPILE -> BYTECOMPILE_CHANGE.
+
+	* esd.c (esd_play_sound_data):
+	Warning fixes.
+	
+	* fns.c:
+	* fns.c (mark_bit_vector):
+	* fns.c (Frequire):
+	* fns.c (vars_of_fns):
+	Eliminate bogus require-prints-loading-message; use already
+	existent load-always-display-messages instead.  Make sure `load'
+	knows we are coming from `require'.
+	
+	* lread.c:
+	* lread.c (READCHARFUN_MAYBE):
+	* lread.c (Fload_internal):
+	* lread.c (PRINT_LOADING_MESSAGE_1):
+	* lread.c (PRINT_LOADING_MESSAGE):
+	* lread.c (vars_of_lread):
+	Turn on `load-warn-when-source-newer' by default.  Change loading
+	message to indicate when we are `require'ing.  Eliminate
+	purify_flag hacks to display more messages; instead, loadup and
+	friends specify this explicitly with
+	`load-always-display-messages'.  Add spaces when batch to clearly
+	indicate recursive loading.  Fassoc() does not GC so no need to
+	gcpro.
+
+	* gui-x.c:
+	* gui-x.c (snarf_widget_values_for_gcpro):
+	* gui-x.c (gcpro_popup_callbacks):
+	* gui-x.h:
+	* menubar-x.c:
+	* menubar-x.c (pre_activate_callback):
+	* menubar-x.c (set_frame_menubar):
+	Fix up crashes when selecting menubar items due to lack of GCPROing
+	of callbacks in lwlib structures.
+
+	* eval.c (Fbacktrace):
+	* lisp.h:
+	* print.c:
+	* print.c (canonicalize_printcharfun):
+	Don't canonicalize to selected-frame when noninteractive, or
+	backtraces get all screwed up as some values are printed through
+	the stream console and some aren't.  Export
+	canonicalize_printcharfun() and use in Fbacktrace().
+
 2003-02-05  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* config.h.in: New symbol: DLSYM_NEEDS_UNDERSCORE.
diff -r 278c9cd3435e -r 465bd3c7d932 src/Makefile.in.in
--- a/src/Makefile.in.in	Wed Feb 05 22:53:04 2003 +0000
+++ b/src/Makefile.in.in	Thu Feb 06 06:36:17 2003 +0000
@@ -503,10 +503,10 @@
 FRC.update-elc.stamp :
 
 update-elc.stamp : ${EXE_TARGET} FRC.update-elc.stamp
-	@touch NOBYTECOMPILE
+	@touch BYTECOMPILE_CHANGE
 	./${EXE_TARGET} -nd ${batch} -l ${srcdir}/../lisp/update-elc.el
-	@if test ! -f $@ -o -f NOBYTECOMPILE; then touch $@; fi; \
-	 $(RM) NOBYTECOMPILE
+	@if test ! -f $@ -o -f BYTECOMPILE_CHANGE; then touch $@; fi; \
+	 $(RM) BYTECOMPILE_CHANGE
 
 obj_src = $(objs:.o=.c)
 
diff -r 278c9cd3435e -r 465bd3c7d932 src/esd.c
--- a/src/esd.c	Wed Feb 05 22:53:04 2003 +0000
+++ b/src/esd.c	Thu Feb 06 06:36:17 2003 +0000
@@ -51,8 +51,7 @@
   fmtType        ffmt;
   int            fmt,speed,tracks;
   unsigned char *pptr,*optr,*cptr,*sptr;
-  ssize_t        wrtn;
-  size_t         crtn;
+  Bytecount      wrtn, crtn;
   size_t         prtn;
   int flags, sock;
 
@@ -116,18 +115,21 @@
   for (pptr = data; (prtn = parsesndfile((void **)&pptr,&length,
                                         (void **)&optr)) > 0; )
     for (cptr = optr; (crtn = sndcnv((void **)&cptr,&prtn,
-                                    (void **)&sptr)) > 0; ) {
-      if ((wrtn = write(sock,sptr,crtn)) < 0) {
-	sound_perror ("write error");
-       goto END_OF_PLAY;
+                                    (void **)&sptr)) > 0; )
+      {
+	if ((wrtn = write(sock,sptr,crtn)) < 0)
+	  {
+	    sound_perror ("write error");
+	    goto END_OF_PLAY;
+	  }
+	if (wrtn != crtn)
+	  {
+	    Extbyte warn_buf[255];
+	    sprintf (warn_buf, "only wrote %ld of %ld bytes", wrtn, crtn);
+	    sound_warn (warn_buf);
+	    goto END_OF_PLAY;
+	  }
       }
-      if (wrtn != crtn) {
-	Extbyte warn_buf[255];
-	sprintf (warn_buf , "only wrote %d of %d bytes", wrtn, crtn);
-	sound_warn (warn_buf);
-       goto END_OF_PLAY;
-      }
-    }
 
   if (ffmt == fmtWave)
     parse_wave_complete();
diff -r 278c9cd3435e -r 465bd3c7d932 src/eval.c
--- a/src/eval.c	Wed Feb 05 22:53:04 2003 +0000
+++ b/src/eval.c	Thu Feb 06 06:36:17 2003 +0000
@@ -6094,10 +6094,7 @@
 
   GCPRO2 (stream, old_level);
 
-  if (NILP (stream))
-    stream = Vstandard_output;
-  if (!noninteractive && (NILP (stream) || EQ (stream, Qt)))
-    stream = Fselected_frame (Qnil);
+  stream = canonicalize_printcharfun (stream);
 
   for (;;)
     {
diff -r 278c9cd3435e -r 465bd3c7d932 src/fns.c
--- a/src/fns.c	Wed Feb 05 22:53:04 2003 +0000
+++ b/src/fns.c	Thu Feb 06 06:36:17 2003 +0000
@@ -1,6 +1,6 @@
 /* Random utility Lisp functions.
    Copyright (C) 1985, 86, 87, 93, 94, 95 Free Software Foundation, Inc.
-   Copyright (C) 1995, 1996, 2000, 2001, 2002 Ben Wing.
+   Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -64,8 +64,6 @@
 static int internal_old_equal (Lisp_Object, Lisp_Object, int);
 Lisp_Object safe_copy_tree (Lisp_Object arg, Lisp_Object vecp, int depth);
 
-int require_prints_loading_message;
-
 static Lisp_Object
 mark_bit_vector (Lisp_Object obj)
 {
@@ -3565,7 +3563,7 @@
       Vautoload_queue = Qt;
 
       tem = call4 (Qload, NILP (filename) ? Fsymbol_name (feature) : filename,
-		   noerror, require_prints_loading_message ? Qrequire : Qt, Qnil);
+		   noerror, Qrequire, Qnil);
       /* If load failed entirely, return nil.  */
       if (NILP (tem))
 	return unbind_to_1 (speccount, Qnil);
@@ -4072,11 +4070,6 @@
     char c = SEPCHAR;
     Vpath_separator = make_string ((Ibyte *) &c, 1);
   }
-
-  DEFVAR_BOOL ("require-prints-loading-message",
-	       &require_prints_loading_message /*
-If non-nil, every time a file is loaded by `require' a message is printed.
-*/ );
 }
 
 void
diff -r 278c9cd3435e -r 465bd3c7d932 src/gui-x.c
--- a/src/gui-x.c	Wed Feb 05 22:53:04 2003 +0000
+++ b/src/gui-x.c	Thu Feb 06 06:36:17 2003 +0000
@@ -1,6 +1,6 @@
 /* General GUI code -- X-specific. (menubars, scrollbars, toolbars, dialogs)
    Copyright (C) 1995 Board of Trustees, University of Illinois.
-   Copyright (C) 1995, 1996, 2000, 2001, 2002 Ben Wing.
+   Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003 Ben Wing.
    Copyright (C) 1995 Sun Microsystems, Inc.
    Copyright (C) 1998 Free Software Foundation, Inc.
 
@@ -105,6 +105,21 @@
   return 0;
 }
 
+/* Snarf the callbacks and other Lisp data that are hidden in the lwlib
+   call-data and accel and stick them into POPUP-DATA for proper marking. */
+
+void
+snarf_widget_values_for_gcpro (Lisp_Object popup_data)
+{
+  struct popup_data *pdata = XPOPUP_DATA (popup_data);
+
+  free_list (pdata->protect_me);
+  pdata->protect_me = Qnil;
+
+  if (pdata->id)
+    lw_map_widget_values (pdata->id, snarf_widget_value_mapper, pdata);
+}
+
 void
 gcpro_popup_callbacks (LWLIB_ID id)
 {
@@ -120,12 +135,7 @@
   pdata->menubar_contents_up_to_date = 0;
   lpdata = wrap_popup_data (pdata);
 
-  /* Now snarf the callbacks and such that are hidden in the lwlib
-     call-data and accel and stick them into the list for proper
-     marking. */
-
-  if (pdata->id)
-    lw_map_widget_values (pdata->id, snarf_widget_value_mapper, pdata);
+  snarf_widget_values_for_gcpro (lpdata);
 
   Vpopup_callbacks = Fcons (Fcons (lid, lpdata), Vpopup_callbacks);
 }
diff -r 278c9cd3435e -r 465bd3c7d932 src/gui-x.h
--- a/src/gui-x.h	Wed Feb 05 22:53:04 2003 +0000
+++ b/src/gui-x.h	Thu Feb 06 06:36:17 2003 +0000
@@ -1,6 +1,6 @@
 /* General GUI code -- X-specific header file.
    Copyright (C) 1993, 1994 Free Software Foundation, Inc.
-   Copyright (C) 1996, 2000, 2002 Ben Wing.
+   Copyright (C) 1996, 2000, 2002, 2003 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -69,6 +69,7 @@
 #define POPUP_DATAP(x) RECORDP (x, popup_data)
 #define CHECK_POPUP_DATA(x) CHECK_RECORD (x, popup_data)
 
+void snarf_widget_values_for_gcpro (Lisp_Object popup_data);
 void gcpro_popup_callbacks (LWLIB_ID id);
 void ungcpro_popup_callbacks (LWLIB_ID id);
 int popup_handled_p (LWLIB_ID id);
diff -r 278c9cd3435e -r 465bd3c7d932 src/lisp.h
--- a/src/lisp.h	Wed Feb 05 22:53:04 2003 +0000
+++ b/src/lisp.h	Thu Feb 06 06:36:17 2003 +0000
@@ -4432,6 +4432,7 @@
 							   ...), 1, 2);
 
 /* Internal functions: */
+Lisp_Object canonicalize_printcharfun (Lisp_Object printcharfun);
 void temp_output_buffer_setup (Lisp_Object);
 void temp_output_buffer_show (Lisp_Object, Lisp_Object);
 void print_cons (Lisp_Object, Lisp_Object, int);
diff -r 278c9cd3435e -r 465bd3c7d932 src/lread.c
--- a/src/lread.c	Wed Feb 05 22:53:04 2003 +0000
+++ b/src/lread.c	Thu Feb 06 06:36:17 2003 +0000
@@ -1,7 +1,7 @@
 /* Lisp parsing and input streams.
    Copyright (C) 1985-1989, 1992-1995 Free Software Foundation, Inc.
    Copyright (C) 1995 Tinker Systems.
-   Copyright (C) 1996, 2001, 2002 Ben Wing.
+   Copyright (C) 1996, 2001, 2002, 2003 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -213,8 +213,8 @@
 /* When errors are signaled, the actual readcharfun should not be used
    as an argument if it is an lstream, so that lstreams don't escape
    to the Lisp level.  */
-#define READCHARFUN_MAYBE(x) (LSTREAMP (x)					\
-			      ? (build_msg_string ("internal input stream"))	\
+#define READCHARFUN_MAYBE(x) (LSTREAMP (x)				     \
+			      ? (build_msg_string ("internal input stream")) \
 			      : (x))
 
 
@@ -500,23 +500,17 @@
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
   int reading_elc = 0;
   int from_require = EQ (nomessage, Qrequire);
-  int message_p =
-    NILP (nomessage) || from_require || load_always_display_messages;
-/*#ifdef DEBUG_XEMACS*/
+  int message_p = NILP (nomessage) || load_always_display_messages;
   static Lisp_Object last_file_loaded;
-/*#endif*/
   struct stat s1, s2;
   GCPRO4 (file, newer, older, found);
+  Ibyte *spaces = alloca_ibytes (load_in_progress * 2 + 10);
+  int i;
 
   CHECK_STRING (file);
 
-/*#ifdef DEBUG_XEMACS*/
-  if (purify_flag && noninteractive)
-    {
-      message_p = 1;
-      last_file_loaded = file;
-    }
-/*#endif / * DEBUG_XEMACS */
+  if (noninteractive)
+    last_file_loaded = file;
 
   /* If file name is magic, call the handler.  */
   handler = Ffind_file_name_handler (file, Qload);
@@ -531,6 +525,15 @@
   if (!NILP (used_codesys))
     CHECK_SYMBOL (used_codesys);
 
+  if (noninteractive)
+    {
+      for (i = 0; i < load_in_progress * 2; i++)
+	spaces[i] = ' ';
+      spaces[i] = '\0';
+    }
+  else
+    spaces[0] = '\0';
+
   /* Avoid weird lossage with null string as arg,
      since it would try to load a directory as a Lisp file.
      Unix truly sucks. */
@@ -621,40 +624,40 @@
   if (load_ignore_elc_files)						\
     {									\
       if (message_p)							\
-	message (loading done,						\
+	message (loading done, spaces,					\
 		 XSTRING_DATA (load_show_full_path_in_messages ?	\
 			       found : newer));				\
     }									\
   else if (!NILP (older))						\
     {									\
       assert (load_ignore_out_of_date_elc_files);			\
-      message (loading done " (file %s is out-of-date)",		\
+      message (loading done " (file %s is out-of-date)", spaces,	\
 	       XSTRING_DATA (load_show_full_path_in_messages ?		\
 			     found : newer),				\
 	       XSTRING_DATA (older));					\
     }									\
   else if (!NILP (newer))						\
-    message (loading done " (file %s is newer)",			\
+    message (loading done " (file %s is newer)", spaces,		\
 	     XSTRING_DATA (load_show_full_path_in_messages ?		\
 			   found : file),				\
 	     XSTRING_DATA (newer));					\
   else if (source_only)							\
-    message (loading done " (file %s.elc does not exist)",		\
+    message (loading done " (file %s.elc does not exist)", spaces,	\
 	     XSTRING_DATA (load_show_full_path_in_messages ?		\
 			   found : file),				\
 	     XSTRING_DATA (Ffile_name_nondirectory (file)));		\
   else if (message_p)							\
-    message (loading done,						\
+    message (loading done, spaces,					\
 	     XSTRING_DATA (load_show_full_path_in_messages ?		\
 			   found : file));				\
   } while (0)
 
-#define PRINT_LOADING_MESSAGE(done)			\
-do {							\
-  if (from_require)					\
-    PRINT_LOADING_MESSAGE_1 ("Requiring %s...", done);	\
-  else							\
-    PRINT_LOADING_MESSAGE_1 ("Loading %s...", done);	\
+#define PRINT_LOADING_MESSAGE(done)				\
+do {								\
+  if (from_require)						\
+    PRINT_LOADING_MESSAGE_1 ("%sRequiring %s...", done);	\
+  else								\
+    PRINT_LOADING_MESSAGE_1 ("%sLoading %s...", done);		\
 } while (0)
 
   PRINT_LOADING_MESSAGE ("");
@@ -736,13 +739,7 @@
     if (!NILP (Ffile_name_absolute_p (file)))
 	name = Ffile_name_nondirectory (file);
 
-    {
-      struct gcpro ngcpro1;
-
-      NGCPRO1 (name);
-      tem = Fassoc (name, Vafter_load_alist);
-      NUNGCPRO;
-    }
+    tem = Fassoc (name, Vafter_load_alist);
     if (!NILP (tem))
       {
 	struct gcpro ngcpro1;
@@ -755,13 +752,13 @@
       }
   }
 
-/* #ifdef DEBUG_XEMACS */
-  if (purify_flag && noninteractive)
+  if (message_p && noninteractive && !EQ (last_file_loaded, file))
     {
-      if (!EQ (last_file_loaded, file))
-	message ("Loading %s ...done", XSTRING_DATA (file));
+      if (from_require)
+	message ("%sRequiring %s ...done", spaces, XSTRING_DATA (file));
+      else
+	message ("%sLoading %s ...done", spaces, XSTRING_DATA (file));
     }
-/* #endif / * DEBUG_XEMACS */
 
   if (!noninteractive)
     PRINT_LOADING_MESSAGE ("done");
@@ -3116,7 +3113,7 @@
 If this variable is true, then when a `.elc' file is being loaded and the
 corresponding `.el' is newer, a warning message will be printed.
 */ );
-  load_warn_when_source_newer = 0;
+  load_warn_when_source_newer = 1;
 
   DEFVAR_BOOL ("load-warn-when-source-only", &load_warn_when_source_only /*
 *Whether `load' should warn when loading a `.el' file instead of an `.elc'.
diff -r 278c9cd3435e -r 465bd3c7d932 src/menubar-x.c
--- a/src/menubar-x.c	Wed Feb 05 22:53:04 2003 +0000
+++ b/src/menubar-x.c	Thu Feb 06 06:36:17 2003 +0000
@@ -1,7 +1,7 @@
 /* Implements an elisp-programmable menubar -- X interface.
    Copyright (C) 1993, 1994 Free Software Foundation, Inc.
    Copyright (C) 1995 Tinker Systems and INS Engineering Corp.
-   Copyright (C) 2000, 2001 ,2002 Ben Wing.
+   Copyright (C) 2000, 2001, 2002, 2003 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -487,6 +487,10 @@
       assert (wv && wv->type == CASCADE_TYPE && wv->contents);
       replace_widget_value_tree (hack_wv, wv->contents);
       free_popup_widget_value_tree (wv);
+      /* Now that we've destructively modified part of the widget value
+	 hierarchy, our list of protected callbacks will no longer be
+	 valid, so we need to recompute it. */
+      snarf_widget_values_for_gcpro (FRAME_MENUBAR_DATA (f));
     }
   else if (!POPUP_DATAP (FRAME_MENUBAR_DATA (f)))
     return;
@@ -613,6 +617,12 @@
     }
   free_popup_widget_value_tree (data);
 
+  /* Buried inside of the lwlib data are pointers to Lisp objects that may
+     have been freshly created.  They need to be GC-protected, so snarf them
+     now and record them into the popup-data object associated with the
+     frame. */
+  snarf_widget_values_for_gcpro (FRAME_MENUBAR_DATA (f));
+
   XFRAME_MENUBAR_DATA (f)->menubar_contents_up_to_date = deep_p;
   XFRAME_MENUBAR_DATA (f)->last_menubar_buffer =
     XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->buffer;
diff -r 278c9cd3435e -r 465bd3c7d932 src/print.c
--- a/src/print.c	Wed Feb 05 22:53:04 2003 +0000
+++ b/src/print.c	Thu Feb 06 06:36:17 2003 +0000
@@ -1,6 +1,6 @@
 /* Lisp object printing and output streams.
    Copyright (C) 1985, 1986, 1988, 1992-1995 Free Software Foundation, Inc.
-   Copyright (C) 1995, 1996, 2000, 2001, 2002 Ben Wing.
+   Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -439,13 +439,13 @@
     Vprint_gensym_alist = Qnil;			\
 } while (0)
 
-static Lisp_Object
+Lisp_Object
 canonicalize_printcharfun (Lisp_Object printcharfun)
 {
   if (NILP (printcharfun))
     printcharfun = Vstandard_output;
 
-  if (EQ (printcharfun, Qt) || NILP (printcharfun))
+  if (!noninteractive && (EQ (printcharfun, Qt) || NILP (printcharfun)))
     printcharfun = Fselected_frame (Qnil); /* print to minibuffer */
 
   return printcharfun;