diff -r -u xemacs-21.4.22/ChangeLog xemacs-21.4.23/ChangeLog
--- xemacs-21.4.22/ChangeLog	2008-12-28 21:18:50.000000000 -0500
+++ xemacs-21.4.23/ChangeLog	2015-01-29 10:04:29.000000000 -0500
@@ -1,3 +1,16 @@
+2015-01-29  Vin Shelton <acs@xemacs.org>
+ 
+	* XEmacs 21.4.23 is released
+
+2015-01-08  Vin Shelton  <acs@xemacs.org>
+
+	Fix progress bar crashes.
+	Thanks to Ralf Soergel for diagnosis and a patch.
+
+	* configure.in (Athena widgets):
+	Test for "international" resource in SimpleWidgetClass in libXaw3d.
+	* configure: Rebuild.
+
 2008-12-28  Vin Shelton  <acs@xemacs.org>
 
 	* XEmacs 21.4.22 is released
diff -r -u xemacs-21.4.22/configure xemacs-21.4.23/configure
--- xemacs-21.4.22/configure	2006-12-07 22:31:17.000000000 -0500
+++ xemacs-21.4.23/configure	2015-01-29 10:04:29.000000000 -0500
@@ -4513,6 +4513,7 @@
 #line 4514 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4521,7 +4522,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -4549,12 +4550,13 @@
   exit 1
 fi
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4553: checking size of int" >&5
+echo "configure:4554: checking size of int" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4556 "configure"
+#line 4557 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4563,7 +4565,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -4585,12 +4587,13 @@
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4589: checking size of long" >&5
+echo "configure:4591: checking size of long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4592 "configure"
+#line 4594 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4599,7 +4602,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -4621,12 +4624,13 @@
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4625: checking size of long long" >&5
+echo "configure:4628: checking size of long long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4628 "configure"
+#line 4631 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4635,7 +4639,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4643: \"$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
@@ -4657,12 +4661,13 @@
 
 
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:4661: checking size of void *" >&5
+echo "configure:4665: checking size of void *" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4664 "configure"
+#line 4668 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4671,7 +4676,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4680: \"$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
@@ -4695,7 +4700,7 @@
 
 case $opsys in
   cygwin* ) cat > conftest.$ac_ext <<EOF
-#line 4699 "configure"
+#line 4704 "configure"
 #include "confdefs.h"
 #include <cygwin/types.h>
 EOF
@@ -4720,7 +4725,7 @@
 esac
 
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:4724: checking for long file names" >&5
+echo "configure:4729: 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:
@@ -4766,10 +4771,10 @@
 
 
 echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:4770: checking for sin" >&5
+echo "configure:4775: checking for sin" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4773 "configure"
+#line 4778 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sin(); below.  */
@@ -4792,7 +4797,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4801: \"$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
@@ -4810,12 +4815,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:4814: checking for sin in -lm" >&5
+echo "configure:4819: 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 4819 "configure"
+#line 4824 "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
@@ -4826,7 +4831,7 @@
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:4830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4835: \"$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
@@ -4870,14 +4875,14 @@
 
 
 cat > conftest.$ac_ext <<EOF
-#line 4874 "configure"
+#line 4879 "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:4881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4886: \"$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
@@ -4894,14 +4899,14 @@
 rm -f conftest*
 
 echo "checking type of mail spool file locking" 1>&6
-echo "configure:4898: checking type of mail spool file locking" >&5
+echo "configure:4903: 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:4902: checking for $ac_func" >&5
+echo "configure:4907: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4905 "configure"
+#line 4910 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4924,7 +4929,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4933: \"$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
@@ -5006,12 +5011,12 @@
 case "$opsys" in decosf*)
   
 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:5010: checking for cma_open in -lpthreads" >&5
+echo "configure:5015: 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 5015 "configure"
+#line 5020 "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
@@ -5022,7 +5027,7 @@
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:5026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5031: \"$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
@@ -5059,7 +5064,7 @@
 
 
 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:5063: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:5068: 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;
@@ -5071,7 +5076,7 @@
 if test "$opsys" = "sol2"; then
   if test "$os_release" -ge 506; then
     echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:5075: checking for \"-z ignore\" linker flag" >&5
+echo "configure:5080: 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 ;;
@@ -5082,7 +5087,7 @@
 
 
 echo "checking "for specified window system"" 1>&6
-echo "configure:5086: checking "for specified window system"" >&5
+echo "configure:5091: checking "for specified window system"" >&5
 
 
 GNOME_CONFIG=no
@@ -5090,7 +5095,7 @@
 
 if test "$with_gnome" != "no"; then
    echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6
-echo "configure:5094: checking for GNOME configuration script" >&5
+echo "configure:5099: checking for GNOME configuration script" >&5
    for possible in gnome-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5121,7 +5126,7 @@
 
 if test "$with_gtk" != "no";then
    echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6
-echo "configure:5125: checking for GTK configuration script" >&5
+echo "configure:5130: checking for GTK configuration script" >&5
    for possible in gtk12-config gtk14-config gtk-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5143,18 +5148,18 @@
 
 if test "${GTK_CONFIG}" != "no"; then
       echo $ac_n "checking gtk version""... $ac_c" 1>&6
-echo "configure:5147: checking gtk version" >&5
+echo "configure:5152: 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:5152: checking gtk libs" >&5
+echo "configure:5157: 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:5158: checking gtk cflags" >&5
+echo "configure:5163: checking gtk cflags" >&5
       GTK_CFLAGS=`${GTK_CONFIG} --cflags`
       if test "$GCC" = "yes"; then
       	GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow"
@@ -5164,19 +5169,19 @@
 
       
 echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6
-echo "configure:5168: checking for main in -lgdk_imlib" >&5
+echo "configure:5173: 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 5173 "configure"
+#line 5178 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5185: \"$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
@@ -5198,12 +5203,12 @@
 
       
 echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6
-echo "configure:5202: checking for Imlib_init in -lImlib" >&5
+echo "configure:5207: 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 5207 "configure"
+#line 5212 "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
@@ -5214,7 +5219,7 @@
 Imlib_init()
 ; return 0; }
 EOF
-if { (eval echo configure:5218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5223: \"$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
@@ -5237,10 +5242,10 @@
       for ac_func in gdk_imlib_init
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5241: checking for $ac_func" >&5
+echo "configure:5246: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5244 "configure"
+#line 5249 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5263,7 +5268,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5272: \"$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
@@ -5342,15 +5347,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5346: checking for $ac_hdr" >&5
+echo "configure:5351: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5349 "configure"
+#line 5354 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5359: \"$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*
@@ -5381,19 +5386,19 @@
 
       
 echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6
-echo "configure:5385: checking for main in -lxml" >&5
+echo "configure:5390: 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 5390 "configure"
+#line 5395 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5402: \"$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
@@ -5415,19 +5420,19 @@
 
       
 echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6
-echo "configure:5419: checking for main in -lglade" >&5
+echo "configure:5424: 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 5424 "configure"
+#line 5429 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5436: \"$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
@@ -5449,19 +5454,19 @@
 
       
 echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6
-echo "configure:5453: checking for main in -lglade-gnome" >&5
+echo "configure:5458: 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 5458 "configure"
+#line 5463 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5470: \"$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
@@ -5482,7 +5487,7 @@
 
 
       cat > conftest.$ac_ext <<EOF
-#line 5486 "configure"
+#line 5491 "configure"
 #include "confdefs.h"
 #include <glade/glade-xml.h>
 EOF
@@ -5541,7 +5546,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:5545: checking for X" >&5
+echo "configure:5550: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -5601,12 +5606,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 5605 "configure"
+#line 5610 "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:5610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5615: \"$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*
@@ -5675,14 +5680,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5679 "configure"
+#line 5684 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:5686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5691: \"$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.
@@ -5791,17 +5796,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:5795: checking whether -R must be followed by a space" >&5
+echo "configure:5800: 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 5798 "configure"
+#line 5803 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -5817,14 +5822,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 5821 "configure"
+#line 5826 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -5860,12 +5865,12 @@
 else
 
 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:5864: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:5869: 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 5869 "configure"
+#line 5874 "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
@@ -5876,7 +5881,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5885: \"$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
@@ -5900,12 +5905,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:5904: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:5909: 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 5909 "configure"
+#line 5914 "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
@@ -5916,7 +5921,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5925: \"$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
@@ -5945,10 +5950,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:5949: checking for gethostbyname" >&5
+echo "configure:5954: checking for gethostbyname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5952 "configure"
+#line 5957 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -5971,7 +5976,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5980: \"$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
@@ -5992,12 +5997,12 @@
     if test $ac_cv_func_gethostbyname = no; then
       
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:5996: checking for gethostbyname in -lnsl" >&5
+echo "configure:6001: 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 6001 "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
@@ -6008,7 +6013,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:6012: \"$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
@@ -6038,10 +6043,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:6042: checking for connect" >&5
+echo "configure:6047: checking for connect" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6045 "configure"
+#line 6050 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -6064,7 +6069,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6073: \"$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
@@ -6087,12 +6092,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:6091: checking "$xe_msg_checking"" >&5
+echo "configure:6096: 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 6096 "configure"
+#line 6101 "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
@@ -6103,7 +6108,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:6107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6112: \"$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
@@ -6127,10 +6132,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:6131: checking for remove" >&5
+echo "configure:6136: checking for remove" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6134 "configure"
+#line 6139 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -6153,7 +6158,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6162: \"$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
@@ -6174,12 +6179,12 @@
     if test $ac_cv_func_remove = no; then
       
 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:6178: checking for remove in -lposix" >&5
+echo "configure:6183: 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 6183 "configure"
+#line 6188 "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
@@ -6190,7 +6195,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:6194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6199: \"$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
@@ -6214,10 +6219,10 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:6218: checking for shmat" >&5
+echo "configure:6223: checking for shmat" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6221 "configure"
+#line 6226 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -6240,7 +6245,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6249: \"$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
@@ -6261,12 +6266,12 @@
     if test $ac_cv_func_shmat = no; then
       
 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:6265: checking for shmat in -lipc" >&5
+echo "configure:6270: 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 6270 "configure"
+#line 6275 "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
@@ -6277,7 +6282,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:6281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6286: \"$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
@@ -6313,12 +6318,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:6317: checking "$xe_msg_checking"" >&5
+echo "configure:6322: 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 6322 "configure"
+#line 6327 "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
@@ -6329,7 +6334,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:6333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6338: \"$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
@@ -6375,15 +6380,15 @@
 
     ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:6379: checking for Xm/Xm.h" >&5
+echo "configure:6384: checking for Xm/Xm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6382 "configure"
+#line 6387 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6392: \"$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*
@@ -6400,12 +6405,12 @@
   echo "$ac_t""yes" 1>&6
   
 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:6404: checking for XmStringFree in -lXm" >&5
+echo "configure:6409: 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 6409 "configure"
+#line 6414 "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
@@ -6416,7 +6421,7 @@
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:6420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6425: \"$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
@@ -6568,7 +6573,7 @@
 
 
     echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:6572: checking for X defines extracted by xmkmf" >&5
+echo "configure:6577: checking for X defines extracted by xmkmf" >&5
   rm -fr conftestdir
   if mkdir conftestdir; then
     cd conftestdir
@@ -6617,15 +6622,15 @@
 
     ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:6621: checking for X11/Intrinsic.h" >&5
+echo "configure:6626: checking for X11/Intrinsic.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6624 "configure"
+#line 6629 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6629: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6634: \"$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*
@@ -6649,12 +6654,12 @@
 
       
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:6653: checking for XOpenDisplay in -lX11" >&5
+echo "configure:6658: 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 6658 "configure"
+#line 6663 "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
@@ -6665,7 +6670,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6674: \"$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
@@ -6690,12 +6695,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:6694: checking "$xe_msg_checking"" >&5
+echo "configure:6699: 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 6699 "configure"
+#line 6704 "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
@@ -6706,7 +6711,7 @@
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:6710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6715: \"$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
@@ -6733,12 +6738,12 @@
 
     
 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:6737: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:6742: 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 6742 "configure"
+#line 6747 "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
@@ -6749,7 +6754,7 @@
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:6753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6758: \"$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
@@ -6772,12 +6777,12 @@
 
     
 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:6776: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:6781: 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 6781 "configure"
+#line 6786 "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
@@ -6788,7 +6793,7 @@
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6797: \"$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
@@ -6811,14 +6816,14 @@
 
 
   echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:6815: checking the version of X11 being used" >&5
+echo "configure:6820: checking the version of X11 being used" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6817 "configure"
+#line 6822 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
     int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:6822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest foobar; x11_release=$?
 else
@@ -6849,10 +6854,10 @@
   for ac_func in XConvertCase XtRegisterDrawable
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6853: checking for $ac_func" >&5
+echo "configure:6858: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6856 "configure"
+#line 6861 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6875,7 +6880,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6884: \"$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
@@ -6907,15 +6912,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6911: checking for $ac_hdr" >&5
+echo "configure:6916: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6914 "configure"
+#line 6919 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6924: \"$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*
@@ -6948,10 +6953,10 @@
     for ac_func in XRegisterIMInstantiateCallback
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6952: checking for $ac_func" >&5
+echo "configure:6957: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6955 "configure"
+#line 6960 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6974,7 +6979,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6983: \"$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
@@ -7002,9 +7007,9 @@
 done
 
   echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6
-echo "configure:7006: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+echo "configure:7011: checking for standard XRegisterIMInstantiateCallback prototype" >&5
   cat > conftest.$ac_ext <<EOF
-#line 7008 "configure"
+#line 7013 "configure"
 #include "confdefs.h"
 
 #define NeedFunctionPrototypes 1
@@ -7016,7 +7021,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7020: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -7037,12 +7042,12 @@
 
     test -z "$with_xmu" && { 
 echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:7041: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:7046: 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 7046 "configure"
+#line 7051 "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
@@ -7053,7 +7058,7 @@
 XmuReadBitmapDataFromFile()
 ; return 0; }
 EOF
-if { (eval echo configure:7057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7062: \"$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
@@ -7092,19 +7097,19 @@
 
       
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:7096: checking for main in -lXbsd" >&5
+echo "configure:7101: 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 7101 "configure"
+#line 7106 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7113: \"$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
@@ -7128,7 +7133,7 @@
     if test "$unexec" = "unexaix.o" -a "$x11_release" = "6"; then
         if test "$GCC" = "yes"; then
                   echo $ac_n "checking for name of AIX gcc threads option""... $ac_c" 1>&6
-echo "configure:7132: checking for name of AIX gcc threads option" >&5
+echo "configure:7137: checking for name of AIX gcc threads option" >&5
       case `$CC -v --help 2>&1` in
         *-mthreads*) aix_threads=-mthreads ;;
                   *) aix_threads=-pthread  ;;
@@ -7142,12 +7147,13 @@
          xe_save_CC="$CC"
          CC="${CC}_r"
          echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:7146: checking size of short" >&5
+echo "configure:7151: checking size of short" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7149 "configure"
+#line 7154 "configure"
 #include "confdefs.h"
 #include <stdio.h>
+#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -7156,7 +7162,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:7160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -7185,22 +7191,22 @@
 fi 
 if test "$with_msw" != "no"; then
   echo "checking for MS-Windows" 1>&6
-echo "configure:7189: checking for MS-Windows" >&5
+echo "configure:7195: checking for MS-Windows" >&5
   
 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:7192: checking for main in -lgdi32" >&5
+echo "configure:7198: 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 7197 "configure"
+#line 7203 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7210: \"$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
@@ -7273,12 +7279,12 @@
  fi
     fi
         cat > conftest.$ac_ext <<EOF
-#line 7277 "configure"
+#line 7283 "configure"
 #include "confdefs.h"
 #include <fcntl.h>
     int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
 EOF
-if { (eval echo configure:7282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   need_event_unixoid=yes; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MSG_SELECT
@@ -7342,15 +7348,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:7346: checking for X11/extensions/shape.h" >&5
+echo "configure:7352: checking for X11/extensions/shape.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7349 "configure"
+#line 7355 "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:7354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7360: \"$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*
@@ -7402,7 +7408,7 @@
 esac
 
 echo "checking for WM_COMMAND option" 1>&6
-echo "configure:7406: checking for WM_COMMAND option" >&5;
+echo "configure:7412: checking for WM_COMMAND option" >&5;
 if test "$with_wmcommand" != "no"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_WMCOMMAND
@@ -7417,15 +7423,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:7421: checking for X11/Xauth.h" >&5
+echo "configure:7427: checking for X11/Xauth.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7424 "configure"
+#line 7430 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7435: \"$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*
@@ -7448,12 +7454,12 @@
  }
 test -z "$with_xauth" && { 
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:7452: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:7458: 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 7457 "configure"
+#line 7463 "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
@@ -7464,7 +7470,7 @@
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:7468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7474: \"$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
@@ -7509,15 +7515,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:7513: checking for ${dir}tt_c.h" >&5
+echo "configure:7519: checking for ${dir}tt_c.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7516 "configure"
+#line 7522 "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:7521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7527: \"$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*
@@ -7553,12 +7559,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:7557: checking "$xe_msg_checking"" >&5
+echo "configure:7563: 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 7562 "configure"
+#line 7568 "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
@@ -7569,7 +7575,7 @@
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:7573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7579: \"$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
@@ -7626,15 +7632,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:7630: checking for Dt/Dt.h" >&5
+echo "configure:7636: checking for Dt/Dt.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7633 "configure"
+#line 7639 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7644: \"$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*
@@ -7657,12 +7663,12 @@
  }
 test -z "$with_cde" && { 
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:7661: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:7667: 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 7666 "configure"
+#line 7672 "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
@@ -7673,7 +7679,7 @@
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:7677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7683: \"$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
@@ -7746,7 +7752,7 @@
 
 if test "$with_dragndrop" != "no" ; then
   echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
-echo "configure:7750: checking if drag and drop API is needed" >&5
+echo "configure:7756: 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
@@ -7766,18 +7772,18 @@
 fi
 
 echo "checking for LDAP" 1>&6
-echo "configure:7770: checking for LDAP" >&5
+echo "configure:7776: checking for LDAP" >&5
 test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ldap.h""... $ac_c" 1>&6
-echo "configure:7773: checking for ldap.h" >&5
+echo "configure:7779: checking for ldap.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7776 "configure"
+#line 7782 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7787: \"$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*
@@ -7800,15 +7806,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:7804: checking for lber.h" >&5
+echo "configure:7810: checking for lber.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7807 "configure"
+#line 7813 "configure"
 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7818: \"$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*
@@ -7833,10 +7839,10 @@
   if test . != "${ldap_libs+.}";then
     ldap_libs=
     echo $ac_n "checking for ldap_open""... $ac_c" 1>&6
-echo "configure:7837: checking for ldap_open" >&5
+echo "configure:7843: checking for ldap_open" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7840 "configure"
+#line 7846 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char ldap_open(); below.  */
@@ -7859,7 +7865,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_ldap_open=yes"
 else
@@ -7879,12 +7885,12 @@
   echo "$ac_t""no" 1>&6
       
 echo $ac_n "checking for ldap_open in -lldap""... $ac_c" 1>&6
-echo "configure:7883: checking for ldap_open in -lldap" >&5
+echo "configure:7889: checking for ldap_open in -lldap" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap "
 cat > conftest.$ac_ext <<EOF
-#line 7888 "configure"
+#line 7894 "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
@@ -7895,7 +7901,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7905: \"$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
@@ -7917,12 +7923,12 @@
 xe_msg_checking="for ldap_open in -lldap"
 test -n "$ldap_other_libs" && xe_msg_checking="$xe_msg_checking using extra libs $ldap_other_libs"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7921: checking "$xe_msg_checking"" >&5
+echo "configure:7927: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap $ldap_other_libs"
 cat > conftest.$ac_ext <<EOF
-#line 7926 "configure"
+#line 7932 "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
@@ -7933,7 +7939,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7943: \"$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
@@ -7955,12 +7961,12 @@
 xe_msg_checking="for ldap_open in -lldap"
 test -n "$ldap_other_libs" && xe_msg_checking="$xe_msg_checking using extra libs $ldap_other_libs"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7959: checking "$xe_msg_checking"" >&5
+echo "configure:7965: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap $ldap_other_libs"
 cat > conftest.$ac_ext <<EOF
-#line 7964 "configure"
+#line 7970 "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
@@ -7971,7 +7977,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7981: \"$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
@@ -7993,12 +7999,12 @@
 xe_msg_checking="for ldap_open in -lldap"
 test -n "$ldap_other_libs" && xe_msg_checking="$xe_msg_checking using extra libs $ldap_other_libs"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7997: checking "$xe_msg_checking"" >&5
+echo "configure:8003: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap $ldap_other_libs"
 cat > conftest.$ac_ext <<EOF
-#line 8002 "configure"
+#line 8008 "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
@@ -8009,7 +8015,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:8013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8019: \"$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
@@ -8041,10 +8047,10 @@
 
       if test yes = "$with_ldap" -a yes != "$ldap_needs_lber";then
 	echo $ac_n "checking for LDAP_OPT_ON definition""... $ac_c" 1>&6
-echo "configure:8045: checking for LDAP_OPT_ON definition" >&5
+echo "configure:8051: checking for LDAP_OPT_ON definition" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8048 "configure"
+#line 8054 "configure"
 #include "confdefs.h"
 #include <lber.h>
 #include <ldap.h>
@@ -8058,7 +8064,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   xe_cv_have_LDAP_OPT_ON=yes
 else
@@ -8072,12 +8078,12 @@
 echo "$ac_t""$xe_cv_have_LDAP_OPT_ON" 1>&6
 	if test yes = "$xe_cv_have_LDAP_OPT_ON";then
 	  echo $ac_n "checking LDAP_OPT_ON linking""... $ac_c" 1>&6
-echo "configure:8076: checking LDAP_OPT_ON linking" >&5
+echo "configure:8082: checking LDAP_OPT_ON linking" >&5
 
 xe_save_LIBS="$LIBS"
 	    LIBS="-lldap $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8081 "configure"
+#line 8087 "configure"
 #include "confdefs.h"
 #include <lber.h>
 #include <ldap.h>
@@ -8086,7 +8092,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   xe_cv_LDAP_OPT_ON_links=yes
 else
@@ -8102,12 +8108,12 @@
 	  if test yes != "$xe_cv_LDAP_OPT_ON_links";then
 	    ldap_needs_lber=yes ldap_other_libs=-llber
 	    echo $ac_n "checking LDAP_OPT_ON linking with -llber""... $ac_c" 1>&6
-echo "configure:8106: checking LDAP_OPT_ON linking with -llber" >&5
+echo "configure:8112: checking LDAP_OPT_ON linking with -llber" >&5
 
 xe_save_LIBS="$LIBS"
 	      LIBS="-lldap $ldap_other_libs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8111 "configure"
+#line 8117 "configure"
 #include "confdefs.h"
 #include <lber.h>
 #include <ldap.h>
@@ -8116,7 +8122,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   xe_cv_LDAP_OPT_ON_links_w_lber=yes
 else
@@ -8152,10 +8158,10 @@
   else
     save_LIBS="$LIBS" LIBS="$ldap_libs $LIBS"
     echo $ac_n "checking for ldap_open""... $ac_c" 1>&6
-echo "configure:8156: checking for ldap_open" >&5
+echo "configure:8162: checking for ldap_open" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8159 "configure"
+#line 8165 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char ldap_open(); below.  */
@@ -8178,7 +8184,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_ldap_open=yes"
 else
@@ -8218,10 +8224,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:8222: checking for $ac_func" >&5
+echo "configure:8228: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8225 "configure"
+#line 8231 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8244,7 +8250,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8254: \"$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
@@ -8275,20 +8281,20 @@
 
 if test "$with_postgresql" != "no"; then
   echo "checking for PostgreSQL" 1>&6
-echo "configure:8279: checking for PostgreSQL" >&5
+echo "configure:8285: 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:8284: checking for ${header_dir}libpq-fe.h" >&5
+echo "configure:8290: checking for ${header_dir}libpq-fe.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8287 "configure"
+#line 8293 "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:8292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8298: \"$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*
@@ -8312,12 +8318,12 @@
 
   test -n "$libpq_fe_h_file" && { 
 echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:8316: checking for PQconnectdb in -lpq" >&5
+echo "configure:8322: 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 8321 "configure"
+#line 8327 "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
@@ -8328,7 +8334,7 @@
 PQconnectdb()
 ; return 0; }
 EOF
-if { (eval echo configure:8332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8338: \"$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
@@ -8361,12 +8367,12 @@
 
     
 echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
-echo "configure:8365: checking for PQconnectStart in -lpq" >&5
+echo "configure:8371: 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 8370 "configure"
+#line 8376 "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
@@ -8377,7 +8383,7 @@
 PQconnectStart()
 ; return 0; }
 EOF
-if { (eval echo configure:8381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8387: \"$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
@@ -8425,7 +8431,7 @@
 
 if test "$window_system" != "none"; then
   echo "checking for graphics libraries" 1>&6
-echo "configure:8429: checking for graphics libraries" >&5
+echo "configure:8435: checking for graphics libraries" >&5
 
       libpath_xpm=
   incpath_xpm=
@@ -8452,10 +8458,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:8456: checking for Xpm - no older than 3.4f" >&5
+echo "configure:8462: checking for Xpm - no older than 3.4f" >&5
     xe_check_libs="$libname_xpm"
     cat > conftest.$ac_ext <<EOF
-#line 8459 "configure"
+#line 8465 "configure"
 #include "confdefs.h"
 #define XPM_NUMBERS
 #include <X11/xpm.h>
@@ -8464,7 +8470,7 @@
       XpmIncludeVersion != XpmLibraryVersion() ? 1 :
       XpmIncludeVersion < 30406 ? 2 : 0 ;}
 EOF
-if { (eval echo configure:8468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8474: \"$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
@@ -8508,17 +8514,17 @@
     libs_x=""$libname_xpm" $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$libname_xpm"\" 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:8512: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:8518: checking for \"FOR_MSW\" xpm" >&5
     xe_check_libs="$libname_xpm"
     cat > conftest.$ac_ext <<EOF
-#line 8515 "configure"
+#line 8521 "configure"
 #include "confdefs.h"
 
 int main() {
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:8522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   xpm_for_msw=no
 else
@@ -8544,15 +8550,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:8548: checking for compface.h" >&5
+echo "configure:8554: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8551 "configure"
+#line 8557 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8562: \"$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*
@@ -8575,12 +8581,12 @@
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8579: checking for UnGenFace in -lcompface" >&5
+echo "configure:8585: 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 8584 "configure"
+#line 8590 "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
@@ -8591,7 +8597,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:8595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8601: \"$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
@@ -8643,12 +8649,12 @@
       if test "$with_png $with_tiff" != "no no"; then
     
 echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
-echo "configure:8647: checking for inflate in -lc" >&5
+echo "configure:8653: 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 8652 "configure"
+#line 8658 "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
@@ -8659,7 +8665,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8669: \"$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
@@ -8678,12 +8684,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:8682: checking for inflate in -lz" >&5
+echo "configure:8688: 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 8687 "configure"
+#line 8693 "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
@@ -8694,7 +8700,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8704: \"$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
@@ -8713,12 +8719,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:8717: checking for inflate in -lgz" >&5
+echo "configure:8723: 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 8722 "configure"
+#line 8728 "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
@@ -8729,7 +8735,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8739: \"$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
@@ -8759,15 +8765,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:8763: checking for jpeglib.h" >&5
+echo "configure:8769: checking for jpeglib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8766 "configure"
+#line 8772 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8777: \"$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*
@@ -8790,12 +8796,12 @@
  }
   test -z "$with_jpeg" && { 
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:8794: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:8800: 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 8799 "configure"
+#line 8805 "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
@@ -8806,7 +8812,7 @@
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:8810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8816: \"$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
@@ -8842,10 +8848,10 @@
 
     png_problem=""
   test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:8846: checking for pow" >&5
+echo "configure:8852: checking for pow" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8849 "configure"
+#line 8855 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pow(); below.  */
@@ -8868,7 +8874,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8878: \"$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
@@ -8889,15 +8895,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:8893: checking for png.h" >&5
+echo "configure:8899: checking for png.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8896 "configure"
+#line 8902 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8907: \"$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*
@@ -8920,12 +8926,12 @@
  }
   test -z "$with_png" && { 
 echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:8924: checking for png_read_image in -lpng" >&5
+echo "configure:8930: 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 8929 "configure"
+#line 8935 "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
@@ -8936,7 +8942,7 @@
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:8940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8946: \"$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
@@ -8959,10 +8965,10 @@
  }
   if test -z "$with_png"; then
     echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:8963: checking for workable png version information" >&5
+echo "configure:8969: checking for workable png version information" >&5
     xe_check_libs="-lpng -lz"
     cat > conftest.$ac_ext <<EOF
-#line 8966 "configure"
+#line 8972 "configure"
 #include "confdefs.h"
 #include <png.h>
     int main(int c, char **v) {
@@ -8970,7 +8976,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:8974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8980: \"$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
@@ -9013,15 +9019,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:9017: checking for tiffio.h" >&5
+echo "configure:9023: checking for tiffio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9020 "configure"
+#line 9026 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9031: \"$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*
@@ -9044,12 +9050,12 @@
  }
   test -z "$with_tiff" && { 
 echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:9048: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:9054: 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 9053 "configure"
+#line 9059 "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
@@ -9060,7 +9066,7 @@
 TIFFClientOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:9064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9070: \"$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
@@ -9099,15 +9105,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:9103: checking for compface.h" >&5
+echo "configure:9109: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9106 "configure"
+#line 9112 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9117: \"$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*
@@ -9130,12 +9136,12 @@
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:9134: checking for UnGenFace in -lcompface" >&5
+echo "configure:9140: 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 9139 "configure"
+#line 9145 "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
@@ -9146,7 +9152,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:9150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9156: \"$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
@@ -9185,12 +9191,12 @@
 
 if test "$with_x11" = "yes"; then
   echo "checking for X11 graphics libraries" 1>&6
-echo "configure:9189: checking for X11 graphics libraries" >&5
+echo "configure:9195: checking for X11 graphics libraries" >&5
 fi
 
 if test "$with_x11" = "yes"; then
   echo "checking for the Athena widgets" 1>&6
-echo "configure:9194: checking for the Athena widgets" >&5
+echo "configure:9200: checking for the Athena widgets" >&5
 
     case "$with_athena" in
         "xaw" | "")	athena_variant=Xaw	athena_3d=no  ;;
@@ -9206,12 +9212,12 @@
     if test "$athena_3d" = "no"; then
     
 echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9210: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:9216: 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 9215 "configure"
+#line 9221 "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
@@ -9222,7 +9228,7 @@
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:9226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9232: \"$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
@@ -9238,12 +9244,12 @@
   echo "$ac_t""yes" 1>&6
           
 echo $ac_n "checking for $athena_3d_function in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9242: checking for $athena_3d_function in -l$athena_variant" >&5
+echo "configure:9248: checking for $athena_3d_function in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'$athena_3d_function | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 9247 "configure"
+#line 9253 "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
@@ -9254,7 +9260,7 @@
 $athena_3d_function()
 ; return 0; }
 EOF
-if { (eval echo configure:9258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9264: \"$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
@@ -9285,12 +9291,12 @@
   else
         
 echo $ac_n "checking for $athena_3d_function in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9289: checking for $athena_3d_function in -l$athena_variant" >&5
+echo "configure:9295: checking for $athena_3d_function in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'$athena_3d_function | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 9294 "configure"
+#line 9300 "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
@@ -9301,7 +9307,7 @@
 $athena_3d_function()
 ; return 0; }
 EOF
-if { (eval echo configure:9305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9311: \"$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
@@ -9319,12 +9325,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for $athena_3d_function in -lXaw""... $ac_c" 1>&6
-echo "configure:9323: checking for $athena_3d_function in -lXaw" >&5
+echo "configure:9329: checking for $athena_3d_function in -lXaw" >&5
 ac_lib_var=`echo Xaw'_'$athena_3d_function | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXaw "
 cat > conftest.$ac_ext <<EOF
-#line 9328 "configure"
+#line 9334 "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
@@ -9335,7 +9341,7 @@
 $athena_3d_function()
 ; return 0; }
 EOF
-if { (eval echo configure:9339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9345: \"$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
@@ -9366,15 +9372,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:9370: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:9376: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9373 "configure"
+#line 9379 "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:9378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9384: \"$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*
@@ -9394,15 +9400,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:9398: checking for X11/Xaw/XawInit.h" >&5
+echo "configure:9404: checking for X11/Xaw/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9401 "configure"
+#line 9407 "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:9406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9412: \"$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*
@@ -9428,15 +9434,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:9432: checking for X11/$athena_variant/XawInit.h" >&5
+echo "configure:9438: checking for X11/$athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9435 "configure"
+#line 9441 "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:9440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9446: \"$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*
@@ -9453,15 +9459,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:9457: checking for X11/$athena_variant/ThreeD.h" >&5
+echo "configure:9463: checking for X11/$athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9460 "configure"
+#line 9466 "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:9465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9471: \"$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*
@@ -9489,15 +9495,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:9493: checking for $athena_variant/XawInit.h" >&5
+echo "configure:9499: checking for $athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9496 "configure"
+#line 9502 "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:9501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9507: \"$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*
@@ -9514,15 +9520,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:9518: checking for $athena_variant/ThreeD.h" >&5
+echo "configure:9524: checking for $athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9521 "configure"
+#line 9527 "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:9526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9532: \"$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*
@@ -9551,15 +9557,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:9555: checking for X11/Xaw3d/XawInit.h" >&5
+echo "configure:9561: checking for X11/Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9558 "configure"
+#line 9564 "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:9563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9569: \"$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*
@@ -9576,15 +9582,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:9580: checking for X11/Xaw3d/ThreeD.h" >&5
+echo "configure:9586: checking for X11/Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9583 "configure"
+#line 9589 "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:9588: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9594: \"$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*
@@ -9616,15 +9622,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:9620: checking for Xaw3d/XawInit.h" >&5
+echo "configure:9626: checking for Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9623 "configure"
+#line 9629 "configure"
 #include "confdefs.h"
 #include <Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9634: \"$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*
@@ -9641,15 +9647,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:9645: checking for Xaw3d/ThreeD.h" >&5
+echo "configure:9651: checking for Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9648 "configure"
+#line 9654 "configure"
 #include "confdefs.h"
 #include <Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9659: \"$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*
@@ -9681,15 +9687,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:9685: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:9691: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9688 "configure"
+#line 9694 "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:9693: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9699: \"$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*
@@ -9718,6 +9724,45 @@
 
     if test -n "$athena_lib" -a -n "$athena_h_path"; then
     have_xaw=yes
+    have_athena_i18n=unset
+                    if test "$athena_variant" = "Xaw3d"; then
+      save_libs_x=$libs_x
+      libs_x="-lXaw3d $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXaw3d\" to \$libs_x"; fi
+            echo $ac_n "checking for "international" resource in Xaw3d SimpleWidget""... $ac_c" 1>&6
+echo "configure:9733: checking for "international" resource in Xaw3d SimpleWidget" >&5
+
+      cat > conftest.$ac_ext <<EOF
+#line 9736 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+        #include <string.h>
+        #undef XAW_INTERNATIONALIZATION
+        #include <$athena_h_path/Simple.h>
+        int main(int c, char **v) {
+        int i = simpleWidgetClass->core_class.num_resources;
+         while (i-- > 0)
+           if (!strcmp(simpleWidgetClass->core_class.resources[i].resource_name,
+                       "international"))
+             exit(0);
+         exit(253);}
+EOF
+if { (eval echo configure:9750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+then
+  ./conftest dummy_arg; xaw_intl_status=$?;
+	  if test "$xaw_intl_status" = "0"; then
+            have_athena_i18n=yes
+          else
+            have_athena_i18n=no
+            libs_x=$save_libs_x
+          fi
+else
+  conftest_rc="$?"
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -fr conftest*
+      echo "$ac_t""$have_athena_i18n" 1>&6
+    fi
   else
     have_xaw=no
   fi
@@ -9728,15 +9773,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:9732: checking for Xm/Xm.h" >&5
+echo "configure:9777: checking for Xm/Xm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9735 "configure"
+#line 9780 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9740: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9785: \"$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*
@@ -9753,12 +9798,12 @@
   echo "$ac_t""yes" 1>&6
   
 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:9757: checking for XmStringFree in -lXm" >&5
+echo "configure:9802: 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 9762 "configure"
+#line 9807 "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
@@ -9769,7 +9814,7 @@
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:9773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9818: \"$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
@@ -9798,9 +9843,9 @@
 
   if test "$have_motif" = "yes"; then
         echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:9802: checking for Lesstif" >&5
+echo "configure:9847: checking for Lesstif" >&5
     cat > conftest.$ac_ext <<EOF
-#line 9804 "configure"
+#line 9849 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 #ifdef LESSTIF_VERSION
@@ -9984,6 +10029,16 @@
 EOF
 }
 
+      if test "$have_athena_i18n" = "yes"; then
+        { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_ATHENA_I18N
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_ATHENA_I18N 1
+EOF
+}
+
+      fi
     fi
   ;;
 esac
@@ -10246,7 +10301,7 @@
 
 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
-echo "configure:10250: checking for Mule-related features" >&5
+echo "configure:10305: checking for Mule-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
@@ -10271,15 +10326,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10275: checking for $ac_hdr" >&5
+echo "configure:10330: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10278 "configure"
+#line 10333 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10338: \"$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*
@@ -10310,12 +10365,12 @@
 
   
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:10314: checking for strerror in -lintl" >&5
+echo "configure:10369: 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 10319 "configure"
+#line 10374 "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
@@ -10326,7 +10381,7 @@
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:10330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10385: \"$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
@@ -10359,18 +10414,18 @@
 
 
   echo "checking for Mule input methods" 1>&6
-echo "configure:10363: checking for Mule input methods" >&5
+echo "configure:10418: checking for Mule input methods" >&5
         case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6
-echo "configure:10366: checking for XIM" >&5
+echo "configure:10421: checking for XIM" >&5
     
 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:10369: checking for XOpenIM in -lX11" >&5
+echo "configure:10424: 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 10374 "configure"
+#line 10429 "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
@@ -10381,7 +10436,7 @@
 XOpenIM()
 ; return 0; }
 EOF
-if { (eval echo configure:10385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10440: \"$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
@@ -10405,12 +10460,12 @@
             if test "$need_motif $have_lesstif" = "yes no"; then
       
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:10409: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:10464: 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 10414 "configure"
+#line 10469 "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
@@ -10421,7 +10476,7 @@
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:10425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10480: \"$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
@@ -10444,12 +10499,12 @@
     elif test "$have_motif $have_lesstif $with_xim" = "yes no no"; then
       
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:10448: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:10503: 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 10453 "configure"
+#line 10508 "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
@@ -10460,7 +10515,7 @@
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:10464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10519: \"$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
@@ -10525,15 +10580,15 @@
 
     if test "$with_xfs" = "yes" ; then
     echo "checking for XFontSet" 1>&6
-echo "configure:10529: checking for XFontSet" >&5
+echo "configure:10584: checking for XFontSet" >&5
     
 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:10532: checking for XmbDrawString in -lX11" >&5
+echo "configure:10587: 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 10537 "configure"
+#line 10592 "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
@@ -10544,7 +10599,7 @@
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:10548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10603: \"$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
@@ -10584,15 +10639,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:10588: checking for wnn/jllib.h" >&5
+echo "configure:10643: checking for wnn/jllib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10591 "configure"
+#line 10646 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10651: \"$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*
@@ -10615,15 +10670,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:10619: checking for wnn/commonhd.h" >&5
+echo "configure:10674: checking for wnn/commonhd.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10622 "configure"
+#line 10677 "configure"
 #include "confdefs.h"
 #include <wnn/commonhd.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10682: \"$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*
@@ -10648,10 +10703,10 @@
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10652: checking for $ac_func" >&5
+echo "configure:10707: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10655 "configure"
+#line 10710 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10674,7 +10729,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10733: \"$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
@@ -10703,12 +10758,12 @@
 
     test "$ac_cv_func_crypt" != "yes" && { 
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:10707: checking for crypt in -lcrypt" >&5
+echo "configure:10762: 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 10712 "configure"
+#line 10767 "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
@@ -10719,7 +10774,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:10723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10778: \"$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
@@ -10754,12 +10809,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:10758: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:10813: 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 10763 "configure"
+#line 10818 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10770,7 +10825,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10788,12 +10843,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:10792: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:10847: 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 10797 "configure"
+#line 10852 "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
@@ -10804,7 +10859,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10863: \"$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
@@ -10822,12 +10877,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:10826: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:10881: 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 10831 "configure"
+#line 10886 "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
@@ -10838,7 +10893,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10897: \"$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
@@ -10856,12 +10911,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:10860: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:10915: 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 10865 "configure"
+#line 10920 "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
@@ -10872,7 +10927,7 @@
 dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10931: \"$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
@@ -10920,12 +10975,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:10924: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:10979: 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 10929 "configure"
+#line 10984 "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
@@ -10936,7 +10991,7 @@
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:10940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10995: \"$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
@@ -10971,15 +11026,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:10975: checking for canna/jrkanji.h" >&5
+echo "configure:11030: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10978 "configure"
+#line 11033 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11038: \"$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*
@@ -11006,15 +11061,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:11010: checking for canna/jrkanji.h" >&5
+echo "configure:11065: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11013 "configure"
+#line 11068 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11018: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11073: \"$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*
@@ -11042,15 +11097,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:11046: checking for canna/RK.h" >&5
+echo "configure:11101: checking for canna/RK.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11049 "configure"
+#line 11104 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11109: \"$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*
@@ -11073,12 +11128,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:11077: checking for RkBgnBun in -lRKC" >&5
+echo "configure:11132: 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 11082 "configure"
+#line 11137 "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
@@ -11089,7 +11144,7 @@
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:11093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11148: \"$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
@@ -11112,12 +11167,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:11116: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:11171: 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 11121 "configure"
+#line 11176 "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
@@ -11128,7 +11183,7 @@
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:11132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11187: \"$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
@@ -11177,12 +11232,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:11181: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:11236: 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 11186 "configure"
+#line 11241 "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
@@ -11193,7 +11248,7 @@
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:11197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11252: \"$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
@@ -11280,10 +11335,10 @@
 for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11284: checking for $ac_func" >&5
+echo "configure:11339: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11287 "configure"
+#line 11342 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11306,7 +11361,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11365: \"$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
@@ -11347,10 +11402,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:11351: checking for $ac_func" >&5
+echo "configure:11406: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11354 "configure"
+#line 11409 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11373,7 +11428,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11432: \"$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
@@ -11402,10 +11457,10 @@
 
 
 echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:11406: checking for openpty" >&5
+echo "configure:11461: checking for openpty" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11409 "configure"
+#line 11464 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char openpty(); below.  */
@@ -11428,7 +11483,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11487: \"$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
@@ -11447,12 +11502,12 @@
 
   
 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:11451: checking for openpty in -lutil" >&5
+echo "configure:11506: 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 11456 "configure"
+#line 11511 "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
@@ -11463,7 +11518,7 @@
 openpty()
 ; return 0; }
 EOF
-if { (eval echo configure:11467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11522: \"$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
@@ -11498,15 +11553,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11502: checking for $ac_hdr" >&5
+echo "configure:11557: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11505 "configure"
+#line 11560 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11565: \"$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*
@@ -11542,15 +11597,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11546: checking for $ac_hdr" >&5
+echo "configure:11601: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11549 "configure"
+#line 11604 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11609: \"$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*
@@ -11583,10 +11638,10 @@
   for ac_func in isastream
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11587: checking for $ac_func" >&5
+echo "configure:11642: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11590 "configure"
+#line 11645 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11609,7 +11664,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11668: \"$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
@@ -11640,15 +11695,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11644: checking for $ac_hdr" >&5
+echo "configure:11699: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11647 "configure"
+#line 11702 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11707: \"$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*
@@ -11685,10 +11740,10 @@
 for ac_func in getloadavg
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11689: checking for $ac_func" >&5
+echo "configure:11744: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11692 "configure"
+#line 11747 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11711,7 +11766,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11770: \"$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
@@ -11744,15 +11799,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11748: checking for $ac_hdr" >&5
+echo "configure:11803: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11751 "configure"
+#line 11806 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11811: \"$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*
@@ -11788,12 +11843,12 @@
 
     
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:11792: checking for kstat_open in -lkstat" >&5
+echo "configure:11847: 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 11797 "configure"
+#line 11852 "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
@@ -11804,7 +11859,7 @@
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:11808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11863: \"$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
@@ -11839,15 +11894,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11843: checking for $ac_hdr" >&5
+echo "configure:11898: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11846 "configure"
+#line 11901 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11906: \"$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*
@@ -11879,12 +11934,12 @@
 
     
 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:11883: checking for kvm_read in -lkvm" >&5
+echo "configure:11938: 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 11888 "configure"
+#line 11943 "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
@@ -11895,7 +11950,7 @@
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:11899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11954: \"$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
@@ -11929,16 +11984,16 @@
 fi
 
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:11933: checking whether netdb declares h_errno" >&5
+echo "configure:11988: checking whether netdb declares h_errno" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11935 "configure"
+#line 11990 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:11942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11997: \"$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
@@ -11958,16 +12013,16 @@
 rm -f conftest*
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:11962: checking for sigsetjmp" >&5
+echo "configure:12017: checking for sigsetjmp" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11964 "configure"
+#line 12019 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:11971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12026: \"$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
@@ -11987,11 +12042,11 @@
 rm -f conftest*
 
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:11991: checking whether localtime caches TZ" >&5
+echo "configure:12046: checking whether localtime caches TZ" >&5
 
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 11995 "configure"
+#line 12050 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
@@ -12026,7 +12081,7 @@
   exit (0);
 }
 EOF
-if { (eval echo configure:12030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
@@ -12056,9 +12111,9 @@
 
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:12060: checking whether gettimeofday accepts one or two arguments" >&5
+echo "configure:12115: checking whether gettimeofday accepts one or two arguments" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12062 "configure"
+#line 12117 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -12079,7 +12134,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12138: \"$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
@@ -12101,19 +12156,19 @@
 
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:12105: checking for inline" >&5
+echo "configure:12160: checking for inline" >&5
 
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 12110 "configure"
+#line 12165 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:12117: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -12154,17 +12209,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:12158: checking for working alloca.h" >&5
+echo "configure:12213: checking for working alloca.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12161 "configure"
+#line 12216 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:12168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12223: \"$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
@@ -12188,10 +12243,10 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:12192: checking for alloca" >&5
+echo "configure:12247: checking for alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12195 "configure"
+#line 12250 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -12219,7 +12274,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:12223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12278: \"$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
@@ -12258,10 +12313,10 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:12262: checking whether alloca needs Cray hooks" >&5
+echo "configure:12317: checking whether alloca needs Cray hooks" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12265 "configure"
+#line 12320 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -12285,10 +12340,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:12289: checking for $ac_func" >&5
+echo "configure:12344: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12292 "configure"
+#line 12347 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12311,7 +12366,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12370: \"$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
@@ -12341,10 +12396,10 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:12345: checking stack direction for C alloca" >&5
+echo "configure:12400: checking stack direction for C alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12348 "configure"
+#line 12403 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -12363,7 +12418,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:12367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
@@ -12393,15 +12448,15 @@
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:12397: checking for vfork.h" >&5
+echo "configure:12452: checking for vfork.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12400 "configure"
+#line 12455 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12460: \"$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*
@@ -12429,10 +12484,10 @@
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:12433: checking for working vfork" >&5
+echo "configure:12488: checking for working vfork" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12436 "configure"
+#line 12491 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -12527,7 +12582,7 @@
   }
 }
 EOF
-if { (eval echo configure:12531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_vfork_works=yes
 else
@@ -12553,10 +12608,10 @@
 
 
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:12557: checking for working strcoll" >&5
+echo "configure:12612: checking for working strcoll" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12560 "configure"
+#line 12615 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -12566,7 +12621,7 @@
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:12570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
@@ -12594,10 +12649,10 @@
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12598: checking for $ac_func" >&5
+echo "configure:12653: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12601 "configure"
+#line 12656 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12620,7 +12675,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12679: \"$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
@@ -12648,10 +12703,10 @@
 done
 
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:12652: checking whether getpgrp takes no argument" >&5
+echo "configure:12707: checking whether getpgrp takes no argument" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12655 "configure"
+#line 12710 "configure"
 #include "confdefs.h"
 
 /*
@@ -12706,7 +12761,7 @@
 }
 
 EOF
-if { (eval echo configure:12710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_getpgrp_void=yes
 else
@@ -12733,10 +12788,10 @@
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:12737: checking for working mmap" >&5
+echo "configure:12792: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 12740 "configure"
+#line 12795 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -12769,7 +12824,7 @@
   return 1;
 }
 EOF
-if { (eval echo configure:12773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   have_mmap=yes
 else
@@ -12798,9 +12853,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:12802: checking for M_MMAP_THRESHOLD" >&5
+echo "configure:12857: checking for M_MMAP_THRESHOLD" >&5
     cat > conftest.$ac_ext <<EOF
-#line 12804 "configure"
+#line 12859 "configure"
 #include "confdefs.h"
 #include <malloc.h>
 int main() {
@@ -12812,7 +12867,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   rel_alloc=no; echo "$ac_t""yes" 1>&6;
 else
@@ -12837,15 +12892,15 @@
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:12841: checking for termios.h" >&5
+echo "configure:12896: checking for termios.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12844 "configure"
+#line 12899 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12904: \"$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*
@@ -12888,15 +12943,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:12892: checking for termio.h" >&5
+echo "configure:12947: checking for termio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12895 "configure"
+#line 12950 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12955: \"$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*
@@ -12928,10 +12983,10 @@
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:12932: checking for socket" >&5
+echo "configure:12987: checking for socket" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12935 "configure"
+#line 12990 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -12954,7 +13009,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13013: \"$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
@@ -12969,15 +13024,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:12973: checking for netinet/in.h" >&5
+echo "configure:13028: checking for netinet/in.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12976 "configure"
+#line 13031 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13036: \"$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*
@@ -12994,15 +13049,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:12998: checking for arpa/inet.h" >&5
+echo "configure:13053: checking for arpa/inet.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13001 "configure"
+#line 13056 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13061: \"$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*
@@ -13027,9 +13082,9 @@
 }
 
       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:13031: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:13086: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 13033 "configure"
+#line 13088 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13040,7 +13095,7 @@
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:13044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13099: \"$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
@@ -13058,9 +13113,9 @@
 fi
 rm -f conftest*
       echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:13062: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:13117: checking "for ip_mreq struct in netinet/in.h"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 13064 "configure"
+#line 13119 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13070,7 +13125,7 @@
 static struct ip_mreq x;
 ; return 0; }
 EOF
-if { (eval echo configure:13074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13129: \"$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
@@ -13101,10 +13156,10 @@
 
 
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:13105: checking for msgget" >&5
+echo "configure:13160: checking for msgget" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13108 "configure"
+#line 13163 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
@@ -13127,7 +13182,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13186: \"$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
@@ -13142,15 +13197,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:13146: checking for sys/ipc.h" >&5
+echo "configure:13201: checking for sys/ipc.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13149 "configure"
+#line 13204 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13154: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13209: \"$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*
@@ -13167,15 +13222,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:13171: checking for sys/msg.h" >&5
+echo "configure:13226: checking for sys/msg.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13174 "configure"
+#line 13229 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13234: \"$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*
@@ -13213,15 +13268,15 @@
 
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:13217: checking for dirent.h" >&5
+echo "configure:13272: checking for dirent.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13220 "configure"
+#line 13275 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13280: \"$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*
@@ -13248,15 +13303,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:13252: checking for sys/dir.h" >&5
+echo "configure:13307: checking for sys/dir.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13255 "configure"
+#line 13310 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13260: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13315: \"$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*
@@ -13289,15 +13344,15 @@
 
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:13293: checking for nlist.h" >&5
+echo "configure:13348: checking for nlist.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13296 "configure"
+#line 13351 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13356: \"$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*
@@ -13327,22 +13382,22 @@
 
 
 echo "checking "for sound support"" 1>&6
-echo "configure:13331: checking "for sound support"" >&5
+echo "configure:13386: 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:13338: checking for multimedia/audio_device.h" >&5
+echo "configure:13393: checking for multimedia/audio_device.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13341 "configure"
+#line 13396 "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:13346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13401: \"$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*
@@ -13398,12 +13453,12 @@
       if test -z "$native_sound_lib"; then
         
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:13402: checking for ALopenport in -laudio" >&5
+echo "configure:13457: 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 13407 "configure"
+#line 13462 "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
@@ -13414,7 +13469,7 @@
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:13418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13473: \"$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
@@ -13445,12 +13500,12 @@
       if test -z "$native_sound_lib"; then
 	
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:13449: checking for AOpenAudio in -lAlib" >&5
+echo "configure:13504: 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 13454 "configure"
+#line 13509 "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
@@ -13461,7 +13516,7 @@
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:13465: \"$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*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13506,15 +13561,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:13510: checking for ${dir}/soundcard.h" >&5
+echo "configure:13565: checking for ${dir}/soundcard.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13513 "configure"
+#line 13568 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13573: \"$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*
@@ -13568,15 +13623,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:13572: checking for audio/audiolib.h" >&5
+echo "configure:13627: checking for audio/audiolib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13575 "configure"
+#line 13630 "configure"
 #include "confdefs.h"
 #include <audio/audiolib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13635: \"$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*
@@ -13594,12 +13649,12 @@
   
     
 echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6
-echo "configure:13598: checking for AuOpenServer in -laudio" >&5
+echo "configure:13653: 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 13603 "configure"
+#line 13658 "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
@@ -13610,7 +13665,7 @@
 AuOpenServer()
 ; return 0; }
 EOF
-if { (eval echo configure:13614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13669: \"$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
@@ -13649,7 +13704,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 13653 "configure"
+#line 13708 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
@@ -13680,7 +13735,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:13684: checking for $ac_word" >&5
+echo "configure:13739: 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.
@@ -13709,10 +13764,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:13713: checking for esd_play_stream" >&5
+echo "configure:13768: checking for esd_play_stream" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13716 "configure"
+#line 13771 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char esd_play_stream(); below.  */
@@ -13735,7 +13790,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13794: \"$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
@@ -13786,7 +13841,7 @@
 
 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:13790: checking for TTY-related features" >&5
+echo "configure:13845: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
@@ -13802,12 +13857,12 @@
     if test -z "$with_ncurses"; then
     
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:13806: checking for tgetent in -lncurses" >&5
+echo "configure:13861: 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 13811 "configure"
+#line 13866 "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
@@ -13818,7 +13873,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13877: \"$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
@@ -13851,15 +13906,15 @@
 
     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:13855: checking for ncurses/curses.h" >&5
+echo "configure:13910: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13858 "configure"
+#line 13913 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13918: \"$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*
@@ -13881,15 +13936,15 @@
 
     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:13885: checking for ncurses/term.h" >&5
+echo "configure:13940: checking for ncurses/term.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13888 "configure"
+#line 13943 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13948: \"$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*
@@ -13919,15 +13974,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:13923: checking for ncurses/curses.h" >&5
+echo "configure:13978: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13926 "configure"
+#line 13981 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13986: \"$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*
@@ -13962,12 +14017,12 @@
 	for lib in curses termlib termcap; do
 	  
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:13966: checking for tgetent in -l$lib" >&5
+echo "configure:14021: 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 13971 "configure"
+#line 14026 "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
@@ -13978,7 +14033,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14037: \"$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
@@ -14003,12 +14058,12 @@
     else       if test -n "$libs_termcap" -a "$opsys" = "openbsd"; then
                                 
 echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:14007: checking for tgoto in -ltermcap" >&5
+echo "configure:14062: checking for tgoto in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ltermcap "
 cat > conftest.$ac_ext <<EOF
-#line 14012 "configure"
+#line 14067 "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
@@ -14019,7 +14074,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:14023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14078: \"$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
@@ -14064,12 +14119,12 @@
       else
 	
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:14068: checking for tgetent in -lcurses" >&5
+echo "configure:14123: 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 14073 "configure"
+#line 14128 "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
@@ -14080,7 +14135,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:14084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14139: \"$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
@@ -14098,12 +14153,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:14102: checking for tgetent in -ltermcap" >&5
+echo "configure:14157: 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 14107 "configure"
+#line 14162 "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
@@ -14114,7 +14169,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:14118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14173: \"$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
@@ -14163,15 +14218,15 @@
     if test "$with_gpm" != "no"; then
     ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for gpm.h""... $ac_c" 1>&6
-echo "configure:14167: checking for gpm.h" >&5
+echo "configure:14222: checking for gpm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14170 "configure"
+#line 14225 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14230: \"$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*
@@ -14189,12 +14244,12 @@
   
       
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:14193: checking for Gpm_Open in -lgpm" >&5
+echo "configure:14248: 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 14198 "configure"
+#line 14253 "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
@@ -14205,7 +14260,7 @@
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:14209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14264: \"$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
@@ -14264,20 +14319,20 @@
 
 test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
   != "no no no" && echo "checking for database support" 1>&6
-echo "configure:14268: checking for database support" >&5
+echo "configure:14323: 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:14273: checking for ndbm.h" >&5
+echo "configure:14328: checking for ndbm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14276 "configure"
+#line 14331 "configure"
 #include "confdefs.h"
 #include <ndbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14336: \"$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*
@@ -14307,12 +14362,12 @@
 if test "$with_database_gdbm" != "no"; then
   
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:14311: checking for dbm_open in -lgdbm" >&5
+echo "configure:14366: 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 14316 "configure"
+#line 14371 "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
@@ -14323,7 +14378,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:14327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14382: \"$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
@@ -14351,10 +14406,10 @@
 
 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:14355: checking for dbm_open" >&5
+echo "configure:14410: checking for dbm_open" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14358 "configure"
+#line 14413 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -14377,7 +14432,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14436: \"$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
@@ -14396,12 +14451,12 @@
 
     
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:14400: checking for dbm_open in -ldbm" >&5
+echo "configure:14455: 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 14405 "configure"
+#line 14460 "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
@@ -14412,7 +14467,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:14416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14471: \"$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
@@ -14452,10 +14507,10 @@
 
 
 echo $ac_n "checking for u_int8_t""... $ac_c" 1>&6
-echo "configure:14456: checking for u_int8_t" >&5
+echo "configure:14511: checking for u_int8_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14459 "configure"
+#line 14514 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -14496,10 +14551,10 @@
 
 fi
 echo $ac_n "checking for u_int16_t""... $ac_c" 1>&6
-echo "configure:14500: checking for u_int16_t" >&5
+echo "configure:14555: checking for u_int16_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14503 "configure"
+#line 14558 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -14540,10 +14595,10 @@
 
 fi
 echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6
-echo "configure:14544: checking for u_int32_t" >&5
+echo "configure:14599: checking for u_int32_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14547 "configure"
+#line 14602 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -14584,10 +14639,10 @@
 
 fi
 echo $ac_n "checking for u_int64_t""... $ac_c" 1>&6
-echo "configure:14588: checking for u_int64_t" >&5
+echo "configure:14643: checking for u_int64_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14591 "configure"
+#line 14646 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -14630,12 +14685,12 @@
 
 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:14634: checking for Berkeley db.h" >&5
+echo "configure:14689: checking for Berkeley db.h" >&5
   for header in "db/db.h" "db.h"; do
     case "$opsys" in
         *freebsd*)
     cat > conftest.$ac_ext <<EOF
-#line 14639 "configure"
+#line 14694 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14651,7 +14706,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_file="$header"; break
 else
@@ -14662,7 +14717,7 @@
         ;;
         *)
     cat > conftest.$ac_ext <<EOF
-#line 14666 "configure"
+#line 14721 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14692,7 +14747,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_file="$header"; break
 else
@@ -14710,9 +14765,9 @@
 
   if test "$with_database_berkdb" != "no"; then
     echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:14714: checking for Berkeley DB version" >&5
+echo "configure:14769: checking for Berkeley DB version" >&5
     cat > conftest.$ac_ext <<EOF
-#line 14716 "configure"
+#line 14771 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 1
@@ -14724,7 +14779,7 @@
   egrep "yes" >/dev/null 2>&1; then
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 14728 "configure"
+#line 14783 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 2
@@ -14751,10 +14806,10 @@
 rm -f conftest*
 
     echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:14755: checking for $dbfunc" >&5
+echo "configure:14810: checking for $dbfunc" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14758 "configure"
+#line 14813 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $dbfunc(); below.  */
@@ -14777,7 +14832,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14836: \"$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
@@ -14796,12 +14851,12 @@
 
     
 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:14800: checking for $dbfunc in -ldb" >&5
+echo "configure:14855: 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 14805 "configure"
+#line 14860 "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
@@ -14812,7 +14867,7 @@
 $dbfunc()
 ; return 0; }
 EOF
-if { (eval echo configure:14816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14871: \"$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
@@ -14876,12 +14931,12 @@
 if test "$with_socks" = "yes"; then
   
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:14880: checking for SOCKSinit in -lsocks" >&5
+echo "configure:14935: 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 14885 "configure"
+#line 14940 "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
@@ -14892,7 +14947,7 @@
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:14896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14951: \"$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
@@ -14947,7 +15002,7 @@
 
 if test "$with_modules" != "no"; then
   echo "checking for module support" 1>&6
-echo "configure:14951: checking for module support" >&5
+echo "configure:15006: checking for module support" >&5
 
     if test "$with_msw" = "yes"; then
     have_dl=yes;
@@ -14963,15 +15018,15 @@
  ;;
       *)          ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:14967: checking for dlfcn.h" >&5
+echo "configure:15022: checking for dlfcn.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14970 "configure"
+#line 15025 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14975: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15030: \"$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*
@@ -14988,16 +15043,16 @@
   echo "$ac_t""yes" 1>&6
   
            echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:14992: checking for dlopen in -lc" >&5
+echo "configure:15047: checking for dlopen in -lc" >&5
            cat > conftest.$ac_ext <<EOF
-#line 14994 "configure"
+#line 15049 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	      dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:15001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -15006,18 +15061,18 @@
   rm -rf conftest*
   
                echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:15010: checking for dlopen in -ldl" >&5
+echo "configure:15065: checking for dlopen in -ldl" >&5
                ac_save_LIBS="$LIBS"
                LIBS="-ldl $LIBS"
                cat > conftest.$ac_ext <<EOF
-#line 15014 "configure"
+#line 15069 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	         dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:15021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -15046,12 +15101,12 @@
         else
            
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:15050: checking for shl_load in -ldld" >&5
+echo "configure:15105: 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 15055 "configure"
+#line 15110 "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
@@ -15062,7 +15117,7 @@
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:15066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15121: \"$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
@@ -15089,12 +15144,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:15093: checking for dld_init in -ldld" >&5
+echo "configure:15148: 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 15098 "configure"
+#line 15153 "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
@@ -15105,7 +15160,7 @@
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:15109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15164: \"$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
@@ -15152,7 +15207,7 @@
 xealias=$internal_configuration
 
 echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:15156: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:15211: checking how to build dynamic libraries for ${xehost}" >&5
 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
 case "$xehost" in
 *-*-linux-gnu*) ;;
@@ -15180,9 +15235,9 @@
   XEGCC=yes
 else
   echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:15184: checking checking whether we are using GNU C" >&5
+echo "configure:15239: checking checking whether we are using GNU C" >&5
   cat > conftest.$ac_ext <<EOF
-#line 15186 "configure"
+#line 15241 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -15204,7 +15259,7 @@
 fi
 
 echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:15208: checking how to produce PIC code" >&5
+echo "configure:15263: checking how to produce PIC code" >&5
 wl=
 
 can_build_shared=yes
@@ -15305,18 +15360,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:15309: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:15364: checking if PIC flag ${dll_cflags} really works" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $dll_cflags -DPIC"
   cat > conftest.$ac_ext <<EOF
-#line 15313 "configure"
+#line 15368 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:15320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15375: \"$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
@@ -15347,7 +15402,7 @@
 xldf=
 xcldf=
 echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:15351: checking if C compiler can produce shared libraries" >&5
+echo "configure:15406: checking if C compiler can produce shared libraries" >&5
 if test "$XEGCC" = yes -o "$__ICC" = yes; then
   xcldf="-shared"
   xldf="-shared"
@@ -15398,14 +15453,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 15402 "configure"
+#line 15457 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:15409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cc_produces_so=yes
 else
@@ -15430,7 +15485,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:15434: checking for ld used by GCC" >&5
+echo "configure:15489: checking for ld used by GCC" >&5
     ac_prog=`($CC -print-prog-name=ld) 2>&5`
     case "$ac_prog" in
     # Accept absolute paths.
@@ -15456,7 +15511,7 @@
     esac
   else
     echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:15460: checking for GNU ld" >&5
+echo "configure:15515: checking for GNU ld" >&5
   fi
 
   if test -z "$LTLD"; then
@@ -15494,7 +15549,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:15498: checking if the linker is GNU ld" >&5
+echo "configure:15553: 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
@@ -15522,7 +15577,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:15526: checking whether the linker supports shared libraries" >&5
+echo "configure:15581: checking whether the linker supports shared libraries" >&5
   dll_ld=$CC
   dll_ldflags=$LDFLAGS
   ld_shlibs=yes
@@ -15733,10 +15788,10 @@
     for ac_func in dlerror _dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15737: checking for $ac_func" >&5
+echo "configure:15792: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 15740 "configure"
+#line 15795 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -15759,7 +15814,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:15763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15818: \"$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
@@ -15798,11 +15853,11 @@
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 15802 "configure"
+#line 15857 "configure"
 #include "confdefs.h"
 int main(int c,char *v[]){return 0;}
 EOF
-if { (eval echo configure:15806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:15861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
diff -r -u xemacs-21.4.22/configure.in xemacs-21.4.23/configure.in
--- xemacs-21.4.22/configure.in	2006-12-07 22:31:16.000000000 -0500
+++ xemacs-21.4.23/configure.in	2015-01-29 10:04:29.000000000 -0500
@@ -3640,6 +3640,37 @@
   dnl Do we actually have a usable Athena widget set? Please?
   if test -n "$athena_lib" -a -n "$athena_h_path"; then
     have_xaw=yes
+    have_athena_i18n=unset
+    dnl   X.org at some point added .international to SimplePart, protected
+    dnl by #ifdef XAW_INTERNATIONALIZATION in Xaw3d (only?).  Unfortunately,
+    dnl the distributed headers for Xaw3d don't set this to correspond to
+    dnl the distributed library.  (pkg-config does, if present.)
+    if test "$athena_variant" = "Xaw3d"; then
+      save_libs_x=$libs_x
+      XE_PREPEND(-lXaw3d, libs_x)
+      dnl The test below was provided by Ralf Soergel.
+      AC_MSG_CHECKING([for "international" resource in Xaw3d SimpleWidget])
+
+      AC_TRY_RUN([#include <stdlib.h>
+        #include <string.h>
+        #undef XAW_INTERNATIONALIZATION
+        #include <$athena_h_path/Simple.h>
+        int main(int c, char **v) {
+        int i = simpleWidgetClass->core_class.num_resources;
+         while (i-- > 0)
+           if (!strcmp(simpleWidgetClass->core_class.resources[i].resource_name,
+                       "international"))
+             exit(0);
+         exit(253);}],
+	[./conftest dummy_arg; xaw_intl_status=$?;
+	  if test "$xaw_intl_status" = "0"; then
+            have_athena_i18n=yes
+          else
+            have_athena_i18n=no
+            libs_x=$save_libs_x
+          fi])
+      AC_MSG_RESULT([$have_athena_i18n])
+    fi
   else
     have_xaw=no
   fi
@@ -3748,6 +3779,9 @@
 
     if test "$athena_3d" = "yes"; then
       AC_DEFINE(HAVE_ATHENA_3D)
+      if test "$have_athena_i18n" = "yes"; then
+        AC_DEFINE(HAVE_ATHENA_I18N)
+      fi
     fi
   ;;
 esac
diff -r -u xemacs-21.4.22/dynodump/_dynodump.h xemacs-21.4.23/dynodump/_dynodump.h
--- xemacs-21.4.22/dynodump/_dynodump.h	1997-05-29 00:22:29.000000000 -0400
+++ xemacs-21.4.23/dynodump/_dynodump.h	2015-01-29 10:04:29.000000000 -0500
@@ -32,7 +32,7 @@
  * Mountain View, California 94043
  */
 
-#pragma ident	"@(#) $Id: _dynodump.h,v 1.5 1996/05/23 18:39:07 georgn Exp $ - SMI"
+#pragma ident	"@(#) $Id: _dynodump.h,v 1.3 1997/05/29 04:22:29 steve Exp $ - SMI"
 
 #ifndef	_DYNODUMP_DOT_H
 #define	_DYNODUMP_DOT_H
diff -r -u xemacs-21.4.22/dynodump/dynodump.c xemacs-21.4.23/dynodump/dynodump.c
--- xemacs-21.4.22/dynodump/dynodump.c	2001-04-12 14:20:43.000000000 -0400
+++ xemacs-21.4.23/dynodump/dynodump.c	2015-01-29 10:04:29.000000000 -0500
@@ -73,7 +73,7 @@
  * N.B. The above commentary is not quite correct in the flags have been hardwired
  *      to RTLD_SAVREL.
  */
-#pragma ident	"@(#) $Id: dynodump.c,v 1.6.2.2 2000/09/20 02:39:17 martinb Exp $ - SMI"
+#pragma ident	"@(#) $Id: dynodump.c,v 1.8 2001/04/12 18:20:43 michaels Exp $ - SMI"
 
 #define __EXTENSIONS__ 1
 
diff -r -u xemacs-21.4.22/dynodump/i386/_relocate.c xemacs-21.4.23/dynodump/i386/_relocate.c
--- xemacs-21.4.22/dynodump/i386/_relocate.c	1997-05-29 00:23:02.000000000 -0400
+++ xemacs-21.4.23/dynodump/i386/_relocate.c	2015-01-29 10:04:29.000000000 -0500
@@ -32,7 +32,7 @@
  * Mountain View, California 94043
  */
 
-#pragma ident	"@(#) $Id: _relocate.c,v 1.4 1995/06/26 20:12:41 georgn Exp $ - SMI"
+#pragma ident	"@(#) $Id: _relocate.c,v 1.3 1997/05/29 04:23:02 steve Exp $ - SMI"
 
 /* LINTLIBRARY */
 
diff -r -u xemacs-21.4.22/dynodump/i386/machdep.h xemacs-21.4.23/dynodump/i386/machdep.h
--- xemacs-21.4.22/dynodump/i386/machdep.h	1997-05-29 00:23:02.000000000 -0400
+++ xemacs-21.4.23/dynodump/i386/machdep.h	2015-01-29 10:04:29.000000000 -0500
@@ -32,7 +32,7 @@
  * Mountain View, California 94043
  */
 
-#pragma ident	"@(#) $Id: machdep.h,v 1.2 1995/02/16 22:58:43 georgn Exp $ - SMI"
+#pragma ident	"@(#) $Id: machdep.h,v 1.3 1997/05/29 04:23:02 steve Exp $ - SMI"
 
 /*
  * Global include file for all sgs Intel machine dependent macros, constants
diff -r -u xemacs-21.4.22/dynodump/ppc/_relocate.c xemacs-21.4.23/dynodump/ppc/_relocate.c
--- xemacs-21.4.22/dynodump/ppc/_relocate.c	1998-03-31 15:10:55.000000000 -0500
+++ xemacs-21.4.23/dynodump/ppc/_relocate.c	2015-01-29 10:04:29.000000000 -0500
@@ -32,7 +32,7 @@
  * Mountain View, California 94043
  */
 
-#pragma ident "@(#) $Id: _relocate.c,v 1.3 1995/06/26 20:16:39 georgn Exp $ - SMI"
+#pragma ident "@(#) $Id: _relocate.c,v 1.4 1998/03/31 20:10:55 steve Exp $ - SMI"
 
 /* LINTLIBRARY */
 
diff -r -u xemacs-21.4.22/dynodump/ppc/machdep.h xemacs-21.4.23/dynodump/ppc/machdep.h
--- xemacs-21.4.22/dynodump/ppc/machdep.h	1997-05-29 00:23:20.000000000 -0400
+++ xemacs-21.4.23/dynodump/ppc/machdep.h	2015-01-29 10:04:29.000000000 -0500
@@ -32,7 +32,7 @@
  * Mountain View, California 94043
  */
 
-#pragma ident "@(#) $Id: machdep.h,v 1.2 1995/02/16 22:58:49 georgn Exp $ - SMI"
+#pragma ident "@(#) $Id: machdep.h,v 1.3 1997/05/29 04:23:20 steve Exp $ - SMI"
 
 /*
  * Global include file for all sgs PowerPC machine dependent macros, constants
diff -r -u xemacs-21.4.22/dynodump/sparc/_relocate.c xemacs-21.4.23/dynodump/sparc/_relocate.c
--- xemacs-21.4.22/dynodump/sparc/_relocate.c	1998-03-31 15:10:55.000000000 -0500
+++ xemacs-21.4.23/dynodump/sparc/_relocate.c	2015-01-29 10:04:29.000000000 -0500
@@ -35,7 +35,7 @@
 /*
  * Update the value of the `_edata' and `_end' symbols.
  */
-#pragma ident	"@(#) $Id: _relocate.c,v 1.4 1995/06/26 20:13:26 georgn Exp $ - SMI"
+#pragma ident	"@(#) $Id: _relocate.c,v 1.4 1998/03/31 20:10:55 steve Exp $ - SMI"
 
 #include	<libelf.h>
 #include	<string.h>
diff -r -u xemacs-21.4.22/dynodump/sparc/machdep.h xemacs-21.4.23/dynodump/sparc/machdep.h
--- xemacs-21.4.22/dynodump/sparc/machdep.h	1997-05-29 00:23:26.000000000 -0400
+++ xemacs-21.4.23/dynodump/sparc/machdep.h	2015-01-29 10:04:29.000000000 -0500
@@ -32,7 +32,7 @@
  * Mountain View, California 94043
  */
 
-#pragma ident	"@(#) $Id: machdep.h,v 1.2 1995/02/16 22:58:55 georgn Exp $ - SMI"
+#pragma ident	"@(#) $Id: machdep.h,v 1.3 1997/05/29 04:23:26 steve Exp $ - SMI"
 
 /*
  * Global include file for all sgs SPARC machine dependent macros, constants
diff -r -u xemacs-21.4.22/dynodump/syms.c xemacs-21.4.23/dynodump/syms.c
--- xemacs-21.4.22/dynodump/syms.c	1997-05-29 00:22:30.000000000 -0400
+++ xemacs-21.4.23/dynodump/syms.c	2015-01-29 10:04:29.000000000 -0500
@@ -35,7 +35,7 @@
 /*
  * Update the value of the `_edata' and `_end' symbols.
  */
-#pragma ident	"@(#) $Id: syms.c,v 1.2 1995/03/06 22:39:22 georgn Exp $ - SMI"
+#pragma ident	"@(#) $Id: syms.c,v 1.3 1997/05/29 04:22:30 steve Exp $ - SMI"
 
 #include	<libelf.h>
 #include	<string.h>
diff -r -u xemacs-21.4.22/lib-src/ChangeLog xemacs-21.4.23/lib-src/ChangeLog
--- xemacs-21.4.22/lib-src/ChangeLog	2008-12-28 21:18:54.000000000 -0500
+++ xemacs-21.4.23/lib-src/ChangeLog	2015-01-29 10:04:29.000000000 -0500
@@ -1,3 +1,16 @@
+2015-01-29  Vin Shelton <acs@xemacs.org>
+ 
+	* XEmacs 21.4.23 is released
+
+2015-01-23  Vin Shelton  <acs@xemacs.org>
+
+	* gnuclient.c: Use CYGWIN_CONF_PATH.
+
+2009-12-08  Sjoerd Mullender  <sjoerd@acm.org>
+
+	* etags.c (absolute_filename): Use memmove instead of strcpy to move
+	characters within a string.
+
 2008-12-28  Vin Shelton  <acs@xemacs.org>
 
 	* XEmacs 21.4.22 is released
diff -r -u xemacs-21.4.22/lib-src/etags.c xemacs-21.4.23/lib-src/etags.c
--- xemacs-21.4.22/lib-src/etags.c	2007-08-20 15:50:12.000000000 -0400
+++ xemacs-21.4.23/lib-src/etags.c	2015-01-29 10:04:29.000000000 -0500
@@ -6829,13 +6829,13 @@
 	      else if (cp[0] != '/')
 		cp = slashp;
 #endif
-	      strcpy (cp, slashp + 3);
+	      memmove (cp, slashp + 3, strlen (slashp + 3) + 1);
 	      slashp = cp;
 	      continue;
 	    }
 	  else if (slashp[2] == '/' || slashp[2] == '\0')
 	    {
-	      strcpy (slashp, slashp + 2);
+	      memmove (slashp, slashp + 2, strlen (slashp + 2) + 1);
 	      continue;
 	    }
 	}
diff -r -u xemacs-21.4.22/lib-src/gnuclient.c xemacs-21.4.23/lib-src/gnuclient.c
--- xemacs-21.4.22/lib-src/gnuclient.c	2006-08-29 23:04:15.000000000 -0400
+++ xemacs-21.4.23/lib-src/gnuclient.c	2015-01-29 10:04:29.000000000 -0500
@@ -48,10 +48,6 @@
  * ../etc/gnuserv.README relative to the directory containing this file)
  */
 
-#ifdef  CYGWIN
-extern void cygwin_conv_to_posix_path(const char *path, char *posix_path);
-#endif
-
 #include "gnuserv.h"
 
 char gnuserv_version[] = "gnuclient version " GNUSERV_VERSION;
@@ -75,6 +71,7 @@
 
 #if !defined(SYSV_IPC) && !defined(UNIX_DOMAIN_SOCKETS) && \
     !defined(INTERNET_DOMAIN_SOCKETS)
+
 int
 main (int argc, char *argv[])
 {
@@ -193,10 +190,6 @@
   /* fullpath - returned full pathname */
   /* filename - filename to expand */
 {
-#ifdef  CYGWIN
-  char cygwinFilename[MAXPATHLEN+1];
-#endif
-
   int len;
   fullpath[0] = fullpath[MAXPATHLEN] = '\0';
 
@@ -204,7 +197,8 @@
   /*
     If we're in cygwin, just convert it and let the unix stuff handle it.
   */
-  cygwin_conv_to_posix_path(filename, cygwinFilename);
+  char *cygwinFilename;
+  CYGWIN_CONV_PATH(filename, cygwinFilename);
   filename = cygwinFilename;
 #endif
 
diff -r -u xemacs-21.4.22/lib-src/rcs2log xemacs-21.4.23/lib-src/rcs2log
--- xemacs-21.4.22/lib-src/rcs2log	2003-01-31 20:11:40.000000000 -0500
+++ xemacs-21.4.23/lib-src/rcs2log	2015-01-29 10:04:29.000000000 -0500
@@ -29,7 +29,7 @@
 
 Report bugs to <bug-gnu-emacs@gnu.org>.'
 
-Id='$Id: rcs2log,v 1.50 2002/02/03 17:31:31 eggert Exp $'
+Id='$Id: rcs2log,v 1.2.20.1 2003/02/01 01:11:40 vins Exp $'
 
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002
 #  Free Software Foundation, Inc.
diff -r -u xemacs-21.4.22/lisp/ChangeLog xemacs-21.4.23/lisp/ChangeLog
--- xemacs-21.4.22/lisp/ChangeLog	2008-12-30 21:25:23.000000000 -0500
+++ xemacs-21.4.23/lisp/ChangeLog	2015-01-29 10:04:29.000000000 -0500
@@ -1,3 +1,52 @@
+2015-01-29  Vin Shelton <acs@xemacs.org>
+ 
+	* XEmacs 21.4.23 is released
+
+2009-01-31  Dr. Volker Zell  <Dr.Volker.Zell@oracle.com>
+
+	* about.el (about-hackers): Update my entry.
+
+	* printer.el (generic-print-buffer): Make File->Print work under Cygwin
+	X11 version of XEmacs, instead of emitting:
+	Feature not yet implemented: "Dialog box type", print-setup
+	(generic-print-region): Ditto.
+
+2014-09-24  Vin Shelton  <acs@xemacs.org>
+
+	* menubar.el:  (add-menu-item-1, delete-menu-item): Do not assume
+	every top-level menu is on current-menubar.
+	Patch from Byrel Mitchell; applied to 21.5 on 2013-12-30.
+
+2014-09-24  Jerry James  <james@xemacs.org>
+
+	* font-lock.el (font-lock-add-keywords): Adapt to differences in
+	Emacs and XEmacs compiled font-lock lists.
+	(font-lock-remove-keywords): Ditto.
+	(font-lock-set-defaults-1): Make changes specified by
+	font-lock-keywords-alist and font-lock-removed-keywords-alist.
+
+2012-01-08  Vin Shelton  <acs@xemacs.org>
+
+	* cus-face.el: autoload custom-set-face-bold.
+
+2011-11-14  Vin Shelton  <acs@xemacs.org>
+
+	* faces.el: When the default background was changed from light to
+	dark or vice versa, the custom-property cache maintained the old
+	value, preventing face definitions from choosing the proper
+	values.  Patch from Aidan Kehoe.
+
+2009-08-14  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* minibuf.el (read-from-minibuffer):
+	Use buffer (format " *Minibuf-%d*" (minibuffer-depth)), regardless
+	of depth.
+
+2009-10-14  Mike Sperber  <mike@xemacs.org>
+
+	* code-files.el (insert-file-contents): Call the file-name handler
+	from Lisp, not from `insert-file-contents-internal', which is too late.
+
 2008-12-28  Vin Shelton  <acs@xemacs.org>
 
 	* XEmacs 21.4.22 is released
diff -r -u xemacs-21.4.22/lisp/about.el xemacs-21.4.23/lisp/about.el
--- xemacs-21.4.22/lisp/about.el	2008-12-25 22:45:13.000000000 -0500
+++ xemacs-21.4.23/lisp/about.el	2015-01-29 10:04:29.000000000 -0500
@@ -2157,7 +2157,7 @@
       (print-short "Jason Yanowitz" "yanowitz@eternity.cs.umass.edu")
       (print-short "La Monte Yarroll" "piggy@hilbert.maths.utas.edu.au")
       (print-short "Blair Zajac" "blair@olympia.gps.caltech.edu")
-      (print-short "Volker Zell" "vzell@de.oracle.com")
+      (print-short "Volker Zell" "dr.volker.zell@oracle.com")
       (print-short "Daniel Zivkovic" "daniel@canada.sun.com")
       (print-short "Karel Zuiderveld" "Karel.Zuiderveld@cv.ruu.nl")
       (widget-insert "\n"))
diff -r -u xemacs-21.4.22/lisp/code-files.el xemacs-21.4.23/lisp/code-files.el
--- xemacs-21.4.22/lisp/code-files.el	2005-01-09 13:45:31.000000000 -0500
+++ xemacs-21.4.23/lisp/code-files.el	2015-01-29 10:04:29.000000000 -0500
@@ -386,76 +386,91 @@
 See also `insert-file-contents-access-hook',
 `insert-file-contents-pre-hook', `insert-file-contents-error-hook',
 and `insert-file-contents-post-hook'."
-  (let (return-val coding-system used-codesys)
-    ;; OK, first load the file.
-    (condition-case err
-	(progn
-	  (run-hook-with-args 'insert-file-contents-access-hook
-			      filename visit)
-	  ;; determine the coding system to use, as described above.
-	  (setq coding-system
-		(or
-		 ;; #1.
-		 coding-system-for-read
-		 ;; #2.
-		 (run-hook-with-args-until-success
-		  'insert-file-contents-pre-hook
-		  filename visit)
-		 ;; #3.
-		 (find-file-coding-system-for-read-from-filename filename)
-		 ;; #4.
-		 buffer-file-coding-system-for-read
-		 ;; #5.
-		 'raw-text))
-	  (if (consp coding-system)
-	      (setq return-val coding-system)
-	    (if (null (find-coding-system coding-system))
-		(progn
-		  (message
-		   "Invalid coding-system (%s), using 'undecided"
-		   coding-system)
-		  (setq coding-system 'undecided)))
-	    (setq return-val
-		  (insert-file-contents-internal filename visit start end
-						 replace coding-system
-						 ;; store here!
-						 'used-codesys))
-	    ))
-      (file-error
-       (run-hook-with-args 'insert-file-contents-error-hook
-			   filename visit err)
-       (signal (car err) (cdr err))))
-    (setq coding-system used-codesys)
-    ;; call any `post-read-conversion' for the coding system that
-    ;; was used ...
-    (let ((func
-	   (coding-system-property coding-system 'post-read-conversion))
-	  (endmark (make-marker)))
-      (set-marker endmark (+ (point) (nth 1 return-val)))
-      (if func
-	  (unwind-protect
-	      (save-excursion
-		(let (buffer-read-only)
-		  (funcall func (point) (marker-position endmark))))
-	    (if visit
-		(progn
-		  (set-buffer-auto-saved)
-		  (set-buffer-modified-p nil)))))
-      (setcar (cdr return-val) (- (marker-position endmark) (point))))
-    ;; now finally set the buffer's `buffer-file-coding-system'.
-    (if (run-hook-with-args-until-success 'insert-file-contents-post-hook
-					  filename visit return-val)
-	nil
-      (if (local-variable-p 'buffer-file-coding-system (current-buffer))
-	  ;; if buffer-file-coding-system is already local, just
-	  ;; set its eol type to what was found, if it wasn't
-	  ;; set already.
-	  (set-buffer-file-coding-system
-	   (subsidiary-coding-system buffer-file-coding-system
-				     (coding-system-eol-type coding-system)))
-	;; otherwise actually set buffer-file-coding-system.
-	(set-buffer-file-coding-system coding-system)))
-    return-val))
+  (let* ((expanded (substitute-in-file-name filename))
+	 (handler (find-file-name-handler expanded 'insert-file-contents)))
+    (if handler
+	(funcall handler 'insert-file-contents filename visit start end replace)
+      (let (return-val coding-system used-codesys)
+	;; OK, first load the file.
+	(condition-case err
+	    (progn
+	      (run-hook-with-args 'insert-file-contents-access-hook
+				  filename visit)
+	      ;; determine the coding system to use, as described above.
+	      (setq coding-system
+		    (or
+		     ;; #1.
+		     coding-system-for-read
+		     ;; #2.
+		     (run-hook-with-args-until-success
+		      'insert-file-contents-pre-hook
+		      filename visit)
+		     ;; #3.
+		     (find-file-coding-system-for-read-from-filename filename)
+		     ;; #4.
+		     buffer-file-coding-system-for-read
+		     ;; #5.
+		     'raw-text))
+	      (if (consp coding-system)
+		  (setq return-val coding-system)
+		(if (null (find-coding-system coding-system))
+		    (progn
+		      (lwarn 'coding-system 'notice
+			"Invalid coding-system (%s), using 'undecided"
+			coding-system)
+		      (setq coding-system 'undecided)))
+		(setq return-val
+		      (insert-file-contents-internal filename visit start end
+						     replace coding-system
+						     ;; store here!
+						     'used-codesys))
+		))
+	  (file-error
+	   (run-hook-with-args 'insert-file-contents-error-hook
+			       filename visit err)
+	   (signal (car err) (cdr err))))
+	(setq coding-system used-codesys)
+	;; call any `post-read-conversion' for the coding system that
+	;; was used ...
+	(let ((func
+	       (coding-system-property coding-system 'post-read-conversion))
+	      (endmark (make-marker)))
+	  (set-marker endmark (+ (point) (nth 1 return-val)))
+	  (if func
+	      (unwind-protect
+		  (save-excursion
+		    (let (buffer-read-only)
+		      (if (>= (function-max-args func) 2)
+			  ;; #### fuckme!  Someone at FSF changed the calling
+			  ;; convention of post-read-conversion.  We try to
+			  ;; support the old way.  #### Should we kill this?
+			  (funcall func (point) (marker-position endmark))
+			(funcall func (- (marker-position endmark) (point))))))
+		(if visit
+		    (progn
+		      (set-buffer-auto-saved)
+		      (set-buffer-modified-p nil)))))
+	  (setcar (cdr return-val) (- (marker-position endmark) (point))))
+	;; now finally set the buffer's `buffer-file-coding-system' ...
+	(if (run-hook-with-args-until-success 'insert-file-contents-post-hook
+					      filename visit return-val)
+	    nil
+	  (if (local-variable-p 'buffer-file-coding-system (current-buffer))
+	      ;; if buffer-file-coding-system is already local, just
+	      ;; set its eol type to what was found, if it wasn't
+	      ;; set already.
+	      (set-buffer-file-coding-system
+	       (subsidiary-coding-system buffer-file-coding-system
+					 (coding-system-eol-type coding-system)) t)
+	    ;; otherwise actually set buffer-file-coding-system.
+	    (set-buffer-file-coding-system coding-system t)))
+	;; ... and `buffer-file-coding-system-when-loaded'.  the machinations
+	;; of set-buffer-file-coding-system cause the actual coding system
+	;; object to be stored, so do that here, too.
+	(setq buffer-file-coding-system-when-loaded
+	      (get-coding-system coding-system))
+	return-val))))
+
 
 (defvar write-region-pre-hook nil
   "A special hook to decide the coding system used for writing out a file.
diff -r -u xemacs-21.4.22/lisp/cus-face.el xemacs-21.4.23/lisp/cus-face.el
--- xemacs-21.4.22/lisp/cus-face.el	2001-12-17 00:49:08.000000000 -0500
+++ xemacs-21.4.23/lisp/cus-face.el	2015-01-29 10:04:29.000000000 -0500
@@ -161,6 +161,7 @@
       (list (list t (face-custom-attributes-get
 		     symbol (selected-frame))))))
 
+;;;###autoload
 (defun custom-set-face-bold (face value &optional frame tags)
   "Set the bold property of FACE to VALUE."
   (if value
diff -r -u xemacs-21.4.22/lisp/faces.el xemacs-21.4.23/lisp/faces.el
--- xemacs-21.4.22/lisp/faces.el	2004-06-22 21:54:36.000000000 -0400
+++ xemacs-21.4.23/lisp/faces.el	2015-01-29 10:04:29.000000000 -0500
@@ -1314,7 +1314,6 @@
 		  (device-type (frame-device frame)))
 	'class (device-class (frame-device frame))
 	'background (or frame-background-mode
-			(frame-property frame 'background-mode)
 			(get-frame-background-mode frame))))
 
 (defcustom init-face-from-resources t
@@ -1375,15 +1374,7 @@
 (defun get-custom-frame-properties (&optional frame)
   "Return a plist with the frame properties of FRAME used by custom.
 If FRAME is nil, return the default frame properties."
-  (cond (frame
-	 ;; Try to get from cache.
-	 (let ((cache (frame-property frame 'custom-properties)))
-	   (unless cache
-	     ;; Oh well, get it then.
-	     (setq cache (extract-custom-frame-properties frame))
-	     ;; and cache it...
-	     (set-frame-property frame 'custom-properties cache))
-	   cache))
+  (cond (frame (extract-custom-frame-properties frame))
 	(default-custom-frame-properties)
 	(t
 	 (setq default-custom-frame-properties
diff -r -u xemacs-21.4.22/lisp/font-lock.el xemacs-21.4.23/lisp/font-lock.el
--- xemacs-21.4.22/lisp/font-lock.el	2007-08-20 15:50:52.000000000 -0400
+++ xemacs-21.4.23/lisp/font-lock.el	2015-01-29 10:04:29.000000000 -0500
@@ -951,7 +951,7 @@
 	 (let ((was-compiled (eq (car font-lock-keywords) t)))
 	   ;; Bring back the user-level (uncompiled) keywords.
 	   (if was-compiled
-	       (setq font-lock-keywords (cadr font-lock-keywords)))
+       (setq font-lock-keywords (cdr font-lock-keywords)))
 	   ;; Now modify or replace them.
 	   (if (eq how 'set)
 	       (setq font-lock-keywords keywords)
@@ -1061,7 +1061,7 @@
 	 (let ((was-compiled (eq (car font-lock-keywords) t)))
 	   ;; Bring back the user-level (uncompiled) keywords.
 	   (if was-compiled
-	       (setq font-lock-keywords (cadr font-lock-keywords)))
+       (setq font-lock-keywords (cdr font-lock-keywords)))
 
 	   ;; Edit them.
 	   (setq font-lock-keywords (copy-sequence font-lock-keywords))
@@ -2032,7 +2032,10 @@
 			     font-lock-defaults
 			     (font-lock-find-font-lock-defaults major-mode)))
 	       (keywords (font-lock-choose-keywords
-			  (nth 0 defaults) font-lock-maximum-decoration)))
+  (nth 0 defaults) font-lock-maximum-decoration))
+       (local (cdr (assq major-mode font-lock-keywords-alist)))
+       (removed-keywords
+ (cdr-safe (assq major-mode font-lock-removed-keywords-alist))))
 
 	  ;; Keywords?
 	  (setq font-lock-keywords (if (fboundp keywords)
@@ -2097,7 +2100,14 @@
 		 ;; older way:
 		 ;; defaults not specified at all, so use `beginning-of-defun'.
 		 (setq font-lock-beginning-of-syntax-function
-		       'beginning-of-defun)))))
+       'beginning-of-defun)))
+
+  ;; Local fontification?
+  (while local
+    (font-lock-add-keywords nil (car (car local)) (cdr (car local)))
+    (setq local (cdr local)))
+  (when removed-keywords
+    (font-lock-remove-keywords nil removed-keywords))))
 
     (setq font-lock-cache-position (make-marker))
     (setq font-lock-defaults-computed t)))
diff -r -u xemacs-21.4.22/lisp/ldap.el xemacs-21.4.23/lisp/ldap.el
--- xemacs-21.4.22/lisp/ldap.el	2001-04-12 14:21:29.000000000 -0400
+++ xemacs-21.4.23/lisp/ldap.el	2015-01-29 10:04:29.000000000 -0500
@@ -5,7 +5,7 @@
 ;; Author: Oscar Figueiredo <Oscar.Figueiredo@di.epfl.ch>
 ;; Maintainer: Oscar Figueiredo <Oscar.Figueiredo@di.epfl.ch>
 ;; Created: Jan 1998
-;; Version: $Revision: 1.7.2.11 $
+;; Version: $Revision: 1.10 $
 ;; Keywords: help comm
 
 ;; This file is part of XEmacs
diff -r -u xemacs-21.4.22/lisp/menubar.el xemacs-21.4.23/lisp/menubar.el
--- xemacs-21.4.22/lisp/menubar.el	2002-08-20 07:34:53.000000000 -0400
+++ xemacs-21.4.23/lisp/menubar.el	2015-01-29 10:04:29.000000000 -0500
@@ -230,7 +230,7 @@
 		      )))
     (unless menubar
       (error "`current-menubar' is nil: can't add menus to it."))
-    (unless menu
+    (unless menu  ; If we don't have all intervening submenus needed by menu-path, add them.
       (let ((rest menu-path)
 	    (so-far menubar))
 	(while rest
@@ -241,7 +241,7 @@
 		  (car (find-menu-item (cdr so-far) (list (car rest))))))
 	  (unless menu
 	    (let ((rest2 so-far))
-	      (while (and (cdr rest2) (car (cdr rest2)))
+	      (while (and (cdr rest2) (car (cdr rest2))) ; Walk rest2 down so-far till rest2 is the last item before divider or end of list.
 		(setq rest2 (cdr rest2)))
 	      (setcdr rest2
 		      (nconc (list (setq menu (list (car rest))))
@@ -250,15 +250,13 @@
 	  (setq rest (cdr rest)))))
     (if (and item-found (car item-found))
 	;; hack the item in place.
-	(if menu
+	(if (or menu (not (eq (car item-found) (car menubar)))) ;If either replacing in submenu, or replacing non-initial top-level item.  
 	    ;; Isn't it very bad form to use nsubstitute for side effects?
-	    (nsubstitute new-item (car item-found) menu)
-	  (setq current-menubar (nsubstitute new-item
-					     (car item-found)
-					     current-menubar)))
+	    (nsubstitute new-item (car item-found) (or menu menubar))
+	  (setcar menubar new-item))
       ;; OK, we have to add the whole thing...
       ;; if BEFORE is specified, try to add it there.
-      (unless menu (setq menu current-menubar))
+      (unless menu (setq menu menubar))
       (when before
 	(setq before (car (find-menu-item menu (list before)))))
       (let ((rest menu)
@@ -272,8 +270,9 @@
 	(when (not added-before)
 	  ;; adding before the first item on the menubar itself is harder
 	  (if (and (eq menu menubar) (eq before (car menu)))
-	      (setq menu (cons new-item menu)
-		    current-menubar menu)
+	      (let ((old-car (cons (car menubar) (cdr menubar))))
+		(setcar menubar new-item)
+		(setcdr menubar old-car))
 	    ;; otherwise, add the item to the end.
 	    (nconc menu (list new-item))))))
     (set-menubar-dirty-flag)
@@ -339,17 +338,17 @@
 menu paths.
 FROM-MENU, if provided, means use that instead of `current-menubar'
 as the menu to change."
-  (let* ((pair (condition-case nil (find-menu-item (or from-menu
-						       current-menubar) path)
+  (let* ((menubar (or from-menu current-menubar))
+	 (pair (condition-case nil (find-menu-item menubar path)
 		 (error nil)))
 	 (item (car pair))
-	 (parent (or (cdr pair) current-menubar)))
+	 (parent (or (cdr pair) menubar)))
     (if (not item)
 	nil
-      ;; the menubar is the only special case, because other menus begin
-      ;; with their name.
-      (if (eq parent current-menubar)
-	  (setq current-menubar (delq item parent))
+      (if (eq item (car menubar)) ; Deleting first item from a top-level menubar
+	  (progn
+	    (setcar menubar (car (cdr menubar)))
+	    (setcdr menubar (cdr (cdr menubar))))
 	(delq item parent))
       (set-menubar-dirty-flag)
       item)))
diff -r -u xemacs-21.4.22/lisp/minibuf.el xemacs-21.4.23/lisp/minibuf.el
--- xemacs-21.4.22/lisp/minibuf.el	2005-12-06 20:16:49.000000000 -0500
+++ xemacs-21.4.23/lisp/minibuf.el	2015-01-29 10:04:29.000000000 -0500
@@ -408,10 +408,8 @@
          (owindow (selected-window))
 	 (oframe (selected-frame))
          (window (minibuffer-window))
-         (buffer (if (eq (minibuffer-depth) 0)
-                     (window-buffer window)
-		   (get-buffer-create (format " *Minibuf-%d"
-					      (minibuffer-depth)))))
+	 (buffer (get-buffer-create (format " *Minibuf-%d*"
+					    (minibuffer-depth))))
          (frame (window-frame window))
          (mconfig (if (eq frame (selected-frame))
                       nil (current-window-configuration frame)))
diff -r -u xemacs-21.4.22/lisp/printer.el xemacs-21.4.23/lisp/printer.el
--- xemacs-21.4.22/lisp/printer.el	2008-12-25 22:45:14.000000000 -0500
+++ xemacs-21.4.23/lisp/printer.el	2015-01-29 10:04:29.000000000 -0500
@@ -261,7 +261,8 @@
 	     (start (if print-region (region-beginning) (point-min buffer)))
 	     (end (if print-region (region-end) (point-max buffer))))
 	(if (or (not (valid-device-type-p 'msprinter))
-		(not display-print-dialog))
+		(not display-print-dialog)
+		(not (string-equal (device-type) "mswindows")))
 	    (generic-print-region start end buffer)
 	  (let* ((d (Printer-get-device))
 		 (props (make-dialog-box 'print :device d
@@ -309,7 +310,8 @@
   to-page    Last page to print, inclusive, If omitted, printing ends at
              the end.
   copies     Number of copies to print.  If omitted, one copy is printed."
-  (cond ((valid-device-type-p 'msprinter)
+  (cond ((and (valid-device-type-p 'msprinter)
+	      (string-equal (device-type) "mswindows"))
 	 ;; loop, printing one copy of document per loop.  kill and
 	 ;; re-create the frame each time so that we eject the piece
 	 ;; of paper at the end even if we're printing more than one
diff -r -u xemacs-21.4.22/lwlib/ChangeLog xemacs-21.4.23/lwlib/ChangeLog
--- xemacs-21.4.22/lwlib/ChangeLog	2008-12-28 21:19:00.000000000 -0500
+++ xemacs-21.4.23/lwlib/ChangeLog	2015-01-29 10:04:29.000000000 -0500
@@ -1,3 +1,15 @@
+2015-01-29  Vin Shelton <acs@xemacs.org>
+ 
+	* XEmacs 21.4.23 is released
+
+2015-01-08  Vin Shelton  <acs@xemacs.org>
+
+	Fix progress bar crashes.
+	Thanks to Ralf Soergel for diagnosis and a patch.
+
+	* lwlib.h (HAVE_ATHENA_I18N):
+	Define XAW_INTERNATIONALIZATION when needed.
+
 2008-12-28  Vin Shelton  <acs@xemacs.org>
 
 	* XEmacs 21.4.22 is released
diff -r -u xemacs-21.4.22/lwlib/lwlib.h xemacs-21.4.23/lwlib/lwlib.h
--- xemacs-21.4.22/lwlib/lwlib.h	2001-10-23 04:35:23.000000000 -0400
+++ xemacs-21.4.23/lwlib/lwlib.h	2015-01-29 10:04:29.000000000 -0500
@@ -3,6 +3,10 @@
 
 #include <X11/Intrinsic.h>
 
+#ifdef HAVE_ATHENA_I18N
+#define XAW_INTERNATIONALIZATION 1
+#endif
+
 #if defined (LWLIB_MENUBARS_LUCID) || defined (LWLIB_MENUBARS_MOTIF) || defined (LWLIB_MENUBARS_ATHENA)
 #define NEED_MENUBARS
 #endif
diff -r -u xemacs-21.4.22/man/ChangeLog xemacs-21.4.23/man/ChangeLog
--- xemacs-21.4.22/man/ChangeLog	2008-12-28 21:19:01.000000000 -0500
+++ xemacs-21.4.23/man/ChangeLog	2015-01-29 10:04:29.000000000 -0500
@@ -1,3 +1,22 @@
+2015-01-29  Vin Shelton <acs@xemacs.org>
+ 
+	* XEmacs 21.4.23 is released
+
+2013-01-02  Vin Shelton  <acs@xemacs.org>
+
+	* lispref/menus.texi (Creating Menu Accelerators): Fix typo in
+	add-submenu example (original patch from Byrel Mitchell).  Change
+	top-level accelerator key from t to s.
+
+2011-04-02  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* xemacs-faq.texi (Q2.5.7):
+	New node on troubleshooting duplicate auto-autoloads.
+	(Top):
+	(Installation):
+	(Q2.5.6):
+	Update menus and node links for Q2.5.7.
+
 2008-12-28  Vin Shelton  <acs@xemacs.org>
 
 	* XEmacs 21.4.22 is released
diff -r -u xemacs-21.4.22/man/info.texi xemacs-21.4.23/man/info.texi
--- xemacs-21.4.22/man/info.texi	2001-04-12 14:22:00.000000000 -0400
+++ xemacs-21.4.23/man/info.texi	2015-01-29 10:04:29.000000000 -0500
@@ -3,7 +3,7 @@
 @setfilename ../info/info.info
 @settitle Info
 @comment %**end of header
-@comment $Id: info.texi,v 1.4.2.6 2000/11/29 08:27:28 stephent Exp $
+@comment $Id: info.texi,v 1.8 2001/04/12 18:22:00 michaels Exp $
 
 @dircategory Texinfo documentation system
 @direntry
diff -r -u xemacs-21.4.22/man/lispref/menus.texi xemacs-21.4.23/man/lispref/menus.texi
--- xemacs-21.4.22/man/lispref/menus.texi	2003-10-22 22:03:40.000000000 -0400
+++ xemacs-21.4.23/man/lispref/menus.texi	2015-01-29 10:04:29.000000000 -0500
@@ -629,18 +629,19 @@
 For example, the command
 
 @example
-(add-submenu nil '("%_Test"
+(add-submenu nil '("Te%_st"
                    ["One" (insert "1") :accelerator ?1 :active t]
                    ["%_Two" (insert "2")]
                    ["%_3" (insert "3")]))
 @end example
 
-will add a new menu to the top level menubar.  The new menu can be reached
-by pressing "t" while the top level menubar is active.  When the menu is
-active, pressing "1" will activate the first item and insert the character
-"1" into the buffer.  Pressing "2" will activate the second item and insert
-the character "2" into the buffer.  Pressing "3" will activate the third item
-and insert the character "3" into the buffer.
+will add a new menu to the top level menubar.  The new menu can be
+reached by pressing "s" while the top level menubar is active.  When
+the menu is active, pressing "1" will activate the first item and
+insert the character "1" into the buffer, pressing "t" will activate
+the second item and insert the character "2" into the buffer, and
+pressing "3" will activate the third item and insert the character "3"
+into the buffer.
 
 It is possible to activate the top level menubar itself using accelerator keys.
 @xref{Menu Accelerator Functions}.
diff -r -u xemacs-21.4.22/man/texinfo.texi xemacs-21.4.23/man/texinfo.texi
--- xemacs-21.4.22/man/texinfo.texi	2002-08-20 07:35:25.000000000 -0400
+++ xemacs-21.4.23/man/texinfo.texi	2015-01-29 10:04:29.000000000 -0500
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
-@c $Id: texinfo.texi,v 1.14.4.1 2002/07/09 08:36:53 stephent Exp $
+@c $Id: texinfo.texi,v 1.14.2.1 2002/08/20 11:35:25 stephent Exp $
 @c %**start of header
 
 @c All text is ignored before the setfilename.
diff -r -u xemacs-21.4.22/man/xemacs-faq.texi xemacs-21.4.23/man/xemacs-faq.texi
--- xemacs-21.4.22/man/xemacs-faq.texi	2006-07-01 01:19:48.000000000 -0400
+++ xemacs-21.4.23/man/xemacs-faq.texi	2015-01-29 10:04:29.000000000 -0500
@@ -7,7 +7,7 @@
 @finalout
 @titlepage
 @title XEmacs FAQ
-@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2005/10/14 02:11:49 $
+@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2006/07/01 05:19:48 $
 @sp 1
 @author Ben Wing <ben@@xemacs.org>
 @author Tony Rossini <rossini@@u.washington.edu>
@@ -326,6 +326,7 @@
 * Q2.5.4::    Startup warnings about deducing proper fonts?
 * Q2.5.5::    Warnings from incorrect key modifiers.
 * Q2.5.6::    XEmacs 21.1 on Windows used to spawn an ugly console window on every startup.  Has that been fixed?
+* Q2.5.7::    XEmacs issues messages about ``auto-autoloads already loaded.''
 
 3 Editing Functions
 
@@ -3124,6 +3125,7 @@
 * Q2.5.4::    Startup warnings about deducing proper fonts?
 * Q2.5.5::    Warnings from incorrect key modifiers.
 * Q2.5.6::    XEmacs 21.1 on Windows used to spawn an ugly console window on every startup.  Has that been fixed?
+* Q2.5.7::    XEmacs issues messages about ``auto-autoloads already loaded.''
 @end menu
 
 @unnumberedsec 2.0: Installation (General)
@@ -4528,7 +4530,7 @@
 EOF
 @end example
 
-@node Q2.5.6,  , Q2.5.5, Installation
+@node Q2.5.6, Q2.5.7, Q2.5.5, Installation
 @unnumberedsubsec Q2.5.6: XEmacs 21.1 on Windows used to spawn an ugly console window on every startup.  Has that been fixed?
 
 Yes.
@@ -4578,6 +4580,54 @@
 works around the "no useful stdio" problem by creating its own console
 window as necessary to display messages in.)
 
+@node Q2.5.7,  , Q2.5.6, Installation
+@unnumberedsubsec Q2.5.7: XEmacs issues messages about ``auto-autoloads already loaded.''
+
+On Sat, 05 Mar 2011 11:54:47 -0500, in Message-ID:
+<4D726AD7.7020303@@gmail.com> on xemacs-beta, Raymond Toy reported:
+
+@quotation
+[N]ow every time I start xemacs, I get 100+ error messages stating that
+the auto-autoload for every package has already been loaded.
+@end quotation
+ 
+This occurs if you have duplicate packages installed on your load-path.
+To detect exactly which paths are duplicated, use @kbd{M-x
+list-load-path-shadows}.  If you have a small number of duplicated
+libraries, it is probably one or more packages available both in the
+XEmacs distribution and in third-party distributions.  If you prefer the
+third-party version, use @kbd{M-x list-packages} to get the package
+management UI, and uninstall the particular packages.  Removal of third
+party packages must be done manually, if you wish to keep the version
+distributed by XEmacs.
+
+When you have many duplicate packages, a common cause is that XEmacs
+finds @emph{package root directories} that are duplicates of each other.
+This can occur in some automounter configurations, or when the roots
+share some subtrees via symlinks.  In this case, you will get a warning
+for @emph{all} of the packages you have installed.  Although this is
+basically a site configuration problem, please report these cases.
+XEmacs is already aware of many automounter artifacts, and automatically
+adjusts for them.  Code is being added to try to detect symlinks.  We
+may not be able to handle every case, but we'd like to know about them,
+and where possible incorporate workarounds.
+
+Package root directories are specified at configuration time via the
+@code{--prefix}, @code{--exec-prefix}, and the @samp{--with-*-packages}
+options; at runtime relative to the XEmacs binary (@file{../share} and
+@file{..} (for run-in-place)); and at runtime via the
+@samp{EMACS*PACKAGES} environment variables.  Unless you have special
+needs, it is best to install XEmacs and the packages (configuring with
+@code{--with-prefix=$prefix} for XEmacs and by untarring the SUMOs in
+@file{@code{$prefix}/share/xemacs/}.
+
+Note that older versions of XEmacs (21.1, 21.4, and early releases of
+21.5) by default expect the packages to be installed under
+@file{@code{$prefix}/lib} rather than @file{@code{$prefix}/share}.  See
+the documentation for @file{configure} for how to point XEmacs at
+@file{@code{$prefix}/share/xemacs/} if that is preferred, or older
+XEmacsen need to share packages with recent versions.
+
 @node Editing, Display, Installation, Top
 @unnumbered 3 Editing Functions
 
diff -r -u xemacs-21.4.22/netinstall/ChangeLog xemacs-21.4.23/netinstall/ChangeLog
--- xemacs-21.4.22/netinstall/ChangeLog	2008-12-28 21:19:03.000000000 -0500
+++ xemacs-21.4.23/netinstall/ChangeLog	2015-01-29 10:04:29.000000000 -0500
@@ -1,3 +1,7 @@
+2015-01-29  Vin Shelton <acs@xemacs.org>
+ 
+	* XEmacs 21.4.23 is released
+
 2008-12-28  Vin Shelton  <acs@xemacs.org>
 
 	* XEmacs 21.4.22 is released
@@ -398,6 +402,6 @@
 
 	* all: port from cygwin setup.
 
-%%% $Id: ChangeLog,v 1.2.2.20 2003/01/03 10:49:30 stephent Exp $
-$Revision: 1.2.2.20 $
+%%% $Id: ChangeLog,v 1.2.2.31 2008/12/29 02:19:03 vins Exp $
+$Revision: 1.2.2.31 $
 
diff -r -u xemacs-21.4.22/netinstall/res.rc xemacs-21.4.23/netinstall/res.rc
--- xemacs-21.4.22/netinstall/res.rc	2005-01-30 23:06:01.000000000 -0500
+++ xemacs-21.4.23/netinstall/res.rc	2015-01-29 10:04:29.000000000 -0500
@@ -516,7 +516,7 @@
     IDS_ERR_OPEN_READ       "Can't open %s for reading: %s"
     IDS_ROOT_ABSOLUTE       "The install directory must be absolute, with both a drive letter and leading slash, like C:\\Cygwin"
     IDS_DOWNLOAD_COMPLETE   "Download Complete"
-    IDS_CVSID               "\n%%% $Id: res.rc,v 1.2.2.2 2002/08/20 11:36:07 stephent Exp $\n"
+    IDS_CVSID               "\n%%% $Id: res.rc,v 1.2.2.3 2005/01/31 04:06:01 ben Exp $\n"
     IDS_NOLOGFILE           "Cannot open log file %s for writing"
     IDS_UNINSTALL_COMPLETE  "Uninstalls complete."
     IDS_WININET             "Unable to find or load the Internet Explorer 5 DLLs"
diff -r -u xemacs-21.4.22/nt/ChangeLog xemacs-21.4.23/nt/ChangeLog
--- xemacs-21.4.22/nt/ChangeLog	2008-12-28 21:19:04.000000000 -0500
+++ xemacs-21.4.23/nt/ChangeLog	2015-01-29 10:04:29.000000000 -0500
@@ -1,3 +1,21 @@
+2015-01-29  Vin Shelton <acs@xemacs.org>
+ 
+	* XEmacs 21.4.23 is released
+
+2011-12-02  Vin Shelton  <acs@xemacs.org>
+
+	* XEmacs.iss: Add all packages to the setup kit.
+
+2011-11-28  Vin Shelton  <acs@xemacs.org>
+
+	* config.inc.samp: Update versions for png, tiff and jpeg.
+
+2009-02-06  Vin Shelton  <acs@xemacs.org>
+
+	* xemacs.mak: Visual Studio 2005 support: add manifest to
+	executables.  Added compile flags for the Intel C Compiler.
+	* XEmacs.iss: Added MSVCR80.dll to support Visual Studio 2005.
+
 2008-12-28  Vin Shelton  <acs@xemacs.org>
 
 	* XEmacs 21.4.22 is released
diff -r -u xemacs-21.4.22/nt/XEmacs.iss xemacs-21.4.23/nt/XEmacs.iss
--- xemacs-21.4.22/nt/XEmacs.iss	2007-09-27 11:13:14.000000000 -0400
+++ xemacs-21.4.23/nt/XEmacs.iss	2015-01-29 10:04:29.000000000 -0500
@@ -3,6 +3,18 @@
 ; This script requires the Inno Setup pre-processor.
 ;
 ; Version History
+; 2011-12-01  Vin Shelton <acs@xemacs.org>    Add all packages to the kit.
+; 2009-01-29  Vin Shelton <acs@xemacs.org>    Add MSVCR80.dll, which is required by VS 2005 and needed at
+;                                             installation time by minitar.
+; 2009-01-06  Vin Shelton <acs@xemacs.org>    Remove {#KitName} and {#XEmacs_Branch} and force the caller
+;                                             to define the ReadMe file name and Setup file name directly.
+; 2009-01-03  Vin Shelton <acs@xemacs.org>    Bump default version to 21.4.22.
+; 2008-01-24  Vin Shelton <acs@xemacs.org>    Implement the concept of release kits, like "XEmacs_Setup_21.4.21.exe"
+;                                             and replace the version info with a date string in non-release kits, so
+;                                             experimental kits are named something like "XEmacs_Setup_21.4-2008-01-24.exe".
+;                                             This feature was implemented at the request of Adrian Aichner, who
+;                                             found the string "21.4.21-2008-01-24" misleading, because the kit is built
+;                                             based on current CVS or mercurial sources, not from the release sources.
 ; 2007-09-26  Vin Shelton <acs@xemacs.org>    Remove setting of package-get-always-update and miscellaneous cleanup.
 ; 2007-09-25  Vin Shelton <acs@xemacs.org>    Put comment wrapper around site-start.el changes and remove them on uninstall.
 ;                                             Enable ftp.xemacs.org for packages and set path to ftp.exe in site-start.el.
@@ -13,27 +25,35 @@
 ; 2006-03-03  Vin Shelton <acs@xemacs.org>    Support for 21.5.  Added packages as separate components.
 ; 2006-01-28  Vin Shelton <acs@xemacs.org>    Erase unused registry code.
 ; 2006-01-26  Vin Shelton <acs@xemacs.org>    Don't append XEmacs binary directory to system path.
-; 2006-01-21  Vin Shelton <acs@xemacs.org>    Append XEmacs binary directory to system path; this is not currently deleted on uninstall.
+; 2006-01-21  Vin Shelton <acs@xemacs.org>    Append XEmacs binary directory to system path; this is not currently
+;                                             deleted on uninstall.
 ;                                             Get built kit from C:\XEmacs-built.
-; 2005-12-26  Vin Shelton <acs@xemacs.org>    Packages are now installed directly into {app}\xemacs-packages, etc.  As of 21.4.19, the package root is found automatically, so EMACSPACKAGEPATH is no longer necessary.
+; 2005-12-26  Vin Shelton <acs@xemacs.org>    Packages are now installed directly into {app}\xemacs-packages, etc.
+;                                             As of 21.4.19, the package root is found automatically,
+;                                             so EMACSPACKAGEPATH is no longer necessary.
 ; 2005-12-17  Vin Shelton <acs@xemacs.org>    Move packages out of the version-specific tree.
 ; 2005-12-13  Vin Shelton <acs@xemacs.org>    Created.
 
-; Allow undefined identifiers, e.g. 'KitName'
+; Allow undefined identifiers
 #pragma parseroption -u+
 
 ;#define QUICKIE_TEST
 
 #ifndef XEmacsVersion
-  #define XEmacsVersion  "21.4.20"
+  #define XEmacsVersion "21.4.22"
 #endif
-;#define KitName     "-2"
 #ifndef ExecSrc
   #define ExecSrc     "installed"
 #endif
 #ifndef PkgSrc
   #define PkgSrc      "packages"
 #endif
+#ifndef ReadMe
+  #define ReadMe      "ReadMe"
+#endif
+#ifndef KitFile
+  #define KitFile     "XEmacs_Setup"
+#endif
 
 [Setup]
 AllowNoIcons=yes
@@ -46,9 +66,9 @@
 Compression=lzma
 DefaultDirName={pf}\XEmacs
 DefaultGroupName=XEmacs
-InfoBeforeFile=ReadMe-{#XEmacsVersion}
+InfoBeforeFile={#ReadMe}
+OutputBaseFilename={#KitFile}
 OutputDir=.
-OutputBaseFilename=XEmacs_Setup_{#XEmacsVersion}{#KitName}
 SolidCompression=yes
 UninstallFilesDir={app}/XEmacs-{#XEmacsVersion}
 
@@ -69,86 +89,149 @@
 Source: "{#PkgSrc}\xemacs-base-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Flags: ignoreversion
 ; minitar.exe and unpack.cmd are used to unpack the packages
 Source: "{#ExecSrc}\XEmacs-{#XEmacsVersion}\i586-pc-win32\minitar.exe"; DestDir: "{app}\xemacs-packages"; Flags: ignoreversion
+Source: "{#ExecSrc}\XEmacs-{#XEmacsVersion}\i586-pc-win32\MSVCR80.dll"; DestDir: "{app}\xemacs-packages"; Flags: ignoreversion
 Source: "unpack.cmd"; DestDir: "{app}\xemacs-packages"; Flags: ignoreversion
 Source: "{#PkgSrc}\package-index.LATEST.gpg"; DestDir: "{app}";
 #ifndef QUICKIE_TEST
-; Recommended
+Source: "{#PkgSrc}\Sun-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: Sun; Flags: ignoreversion
+Source: "{#PkgSrc}\ada-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: ada; Flags: ignoreversion
+Source: "{#PkgSrc}\apel-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: apel; Flags: ignoreversion
+Source: "{#PkgSrc}\auctex-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: auctex; Flags: ignoreversion
+Source: "{#PkgSrc}\bbdb-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: bbdb; Flags: ignoreversion
+Source: "{#PkgSrc}\build-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: build; Flags: ignoreversion
 Source: "{#PkgSrc}\c-support-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: c_support; Flags: ignoreversion
+Source: "{#PkgSrc}\calc-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: calc; Flags: ignoreversion
+Source: "{#PkgSrc}\calendar-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: calendar; Flags: ignoreversion
 Source: "{#PkgSrc}\cc-mode-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: cc_mode; Flags: ignoreversion
+Source: "{#PkgSrc}\cedet-common-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: cedet_common; Flags: ignoreversion
+Source: "{#PkgSrc}\clearcase-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: clearcase; Flags: ignoreversion
+Source: "{#PkgSrc}\cogre-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: cogre; Flags: ignoreversion
+Source: "{#PkgSrc}\cookie-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: cookie; Flags: ignoreversion
+Source: "{#PkgSrc}\crisp-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: crisp; Flags: ignoreversion
 Source: "{#PkgSrc}\debug-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: debug; Flags: ignoreversion
+Source: "{#PkgSrc}\dictionary-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: dictionary; Flags: ignoreversion
 Source: "{#PkgSrc}\dired-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: dired; Flags: ignoreversion
+Source: "{#PkgSrc}\docbookide-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: docbookide; Flags: ignoreversion
+Source: "{#PkgSrc}\easypg-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: easypg; Flags: ignoreversion
 Source: "{#PkgSrc}\ecb-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: ecb; Flags: ignoreversion
+Source: "{#PkgSrc}\ecrypto-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: ecrypto; Flags: ignoreversion
+Source: "{#PkgSrc}\ede-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: ede; Flags: ignoreversion
 Source: "{#PkgSrc}\edebug-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: edebug; Flags: ignoreversion
+#ifdef MULE
+Source: "{#PkgSrc}\edict-*-pkg.tar"; DestDir: "{app}\mule-packages"; Components: edict; Flags: ignoreversion
+#endif
 Source: "{#PkgSrc}\ediff-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: ediff; Flags: ignoreversion
 Source: "{#PkgSrc}\edit-utils-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: edit_utils; Flags: ignoreversion
+Source: "{#PkgSrc}\edt-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: edt; Flags: ignoreversion
+Source: "{#PkgSrc}\efs-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: efs; Flags: ignoreversion
+#ifdef MULE
+Source: "{#PkgSrc}\egg-its-*-pkg.tar"; DestDir: "{app}\mule-packages"; Components: egg_its; Flags: ignoreversion
+#endif
 Source: "{#PkgSrc}\eieio-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: eieio; Flags: ignoreversion
-Source: "{#PkgSrc}\fsf-compat-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: fsf_compat; Flags: ignoreversion
-Source: "{#PkgSrc}\mail-lib-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: mail_lib; Flags: ignoreversion
-Source: "{#PkgSrc}\net-utils-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: net_utils; Flags: ignoreversion
-Source: "{#PkgSrc}\os-utils-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: os_utils; Flags: ignoreversion
-Source: "{#PkgSrc}\pc-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: pc; Flags: ignoreversion
-Source: "{#PkgSrc}\perl-modes-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: perl_modes; Flags: ignoreversion
-Source: "{#PkgSrc}\prog-modes-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: prog_modes; Flags: ignoreversion
-Source: "{#PkgSrc}\semantic-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: semantic; Flags: ignoreversion
-Source: "{#PkgSrc}\sh-script-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: sh_script; Flags: ignoreversion
-Source: "{#PkgSrc}\sounds-wav-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: sounds_wav; Flags: ignoreversion
-Source: "{#PkgSrc}\speedbar-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: speedbar; Flags: ignoreversion
-Source: "{#PkgSrc}\texinfo-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: texinfo; Flags: ignoreversion
-Source: "{#PkgSrc}\text-modes-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: text_modes; Flags: ignoreversion
-Source: "{#PkgSrc}\time-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: time; Flags: ignoreversion
-Source: "{#PkgSrc}\xemacs-devel-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: xemacs_devel; Flags: ignoreversion
-; Optional
-Source: "{#PkgSrc}\auctex-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: auctex; Flags: ignoreversion
-Source: "{#PkgSrc}\bbdb-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: bbdb; Flags: ignoreversion
-Source: "{#PkgSrc}\calc-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: calc; Flags: ignoreversion
-Source: "{#PkgSrc}\easypg-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: easypg; Flags: ignoreversion
-Source: "{#PkgSrc}\ecrypto-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: ecrypto; Flags: ignoreversion
 Source: "{#PkgSrc}\elib-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: elib; Flags: ignoreversion
 Source: "{#PkgSrc}\emerge-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: emerge; Flags: ignoreversion
+Source: "{#PkgSrc}\erc-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: erc; Flags: ignoreversion
+Source: "{#PkgSrc}\escreen-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: escreen; Flags: ignoreversion
 Source: "{#PkgSrc}\eshell-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: eshell; Flags: ignoreversion
+Source: "{#PkgSrc}\eterm-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: eterm; Flags: ignoreversion
+Source: "{#PkgSrc}\eudc-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: eudc; Flags: ignoreversion
 Source: "{#PkgSrc}\footnote-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: footnote; Flags: ignoreversion
+Source: "{#PkgSrc}\forms-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: forms; Flags: ignoreversion
 Source: "{#PkgSrc}\fortran-modes-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: fortran_modes; Flags: ignoreversion
+Source: "{#PkgSrc}\frame-icon-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: frame_icon; Flags: ignoreversion
+Source: "{#PkgSrc}\fsf-compat-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: fsf_compat; Flags: ignoreversion
+Source: "{#PkgSrc}\games-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: games; Flags: ignoreversion
+Source: "{#PkgSrc}\general-docs-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: general_docs; Flags: ignoreversion
+Source: "{#PkgSrc}\gnats-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: gnats; Flags: ignoreversion
 Source: "{#PkgSrc}\gnus-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: gnus; Flags: ignoreversion
+Source: "{#PkgSrc}\guided-tour-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: guided_tour; Flags: ignoreversion
+Source: "{#PkgSrc}\haskell-mode-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: haskell_mode; Flags: ignoreversion
 Source: "{#PkgSrc}\hm--html-menus-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: hm__html_menus; Flags: ignoreversion
+Source: "{#PkgSrc}\hyperbole-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: hyperbole; Flags: ignoreversion
 Source: "{#PkgSrc}\ibuffer-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: ibuffer; Flags: ignoreversion
+Source: "{#PkgSrc}\idlwave-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: idlwave; Flags: ignoreversion
 Source: "{#PkgSrc}\igrep-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: igrep; Flags: ignoreversion
+Source: "{#PkgSrc}\ilisp-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: ilisp; Flags: ignoreversion
 Source: "{#PkgSrc}\ispell-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: ispell; Flags: ignoreversion
 Source: "{#PkgSrc}\jde-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: jde; Flags: ignoreversion
+#ifdef MULE
+Source: "{#PkgSrc}\latin-euro-standards-*-pkg.tar"; DestDir: "{app}\mule-packages"; Components: latin_euro_standards; Flags: ignoreversion
+Source: "{#PkgSrc}\latin-unity-*-pkg.tar"; DestDir: "{app}\mule-packages"; Components: latin_unity; Flags: ignoreversion
+Source: "{#PkgSrc}\leim-*-pkg.tar"; DestDir: "{app}\mule-packages"; Components: leim; Flags: ignoreversion
+Source: "{#PkgSrc}\locale-*-pkg.tar"; DestDir: "{app}\mule-packages"; Components: locale; Flags: ignoreversion
+Source: "{#PkgSrc}\lookup-*-pkg.tar"; DestDir: "{app}\mule-packages"; Components: lookup; Flags: ignoreversion
+#endif
+Source: "{#PkgSrc}\mail-lib-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: mail_lib; Flags: ignoreversion
 Source: "{#PkgSrc}\mailcrypt-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: mailcrypt; Flags: ignoreversion
+Source: "{#PkgSrc}\mew-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: mew; Flags: ignoreversion
 Source: "{#PkgSrc}\mh-e-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: mh_e; Flags: ignoreversion
+Source: "{#PkgSrc}\mine-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: mine; Flags: ignoreversion
+Source: "{#PkgSrc}\misc-games-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: misc_games; Flags: ignoreversion
 Source: "{#PkgSrc}\mmm-mode-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: mmm_mode; Flags: ignoreversion
+#ifdef MULE
+Source: "{#PkgSrc}\mule-base-*-pkg.tar"; DestDir: "{app}\mule-packages"; Components: mule_base; Flags: ignoreversion
+Source: "{#PkgSrc}\mule-ucs-*-pkg.tar"; DestDir: "{app}\mule-packages"; Components: mule_ucs; Flags: ignoreversion
+#endif
+Source: "{#PkgSrc}\net-utils-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: net_utils; Flags: ignoreversion
+Source: "{#PkgSrc}\ocaml-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: ocaml; Flags: ignoreversion
+Source: "{#PkgSrc}\oo-browser-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: oo_browser; Flags: ignoreversion
+Source: "{#PkgSrc}\os-utils-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: os_utils; Flags: ignoreversion
+Source: "{#PkgSrc}\pc-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: pc; Flags: ignoreversion
 Source: "{#PkgSrc}\pcl-cvs-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: pcl_cvs; Flags: ignoreversion
 Source: "{#PkgSrc}\pcomplete-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: pcomplete; Flags: ignoreversion
+Source: "{#PkgSrc}\perl-modes-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: perl_modes; Flags: ignoreversion
+Source: "{#PkgSrc}\pgg-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: pgg; Flags: ignoreversion
+Source: "{#PkgSrc}\prog-modes-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: prog_modes; Flags: ignoreversion
 Source: "{#PkgSrc}\ps-print-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: ps_print; Flags: ignoreversion
 Source: "{#PkgSrc}\psgml-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: psgml; Flags: ignoreversion
+Source: "{#PkgSrc}\psgml-dtds-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: psgml_dtds; Flags: ignoreversion
 Source: "{#PkgSrc}\python-modes-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: python_modes; Flags: ignoreversion
 Source: "{#PkgSrc}\re-builder-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: re_builder; Flags: ignoreversion
 Source: "{#PkgSrc}\reftex-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: reftex; Flags: ignoreversion
+Source: "{#PkgSrc}\riece-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: riece; Flags: ignoreversion
+Source: "{#PkgSrc}\rmail-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: rmail; Flags: ignoreversion
 Source: "{#PkgSrc}\ruby-modes-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: ruby_modes; Flags: ignoreversion
 Source: "{#PkgSrc}\sasl-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: sasl; Flags: ignoreversion
 Source: "{#PkgSrc}\scheme-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: scheme; Flags: ignoreversion
+Source: "{#PkgSrc}\semantic-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: semantic; Flags: ignoreversion
 Source: "{#PkgSrc}\sgml-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: sgml; Flags: ignoreversion
+Source: "{#PkgSrc}\sh-script-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: sh_script; Flags: ignoreversion
 Source: "{#PkgSrc}\sieve-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: sieve; Flags: ignoreversion
+#ifdef MULE
+Source: "{#PkgSrc}\skk-*-pkg.tar"; DestDir: "{app}\mule-packages"; Components: skk; Flags: ignoreversion
+#endif
+Source: "{#PkgSrc}\slider-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: slider; Flags: ignoreversion
+Source: "{#PkgSrc}\sml-mode-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: sml_mode; Flags: ignoreversion
+Source: "{#PkgSrc}\sounds-au-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: sounds_au; Flags: ignoreversion
+Source: "{#PkgSrc}\sounds-wav-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: sounds_wav; Flags: ignoreversion
+Source: "{#PkgSrc}\speedbar-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: speedbar; Flags: ignoreversion
+Source: "{#PkgSrc}\strokes-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: strokes; Flags: ignoreversion
 Source: "{#PkgSrc}\supercite-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: supercite; Flags: ignoreversion
+Source: "{#PkgSrc}\texinfo-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: texinfo; Flags: ignoreversion
+Source: "{#PkgSrc}\text-modes-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: text_modes; Flags: ignoreversion
 Source: "{#PkgSrc}\textools-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: textools; Flags: ignoreversion
+Source: "{#PkgSrc}\time-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: time; Flags: ignoreversion
+Source: "{#PkgSrc}\tm-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: tm; Flags: ignoreversion
+Source: "{#PkgSrc}\tooltalk-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: tooltalk; Flags: ignoreversion
+Source: "{#PkgSrc}\tpu-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: tpu; Flags: ignoreversion
 Source: "{#PkgSrc}\tramp-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: tramp; Flags: ignoreversion
 Source: "{#PkgSrc}\vc-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: vc; Flags: ignoreversion
+Source: "{#PkgSrc}\vc-cc-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: vc_cc; Flags: ignoreversion
 Source: "{#PkgSrc}\vhdl-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: vhdl; Flags: ignoreversion
+Source: "{#PkgSrc}\view-process-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: view_process; Flags: ignoreversion
 Source: "{#PkgSrc}\viper-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: viper; Flags: ignoreversion
 Source: "{#PkgSrc}\vm-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: vm; Flags: ignoreversion
 Source: "{#PkgSrc}\w3-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: w3; Flags: ignoreversion
 Source: "{#PkgSrc}\x-symbol-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: x_symbol; Flags: ignoreversion
+Source: "{#PkgSrc}\xemacs-base-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: xemacs_base; Flags: ignoreversion
+Source: "{#PkgSrc}\xemacs-devel-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: xemacs_devel; Flags: ignoreversion
 Source: "{#PkgSrc}\xetla-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: xetla; Flags: ignoreversion
+Source: "{#PkgSrc}\xlib-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: xlib; Flags: ignoreversion
 Source: "{#PkgSrc}\xslide-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: xslide; Flags: ignoreversion
 Source: "{#PkgSrc}\xslt-process-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: xslt_process; Flags: ignoreversion
+Source: "{#PkgSrc}\xwem-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: xwem; Flags: ignoreversion
+Source: "{#PkgSrc}\zenirc-*-pkg.tar"; DestDir: "{app}\xemacs-packages"; Components: zenirc; Flags: ignoreversion
 #endif  // ifndef QUICKIE_TEST
-#ifdef MULE
-Source: "{#PkgSrc}\latin-euro-standards-*-pkg.tar"; DestDir: "{app}\mule-packages"; Components: latin_euro_standards; Flags: ignoreversion
-Source: "{#PkgSrc}\latin-unity-*-pkg.tar"; DestDir: "{app}\mule-packages"; Components: latin_unity; Flags: ignoreversion
-Source: "{#PkgSrc}\locale-*-pkg.tar"; DestDir: "{app}\mule-packages"; Components: locale; Flags: ignoreversion
-Source: "{#PkgSrc}\lookup-*-pkg.tar"; DestDir: "{app}\mule-packages"; Components: lookup; Flags: ignoreversion
-Source: "{#PkgSrc}\mule-base-*-pkg.tar"; DestDir: "{app}\mule-packages"; Components: mule_base; Flags: ignoreversion
-#endif
 
 [Types]
 Name: "recommended"; Description: "Recommended installation"
@@ -158,85 +241,144 @@
 
 [Components]
 Name: "base"; Description: "XEmacs {#XEmacsVersion} executable and essential support files"; Types: complete minimal recommended custom; Flags: fixed
-Name: "auctex"; Description: "auctex: Basic TeX/LaTeX support"; Types: complete custom
+Name: "Sun"; Description: "Sun: Support for Sparcworks."; Types: complete custom
+Name: "ada"; Description: "ada: Ada language support."; Types: complete custom
+Name: "apel"; Description: "apel: A Portable Emacs Library.  Used by XEmacs MIME support."; Types: complete custom
+Name: "auctex"; Description: "auctex: Basic TeX/LaTeX support."; Types: complete custom
 Name: "bbdb"; Description: "bbdb: The Big Brother Data Base"; Types: complete custom
-Name: "c_support"; Description: "c-support: Basic single-file add-ons for editing C code"; Types: complete recommended custom
+Name: "build"; Description: "build: Build XEmacs from within (UNIX, Windows)."; Types: complete custom
+Name: "c_support"; Description: "c-support: Basic single-file add-ons for editing C code."; Types: complete custom recommended
 Name: "calc"; Description: "calc: Emacs calculator"; Types: complete custom
-Name: "cc_mode"; Description: "cc-mode: C, C++, etc language support"; Types: complete recommended custom
-Name: "debug"; Description: "debug: GUD, gdb, dbx debugging support"; Types: complete recommended custom
-Name: "dired"; Description: "dired: Manage file systems"; Types: complete recommended custom
-Name: "ecb"; Description: "ecb: Emacs source code browser"; Types: complete recommended custom
-Name: "easypg"; Description: "easypg: GnuPG interface for Emacs"; Types: complete custom
-Name: "ecrypto"; Description: "ecrypto: Crypto functionality in Emacs Lisp"; Types: complete custom
-Name: "edebug"; Description: "edebug: An Emacs Lisp debugger"; Types: complete recommended custom
-Name: "ediff"; Description: "ediff: Interface over GNU patch"; Types: complete recommended custom
-Name: "edit_utils"; Description: "edit-utils: Miscellaneous editor extensions, you probably need this"; Types: complete minimal recommended custom
-Name: "efs"; Description: "efs: Edit files on other computers"; Types: complete minimal recommended custom; Flags: fixed
-Name: "eieio"; Description: "eieio: Enhanced Implementation of Emacs Interpreted Objects"; Types: complete recommended custom
-Name: "elib"; Description: "elib: Portable Emacs Lisp utilities library"; Types: complete custom
-Name: "emerge"; Description: "emerge: Another interface over GNU patch"; Types: complete custom
-Name: "eshell"; Description: "eshell: Command shell implemented in Emacs Lisp"; Types: complete custom
-Name: "footnote"; Description: "footnote: Footnoting in mail message editing modes"; Types: complete custom
-Name: "fortran_modes"; Description: "fortran-modes: Fortran support"; Types: complete custom
-Name: "fsf_compat"; Description: "fsf-compat: FSF Emacs compatibility files"; Types: complete recommended custom
-Name: "gnus"; Description: "gnus: The Gnus Newsreader and Mailreader"; Types: complete custom
-Name: "hm__html_menus"; Description: "hm--html-menus: HTML editing"; Types: complete custom
+Name: "calendar"; Description: "calendar: Calendar and diary support."; Types: complete custom
+Name: "cc_mode"; Description: "cc-mode: C, C++, Objective-C, Java, CORBA IDL, Pike and AWK language support."; Types: complete custom recommended
+Name: "cedet_common"; Description: "cedet-common: Common files for CEDET development environment."; Types: complete custom
+Name: "clearcase"; Description: "clearcase: New Clearcase Version Control for XEmacs (UNIX, Windows)."; Types: complete custom
+Name: "cogre"; Description: "cogre: Graph editing mode."; Types: complete custom
+Name: "cookie"; Description: "cookie: Spook and Yow (Zippy quotes)."; Types: complete custom
+Name: "crisp"; Description: "crisp: Crisp/Brief emulation."; Types: complete custom
+Name: "debug"; Description: "debug: GUD, gdb, dbx debugging support."; Types: complete custom recommended
+Name: "dictionary"; Description: "dictionary: Interface to RFC2229 dictionary servers."; Types: complete custom
+Name: "dired"; Description: "dired: Manage file systems."; Types: complete custom recommended
+Name: "docbookide"; Description: "docbookide: DocBook editing support."; Types: complete custom
+Name: "easypg"; Description: "easypg: GnuPG interface for Emacs."; Types: complete custom
+Name: "ecb"; Description: "ecb: Emacs source code browser."; Types: complete custom recommended
+Name: "ecrypto"; Description: "ecrypto: Crypto functionality in Emacs Lisp."; Types: complete custom
+Name: "ede"; Description: "ede: Emacs Development Environment."; Types: complete custom
+Name: "edebug"; Description: "edebug: An Emacs Lisp debugger."; Types: complete custom recommended
+#ifdef MULE
+Name: "edict"; Description: "edict: MULE: Lisp Interface to EDICT, Kanji Dictionary."; Types: complete custom
+#endif
+Name: "ediff"; Description: "ediff: Interface over GNU patch."; Types: complete custom recommended
+Name: "edit_utils"; Description: "edit-utils: Miscellaneous editor extensions, you probably need this."; Types: complete custom recommended minimal
+Name: "edt"; Description: "edt: DEC EDIT/EDT emulation."; Types: complete custom
+Name: "efs"; Description: "efs: Treat files on remote systems the same as local files."; Types: complete custom recommended minimal; Flags: fixed
+#ifdef MULE
+Name: "egg_its"; Description: "egg-its: MULE: Wnn (4.2 and 6) support.  SJ3 support."; Types: complete custom
+#endif
+Name: "eieio"; Description: "eieio: Enhanced Implementation of Emacs Interpreted Objects"; Types: complete custom recommended
+Name: "elib"; Description: "elib: Portable Emacs Lisp utilities library."; Types: complete custom
+Name: "emerge"; Description: "emerge: Another interface over GNU patch."; Types: complete custom
+Name: "erc"; Description: "erc: ERC is an Emacs InternetRelayChat client."; Types: complete custom
+Name: "escreen"; Description: "escreen: Multiple editing sessions withing a single frame (like screen)."; Types: complete custom
+Name: "eshell"; Description: "eshell: Command shell implemented entirely in Emacs Lisp"; Types: complete custom
+Name: "eterm"; Description: "eterm: Terminal emulation."; Types: complete custom
+Name: "eudc"; Description: "eudc: Emacs Unified Directory Client (LDAP, PH)."; Types: complete custom
+Name: "footnote"; Description: "footnote: Footnoting in mail message editing modes."; Types: complete custom
+Name: "forms"; Description: "forms: Forms editing support (obsolete, use Widget instead)."; Types: complete custom
+Name: "fortran_modes"; Description: "fortran-modes: Fortran support."; Types: complete custom
+Name: "frame_icon"; Description: "frame-icon: Set up mode-specific icons for each frame under XEmacs"; Types: complete custom
+Name: "fsf_compat"; Description: "fsf-compat: FSF Emacs compatibility files."; Types: complete custom recommended
+Name: "games"; Description: "games: Tetris, Sokoban, Sudoku, and Snake."; Types: complete custom
+Name: "general_docs"; Description: "general-docs: General XEmacs documentation."; Types: complete custom
+Name: "gnats"; Description: "gnats: XEmacs bug reports."; Types: complete custom
+Name: "gnus"; Description: "gnus: The Gnus Newsreader and Mailreader."; Types: complete custom
+Name: "guided_tour"; Description: "guided-tour: Phil Sung's Guided Tour of Emacs."; Types: complete custom
+Name: "haskell_mode"; Description: "haskell-mode: Haskell editing support."; Types: complete custom
+Name: "hm__html_menus"; Description: "hm--html-menus: HTML editing."; Types: complete custom
+Name: "hyperbole"; Description: "hyperbole: Hyperbole: The Everyday Info Manager"; Types: complete custom
 Name: "ibuffer"; Description: "ibuffer: Advanced replacement for buffer-menu"; Types: complete custom
-Name: "igrep"; Description: "igrep: Enhanced front-end for Grep"; Types: complete custom
-Name: "ispell"; Description: "ispell: Spell-checking with GNU ispell"; Types: complete custom
-Name: "jde"; Description: "jde: Integrated Development Environment for Java"; Types: complete custom
+Name: "idlwave"; Description: "idlwave: Editing and Shell mode for the Interactive Data Language"; Types: complete custom
+Name: "igrep"; Description: "igrep: Enhanced front-end for Grep."; Types: complete custom
+Name: "ilisp"; Description: "ilisp: Front-end for Inferior Lisp."; Types: complete custom
+Name: "ispell"; Description: "ispell: Spell-checking with GNU ispell."; Types: complete custom
+Name: "jde"; Description: "jde: Integrated Development Environment for Java."; Types: complete custom
 #ifdef MULE
-Name: "latin_euro_standards"; Description: "latin-euro-standards: Support for the Latin character sets (MULE)"; Types: complete recommended custom
-Name: "latin_unity"; Description: "latin-unity: Find single ISO 8859 character set to encode a buffer (MULE)"; Types: complete recommended custom
-Name: "locale"; Description: "locale: Localized menubars and localized splash screens (MULE)"; Types: complete recommended custom
-Name: "lookup"; Description: "lookup: Dictionary support (MULE)"; Types: complete recommended custom
-#endif
-Name: "mail_lib"; Description: "mail-lib: Fundamental lisp files for providing email support"; Types: complete recommended custom
-Name: "mailcrypt"; Description: "mailcrypt: Support for messaging encryption with PGP"; Types: complete custom
-Name: "mh_e"; Description: "mh-e: Interface to the MH Mail System"; Types: complete custom
+Name: "latin_euro_standards"; Description: "latin-euro-standards: MULE: Support for the Latin{{7,8,9,10} character sets & coding systems."; Types: complete custom recommended
+Name: "latin_unity"; Description: "latin-unity: MULE: find single ISO 8859 character set to encode a buffer."; Types: complete custom recommended
+Name: "leim"; Description: "leim: MULE: Quail.  All non-English and non-Japanese language support."; Types: complete custom
+Name: "locale"; Description: "locale: MULE: Localized menubars and localized splash screens."; Types: complete custom recommended
+Name: "lookup"; Description: "lookup: MULE: Dictionary support"; Types: complete custom recommended
+#endif
+Name: "mail_lib"; Description: "mail-lib: Fundamental lisp files for providing email support."; Types: complete custom recommended
+Name: "mailcrypt"; Description: "mailcrypt: Support for messaging encryption with PGP."; Types: complete custom
+Name: "mew"; Description: "mew: Messaging in an Emacs World."; Types: complete custom
+Name: "mh_e"; Description: "mh-e: The XEmacs Interface to the MH Mail System."; Types: complete custom
+Name: "mine"; Description: "mine: Minehunt Game."; Types: complete custom
+Name: "misc_games"; Description: "misc-games: Other amusements and diversions."; Types: complete custom
 Name: "mmm_mode"; Description: "mmm-mode: Multiple major modes in a single buffer"; Types: complete custom
 #ifdef MULE
-Name: "mule_base"; Description: "mule-base: Basic MULE support"; Types: complete recommended custom
+Name: "mule_base"; Description: "mule-base: MULE: Basic Mule support."; Types: complete custom recommended
+Name: "mule_ucs"; Description: "mule-ucs: MULE: Extended coding systems (including Unicode) for XEmacs."; Types: complete custom
 #endif
-Name: "net_utils"; Description: "net-utils: Miscellaneous Networking Utilities"; Types: complete recommended custom
-Name: "os_utils"; Description: "os-utils: Miscellaneous O/S utilities"; Types: complete recommended custom
-Name: "pc"; Description: "pc: PC style interface emulation"; Types: complete recommended custom
-Name: "pcl_cvs"; Description: "pcl-cvs: CVS frontend"; Types: complete custom
-Name: "pcomplete"; Description: "pcomplete: Provides programmatic completion"; Types: complete custom
-Name: "perl_modes"; Description: "perl-modes: Perl support"; Types: complete recommended custom
-Name: "prog_modes"; Description: "prog-modes: Support for various programming languages"; Types: complete recommended custom
+Name: "net_utils"; Description: "net-utils: Miscellaneous Networking Utilities."; Types: complete custom recommended
+Name: "ocaml"; Description: "ocaml: Objective Caml editing support."; Types: complete custom
+Name: "oo_browser"; Description: "oo-browser: OO-Browser: The Multi-Language Object-Oriented Code Browser"; Types: complete custom
+Name: "os_utils"; Description: "os-utils: Miscellaneous O/S utilities."; Types: complete custom recommended
+Name: "pc"; Description: "pc: PC style interface emulation."; Types: complete custom recommended
+Name: "pcl_cvs"; Description: "pcl-cvs: CVS frontend."; Types: complete custom
+Name: "pcomplete"; Description: "pcomplete: Provides programmatic completion."; Types: complete custom
+Name: "perl_modes"; Description: "perl-modes: Perl support."; Types: complete custom recommended
+Name: "pgg"; Description: "pgg: Emacs interface to various PGP implementations."; Types: complete custom
+Name: "prog_modes"; Description: "prog-modes: Support for various programming languages."; Types: complete custom recommended
 Name: "ps_print"; Description: "ps-print: Printing functions and utilities"; Types: complete custom
-Name: "psgml"; Description: "psgml: Validated HTML/SGML editing"; Types: complete custom
-Name: "python_modes"; Description: "python-modes: Python support"; Types: complete custom
-Name: "re_builder"; Description: "re-builder: Build regular expressions"; Types: complete custom
-Name: "reftex"; Description: "reftex: LaTeX cross-references and citations"; Types: complete custom
-Name: "ruby_modes"; Description: "ruby-modes: Ruby support"; Types: complete custom
-Name: "sasl"; Description: "sasl: Simple Authentication and Security Layer (SASL) library"; Types: complete custom
-Name: "scheme"; Description: "scheme: Front-end support for Inferior Scheme"; Types: complete custom
-Name: "semantic"; Description: "semantic: Semantic bovinator (Yacc/Lex for XEmacs)"; Types: complete recommended custom
-Name: "sgml"; Description: "sgml: SGML/Linuxdoc-SGML editing"; Types: complete custom
-Name: "sh_script"; Description: "sh-script: Support for editing shell scripts"; Types: complete recommended custom
-Name: "sieve"; Description: "sieve: Manage Sieve email filtering scripts"; Types: complete custom
-Name: "sounds_wav"; Description: "sounds-wav: XEmacs Microsoft sound files"; Types: complete recommended custom
-Name: "speedbar"; Description: "speedbar: Provides a separate frame with convenient references"; Types: complete recommended custom
-Name: "supercite"; Description: "supercite: Citation tool for news & mail messages"; Types: complete custom
-Name: "texinfo"; Description: "texinfo: XEmacs TeXinfo support"; Types: complete minimal recommended custom
-Name: "text_modes"; Description: "text-modes: Miscellaneous support for editing text files"; Types: complete recommended custom
-Name: "textools"; Description: "textools: Miscellaneous TeX support"; Types: complete custom
-Name: "time"; Description: "time: Display time & date on the modeline"; Types: complete recommended custom
-Name: "tramp"; Description: "tramp: Remote shell-based file editing"; Types: complete custom
-Name: "vc"; Description: "vc: Version Control for Free systems"; Types: complete custom
-Name: "vhdl"; Description: "vhdl: Support for VHDL"; Types: complete custom
-Name: "viper"; Description: "viper: VI emulation support"; Types: complete custom
-Name: "vm"; Description: "vm: An Emacs mailer"; Types: complete custom
-Name: "w3"; Description: "w3: A Web browser"; Types: complete custom
-Name: "x_symbol"; Description: "x-symbol: Semi WYSIWYG for LaTeX and HTML"; Types: complete custom
-Name: "xemacs_base"; Description: "xemacs-base: Basic XEmacs support";  Types: complete minimal recommended custom; Flags: fixed
-Name: "xemacs_devel"; Description: "xemacs-devel: Emacs Lisp developer support"; Types: complete recommended custom
-Name: "xetla"; Description: "xetla: XEmacs support for GNU/arch (tla)"; Types: complete custom
-Name: "xslide"; Description: "xslide: XSL editing support"; Types: complete custom
-Name: "xslt_process"; Description: "xslt-process: XSLT processing support"; Types: complete custom
-
+Name: "psgml"; Description: "psgml: Validated HTML/SGML editing."; Types: complete custom
+Name: "psgml_dtds"; Description: "psgml-dtds: Deprecated collection of DTDs for psgml."; Types: complete custom
+Name: "python_modes"; Description: "python-modes: Python support."; Types: complete custom
+Name: "re_builder"; Description: "re-builder: Interactive development tool for regular expressions."; Types: complete custom
+Name: "reftex"; Description: "reftex: Emacs support for LaTeX cross-references, citations.."; Types: complete custom
+Name: "riece"; Description: "riece: IRC (Internet Relay Chat) client for Emacs."; Types: complete custom
+Name: "rmail"; Description: "rmail: An obsolete Emacs mailer."; Types: complete custom
+Name: "ruby_modes"; Description: "ruby-modes: Ruby support."; Types: complete custom
+Name: "sasl"; Description: "sasl: Simple Authentication and Security Layer (SASL) library."; Types: complete custom
+Name: "scheme"; Description: "scheme: Front-end support for Inferior Scheme."; Types: complete custom
+Name: "semantic"; Description: "semantic: Semantic bovinator (Yacc/Lex for XEmacs). Includes Senator."; Types: complete custom recommended
+Name: "sgml"; Description: "sgml: SGML/Linuxdoc-SGML editing."; Types: complete custom
+Name: "sh_script"; Description: "sh-script: Support for editing shell scripts."; Types: complete custom recommended
+Name: "sieve"; Description: "sieve: Manage Sieve email filtering scripts."; Types: complete custom
+#ifdef MULE
+Name: "skk"; Description: "skk: MULE: Japanese Language Input Method."; Types: complete custom
+#endif
+Name: "slider"; Description: "slider: User interface tool."; Types: complete custom
+Name: "sml_mode"; Description: "sml-mode: SML editing support."; Types: complete custom
+Name: "sounds_au"; Description: "sounds-au: XEmacs Sun sound files."; Types: complete custom
+Name: "sounds_wav"; Description: "sounds-wav: XEmacs Microsoft sound files."; Types: complete custom recommended
+Name: "speedbar"; Description: "speedbar: Provides a separate frame with convenient references."; Types: complete custom recommended
+Name: "strokes"; Description: "strokes: Mouse enhancement utility."; Types: complete custom
+Name: "supercite"; Description: "supercite: An Emacs citation tool for News & Mail messages."; Types: complete custom
+Name: "texinfo"; Description: "texinfo: XEmacs TeXinfo support."; Types: complete custom recommended minimal
+Name: "text_modes"; Description: "text-modes: Miscellaneous support for editing text files."; Types: complete custom recommended
+Name: "textools"; Description: "textools: Miscellaneous TeX support."; Types: complete custom
+Name: "time"; Description: "time: Display time & date on the modeline."; Types: complete custom recommended
+Name: "tm"; Description: "tm: Emacs MIME support. Not needed for gnus >= 5.8.0"; Types: complete custom
+Name: "tooltalk"; Description: "tooltalk: Support for building with Tooltalk."; Types: complete custom
+Name: "tpu"; Description: "tpu: DEC EDIT/TPU support."; Types: complete custom
+Name: "tramp"; Description: "tramp: Remote shell-based file editing."; Types: complete custom
+Name: "vc"; Description: "vc: Version Control for Free systems."; Types: complete custom
+Name: "vc_cc"; Description: "vc-cc: Version Control for ClearCase (UnFree) systems."; Types: complete custom
+Name: "vhdl"; Description: "vhdl: Support for VHDL."; Types: complete custom
+Name: "view_process"; Description: "view-process: A Unix process browsing tool."; Types: complete custom
+Name: "viper"; Description: "viper: VI emulation support."; Types: complete custom
+Name: "vm"; Description: "vm: An Emacs mailer."; Types: complete custom
+Name: "w3"; Description: "w3: A Web browser."; Types: complete custom
+Name: "x_symbol"; Description: "x-symbol: Semi WYSIWYG for LaTeX, HTML, etc, using additional fonts."; Types: complete custom
+Name: "xemacs_base"; Description: "xemacs-base: Fundamental XEmacs support, you almost certainly need this."; Types: complete custom recommended minimal; Flags: fixed
+Name: "xemacs_devel"; Description: "xemacs-devel: Emacs Lisp developer support."; Types: complete custom recommended
+Name: "xetla"; Description: "xetla: (S)XEmacs Frontend to GNU/arch (tla)."; Types: complete custom
+Name: "xlib"; Description: "xlib: Emacs interface to X server."; Types: complete custom
+Name: "xslide"; Description: "xslide: XSL editing support."; Types: complete custom
+Name: "xslt_process"; Description: "xslt-process: XSLT processing support."; Types: complete custom
+Name: "xwem"; Description: "xwem: X Emacs Window Manager."; Types: complete custom
+Name: "zenirc"; Description: "zenirc: ZENIRC IRC Client."; Types: complete custom
 [INI]
 
 [Icons]
@@ -417,4 +559,3 @@
     end;
   end;
 end;
-
diff -r -u xemacs-21.4.22/nt/config.inc.samp xemacs-21.4.23/nt/config.inc.samp
--- xemacs-21.4.22/nt/config.inc.samp	2008-01-23 07:14:01.000000000 -0500
+++ xemacs-21.4.23/nt/config.inc.samp	2015-01-29 10:04:29.000000000 -0500
@@ -52,20 +52,20 @@
 # do that here so we can preserve the version number, like for the other
 # libraries.
 HAVE_PNG=1
-PNG_DIR=$(OPTIONAL_LIBRARY_DIR)\libpng-1.2.8
-ZLIB_DIR=$(OPTIONAL_LIBRARY_DIR)\zlib-1.2.1
+PNG_DIR=$(OPTIONAL_LIBRARY_DIR)\libpng-1.2.46
+ZLIB_DIR=$(OPTIONAL_LIBRARY_DIR)\zlib
 
 # Set this to enable JPEG support (useful, but not necessary), and specify
 # the directory containing jpeg.  Get the latest version from
 # ftp://ftp.uu.net/graphics/jpeg/.
 HAVE_JPEG=1
-JPEG_DIR=$(OPTIONAL_LIBRARY_DIR)\jpeg-6b
+JPEG_DIR=$(OPTIONAL_LIBRARY_DIR)\jpeg-8c
 
 # Set this to enable TIFF support (not very important), and specify the
 # directory containing tiff.  Get the latest version from
 # ftp://ftp.uu.net/graphics/tiff/.
 HAVE_TIFF=1
-TIFF_DIR=$(OPTIONAL_LIBRARY_DIR)\tiff-v3.5.7
+TIFF_DIR=$(OPTIONAL_LIBRARY_DIR)\tiff-v3.9.5
 
 # Set this to enable XFace support (not very important), and specify the
 # directory containing compface.  Get the library from
diff -r -u xemacs-21.4.22/nt/xemacs.mak xemacs-21.4.23/nt/xemacs.mak
--- xemacs-21.4.22/nt/xemacs.mak	2008-01-23 07:14:02.000000000 -0500
+++ xemacs-21.4.23/nt/xemacs.mak	2015-01-29 10:04:29.000000000 -0500
@@ -63,6 +63,18 @@
 COPY=xcopy /q
 COPYDIR=xcopy /q /e
 
+########################### Figure out current version of VC++.
+
+!if [if not exist $(OUTDIR) mkdir "$(OUTDIR)"]
+!endif
+!if [echo MSC_VER=_MSC_VER > $(OUTDIR)\vcversion.c]
+!endif
+!if [cl /nologo /EP $(OUTDIR)\vcversion.c > $(OUTDIR)\vcversion.tmp]
+!endif
+!include "$(OUTDIR)\vcversion.tmp"
+
+########################### Process the config.inc options.
+
 !include "config.inc"
 
 !if !defined(INFODOCK)
@@ -355,14 +367,10 @@
 
 !if $(USE_INTEL_COMPILER)
 CC=icl
-# Use static library if possible
-INTEL_LIBS=libircmt.lib libmmt.lib
-# Debugging requires DLL version of libm
-!if $(DEBUG_XEMACS)
+# The static math lib no longer works for building XEmacs as of version 11.0
+# of the Intel C Compiler, so always link with the dynamic version.
 INTEL_LIBS=libircmt.lib libmmd.lib
 !endif
-!endif
-
 #
 # Compiler command echo control. Define VERBOSECC=1 to get verbose compilation.
 #
@@ -379,6 +387,9 @@
 OPT=-Od -Zi
 !else
 OPT=-O2 -G5
+!if $(USE_INTEL_COMPILER)
+OPT=-Os -arch:ia32
+!endif
 !endif
 
 !if $(USE_CRTDLL)
@@ -568,6 +579,11 @@
 {$(LIB_SRC)}.c{$(LIB_SRC)}.exe :
 	cd $(LIB_SRC)
 	$(CCV) -I. -I$(XEMACS)/src -I$(XEMACS)/nt/inc $(LIB_SRC_DEFINES) $(CFLAGS) -Fe$@ $** -link -incremental:no setargv.obj
+# If we're using Visual Studio 2005 or greater,
+# embed the manifest into the executable.
+!if $(MSC_VER) >= 1400
+	mt -manifest $@.manifest -outputresource:$@;1
+!endif
 	cd $(NT)
 
 # Individual dependencies
@@ -576,15 +592,30 @@
 $(LIB_SRC)/movemail.exe: $(LIB_SRC)/movemail.c $(LIB_SRC)/pop.c $(ETAGS_DEPS)
 	cd $(LIB_SRC)
 	$(CCV) -I. -I$(XEMACS)/src -I$(XEMACS)/nt/inc $(LIB_SRC_DEFINES) $(CFLAGS) -Fe$@ $** wsock32.lib -link -incremental:no
+# If we're using Visual Studio 2005 or greater,
+# embed the manifest into the executable.
+!if $(MSC_VER) >= 1400
+	mt -manifest $@.manifest -outputresource:$@;1
+!endif
 	cd $(NT)
 
 $(LIB_SRC)/winclient.exe: $(LIB_SRC)/winclient.c
 	cd $(LIB_SRC)
 	$(CCV) -I. -I$(XEMACS)/src -I$(XEMACS)/nt/inc $(LIB_SRC_DEFINES) $(CFLAGS) -Fe$@ $** user32.lib -link -incremental:no
+# If we're using Visual Studio 2005 or greater,
+# embed the manifest into the executable.
+!if $(MSC_VER) >= 1400
+	mt -manifest $@.manifest -outputresource:$@;1
+!endif
 	cd $(NT)
 
 $(LIB_SRC)/minitar.exe : $(NT)/minitar.c
 	$(CCV) $(CFLAGS_NO_LIB) -I"$(ZLIB_DIR)" $(LIB_SRC_DEFINES) -MD -Fe$@ $** $(ZLIB_DIR)\zlib.lib -link -incremental:no
+# If we're using Visual Studio 2005 or greater,
+# embed the manifest into the executable.
+!if $(MSC_VER) >= 1400
+	mt -manifest $@.manifest -outputresource:$@;1
+!endif
 
 LIB_SRC_TOOLS = \
 	$(LIB_SRC)/etags.exe		\
@@ -1438,6 +1469,11 @@
 # Make the resource section read/write since almost all of it is the dump
 # data which needs to be writable.  This avoids having to copy it.
 	editbin -nologo -stack:0x800000 -section:.rsrc,rw xemacs.exe
+# If we're using Visual Studio 2005 or greater,
+# embed the manifest into the executable.
+!if $(MSC_VER) >= 1400
+	mt -manifest $@.manifest -outputresource:$@;1
+!endif
 	$(DEL) $(TEMACS_DIR)\xemacs.dmp
 !else
 	editbin -nologo -stack:0x800000 xemacs.exe
diff -r -u xemacs-21.4.22/src/ChangeLog xemacs-21.4.23/src/ChangeLog
--- xemacs-21.4.22/src/ChangeLog	2008-12-28 21:19:05.000000000 -0500
+++ xemacs-21.4.23/src/ChangeLog	2015-01-29 10:04:29.000000000 -0500
@@ -1,3 +1,115 @@
+2015-01-29  Vin Shelton <acs@xemacs.org>
+ 
+	* XEmacs 21.4.23 is released
+
+2015-01-28  Vin Shelton  <acs@xemacs.org>
+
+	* process-unix.c: Move disconnect_controlling_terminal() call
+	later in create_process_unix().  This is necessary for Cygwin, but
+	seems to work on linux (at least), too.
+
+2015-01-25  Vin Shelton  <acs@xemacs.org>
+
+	Fix progress bar crashes.
+	Thanks to Ralf Soergel for diagnosis and a patch.
+
+	* config.h.in (HAVE_ATHENA_I18N): New #define.
+
+2015-01-24  Vin Shelton  <acs@xemacs.org>
+
+	* fileio.c: Guard include of w32api/aclapi.h to preserve Status
+	definition for X Windows.
+
+	* syswindows.h: Move #undef and redeclaration of Status because
+	more w32api includes use Status, which is already defined for X
+	Windows.
+
+2015-01-23  Vin Shelton  <acs@xemacs.org>
+
+	* s/cygwin32.h: Use strcasecmp instead of stricmp.
+
+2009-01-31  Dr. Volker Zell  <Dr.Volker.Zell@oracle.com>
+
+	* redisplay-msw.c (mswindows_text_width_single_run): #ifndef assertion
+	to fix a crash under Cygwin (Windows variant) when paging in Info buffer.
+
+	* sysdir.h: Revert workaround missing d_ino field from 'struct dirent'
+	for Cygwin as it's back in again.
+
+2012-07-12  Vin Shelton  <acs@xemacs.org>
+
+	* glyphs-eimage.c: Fix this so it compiles with libpng-1.5.10.
+	Thanks to Aidan, Julian and Hans de Graaff.
+
+2011-08-05  Stephen J. Turnbull  <stephen@xemacs.org>
+	There are only (octal) 0200 ASCII characters, and only 128 values
+	supplied in the definition.
+
+	* syntax.h (syntax_spec_code):
+	* syntax.c (syntax_spec_code):
+	Declare array with correct dimension.
+	* search.c (skip_chars):
+	Correct bounds check on index of syntax_spec_code.
+
+2011-12-11  Julian Bradfield <jcb+xeb@jcbradfield.org>
+
+	* regex.c: ^ was wrongly interpreted as literal when occurring at
+	the start of a shy group.
+
+2009-09-23  Stephen Turnbull  <stephen@xemacs.org>
+
+	* glyphs-eimage.c (png_instantiate):
+	Clean up PNG handling.  Fixes crash in issue570.
+
+	Pad eimage buffer to handle overrun in libpng (fix crash).
+	Reorder libpng setup and call png_read_update_info (display images
+	with transparency correctly).
+
+2010-03-05  Ben Wing  <ben@xemacs.org>
+
+	* mule-coding.c (iso2022_encode):
+	Horrible bug: `escape-quoted' was failing to escape-quote special
+	characters in the 0x80 - 0x9F range.  Who knows what breakage ensued?
+	Ported from 21.5.
+
+2011-04-02  Vin Shelton  <acs@xemacs.org>
+
+	* eldap.h: Added definition of LDAP_DEPRECATED per Hans de Graaff:
+	http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-editors/xemacs/files/xemacs-21.4.22-deprecated-ldap.patch
+
+2011-04-02  Mats Lidell <mats@xemacs.org>
+
+	* event-unixoid: implement find_tty_or_stream_cosole_from_fd()
+	from 21.5.
+	* events.c:
+	* event-tty.c: Use find_tty_or_stream_console_from_fd().
+
+2009-11-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	Fix issue630.
+
+	* regex.c (regex_compile):
+	Sync treatment of normal_char to GNU Emacs 22.1.
+	Thanks to Aidan Kehoe for the diagnosis and suggestion.
+	(print_partial_compiled_pattern):
+	Avoid buffer overrun in case of /exactn/0.
+
+2009-10-14  Mike Sperber  <mike@xemacs.org>
+
+	* fileio.c (Finsert_file_contents_internal): Don't call the
+	file-name handler for `insert-file-contents' from here, which is
+	too late.  Instead, do it from Lisp.SSper
+
+2009-10-01  Mike Sperber  <mike@xemacs.org>
+
+	* frame-x.c (x_focus_on_frame): Use correct timestamep with
+	XSetInputFocus.
+
+2009-01-31  Vin Shelton  <acs@xemacs.org>
+
+	* regex.c (re_search_2): Really apply Julian Bradfield's patch for
+	at_dot.
+
 2008-12-28  Vin Shelton  <acs@xemacs.org>
 
 	* XEmacs 21.4.22 is released
diff -r -u xemacs-21.4.22/src/config.h.in xemacs-21.4.23/src/config.h.in
--- xemacs-21.4.22/src/config.h.in	2005-11-27 21:10:19.000000000 -0500
+++ xemacs-21.4.23/src/config.h.in	2015-01-29 10:04:29.000000000 -0500
@@ -720,6 +720,7 @@
 #undef LWLIB_WIDGETS_MOTIF
 #undef LWLIB_WIDGETS_ATHENA
 #undef HAVE_ATHENA_3D
+#undef HAVE_ATHENA_I18N
 
 /* Other things that can be disabled by configure. */
 #undef HAVE_MENUBARS
diff -r -u xemacs-21.4.22/src/eldap.h xemacs-21.4.23/src/eldap.h
--- xemacs-21.4.22/src/eldap.h	2001-04-12 14:23:36.000000000 -0400
+++ xemacs-21.4.23/src/eldap.h	2015-01-29 10:04:29.000000000 -0500
@@ -21,6 +21,8 @@
 #ifndef INCLUDED_eldap_h_
 #define INCLUDED_eldap_h_
 
+#define LDAP_DEPRECATED 1
+
 #include <lber.h>
 #include <ldap.h>
 
diff -r -u xemacs-21.4.22/src/event-tty.c xemacs-21.4.23/src/event-tty.c
--- xemacs-21.4.22/src/event-tty.c	2001-04-12 14:23:42.000000000 -0400
+++ xemacs-21.4.23/src/event-tty.c	2015-01-29 10:04:29.000000000 -0500
@@ -142,7 +142,7 @@
 		 user events ahead of process events. */
 	      if (FD_ISSET (i, &temp_mask) && FD_ISSET (i, &tty_only_mask))
 		{
-		  struct console *c = tty_find_console_from_fd (i);
+		  struct console *c = find_tty_or_stream_console_from_fd (i);
 
 		  assert (c);
 		  if (read_event_from_tty_or_stream_desc (emacs_event, c, i))
diff -r -u xemacs-21.4.22/src/event-unixoid.c xemacs-21.4.23/src/event-unixoid.c
--- xemacs-21.4.22/src/event-unixoid.c	2005-01-30 21:55:12.000000000 -0500
+++ xemacs-21.4.23/src/event-unixoid.c	2015-01-29 10:04:29.000000000 -0500
@@ -70,6 +70,24 @@
 
 int fake_event_occurred;
 
+struct console *
+find_tty_or_stream_console_from_fd (int fd)
+{
+  Lisp_Object concons;
+
+  CONSOLE_LOOP (concons)
+    {
+      struct console *c;
+
+      c = XCONSOLE (XCAR (concons));
+      if ((CONSOLE_TTY_P (c) && CONSOLE_TTY_DATA (c)->infd == fd) ||
+	  (CONSOLE_STREAM_P (c) && fileno (CONSOLE_STREAM_DATA (c)->in) == fd))
+	return c;
+    }
+
+  return 0;
+}
+
 int
 read_event_from_tty_or_stream_desc (Lisp_Event *event,
 				    struct console *con, int fd)
diff -r -u xemacs-21.4.22/src/events.h xemacs-21.4.23/src/events.h
--- xemacs-21.4.22/src/events.h	2001-04-12 14:23:42.000000000 -0400
+++ xemacs-21.4.23/src/events.h	2015-01-29 10:04:29.000000000 -0500
@@ -651,6 +651,7 @@
 int event_stream_unixoid_unselect_console (struct console *con);
 int event_stream_unixoid_select_process   (Lisp_Process *proc);
 int event_stream_unixoid_unselect_process (Lisp_Process *proc);
+struct console *find_tty_or_stream_console_from_fd (int fd);
 int read_event_from_tty_or_stream_desc (Lisp_Event *event,
 					struct console *con, int fd);
 USID event_stream_unixoid_create_stream_pair (void* inhandle, void* outhandle,
diff -r -u xemacs-21.4.22/src/file-coding.c xemacs-21.4.23/src/file-coding.c
--- xemacs-21.4.22/src/file-coding.c	2005-01-30 21:55:13.000000000 -0500
+++ xemacs-21.4.23/src/file-coding.c	2015-01-29 10:04:29.000000000 -0500
@@ -1,6 +1,7 @@
 /* Code conversion functions.
    Copyright (C) 1991, 1995 Free Software Foundation, Inc.
    Copyright (C) 1995 Sun Microsystems, Inc.
+   Copyright (C) 2010 Ben Wing
 
 This file is part of XEmacs.
 
@@ -5412,7 +5413,7 @@
 	  if (EQ (charset, Vcharset_control_1))
 	    {
 	      if (CODING_SYSTEM_ISO2022_ESCAPE_QUOTED (codesys)
-		  && fit_to_be_escape_quoted (c))
+		  && fit_to_be_escape_quoted (c - 0x20))
 		Dynarr_add (dst, ISO_CODE_ESC);
 	      /* you asked for it ... */
 	      Dynarr_add (dst, c - 0x20);
diff -r -u xemacs-21.4.22/src/fileio.c xemacs-21.4.23/src/fileio.c
--- xemacs-21.4.22/src/fileio.c	2007-01-06 09:06:40.000000000 -0500
+++ xemacs-21.4.23/src/fileio.c	2015-01-29 10:04:29.000000000 -0500
@@ -60,7 +60,9 @@
 #include <aclapi.h>
 #endif /* WIN32_NATIVE */
 #ifdef CYGWIN
+#undef Status
 #include <w32api/aclapi.h>
+#define Status int
 #endif
 
 
@@ -2873,16 +2875,6 @@
 
   filename = Fexpand_file_name (filename, Qnil);
 
-  /* If the file name has special constructs in it,
-     call the corresponding file handler.  */
-  handler = Ffind_file_name_handler (filename, Qinsert_file_contents);
-  if (!NILP (handler))
-    {
-      val = call6 (handler, Qinsert_file_contents, filename,
-		   visit, start, end, replace);
-      goto handled;
-    }
-
 #ifdef FILE_CODING
   if (!NILP (used_codesys))
     CHECK_SYMBOL (used_codesys);
diff -r -u xemacs-21.4.22/src/frame-x.c xemacs-21.4.23/src/frame-x.c
--- xemacs-21.4.22/src/frame-x.c	2005-01-30 21:55:16.000000000 -0500
+++ xemacs-21.4.23/src/frame-x.c	2015-01-29 10:04:29.000000000 -0500
@@ -2649,8 +2649,7 @@
 	  XSetInputFocus (XtDisplay (shell_widget),
 			  XtWindow (shell_widget),
 			  RevertToParent,
-			  DEVICE_X_MOUSE_TIMESTAMP
-			  (XDEVICE (FRAME_DEVICE (f))));
+			  CurrentTime);
 	  XFlush (XtDisplay (shell_widget));
 	}
     }
diff -r -u xemacs-21.4.22/src/glyphs-eimage.c xemacs-21.4.23/src/glyphs-eimage.c
--- xemacs-21.4.22/src/glyphs-eimage.c	2007-08-20 15:52:28.000000000 -0400
+++ xemacs-21.4.23/src/glyphs-eimage.c	2015-01-29 10:04:29.000000000 -0500
@@ -935,13 +935,22 @@
   png_read_info (png_ptr, info_ptr);
 
   {
-    int y;
+    int y, padding;
     unsigned char **row_pointers;
-    height = info_ptr->height;
-    width = info_ptr->width;
+    height = png_get_image_height(png_ptr, info_ptr);
+    width = png_get_image_width(png_ptr, info_ptr);
+
+    /* Wow, allocate all the memory.  Truly, exciting.
+       Well, yes, there's excitement to be had.  It turns out that libpng
+       strips in place, so the last row overruns the buffer if depth is 16
+       or there's an alpha channel.  This is a crash on Linux.  So we need
+       to add padding.
+       The worst case is reducing 8 bytes (16-bit RGBA) to 3 (8-bit RGB). */
+
+    padding = 5 * width;
+    unwind.eimage = xnew_array_and_zero (unsigned char,
+					 width * height * 3 + padding);
 
-    /* Wow, allocate all the memory.  Truly, exciting. */
-    unwind.eimage = xnew_array_and_zero (unsigned char, width * height * 3);
     /* libpng expects that the image buffer passed in contains a
        picture to draw on top of if the png has any transparencies.
        This could be a good place to pass that in... */
@@ -990,27 +999,31 @@
     /* Now that we're using EImage, ask for 8bit RGB triples for any type
        of image*/
     /* convert palette images to full RGB */
-    if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+    if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE)
       png_set_expand (png_ptr);
     /* send grayscale images to RGB too */
-    if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
-        info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+    if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY ||
+       png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA)
       png_set_gray_to_rgb (png_ptr);
-    /* we can't handle alpha values */
-    if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
-      png_set_strip_alpha (png_ptr);
     /* tell libpng to strip 16 bit depth files down to 8 bits */
-    if (info_ptr->bit_depth == 16)
+    if (png_get_bit_depth(png_ptr, info_ptr) == 16)
       png_set_strip_16 (png_ptr);
     /* if the image is < 8 bits, pad it out */
-    if (info_ptr->bit_depth < 8)
+    if (png_get_bit_depth(png_ptr, info_ptr) < 8)
       {
-	if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
+       if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY)
 	  png_set_expand (png_ptr);
 	else
 	  png_set_packing (png_ptr);
       }
 
+    /* we can't handle alpha values
+       png_read_update_info ensures the alpha flag is set when one of
+       the transforms above causes an alpha channel to be generated */
+    png_read_update_info (png_ptr, info_ptr);
+    if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA)
+      png_set_strip_alpha (png_ptr);
+
     png_read_image (png_ptr, row_pointers);
     png_read_end (png_ptr, info_ptr);
 
@@ -1023,17 +1036,22 @@
      * from lisp anyway. - WMP
      */
     {
-      int i;
+      int i, num_text = 0;
+      png_textp text_ptr = NULL;
 
-      for (i = 0 ; i < info_ptr->num_text ; i++)
+      if (png_get_text (png_ptr, info_ptr, &text_ptr, &num_text) > 0)
 	{
-	  /* How paranoid do I have to be about no trailing NULLs, and
-	     using (int)info_ptr->text[i].text_length, and strncpy and a temp
-	     string somewhere? */
-
-	  warn_when_safe (Qpng, Qinfo, "%s - %s",
-			  info_ptr->text[i].key,
-			  info_ptr->text[i].text);
+	  for (i = 0 ; i < num_text ; i++)
+	    {
+
+	      /* How paranoid do I have to be about no trailing NULLs, and
+		 using (int)info_ptr->text[i].text_length, and strncpy and a temp
+		 string somewhere? */
+
+	      warn_when_safe (Qpng, Qinfo, "%s - %s",
+			      text_ptr[i].key, text_ptr[i].text);
+	    }
+
 	}
     }
 #endif
diff -r -u xemacs-21.4.22/src/process-unix.c xemacs-21.4.23/src/process-unix.c
--- xemacs-21.4.22/src/process-unix.c	2005-11-24 21:01:57.000000000 -0500
+++ xemacs-21.4.23/src/process-unix.c	2015-01-29 10:04:29.000000000 -0500
@@ -921,9 +921,10 @@
 
 	/* Disconnect the current controlling terminal, pursuant to
 	   making the pty be the controlling terminal of the process.
-	   Also put us in our own process group. */
-
-	disconnect_controlling_terminal ();
+	   Also put us in our own process group.
+	   Moved this call to later in the function, because on Cygwin,
+	   setsid() causes the pty setup to fail in some way.
+	disconnect_controlling_terminal (); */
 
 #ifdef HAVE_PTYS
 	if (pty_flag)
@@ -1049,6 +1050,12 @@
 
 #endif /* HAVE_PTYS */
 
+	/* Moved this here because of Cygwin. Vin Shelton 2015-01-28. */
+	/* Disconnect the current controlling terminal, pursuant to
+	   making the pty be the controlling terminal of the process.
+	   Also put us in our own process group. */
+	disconnect_controlling_terminal ();
+
 	signal (SIGINT,  SIG_DFL);
 	signal (SIGQUIT, SIG_DFL);
 
diff -r -u xemacs-21.4.22/src/redisplay-msw.c xemacs-21.4.23/src/redisplay-msw.c
--- xemacs-21.4.22/src/redisplay-msw.c	2006-07-04 09:14:14.000000000 -0400
+++ xemacs-21.4.23/src/redisplay-msw.c	2015-01-29 10:04:29.000000000 -0500
@@ -191,8 +191,15 @@
   if (!fi->proportional_p || !hdc)
     return (fi->width * run->len);
   else
-    {
+  {
+/* The 21.4.19 version of XEmacs doesn't have the Unicode support necessary to display 
+   anything but ISO 8859-1 on Windows.
+   So commenting out the following assertion doesn't fix the problem but
+   it does prevent a crash when XEmacs tries to display Han characters
+*/ 
+#ifndef CYGWIN
       assert(run->dimension == 1);	/* #### FIXME! */
+#endif
       mswindows_set_dc_font (hdc, font_inst,
 			     cachel->underline, cachel->strikethru);
       GetTextExtentPoint32 (hdc, run->ptr, run->len, &size);
@@ -560,7 +567,9 @@
 	  }
 	}
 
+#ifndef CYGWIN
       assert (runs[i].dimension == 1);	/* #### FIXME: Broken when Mule? */
+#endif
       ExtTextOut (hdc, xpos, dl->ypos,
 		  NILP(bg_pmap) ? ETO_CLIPPED | ETO_OPAQUE : ETO_CLIPPED,
 		  &rect, (char *) runs[i].ptr, runs[i].len, NULL); 
diff -r -u xemacs-21.4.22/src/regex.c xemacs-21.4.23/src/regex.c
--- xemacs-21.4.22/src/regex.c	2006-03-30 20:29:00.000000000 -0500
+++ xemacs-21.4.23/src/regex.c	2015-01-29 10:04:29.000000000 -0500
@@ -148,6 +148,7 @@
 
 #define INC_CHARPTR(p) ((p)++)
 #define DEC_CHARPTR(p) ((p)--)
+#define MAX_EMCHAR_LEN 1
 
 #include <string.h>
 
@@ -707,12 +708,11 @@
 	case exactn:
 	  mcnt = *p++;
           printf ("/exactn/%d", mcnt);
-          do
+          while (mcnt--)
 	    {
-              putchar ('/');
+	      putchar ('/');
 	      putchar (*p++);
             }
-          while (--mcnt);
           break;
 
 	case start_memory:
@@ -3105,10 +3105,7 @@
 	/* `p' points to the location after where `c' came from. */
 	normal_char:
 	  {
-	    /* XEmacs: modifications here for Mule. */
-	    /* `q' points to the beginning of the next char. */
-	    re_char *q = p;
-
+	    /* The following conditional synced to GNU Emacs 22.1.  */
 	    /* If no exactn currently being built.  */
 	    if (!pending_exact
 
@@ -3116,18 +3113,19 @@
 		|| pending_exact + *pending_exact + 1 != buf_end
 
 		/* We have only one byte following the exactn for the count. */
-		|| ((unsigned int) (*pending_exact + (q - p)) >=
-		    ((unsigned int) (1 << BYTEWIDTH) - 1))
+		|| *pending_exact >= (1 << BYTEWIDTH) - MAX_EMCHAR_LEN
 
-		/* If followed by a repetition operator.  */
-		|| *q == '*' || *q == '^'
+		/* If followed by a repetition operator.
+		   If the lookahead fails because of end of pattern, any
+		   trailing backslash will get caught later.  */
+		|| (p != pend && (*p == '*' || *p == '^'))
 		|| ((syntax & RE_BK_PLUS_QM)
-		    ? *q == '\\' && (q[1] == '+' || q[1] == '?')
-		    : (*q == '+' || *q == '?'))
+		    ? p + 1 < pend && *p == '\\' && (p[1] == '+' || p[1] == '?')
+		    : p != pend && (*p == '+' || *p == '?'))
 		|| ((syntax & RE_INTERVALS)
 		    && ((syntax & RE_NO_BK_BRACES)
-			? *q == '{'
-			: (q[0] == '\\' && q[1] == '{'))))
+			? p != pend && *p == '{'
+			: p + 1 < pend && (p[0] == '\\' && p[1] == '{'))))
 	      {
 		/* Start building a new exactn.  */
 
@@ -3295,12 +3293,18 @@
 {
   re_char *prev = p - 2;
   re_bool prev_prev_backslash = prev > pattern && prev[-1] == '\\';
+  re_bool shy_open = prev-1 > pattern && prev[0] == ':'
+    && prev[-1] == '?' && prev[-2] == '(';
+  re_bool ppp_backslash = prev-2 > pattern && prev[-3] == '\\';
 
   return
        /* After a subexpression?  */
        (*prev == '(' && (syntax & RE_NO_BK_PARENS || prev_prev_backslash))
        /* After an alternative?  */
-    || (*prev == '|' && (syntax & RE_NO_BK_VBAR || prev_prev_backslash));
+    || (*prev == '|' && (syntax & RE_NO_BK_VBAR || prev_prev_backslash))
+       /* After a shy open? */
+    || (!(syntax & RE_NO_SHY_GROUPS) && shy_open 
+      && (syntax & RE_NO_BK_PARENS || ppp_backslash));
 }
 
 
@@ -4075,7 +4079,7 @@
      don't keep searching past point.  */
   if (bufp->used > 0 && (re_opcode_t) bufp->buffer[0] == at_dot && range > 0)
     {
-      range = BUF_PT (regex_emacs_buffer) - BUF_BEGV (regex_emacs_buffer)
+      range = BI_BUF_PT (regex_emacs_buffer) - BI_BUF_BEGV (regex_emacs_buffer)
 	      - startpos;
       if (range < 0)
 	return -1;
diff -r -u xemacs-21.4.22/src/s/cygwin32.h xemacs-21.4.23/src/s/cygwin32.h
--- xemacs-21.4.22/src/s/cygwin32.h	2001-04-12 14:24:42.000000000 -0400
+++ xemacs-21.4.23/src/s/cygwin32.h	2015-01-29 10:04:29.000000000 -0500
@@ -224,3 +224,6 @@
 #define CYGWIN_WIN32_PATH(src, dst) \
 dst = alloca (cygwin_posix_to_win32_path_list_buf_size(src)); \
 cygwin_posix_to_win32_path_list(src, dst)
+
+/* Cygwin uses strcasecmp instead of stricmp */
+#define stricmp strcasecmp
diff -r -u xemacs-21.4.22/src/search.c xemacs-21.4.23/src/search.c
--- xemacs-21.4.22/src/search.c	2005-01-30 21:55:31.000000000 -0500
+++ xemacs-21.4.23/src/search.c	2015-01-29 10:04:29.000000000 -0500
@@ -826,7 +826,7 @@
       INC_CHARPTR (p);
       if (syntaxp)
 	{
-	  if (c < 0400 && syntax_spec_code[c] < (unsigned char) Smax)
+	  if (c < 0200 && syntax_spec_code[c] < (unsigned char) Smax)
 	    fastmap[c] = 1;
 	  else
 	    signal_simple_error ("Invalid syntax designator",
diff -r -u xemacs-21.4.22/src/syntax.c xemacs-21.4.23/src/syntax.c
--- xemacs-21.4.22/src/syntax.c	2005-01-30 21:55:34.000000000 -0500
+++ xemacs-21.4.23/src/syntax.c	2015-01-29 10:04:29.000000000 -0500
@@ -498,7 +498,7 @@
    into the code it signifies.
    This is used by modify-syntax-entry, and other things. */
 
-const unsigned char syntax_spec_code[0400] =
+const unsigned char syntax_spec_code[0200] =
 { 0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377,
   0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377,
   0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377,
diff -r -u xemacs-21.4.22/src/syntax.h xemacs-21.4.23/src/syntax.h
--- xemacs-21.4.22/src/syntax.h	2003-01-15 07:18:02.000000000 -0500
+++ xemacs-21.4.23/src/syntax.h	2015-01-29 10:04:29.000000000 -0500
@@ -265,7 +265,7 @@
    that character signifies (as a char).
    For example, (enum syntaxcode) syntax_spec_code['w'] is Sword. */
 
-extern const unsigned char syntax_spec_code[0400];
+extern const unsigned char syntax_spec_code[0200];
 
 /* Indexed by syntax code, give the letter that describes it. */
 
diff -r -u xemacs-21.4.22/src/sysdep.c xemacs-21.4.23/src/sysdep.c
--- xemacs-21.4.22/src/sysdep.c	2005-01-30 21:55:34.000000000 -0500
+++ xemacs-21.4.23/src/sysdep.c	2015-01-29 10:04:29.000000000 -0500
@@ -1319,7 +1319,7 @@
 void
 disconnect_controlling_terminal (void)
 {
-#  ifdef HAVE_SETSID
+#  if defined(HAVE_SETSID)
   /* Controlling terminals are attached to a session.
      Create a new session for us; it will have no controlling
      terminal.  This also, of course, puts us in our own
diff -r -u xemacs-21.4.22/src/sysdir.h xemacs-21.4.23/src/sysdir.h
--- xemacs-21.4.22/src/sysdir.h	2006-01-23 21:54:45.000000000 -0500
+++ xemacs-21.4.23/src/sysdir.h	2015-01-29 10:04:29.000000000 -0500
@@ -59,11 +59,7 @@
    Since applying strlen to the name always works, we'll just do that.  */
 #define NAMLEN(p) strlen (p->d_name)
 
-#ifdef __CYGWIN__
-# define DIRENTRY_NONEMPTY(p) ((p)->d_name[0] != '\0')
-#else
 # define DIRENTRY_NONEMPTY(p) ((p)->d_ino)
-#endif
 
 /* encapsulation: directory calls */
 
diff -r -u xemacs-21.4.22/src/syswindows.h xemacs-21.4.23/src/syswindows.h
--- xemacs-21.4.22/src/syswindows.h	2008-12-27 20:58:16.000000000 -0500
+++ xemacs-21.4.23/src/syswindows.h	2015-01-29 10:04:29.000000000 -0500
@@ -55,6 +55,12 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#ifdef HAVE_X_WINDOWS
+/* Christ almighty.  The problems you get when combining two large code bases,
+   neither with any respect for namespace purity. */
+#undef Status
+#endif
+
 #include <windows.h>
 
 #if defined (CYGWIN) && CYGWIN_VERSION_DLL_MAJOR < 21
@@ -64,15 +70,7 @@
 #define FONTENUMPROC FONTENUMEXPROC
 #define ntmTm ntmentm
 #elif defined (WIN32_LEAN_AND_MEAN)
-#ifdef HAVE_X_WINDOWS
-/* Christ almighty.  The problems you get when combining two large code bases,
-   neither with any respect for namespace purity. */
-#undef Status
-#endif
 #include <winspool.h>
-#ifdef HAVE_X_WINDOWS
-#define Status int
-#endif
 #include <mmsystem.h>
 #include <shlobj.h>
 #include <shellapi.h>
@@ -190,6 +188,10 @@
 
 #include <wchar.h>
 
+#ifdef HAVE_X_WINDOWS
+#define Status int
+#endif
+
 #if defined (CYGWIN) && (CYGWIN_VERSION_DLL_COMBINED < 190)
 
 /* All but wcscmp and wcslen left out of Cygwin headers -- but present
diff -r -u xemacs-21.4.22/src/unexsol2.c xemacs-21.4.23/src/unexsol2.c
--- xemacs-21.4.22/src/unexsol2.c	1997-10-12 23:35:33.000000000 -0400
+++ xemacs-21.4.23/src/unexsol2.c	2015-01-29 10:04:29.000000000 -0500
@@ -20,7 +20,7 @@
 
 /* Synched up with: Not in FSF. */
 
-/* #pragma ident "@(#) $Id: unexsol2.c,v 1.2 1995/01/25 20:39:16 georgn Exp $" */
+/* #pragma ident "@(#) $Id: unexsol2.c,v 1.3 1997/10/13 03:35:33 steve Exp $" */
 
 #include <stdlib.h>
 #include <stdio.h>
diff -r -u xemacs-21.4.22/tests/ChangeLog xemacs-21.4.23/tests/ChangeLog
--- xemacs-21.4.22/tests/ChangeLog	2008-12-28 21:19:12.000000000 -0500
+++ xemacs-21.4.23/tests/ChangeLog	2015-01-29 10:04:29.000000000 -0500
@@ -1,3 +1,17 @@
+2015-01-29  Vin Shelton <acs@xemacs.org>
+ 
+	* XEmacs 21.4.23 is released
+
+2011-12-11  Julian Bradfield <jcb+xeb@jcbradfield.org>
+
+	* automated/regexp-tests.l: ^ was wrongly interpreted as literal
+	when occurring at the start of a shy group.
+
+2010-03-07  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* automated/mule-tests.el (string character conversion):
+	Test that escape-quoted quotes CSI, SS2, and SS3 from C1 controls.
+
 2008-12-28  Vin Shelton  <acs@xemacs.org>
 
 	* XEmacs 21.4.22 is released
diff -r -u xemacs-21.4.22/tests/automated/mule-tests.el xemacs-21.4.23/tests/automated/mule-tests.el
--- xemacs-21.4.22/tests/automated/mule-tests.el	2007-08-20 15:53:26.000000000 -0400
+++ xemacs-21.4.23/tests/automated/mule-tests.el	2015-01-29 10:04:29.000000000 -0500
@@ -320,6 +320,29 @@
       (Assert (equal (substring string (* 94 k) (* 94 (1+ k))) ascii-string))))
 
   ;;---------------------------------------------------------------
+  ;; Test string character conversion
+  ;;---------------------------------------------------------------
+
+  ;; #### This should test all coding systems!
+
+  (let ((all-octets (let ((s (make-string 256 ?\000)))
+		      (loop for i from (1- (length s)) downto 0 do
+			(aset s i (int-char i)))
+		      s))
+	(escape-quoted-result (let ((schar '(27 155 142 143 14 15))
+				    (s (make-string 262 ?\000))
+				    (pos 0))
+				(loop for ord from 0 to 255 do
+				  (when (member ord schar)
+				    (aset s pos ?\033)
+				    (setq pos (1+ pos)))
+				  (aset s pos (int-char ord))
+				  (setq pos (1+ pos)))
+				s)))
+    (Assert (string= (encode-coding-string all-octets 'escape-quoted)
+		     escape-quoted-result)))
+
+  ;;---------------------------------------------------------------
   ;; Test file-system character conversion (and, en passant, file ops)
   ;;---------------------------------------------------------------
   (let* ((scaron (make-char 'latin-iso8859-2 57))
diff -r -u xemacs-21.4.22/tests/automated/regexp-tests.el xemacs-21.4.23/tests/automated/regexp-tests.el
--- xemacs-21.4.22/tests/automated/regexp-tests.el	2008-12-25 22:45:29.000000000 -0500
+++ xemacs-21.4.23/tests/automated/regexp-tests.el	2015-01-29 10:04:29.000000000 -0500
@@ -447,11 +447,16 @@
   (Assert (progn (string-match "\\(a\\)" "a")  
 		 (string-match "\\(?:a\\)" "a")  
 		 (not (match-beginning 1))))
+
+  ;; ^ at beginning of shy group. Fix by
+  ;; Julian Bradfield on 2012-12-11.
+  (Assert (string-match "\\(?:^\\)" ""))
+  (Assert (string-match "a(?:^)" "a:^)"))
 )
 
 
 ;; empty string at point
-;; Thanks Julian Bradford on XEmacs Beta
+;; Thanks Julian Bradfield on XEmacs Beta
 ;; <18652.54975.894512.880956@krk.inf.ed.ac.uk>
 (with-string-as-buffer-contents "aáa"
   (goto-char (point-min))
diff -r -u xemacs-21.4.22/version.sh xemacs-21.4.23/version.sh
--- xemacs-21.4.22/version.sh	2008-12-28 21:18:51.000000000 -0500
+++ xemacs-21.4.23/version.sh	2015-01-29 10:04:29.000000000 -0500
@@ -2,8 +2,8 @@
 emacs_is_beta=
 emacs_major_version=21
 emacs_minor_version=4
-emacs_beta_version=22
-xemacs_codename="Instant Classic"
+emacs_beta_version=23
+xemacs_codename="Moral Majority"
 emacs_kit_version=
 infodock_major_version=4
 infodock_minor_version=0