From: tomo <tomo>
Date: Mon, 12 Aug 2002 15:55:16 +0000 (+0000)
Subject: XEmacs 21.2.45 "Thelxepeia".
X-Git-Tag: r21-2-45~1
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cc5b779cb8755e01e02aead4fba711c06158b90;p=chise%2Fxemacs-chise.git.1

XEmacs 21.2.45 "Thelxepeia".
---

diff --git a/CHANGES-beta b/CHANGES-beta
index 1421817..a762b32 100644
--- a/CHANGES-beta
+++ b/CHANGES-beta
@@ -1,3 +1,12 @@
+to 21.2.45 "Thelxepeia"
+-- lib-src Makefile fixes -- Martin Buchholz
+-- startup path fixes -- Michael Sperber
+-- Port FSF 20.7 syntax table improvements -- Matt Tucker
+-- --pdump now works with HP-UX native cc -- Martin Buchholz
+-- copy-file now works correctly with non-ascii filenames -- Martin Buchholz
+-- More pdump improvements -- Martin Buchholz
+-- Prefer more standard utime() to utimes() -- Martin Buchholz
+
 to 21.2.44 "Thalia"
 -- Upgrade to etags 14.15 -- Francesco Potorti
 -- XEmacs now works on Unixware 7 -- Martin Buchholz
diff --git a/ChangeLog b/ChangeLog
index b81197a..82e43d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2001-02-23  Martin Buchholz <martin@xemacs.org>
+
+	* XEmacs 21.2.45 "Thelxepeia" is released.
+
+2001-02-13  Martin Buchholz  <martin@xemacs.org>
+
+	* aclocal.m4: Fix module support for AIX cc.
+	Support possible future OSes irix7, aix5, osf[56].
+
+2001-02-12  Martin Buchholz  <martin@xemacs.org>
+
+	* configure.in: No need for NON_GNU_CPP on SCO.
+
+2001-02-10  Martin Buchholz  <martin@xemacs.org>
+
+	* etc/MACHINES: Rewritten.  Bitrot discarded.
+
+2001-02-09  Martin Buchholz  <martin@xemacs.org>
+
+	* configure.in: Prefer utime to utimes - it's more standard.
+	Remove explicit checking for struct utimbuf.
+	Remove explicit checking for <utime.h>.
+	Combined into one simpler test for utime.
+	Add explicit check for utimes, if utime not found.
+
 2001-02-08  Martin Buchholz <martin@xemacs.org>
 
 	* XEmacs 21.2.44 "Thalia" is released.
diff --git a/aclocal.m4 b/aclocal.m4
index 9dd7ecf..7e20505 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -88,11 +88,11 @@ if test "$XEGCC" = yes; then
   wl='-Wl,'
 
   case "$xehost_os" in
-  aix3* | aix4* | irix5* | irix6* | osf3* | osf4*)
+  aix[[3-9]]* | irix[[5-9]]* | osf[[3-9]])
     # PIC is the default for these OSes.
     ;;
 
-  aix3* | aix4* | os2*)
+  os2*)
     # We can build DLLs from non-PIC.
     ;;
   amigaos*)
@@ -117,7 +117,7 @@ else
     dll_cflags='+Z'
     ;;
 
-  irix5* | irix6*)
+  irix[[5-9]]*)
     wl='-Wl,'
     # PIC (with -KPIC) is the default.
     ;;
@@ -126,11 +126,16 @@ else
     # We can build DLLs from non-PIC.
     ;;
 
-  osf3* | osf4*)
+  osf[[3-9]]*)
     # All OSF/1 code is PIC.
     wl='-Wl,'
     ;;
 
+  aix[[3-9]]*)
+    # All AIX code is PIC.
+    wl='-Wl,'
+    ;;
+
   sco3.2v5*)
     dll_cflags='-belf -Kpic'
     wl='-Wl,'
@@ -243,7 +248,7 @@ if test "$XEGCC" = yes; then
   xldf="-shared"
 else # Not using GCC
   case "$xehost_os" in
-    aix3* | aix4*)
+    aix[[3-9]]*)
       xldf="-bE:ELLSONAME.exp -H512 -T512 -bhalt:4 -bM:SRE -bnoentry -lc"
       xcldf="${wl}-bE:ELLSONAME.exp ${wl}-H512 ${wl}-T512 ${wl}-bhalt:4 ${wl}-bM:SRE ${wl}-bnoentry ${wl}-lc"
       ;;
@@ -262,7 +267,7 @@ else # Not using GCC
       xcldf="${wl}-b ${wl}+s"
       ;;
 
-    irix5* | irix6* | osf3* | osf4*)
+    irix[[5-9]]* | osf[[3-9]]*)
       xcldf="${wl}-shared"
       xldf="-shared"
       ;;
@@ -415,7 +420,7 @@ else
       dll_ldflags=$xldf
       ;;
 
-    aix4*)
+    aix[[4-9]]*)
       dll_ldflags=$xcldf
       ;;
 
@@ -445,7 +450,7 @@ else
       dll_ldflags=$xldf
       ;;
 
-    irix5* | irix6*)
+    irix[[5-9]]*)
       dll_ld=$LTLD
       dll_ldflags=$xldf
       ;;
@@ -532,11 +537,7 @@ fi
 
 if test -z "$ld_dynamic_link_flags"; then
   case "$xehost_os" in
-  aix3*)
-    ld_dynamic_link_flags=
-    ;;
-
-  aix4*)
+  aix[[3-9]]*)
     ld_dynamic_link_flags=
     ;;
 
@@ -556,7 +557,7 @@ if test -z "$ld_dynamic_link_flags"; then
     ld_dynamic_link_flags="${wl}-E"
     ;;
 
-  irix5* | irix6*)
+  irix[[5-9]]*)
     ld_dynamic_link_flags=
     ;;
 
diff --git a/configure b/configure
index 873d9c3..2a4d54f 100755
--- a/configure
+++ b/configure
@@ -3,10 +3,11 @@
 #### Configuration script for XEmacs.  Largely divergent from FSF.
 #### Guess values for system-dependent variables and create Makefiles.
 #### Generated automatically using autoconf version 2.13 
-#### Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+#### Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 #### Copyright (C) 1993-1995 Board of Trustees, University of Illinois.
 #### Copyright (C) 1996, 1997 Sun Microsystems, Inc.
 #### Copyright (C) 1995, 1996 Ben Wing.
+#### Copyright (C) 2000, 2001 Martin Buchholz.
 #### Copyright (C) 1998, 1999 J. Kean Johnston.
 
 ### Don't edit this script!
@@ -835,7 +836,7 @@ echo "  Use \`$progname --help' to show usage.") >&2 && exit 1
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:839: checking whether ln -s works" >&5
+echo "configure:840: checking whether ln -s works" >&5
 
 rm -f conftestdata
 if ln -s X conftestdata 2>/dev/null
@@ -1100,7 +1101,7 @@ EOF
 
 
 echo $ac_n "checking "host system type"""... $ac_c" 1>&6
-echo "configure:1104: checking "host system type"" >&5
+echo "configure:1105: checking "host system type"" >&5
 internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'`
 canonical=`${CONFIG_SHELL-/bin/sh} $srcdir/config.sub "$internal_configuration"`
 configuration=`echo "$configuration" | sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'`
@@ -1479,12 +1480,7 @@ EOF
       *-bsdi3* )		opsys=bsdos3 ;;
       *-bsdi2.1* )		opsys=bsdos2-1 ;;
       *-bsdi2* )		opsys=bsdos2 ;;
-      *-sco3.2v5* )		opsys=sco5 ;
-							if test "$dynamic" = "yes" ; then
-		NON_GNU_CPP="/lib/cpp -D_XOPEN_SOURCE -D_SCO_ELF"  ;
-	else
-		NON_GNU_CPP="/lib/cpp -D_XOPEN_SOURCE"  ;
-	fi ;;
+      *-sco3.2v5* )		opsys=sco5 ;;
       *-sysv5* )		opsys=sco7 ;;
       *-386bsd* )	        opsys=386bsd ;;
       *-freebsd* )		opsys=freebsd ;;
@@ -1619,7 +1615,7 @@ xe_save_CFLAGS="$CFLAGS"
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1623: checking for $ac_word" >&5
+echo "configure:1619: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1646,7 +1642,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1650: checking for $ac_word" >&5
+echo "configure:1646: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1694,7 +1690,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1698: checking for $ac_word" >&5
+echo "configure:1694: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1723,7 +1719,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1727: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1723: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -1736,12 +1732,12 @@ cross_compiling=no
 
 cat > conftest.$ac_ext << EOF
 
-#line 1740 "configure"
+#line 1736 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1769,19 +1765,19 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1773: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1769: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1778: checking whether we are using GNU C" >&5
+echo "configure:1774: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1799,7 +1795,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1803: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1799: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -1832,7 +1828,7 @@ if   test "$with_gcc" = "no"  -a "$GCC" = "yes"; then
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1836: checking for $ac_word" >&5
+echo "configure:1832: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1859,7 +1855,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1863: checking for $ac_word" >&5
+echo "configure:1859: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1907,7 +1903,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1911: checking for $ac_word" >&5
+echo "configure:1907: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1936,7 +1932,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1940: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1936: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -1949,12 +1945,12 @@ cross_compiling=no
 
 cat > conftest.$ac_ext << EOF
 
-#line 1953 "configure"
+#line 1949 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1982,19 +1978,19 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1986: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1982: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1991: checking whether we are using GNU C" >&5
+echo "configure:1987: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -2012,7 +2008,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2016: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2012: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -2045,7 +2041,7 @@ elif test "$with_gcc" = "yes" -a "$GCC" != "yes" ; then
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2049: checking for $ac_word" >&5
+echo "configure:2045: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2072,7 +2068,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2076: checking for $ac_word" >&5
+echo "configure:2072: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2120,7 +2116,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2124: checking for $ac_word" >&5
+echo "configure:2120: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2149,7 +2145,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2153: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2149: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -2162,12 +2158,12 @@ cross_compiling=no
 
 cat > conftest.$ac_ext << EOF
 
-#line 2166 "configure"
+#line 2162 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:2171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -2195,19 +2191,19 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2199: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2195: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2204: checking whether we are using GNU C" >&5
+echo "configure:2200: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2211: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -2225,7 +2221,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2229: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2225: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -2262,7 +2258,7 @@ test -n "$CPP" -a -d "$CPP" && CPP=
 test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP"
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2266: checking how to run the C preprocessor" >&5
+echo "configure:2262: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2275,13 +2271,13 @@ if test -z "$CPP"; then
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2279 "configure"
+#line 2275 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2281: \"$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
   :
@@ -2292,13 +2288,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2296 "configure"
+#line 2292 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2298: \"$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
   :
@@ -2309,13 +2305,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2313 "configure"
+#line 2309 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2315: \"$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
   :
@@ -2341,9 +2337,9 @@ echo "$ac_t""$CPP" 1>&6
 
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:2345: checking for AIX" >&5
+echo "configure:2341: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2347 "configure"
+#line 2343 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -2370,9 +2366,9 @@ rm -f conftest*
  
 
 echo $ac_n "checking for GNU libc""... $ac_c" 1>&6
-echo "configure:2374: checking for GNU libc" >&5
+echo "configure:2370: checking for GNU libc" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2376 "configure"
+#line 2372 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
@@ -2384,7 +2380,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_glibc=yes
 else
@@ -2461,7 +2457,7 @@ EOF
 esac
 
 cat > conftest.$ac_ext <<EOF
-#line 2465 "configure"
+#line 2461 "configure"
 #include "confdefs.h"
 int main () {
 #if defined __SUNPRO_C
@@ -2475,7 +2471,7 @@ return 0;
 #endif
 }
 EOF
-if { (eval echo configure:2479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:2475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -2709,17 +2705,17 @@ test "$__DECC" = "yes" && c_switch_site="$c_switch_site -std1" &&  if test "$ext
 
 if test "$__USLC__" = yes; then
   echo $ac_n "checking for whether the -Kalloca compiler flag is needed""... $ac_c" 1>&6
-echo "configure:2713: checking for whether the -Kalloca compiler flag is needed" >&5
+echo "configure:2709: checking for whether the -Kalloca compiler flag is needed" >&5
   need_kalloca=no
   cat > conftest.$ac_ext <<EOF
-#line 2716 "configure"
+#line 2712 "configure"
 #include "confdefs.h"
 
 int main() {
 void *x = alloca(4);
 ; return 0; }
 EOF
-if { (eval echo configure:2723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   :
 else
@@ -2730,14 +2726,14 @@ else
     xe_save_c_switch_system="$c_switch_system"
     c_switch_system="$c_switch_system -Kalloca"
     cat > conftest.$ac_ext <<EOF
-#line 2734 "configure"
+#line 2730 "configure"
 #include "confdefs.h"
 
 int main() {
 void *x = alloca(4);
 ; return 0; }
 EOF
-if { (eval echo configure:2741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    need_kalloca=yes 
 else
@@ -2771,7 +2767,7 @@ fi
 
 if test "$GCC" = "yes"; then
 echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6
-echo "configure:2775: checking for buggy gcc versions" >&5
+echo "configure:2771: checking for buggy gcc versions" >&5
 GCC_VERSION=`$CC --version`
 case `uname -s`:`uname -m`:$GCC_VERSION in
 		    *:sun4*:2.8.1|*:sun4*:egcs-2.90.*)
@@ -2894,7 +2890,7 @@ test "$pdump" = "yes" && extra_objs="$extra_objs dumper.o" &&  if test "$extra_v
  fi
 
 echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:2898: checking for dynodump" >&5
+echo "configure:2894: checking for dynodump" >&5
 if test "$unexec" != "unexsol2.o"; then
   echo "$ac_t""no" 1>&6
 else
@@ -2932,12 +2928,12 @@ if test "$unexec" = "unexaix.o"; then
   done
   
 echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6
-echo "configure:2936: checking for terminateAndUnload in -lC" >&5
+echo "configure:2932: checking for terminateAndUnload in -lC" >&5
 ac_lib_var=`echo C'_'terminateAndUnload | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lC "
 cat > conftest.$ac_ext <<EOF
-#line 2941 "configure"
+#line 2937 "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
@@ -2948,7 +2944,7 @@ int main() {
 terminateAndUnload()
 ; return 0; }
 EOF
-if { (eval echo configure:2952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2948: \"$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
@@ -3056,7 +3052,7 @@ fi
 
 if test "$add_runtime_path" = "yes"; then
       echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:3060: checking "for runtime libraries flag"" >&5
+echo "configure:3056: checking "for runtime libraries flag"" >&5
   case "$opsys" in
     sol2 ) dash_r="-R" ;;
     decosf* | linux* | irix*) dash_r="-rpath " ;;
@@ -3078,14 +3074,14 @@ if test "$GCC" = "yes"; then
   done
 fi
         cat > conftest.$ac_ext <<EOF
-#line 3082 "configure"
+#line 3078 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   dash_r="$try_dash_r"
 else
@@ -3178,7 +3174,6 @@ fi
 
 
 
-
 GNU_MALLOC=yes
 if test "$with_dlmalloc" != "no"; then
 	doug_lea_malloc=yes
@@ -3187,10 +3182,10 @@ else
 fi
 after_morecore_hook_exists=yes
 echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
-echo "configure:3191: checking for malloc_set_state" >&5
+echo "configure:3186: checking for malloc_set_state" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3194 "configure"
+#line 3189 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_set_state(); below.  */
@@ -3213,7 +3208,7 @@ malloc_set_state();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_malloc_set_state=yes"
 else
@@ -3233,16 +3228,16 @@ doug_lea_malloc=no
 fi
 
 echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
-echo "configure:3237: checking whether __after_morecore_hook exists" >&5
+echo "configure:3232: checking whether __after_morecore_hook exists" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3239 "configure"
+#line 3234 "configure"
 #include "confdefs.h"
 extern void (* __after_morecore_hook)();
 int main() {
 __after_morecore_hook = 0
 ; return 0; }
 EOF
-if { (eval echo configure:3246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -3298,7 +3293,7 @@ fi
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3302: checking for $ac_word" >&5
+echo "configure:3297: checking for $ac_word" >&5
 
 if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -3353,7 +3348,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:3357: checking for a BSD compatible install" >&5
+echo "configure:3352: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 
   IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
@@ -3407,7 +3402,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3411: checking for $ac_word" >&5
+echo "configure:3406: checking for $ac_word" >&5
 
 if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -3435,19 +3430,19 @@ done
 test -n "$YACC" || YACC="yacc"
 
 
-for ac_hdr in   a.out.h   elf.h   cygwin/version.h   fcntl.h   inttypes.h   libgen.h   locale.h   mach/mach.h   sys/param.h   sys/pstat.h   sys/time.h   sys/timeb.h   sys/un.h   ulimit.h   unistd.h   utime.h 
+for ac_hdr in   a.out.h   elf.h   cygwin/version.h   fcntl.h   inttypes.h   libgen.h   locale.h   mach/mach.h   sys/param.h   sys/pstat.h   sys/time.h   sys/timeb.h   sys/un.h   ulimit.h   unistd.h 
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3443: checking for $ac_hdr" >&5
+echo "configure:3438: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3446 "configure"
+#line 3441 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3446: \"$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*
@@ -3477,10 +3472,10 @@ fi
 done
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3481: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3476: checking for sys/wait.h that is POSIX.1 compatible" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3484 "configure"
+#line 3479 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3496,7 +3491,7 @@ wait (&s);
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -3520,10 +3515,10 @@ EOF
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3524: checking for ANSI C header files" >&5
+echo "configure:3519: checking for ANSI C header files" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3527 "configure"
+#line 3522 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3531,7 +3526,7 @@ cat > conftest.$ac_ext <<EOF
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3530: \"$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*
@@ -3548,7 +3543,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3552 "configure"
+#line 3547 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3566,7 +3561,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3570 "configure"
+#line 3565 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3584,7 +3579,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
 cat > conftest.$ac_ext <<EOF
-#line 3588 "configure"
+#line 3583 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3595,7 +3590,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:3599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -3621,10 +3616,10 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3625: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3620: checking whether time.h and sys/time.h may both be included" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3628 "configure"
+#line 3623 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3633,7 +3628,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -3657,10 +3652,10 @@ EOF
 fi
 
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:3661: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:3656: checking for sys_siglist declaration in signal.h or unistd.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3664 "configure"
+#line 3659 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3672,7 +3667,7 @@ int main() {
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:3676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -3696,36 +3691,26 @@ EOF
 fi
 
 
-echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6
-echo "configure:3701: checking for struct utimbuf" >&5
+
+echo $ac_n "checking for utime""... $ac_c" 1>&6
+echo "configure:3697: checking for utime" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3703 "configure"
+#line 3699 "configure"
 #include "confdefs.h"
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-#ifdef HAVE_UTIME_H
+#include <sys/types.h>
 #include <utime.h>
-#endif
 int main() {
-static struct utimbuf x; x.actime = x.modtime;
+struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x);
 ; return 0; }
 EOF
-if { (eval echo configure:3722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3707: \"$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
-    Defining HAVE_STRUCT_UTIMBUF
+    Defining HAVE_UTIME
 EOF
 cat >> confdefs.h <<\EOF
-#define HAVE_STRUCT_UTIMBUF 1
+#define HAVE_UTIME 1
 EOF
 }
 
@@ -3734,14 +3719,71 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
+      for ac_func in utimes
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:3726: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3729 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3752: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_func
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+}
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
 fi
 rm -f conftest*
 
+
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3742: checking return type of signal handlers" >&5
+echo "configure:3784: checking return type of signal handlers" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3745 "configure"
+#line 3787 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3758,7 +3800,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -3780,10 +3822,10 @@ EOF
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3784: checking for size_t" >&5
+echo "configure:3826: checking for size_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3787 "configure"
+#line 3829 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3814,10 +3856,10 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3818: checking for pid_t" >&5
+echo "configure:3860: checking for pid_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3821 "configure"
+#line 3863 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3848,10 +3890,10 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3852: checking for uid_t in sys/types.h" >&5
+echo "configure:3894: checking for uid_t in sys/types.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3855 "configure"
+#line 3897 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -3887,10 +3929,10 @@ EOF
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:3891: checking for mode_t" >&5
+echo "configure:3933: checking for mode_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3894 "configure"
+#line 3936 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3921,10 +3963,10 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3925: checking for off_t" >&5
+echo "configure:3967: checking for off_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3928 "configure"
+#line 3970 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3955,10 +3997,10 @@ EOF
 fi
 
 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:3959: checking for ssize_t" >&5
+echo "configure:4001: checking for ssize_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3962 "configure"
+#line 4004 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3990,9 +4032,9 @@ fi
 
 
 echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:3994: checking for socklen_t" >&5
+echo "configure:4036: checking for socklen_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3996 "configure"
+#line 4038 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 socklen_t x;
@@ -4001,7 +4043,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -4010,7 +4052,7 @@ else
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 4014 "configure"
+#line 4056 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 int accept (int, struct sockaddr *, size_t *);
@@ -4019,7 +4061,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 echo "$ac_t""size_t" 1>&6
@@ -4051,9 +4093,9 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:4055: checking for struct timeval" >&5
+echo "configure:4097: checking for struct timeval" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4057 "configure"
+#line 4099 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -4069,7 +4111,7 @@ int main() {
 static struct timeval x; x.tv_sec = x.tv_usec;
 ; return 0; }
 EOF
-if { (eval echo configure:4073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
   HAVE_TIMEVAL=yes
@@ -4091,10 +4133,10 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:4095: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:4137: checking whether struct tm is in sys/time.h or time.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4098 "configure"
+#line 4140 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -4102,7 +4144,7 @@ int main() {
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:4106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -4126,10 +4168,10 @@ EOF
 fi
 
 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:4130: checking for tm_zone in struct tm" >&5
+echo "configure:4172: checking for tm_zone in struct tm" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4133 "configure"
+#line 4175 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -4137,7 +4179,7 @@ int main() {
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:4141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_zone=yes
 else
@@ -4160,10 +4202,10 @@ EOF
 
 else
   echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:4164: checking for tzname" >&5
+echo "configure:4206: checking for tzname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4167 "configure"
+#line 4209 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -4173,7 +4215,7 @@ int main() {
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:4177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_var_tzname=yes
 else
@@ -4199,10 +4241,10 @@ fi
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4203: checking for working const" >&5
+echo "configure:4245: checking for working const" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4206 "configure"
+#line 4248 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4251,7 +4293,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:4255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -4276,7 +4318,7 @@ fi
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:4280: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:4322: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 
 cat > conftestmake <<\EOF
@@ -4301,12 +4343,12 @@ fi
 
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:4305: checking whether byte ordering is bigendian" >&5
+echo "configure:4347: checking whether byte ordering is bigendian" >&5
 
 ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 4310 "configure"
+#line 4352 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4317,11 +4359,11 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 4325 "configure"
+#line 4367 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4332,7 +4374,7 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -4349,7 +4391,7 @@ fi
 rm -f conftest*
 if test $ac_cv_c_bigendian = unknown; then
 cat > conftest.$ac_ext <<EOF
-#line 4353 "configure"
+#line 4395 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -4362,7 +4404,7 @@ main () {
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:4366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_bigendian=no
 else
@@ -4389,10 +4431,10 @@ fi
 
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:4393: checking size of short" >&5
+echo "configure:4435: checking size of short" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4396 "configure"
+#line 4438 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4403,7 +4445,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -4431,10 +4473,10 @@ if test "$ac_cv_sizeof_short" = 0; then
   exit 1
 fi
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4435: checking size of int" >&5
+echo "configure:4477: checking size of int" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4438 "configure"
+#line 4480 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4445,7 +4487,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -4467,10 +4509,10 @@ EOF
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4471: checking size of long" >&5
+echo "configure:4513: checking size of long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4474 "configure"
+#line 4516 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4481,7 +4523,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -4503,10 +4545,10 @@ EOF
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4507: checking size of long long" >&5
+echo "configure:4549: checking size of long long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4510 "configure"
+#line 4552 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4517,7 +4559,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4563: \"$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
@@ -4539,10 +4581,10 @@ EOF
 
 
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:4543: checking size of void *" >&5
+echo "configure:4585: checking size of void *" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4546 "configure"
+#line 4588 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4553,7 +4595,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4599: \"$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
@@ -4576,7 +4618,7 @@ EOF
 
 
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:4580: checking for long file names" >&5
+echo "configure:4622: 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:
@@ -4622,10 +4664,10 @@ fi
 
 
 echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:4626: checking for sin" >&5
+echo "configure:4668: checking for sin" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4629 "configure"
+#line 4671 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sin(); below.  */
@@ -4648,7 +4690,7 @@ sin();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4694: \"$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
@@ -4666,12 +4708,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:4670: checking for sin in -lm" >&5
+echo "configure:4712: 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 4675 "configure"
+#line 4717 "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
@@ -4682,7 +4724,7 @@ int main() {
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:4686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4728: \"$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
@@ -4726,14 +4768,14 @@ EOF
 
 
 cat > conftest.$ac_ext <<EOF
-#line 4730 "configure"
+#line 4772 "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:4737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4779: \"$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
@@ -4750,14 +4792,14 @@ fi
 rm -f conftest*
 
 echo "checking type of mail spool file locking" 1>&6
-echo "configure:4754: checking type of mail spool file locking" >&5
+echo "configure:4796: 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:4758: checking for $ac_func" >&5
+echo "configure:4800: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4761 "configure"
+#line 4803 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4780,7 +4822,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4826: \"$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
@@ -4862,12 +4904,12 @@ test "$mail_locking" = "locking" -a "$ac_cv_func_locking" != "yes" && \
 case "$opsys" in decosf*)
   
 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:4866: checking for cma_open in -lpthreads" >&5
+echo "configure:4908: 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 4871 "configure"
+#line 4913 "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
@@ -4878,7 +4920,7 @@ int main() {
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:4882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4924: \"$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
@@ -4914,7 +4956,7 @@ fi
 esac
 
 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:4918: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:4960: 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;
@@ -4926,7 +4968,7 @@ fi
 if test "$opsys" = "sol2"; then
   if test "$os_release" -ge 56; then
     echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:4930: checking for \"-z ignore\" linker flag" >&5
+echo "configure:4972: 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 ;;
@@ -4937,7 +4979,7 @@ fi
 
 
 echo "checking "for specified window system"" 1>&6
-echo "configure:4941: checking "for specified window system"" >&5
+echo "configure:4983: checking "for specified window system"" >&5
 
 if test "$with_x11" != "no"; then
     test "$x_includes $x_libraries" != "NONE NONE" && \
@@ -4970,7 +5012,7 @@ if test "$with_x11" != "no"; then
 # 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:4974: checking for X" >&5
+echo "configure:5016: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -5030,12 +5072,12 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 5034 "configure"
+#line 5076 "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:5039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5081: \"$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*
@@ -5104,14 +5146,14 @@ if test "$ac_x_libraries" = NO; then
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5108 "configure"
+#line 5150 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:5115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5157: \"$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.
@@ -5220,17 +5262,17 @@ else
     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:5224: checking whether -R must be followed by a space" >&5
+echo "configure:5266: 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 5227 "configure"
+#line 5269 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -5246,14 +5288,14 @@ rm -f conftest*
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 5250 "configure"
+#line 5292 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -5289,12 +5331,12 @@ ac_cv_lib_dnet_dnet_ntoa=no
 else
 
 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:5293: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:5335: 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 5298 "configure"
+#line 5340 "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
@@ -5305,7 +5347,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5351: \"$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
@@ -5329,12 +5371,12 @@ fi
     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:5333: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:5375: 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 5338 "configure"
+#line 5380 "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
@@ -5345,7 +5387,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5391: \"$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
@@ -5374,10 +5416,10 @@ fi
     # 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:5378: checking for gethostbyname" >&5
+echo "configure:5420: checking for gethostbyname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5381 "configure"
+#line 5423 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -5400,7 +5442,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5446: \"$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
@@ -5421,12 +5463,12 @@ fi
     if test $ac_cv_func_gethostbyname = no; then
       
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:5425: checking for gethostbyname in -lnsl" >&5
+echo "configure:5467: 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 5430 "configure"
+#line 5472 "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
@@ -5437,7 +5479,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:5441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5483: \"$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
@@ -5467,10 +5509,10 @@ fi
     # -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:5471: checking for connect" >&5
+echo "configure:5513: checking for connect" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5474 "configure"
+#line 5516 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -5493,7 +5535,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5539: \"$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
@@ -5516,12 +5558,12 @@ fi
 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:5520: checking "$xe_msg_checking"" >&5
+echo "configure:5562: 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 5525 "configure"
+#line 5567 "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
@@ -5532,7 +5574,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:5536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5578: \"$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
@@ -5556,10 +5598,10 @@ fi
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:5560: checking for remove" >&5
+echo "configure:5602: checking for remove" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5563 "configure"
+#line 5605 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -5582,7 +5624,7 @@ remove();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5628: \"$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
@@ -5603,12 +5645,12 @@ fi
     if test $ac_cv_func_remove = no; then
       
 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:5607: checking for remove in -lposix" >&5
+echo "configure:5649: 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 5612 "configure"
+#line 5654 "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
@@ -5619,7 +5661,7 @@ int main() {
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:5623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5665: \"$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
@@ -5643,10 +5685,10 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:5647: checking for shmat" >&5
+echo "configure:5689: checking for shmat" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5650 "configure"
+#line 5692 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -5669,7 +5711,7 @@ shmat();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5715: \"$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
@@ -5690,12 +5732,12 @@ fi
     if test $ac_cv_func_shmat = no; then
       
 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:5694: checking for shmat in -lipc" >&5
+echo "configure:5736: 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 5699 "configure"
+#line 5741 "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
@@ -5706,7 +5748,7 @@ int main() {
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:5710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5752: \"$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
@@ -5742,12 +5784,12 @@ fi
 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:5746: checking "$xe_msg_checking"" >&5
+echo "configure:5788: 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 5751 "configure"
+#line 5793 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5758,7 +5800,7 @@ int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:5762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5804: \"$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
@@ -5929,7 +5971,7 @@ EOF
 
 
     echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:5933: checking for X defines extracted by xmkmf" >&5
+echo "configure:5975: checking for X defines extracted by xmkmf" >&5
   rm -fr conftestdir
   if mkdir conftestdir; then
     cd conftestdir
@@ -5976,15 +6018,15 @@ EOF
 
     ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:5980: checking for X11/Intrinsic.h" >&5
+echo "configure:6022: checking for X11/Intrinsic.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5983 "configure"
+#line 6025 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6030: \"$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*
@@ -6008,12 +6050,12 @@ fi
 
       
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:6012: checking for XOpenDisplay in -lX11" >&5
+echo "configure:6054: 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 6017 "configure"
+#line 6059 "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
@@ -6024,7 +6066,7 @@ int main() {
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6070: \"$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
@@ -6049,12 +6091,12 @@ fi
 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:6053: checking "$xe_msg_checking"" >&5
+echo "configure:6095: 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 6058 "configure"
+#line 6100 "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
@@ -6065,7 +6107,7 @@ int main() {
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:6069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6111: \"$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
@@ -6092,12 +6134,12 @@ fi
 
     
 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:6096: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:6138: 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 6101 "configure"
+#line 6143 "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
@@ -6108,7 +6150,7 @@ int main() {
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:6112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6154: \"$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
@@ -6131,12 +6173,12 @@ fi
 
     
 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:6135: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:6177: 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 6140 "configure"
+#line 6182 "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
@@ -6147,7 +6189,7 @@ int main() {
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6193: \"$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
@@ -6170,14 +6212,14 @@ fi
 
 
   echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:6174: checking the version of X11 being used" >&5
+echo "configure:6216: checking the version of X11 being used" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6176 "configure"
+#line 6218 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
     int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:6181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest foobar; x11_release=$?
 else
@@ -6208,10 +6250,10 @@ EOF
   for ac_func in XConvertCase
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6212: checking for $ac_func" >&5
+echo "configure:6254: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6215 "configure"
+#line 6257 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6234,7 +6276,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6280: \"$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
@@ -6266,15 +6308,15 @@ done
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6270: checking for $ac_hdr" >&5
+echo "configure:6312: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6273 "configure"
+#line 6315 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6278: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6320: \"$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*
@@ -6307,10 +6349,10 @@ done
     for ac_func in XRegisterIMInstantiateCallback
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6311: checking for $ac_func" >&5
+echo "configure:6353: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6314 "configure"
+#line 6356 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6333,7 +6375,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6379: \"$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
@@ -6361,9 +6403,9 @@ fi
 done
 
   echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6
-echo "configure:6365: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+echo "configure:6407: checking for standard XRegisterIMInstantiateCallback prototype" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6367 "configure"
+#line 6409 "configure"
 #include "confdefs.h"
 
 #define NeedFunctionPrototypes 1
@@ -6375,7 +6417,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:6379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -6396,12 +6438,12 @@ rm -f conftest*
 
     test -z "$with_xmu" && { 
 echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:6400: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:6442: 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 6405 "configure"
+#line 6447 "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
@@ -6412,7 +6454,7 @@ int main() {
 XmuReadBitmapDataFromFile()
 ; return 0; }
 EOF
-if { (eval echo configure:6416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6458: \"$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
@@ -6451,19 +6493,19 @@ EOF
 
       
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:6455: checking for main in -lXbsd" >&5
+echo "configure:6497: 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 6460 "configure"
+#line 6502 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:6467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6509: \"$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
@@ -6500,22 +6542,22 @@ fi
 fi 
 if test "$with_msw" != "no"; then
   echo "checking for MS-Windows" 1>&6
-echo "configure:6504: checking for MS-Windows" >&5
+echo "configure:6546: checking for MS-Windows" >&5
   
 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:6507: checking for main in -lgdi32" >&5
+echo "configure:6549: 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 6512 "configure"
+#line 6554 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:6519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6561: \"$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
@@ -6586,12 +6628,12 @@ EOF
  fi
     fi
         cat > conftest.$ac_ext <<EOF
-#line 6590 "configure"
+#line 6632 "configure"
 #include "confdefs.h"
 #include <fcntl.h>
     int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
 EOF
-if { (eval echo configure:6595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MSG_SELECT
@@ -6655,15 +6697,15 @@ fi
 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:6659: checking for X11/extensions/shape.h" >&5
+echo "configure:6701: checking for X11/extensions/shape.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6662 "configure"
+#line 6704 "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:6667: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6709: \"$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*
@@ -6710,7 +6752,7 @@ case "$x_libraries" in *X11R4* )
 esac
 
 echo "checking for WM_COMMAND option" 1>&6
-echo "configure:6714: checking for WM_COMMAND option" >&5;
+echo "configure:6756: checking for WM_COMMAND option" >&5;
 if test "$with_wmcommand" != "no"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_WMCOMMAND
@@ -6725,15 +6767,15 @@ fi
 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:6729: checking for X11/Xauth.h" >&5
+echo "configure:6771: checking for X11/Xauth.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6732 "configure"
+#line 6774 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6737: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6779: \"$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*
@@ -6756,12 +6798,12 @@ fi
  }
 test -z "$with_xauth" && { 
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:6760: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:6802: 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 6765 "configure"
+#line 6807 "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
@@ -6772,7 +6814,7 @@ int main() {
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:6776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6818: \"$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
@@ -6817,15 +6859,15 @@ if test "$with_tooltalk" != "no" ; then
       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:6821: checking for ${dir}tt_c.h" >&5
+echo "configure:6863: checking for ${dir}tt_c.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6824 "configure"
+#line 6866 "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:6829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6871: \"$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*
@@ -6861,12 +6903,12 @@ if test "$with_tooltalk" != "no" ; then
 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:6865: checking "$xe_msg_checking"" >&5
+echo "configure:6907: 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 6870 "configure"
+#line 6912 "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
@@ -6877,7 +6919,7 @@ int main() {
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:6881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6923: \"$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
@@ -6934,15 +6976,15 @@ fi
 
 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:6938: checking for Dt/Dt.h" >&5
+echo "configure:6980: checking for Dt/Dt.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6941 "configure"
+#line 6983 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6988: \"$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*
@@ -6965,12 +7007,12 @@ fi
  }
 test -z "$with_cde" && { 
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:6969: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:7011: 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 6974 "configure"
+#line 7016 "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
@@ -6981,7 +7023,7 @@ int main() {
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:6985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7027: \"$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
@@ -7051,7 +7093,7 @@ fi
 
 if test "$with_dragndrop" != "no" ; then
   echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
-echo "configure:7055: checking if drag and drop API is needed" >&5
+echo "configure:7097: 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
@@ -7071,18 +7113,18 @@ EOF
 fi
 
 echo "checking for LDAP" 1>&6
-echo "configure:7075: checking for LDAP" >&5
+echo "configure:7117: 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:7078: checking for ldap.h" >&5
+echo "configure:7120: checking for ldap.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7081 "configure"
+#line 7123 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7086: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7128: \"$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*
@@ -7105,15 +7147,15 @@ fi
  }
 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:7109: checking for lber.h" >&5
+echo "configure:7151: checking for lber.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7112 "configure"
+#line 7154 "configure"
 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7159: \"$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*
@@ -7137,12 +7179,12 @@ fi
 if test "$with_ldap" != "no"; then
   
 echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
-echo "configure:7141: checking for ldap_search in -lldap" >&5
+echo "configure:7183: checking for ldap_search in -lldap" >&5
 ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap "
 cat > conftest.$ac_ext <<EOF
-#line 7146 "configure"
+#line 7188 "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
@@ -7153,7 +7195,7 @@ int main() {
 ldap_search()
 ; return 0; }
 EOF
-if { (eval echo configure:7157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7199: \"$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
@@ -7178,12 +7220,12 @@ fi
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7182: checking "$xe_msg_checking"" >&5
+echo "configure:7224: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap -llber"
 cat > conftest.$ac_ext <<EOF
-#line 7187 "configure"
+#line 7229 "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
@@ -7194,7 +7236,7 @@ int main() {
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7240: \"$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
@@ -7219,12 +7261,12 @@ fi
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber -lkrb" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7223: checking "$xe_msg_checking"" >&5
+echo "configure:7265: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap -llber -lkrb"
 cat > conftest.$ac_ext <<EOF
-#line 7228 "configure"
+#line 7270 "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
@@ -7235,7 +7277,7 @@ int main() {
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7281: \"$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
@@ -7260,12 +7302,12 @@ fi
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber -lkrb -ldes" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb -ldes"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7264: checking "$xe_msg_checking"" >&5
+echo "configure:7306: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap -llber -lkrb -ldes"
 cat > conftest.$ac_ext <<EOF
-#line 7269 "configure"
+#line 7311 "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
@@ -7276,7 +7318,7 @@ int main() {
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7322: \"$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
@@ -7327,10 +7369,10 @@ EOF
   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:7331: checking for $ac_func" >&5
+echo "configure:7373: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7334 "configure"
+#line 7376 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7353,7 +7395,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7399: \"$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
@@ -7384,20 +7426,20 @@ fi
 
 if test "$with_postgresql" != "no"; then
   echo "checking for PostgreSQL" 1>&6
-echo "configure:7388: checking for PostgreSQL" >&5
+echo "configure:7430: 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:7393: checking for ${header_dir}libpq-fe.h" >&5
+echo "configure:7435: checking for ${header_dir}libpq-fe.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7396 "configure"
+#line 7438 "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:7401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7443: \"$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*
@@ -7421,12 +7463,12 @@ fi
 
   test -n "$libpq_fe_h_file" && { 
 echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:7425: checking for PQconnectdb in -lpq" >&5
+echo "configure:7467: 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 7430 "configure"
+#line 7472 "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
@@ -7437,7 +7479,7 @@ int main() {
 PQconnectdb()
 ; return 0; }
 EOF
-if { (eval echo configure:7441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7470,12 +7512,12 @@ EOF
 
     
 echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
-echo "configure:7474: checking for PQconnectStart in -lpq" >&5
+echo "configure:7516: 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 7479 "configure"
+#line 7521 "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
@@ -7486,7 +7528,7 @@ int main() {
 PQconnectStart()
 ; return 0; }
 EOF
-if { (eval echo configure:7490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7532: \"$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
@@ -7534,15 +7576,15 @@ fi
 
 if test "$window_system" != "none"; then
   echo "checking for graphics libraries" 1>&6
-echo "configure:7538: checking for graphics libraries" >&5
+echo "configure:7580: checking for graphics libraries" >&5
 
     xpm_problem=""
   if test -z "$with_xpm"; then
     echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:7543: checking for Xpm - no older than 3.4f" >&5
+echo "configure:7585: checking for Xpm - no older than 3.4f" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 7546 "configure"
+#line 7588 "configure"
 #include "confdefs.h"
 #define XPM_NUMBERS
 #include <X11/xpm.h>
@@ -7551,7 +7593,7 @@ echo "configure:7543: checking for Xpm - no older than 3.4f" >&5
       XpmIncludeVersion != XpmLibraryVersion() ? 1 :
       XpmIncludeVersion < 30406 ? 2 : 0 ;}
 EOF
-if { (eval echo configure:7555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7597: \"$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
@@ -7593,17 +7635,17 @@ EOF
 
     libs_x="-lXpm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXpm\" to \$libs_x"; fi
     echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6
-echo "configure:7597: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:7639: checking for \"FOR_MSW\" xpm" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 7600 "configure"
+#line 7642 "configure"
 #include "confdefs.h"
 
 int main() {
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:7607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   xpm_for_msw=no
 else
@@ -7629,15 +7671,15 @@ EOF
 
     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:7633: checking for compface.h" >&5
+echo "configure:7675: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7636 "configure"
+#line 7678 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7641: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7683: \"$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*
@@ -7660,12 +7702,12 @@ fi
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:7664: checking for UnGenFace in -lcompface" >&5
+echo "configure:7706: 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 7669 "configure"
+#line 7711 "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
@@ -7676,7 +7718,7 @@ int main() {
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:7680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7722: \"$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
@@ -7728,12 +7770,12 @@ EOF
       if test "$with_png $with_tiff" != "no no"; then
     
 echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
-echo "configure:7732: checking for inflate in -lc" >&5
+echo "configure:7774: 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 7737 "configure"
+#line 7779 "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
@@ -7744,7 +7786,7 @@ int main() {
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:7748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7790: \"$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
@@ -7763,12 +7805,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:7767: checking for inflate in -lz" >&5
+echo "configure:7809: 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 7772 "configure"
+#line 7814 "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
@@ -7779,7 +7821,7 @@ int main() {
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:7783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7825: \"$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
@@ -7798,12 +7840,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:7802: checking for inflate in -lgz" >&5
+echo "configure:7844: 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 7807 "configure"
+#line 7849 "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
@@ -7814,7 +7856,7 @@ int main() {
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:7818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7860: \"$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
@@ -7844,15 +7886,15 @@ fi
 
     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:7848: checking for jpeglib.h" >&5
+echo "configure:7890: checking for jpeglib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7851 "configure"
+#line 7893 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7898: \"$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*
@@ -7875,12 +7917,12 @@ fi
  }
   test -z "$with_jpeg" && { 
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:7879: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:7921: 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 7884 "configure"
+#line 7926 "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
@@ -7891,7 +7933,7 @@ int main() {
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:7895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7937: \"$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
@@ -7927,10 +7969,10 @@ EOF
 
     png_problem=""
   test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:7931: checking for pow" >&5
+echo "configure:7973: checking for pow" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7934 "configure"
+#line 7976 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pow(); below.  */
@@ -7953,7 +7995,7 @@ pow();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7999: \"$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
@@ -7974,15 +8016,15 @@ fi
  }
   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:7978: checking for png.h" >&5
+echo "configure:8020: checking for png.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7981 "configure"
+#line 8023 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8028: \"$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*
@@ -8005,12 +8047,12 @@ fi
  }
   test -z "$with_png" && { 
 echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:8009: checking for png_read_image in -lpng" >&5
+echo "configure:8051: 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 8014 "configure"
+#line 8056 "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
@@ -8021,7 +8063,7 @@ int main() {
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:8025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8067: \"$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
@@ -8044,10 +8086,10 @@ fi
  }
   if test -z "$with_png"; then
     echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:8048: checking for workable png version information" >&5
+echo "configure:8090: checking for workable png version information" >&5
     xe_check_libs="-lpng -lz"
     cat > conftest.$ac_ext <<EOF
-#line 8051 "configure"
+#line 8093 "configure"
 #include "confdefs.h"
 #include <png.h>
     int main(int c, char **v) {
@@ -8055,7 +8097,7 @@ echo "configure:8048: checking for workable png version information" >&5
     if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1;
     return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}
 EOF
-if { (eval echo configure:8059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8101: \"$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
@@ -8098,15 +8140,15 @@ EOF
 
     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:8102: checking for tiffio.h" >&5
+echo "configure:8144: checking for tiffio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8105 "configure"
+#line 8147 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8152: \"$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*
@@ -8129,12 +8171,12 @@ fi
  }
   test -z "$with_tiff" && { 
 echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8133: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:8175: 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 8138 "configure"
+#line 8180 "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
@@ -8145,7 +8187,7 @@ int main() {
 TIFFClientOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:8149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8191: \"$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
@@ -8184,10 +8226,10 @@ fi
 if test "$with_x11" = "yes"; then
 
   echo "checking for X11 graphics libraries" 1>&6
-echo "configure:8188: checking for X11 graphics libraries" >&5
+echo "configure:8230: checking for X11 graphics libraries" >&5
 
   echo "checking for the Athena widgets" 1>&6
-echo "configure:8191: checking for the Athena widgets" >&5
+echo "configure:8233: checking for the Athena widgets" >&5
 
     case "$with_athena" in
         "xaw" | "")	athena_variant=Xaw	athena_3d=no  ;;
@@ -8201,12 +8243,12 @@ echo "configure:8191: checking for the Athena widgets" >&5
     if test "$athena_3d" = "no"; then
     
 echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8205: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:8247: 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 8210 "configure"
+#line 8252 "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
@@ -8217,7 +8259,7 @@ int main() {
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:8221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8263: \"$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
@@ -8233,12 +8275,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
   echo "$ac_t""yes" 1>&6
           
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8237: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:8279: checking for threeDClassRec in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 8242 "configure"
+#line 8284 "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
@@ -8249,7 +8291,7 @@ int main() {
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8295: \"$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
@@ -8280,12 +8322,12 @@ fi
   else
         
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8284: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:8326: checking for threeDClassRec in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 8289 "configure"
+#line 8331 "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
@@ -8296,7 +8338,7 @@ int main() {
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8342: \"$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
@@ -8314,12 +8356,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6
-echo "configure:8318: checking for threeDClassRec in -lXaw" >&5
+echo "configure:8360: checking for threeDClassRec in -lXaw" >&5
 ac_lib_var=`echo Xaw'_'threeDClassRec | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXaw "
 cat > conftest.$ac_ext <<EOF
-#line 8323 "configure"
+#line 8365 "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
@@ -8330,7 +8372,7 @@ int main() {
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8376: \"$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,15 +8403,15 @@ fi
     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:8365: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:8407: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8368 "configure"
+#line 8410 "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:8373: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8415: \"$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*
@@ -8389,15 +8431,15 @@ else
   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:8393: checking for X11/Xaw/XawInit.h" >&5
+echo "configure:8435: checking for X11/Xaw/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8396 "configure"
+#line 8438 "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:8401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8443: \"$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*
@@ -8423,15 +8465,15 @@ fi
   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:8427: checking for X11/$athena_variant/XawInit.h" >&5
+echo "configure:8469: checking for X11/$athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8430 "configure"
+#line 8472 "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:8435: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8477: \"$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*
@@ -8448,15 +8490,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   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:8452: checking for X11/$athena_variant/ThreeD.h" >&5
+echo "configure:8494: checking for X11/$athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8455 "configure"
+#line 8497 "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:8460: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8484,15 +8526,15 @@ fi
         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:8488: checking for $athena_variant/XawInit.h" >&5
+echo "configure:8530: checking for $athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8491 "configure"
+#line 8533 "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:8496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8538: \"$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*
@@ -8509,15 +8551,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   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:8513: checking for $athena_variant/ThreeD.h" >&5
+echo "configure:8555: checking for $athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8516 "configure"
+#line 8558 "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:8521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8563: \"$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*
@@ -8546,15 +8588,15 @@ fi
         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:8550: checking for X11/Xaw3d/XawInit.h" >&5
+echo "configure:8592: checking for X11/Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8553 "configure"
+#line 8595 "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:8558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8600: \"$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*
@@ -8571,15 +8613,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   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:8575: checking for X11/Xaw3d/ThreeD.h" >&5
+echo "configure:8617: checking for X11/Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8578 "configure"
+#line 8620 "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:8583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8625: \"$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*
@@ -8611,15 +8653,15 @@ fi
         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:8615: checking for Xaw3d/XawInit.h" >&5
+echo "configure:8657: checking for Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8618 "configure"
+#line 8660 "configure"
 #include "confdefs.h"
 #include <Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8636,15 +8678,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   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:8640: checking for Xaw3d/ThreeD.h" >&5
+echo "configure:8682: checking for Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8643 "configure"
+#line 8685 "configure"
 #include "confdefs.h"
 #include <Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8648: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8690: \"$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*
@@ -8676,15 +8718,15 @@ fi
             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:8680: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:8722: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8683 "configure"
+#line 8725 "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:8688: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8730: \"$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*
@@ -8719,15 +8761,15 @@ fi
 
     ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:8723: checking for Xm/Xm.h" >&5
+echo "configure:8765: checking for Xm/Xm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8726 "configure"
+#line 8768 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8773: \"$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*
@@ -8744,12 +8786,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:8748: checking for XmStringFree in -lXm" >&5
+echo "configure:8790: 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 8753 "configure"
+#line 8795 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8760,7 +8802,7 @@ int main() {
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:8764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8789,9 +8831,9 @@ fi
 
   if test "$have_motif" = "yes"; then
         echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:8793: checking for Lesstif" >&5
+echo "configure:8835: checking for Lesstif" >&5
     cat > conftest.$ac_ext <<EOF
-#line 8795 "configure"
+#line 8837 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 #ifdef LESSTIF_VERSION
@@ -9197,7 +9239,7 @@ fi
 
 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
-echo "configure:9201: checking for Mule-related features" >&5
+echo "configure:9243: checking for Mule-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
@@ -9222,15 +9264,15 @@ EOF
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9226: checking for $ac_hdr" >&5
+echo "configure:9268: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9229 "configure"
+#line 9271 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9276: \"$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*
@@ -9261,12 +9303,12 @@ done
 
   
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:9265: checking for strerror in -lintl" >&5
+echo "configure:9307: 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 9270 "configure"
+#line 9312 "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
@@ -9277,7 +9319,7 @@ int main() {
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:9281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9323: \"$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
@@ -9310,18 +9352,18 @@ fi
 
 
   echo "checking for Mule input methods" 1>&6
-echo "configure:9314: checking for Mule input methods" >&5
+echo "configure:9356: checking for Mule input methods" >&5
         case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6
-echo "configure:9317: checking for XIM" >&5
+echo "configure:9359: checking for XIM" >&5
     
 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:9320: checking for XOpenIM in -lX11" >&5
+echo "configure:9362: 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 9325 "configure"
+#line 9367 "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
@@ -9332,7 +9374,7 @@ int main() {
 XOpenIM()
 ; return 0; }
 EOF
-if { (eval echo configure:9336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9378: \"$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
@@ -9356,12 +9398,12 @@ fi
         if test "$have_motif $have_lesstif" = "yes no"; then
       
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:9360: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:9402: 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 9365 "configure"
+#line 9407 "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
@@ -9372,7 +9414,7 @@ int main() {
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:9376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9418: \"$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
@@ -9437,15 +9479,15 @@ EOF
 
     if test "$with_xfs" = "yes" ; then
     echo "checking for XFontSet" 1>&6
-echo "configure:9441: checking for XFontSet" >&5
+echo "configure:9483: checking for XFontSet" >&5
     
 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:9444: checking for XmbDrawString in -lX11" >&5
+echo "configure:9486: 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 9449 "configure"
+#line 9491 "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
@@ -9456,7 +9498,7 @@ int main() {
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:9460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9502: \"$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
@@ -9496,15 +9538,15 @@ EOF
     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:9500: checking for wnn/jllib.h" >&5
+echo "configure:9542: checking for wnn/jllib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9503 "configure"
+#line 9545 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9550: \"$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*
@@ -9527,15 +9569,15 @@ fi
  }
     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:9531: checking for wnn/commonhd.h" >&5
+echo "configure:9573: checking for wnn/commonhd.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9534 "configure"
+#line 9576 "configure"
 #include "confdefs.h"
 #include <wnn/commonhd.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9581: \"$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*
@@ -9560,10 +9602,10 @@ fi
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9564: checking for $ac_func" >&5
+echo "configure:9606: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9567 "configure"
+#line 9609 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -9586,7 +9628,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:9590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9632: \"$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
@@ -9615,12 +9657,12 @@ done
 
     test "$ac_cv_func_crypt" != "yes" && { 
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:9619: checking for crypt in -lcrypt" >&5
+echo "configure:9661: 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 9624 "configure"
+#line 9666 "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
@@ -9631,7 +9673,7 @@ int main() {
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:9635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9677: \"$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
@@ -9666,12 +9708,12 @@ fi
     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:9670: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:9712: 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 9675 "configure"
+#line 9717 "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
@@ -9682,7 +9724,7 @@ int main() {
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:9686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9728: \"$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
@@ -9700,12 +9742,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6
-echo "configure:9704: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:9746: 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 9709 "configure"
+#line 9751 "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
@@ -9716,7 +9758,7 @@ int main() {
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:9720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9762: \"$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
@@ -9734,12 +9776,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6
-echo "configure:9738: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:9780: 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 9743 "configure"
+#line 9785 "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
@@ -9750,7 +9792,7 @@ int main() {
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:9754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9796: \"$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
@@ -9768,12 +9810,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6
-echo "configure:9772: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:9814: 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 9777 "configure"
+#line 9819 "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
@@ -9784,7 +9826,7 @@ int main() {
 dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:9788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9830: \"$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
@@ -9832,12 +9874,12 @@ EOF
     if test "$with_wnn6" != "no"; then
       
 echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6
-echo "configure:9836: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:9878: 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 9841 "configure"
+#line 9883 "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
@@ -9848,7 +9890,7 @@ int main() {
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:9852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9894: \"$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
@@ -9883,15 +9925,15 @@ EOF
   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:9887: checking for canna/jrkanji.h" >&5
+echo "configure:9929: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9890 "configure"
+#line 9932 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9937: \"$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*
@@ -9918,15 +9960,15 @@ fi
     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:9922: checking for canna/jrkanji.h" >&5
+echo "configure:9964: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9925 "configure"
+#line 9967 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9972: \"$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*
@@ -9954,15 +9996,15 @@ fi
 
   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:9958: checking for canna/RK.h" >&5
+echo "configure:10000: checking for canna/RK.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9961 "configure"
+#line 10003 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10008: \"$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*
@@ -9985,12 +10027,12 @@ fi
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:9989: checking for RkBgnBun in -lRKC" >&5
+echo "configure:10031: 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 9994 "configure"
+#line 10036 "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
@@ -10001,7 +10043,7 @@ int main() {
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:10005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10047: \"$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
@@ -10024,12 +10066,12 @@ fi
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:10028: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:10070: 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 10033 "configure"
+#line 10075 "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
@@ -10040,7 +10082,7 @@ int main() {
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:10044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10086: \"$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
@@ -10089,12 +10131,12 @@ if test "$need_motif" = "yes" ; then
   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:10093: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:10135: 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 10098 "configure"
+#line 10140 "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
@@ -10105,7 +10147,7 @@ int main() {
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:10109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10151: \"$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
@@ -10188,13 +10230,13 @@ fi
 
 fi
 
-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 utimes waitpid vsnprintf fsync ftruncate umask
+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:10195: checking for $ac_func" >&5
+echo "configure:10237: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10198 "configure"
+#line 10240 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10217,7 +10259,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10263: \"$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
@@ -10249,10 +10291,10 @@ done
 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:10253: checking for $ac_func" >&5
+echo "configure:10295: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10256 "configure"
+#line 10298 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10275,7 +10317,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10321: \"$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
@@ -10304,10 +10346,10 @@ done
 
 
 echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:10308: checking for openpty" >&5
+echo "configure:10350: checking for openpty" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10311 "configure"
+#line 10353 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char openpty(); below.  */
@@ -10330,7 +10372,7 @@ openpty();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10376: \"$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
@@ -10349,12 +10391,12 @@ else
 
   
 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:10353: checking for openpty in -lutil" >&5
+echo "configure:10395: 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 10358 "configure"
+#line 10400 "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
@@ -10365,7 +10407,7 @@ int main() {
 openpty()
 ; return 0; }
 EOF
-if { (eval echo configure:10369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10411: \"$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
@@ -10400,15 +10442,15 @@ EOF
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10404: checking for $ac_hdr" >&5
+echo "configure:10446: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10407 "configure"
+#line 10449 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10454: \"$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*
@@ -10444,15 +10486,15 @@ for ac_hdr in stropts.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10448: checking for $ac_hdr" >&5
+echo "configure:10490: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10451 "configure"
+#line 10493 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10498: \"$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*
@@ -10485,10 +10527,10 @@ if test "$ac_cv_header_stropts_h" = "yes"; then
   for ac_func in isastream
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10489: checking for $ac_func" >&5
+echo "configure:10531: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10492 "configure"
+#line 10534 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10511,7 +10553,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10557: \"$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
@@ -10542,15 +10584,15 @@ done
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10546: checking for $ac_hdr" >&5
+echo "configure:10588: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10549 "configure"
+#line 10591 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10596: \"$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*
@@ -10587,10 +10629,10 @@ extra_objs="$extra_objs realpath.o" &&  if test "$extra_verbose" = "yes"; then
 for ac_func in getloadavg
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10591: checking for $ac_func" >&5
+echo "configure:10633: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10594 "configure"
+#line 10636 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10613,7 +10655,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10659: \"$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
@@ -10646,15 +10688,15 @@ if test "$ac_cv_func_getloadavg" = "yes"; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10650: checking for $ac_hdr" >&5
+echo "configure:10692: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10653 "configure"
+#line 10695 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10658: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10700: \"$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*
@@ -10690,12 +10732,12 @@ else
 
     
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:10694: checking for kstat_open in -lkstat" >&5
+echo "configure:10736: 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 10699 "configure"
+#line 10741 "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
@@ -10706,7 +10748,7 @@ int main() {
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:10710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10752: \"$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
@@ -10741,15 +10783,15 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10745: checking for $ac_hdr" >&5
+echo "configure:10787: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10748 "configure"
+#line 10790 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10795: \"$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*
@@ -10781,12 +10823,12 @@ done
 
     
 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:10785: checking for kvm_read in -lkvm" >&5
+echo "configure:10827: 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 10790 "configure"
+#line 10832 "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
@@ -10797,7 +10839,7 @@ int main() {
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:10801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10843: \"$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
@@ -10831,16 +10873,16 @@ fi
 fi
 
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:10835: checking whether netdb declares h_errno" >&5
+echo "configure:10877: checking whether netdb declares h_errno" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10837 "configure"
+#line 10879 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:10844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10886: \"$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
@@ -10860,16 +10902,16 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:10864: checking for sigsetjmp" >&5
+echo "configure:10906: checking for sigsetjmp" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10866 "configure"
+#line 10908 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:10873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10915: \"$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
@@ -10889,11 +10931,11 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:10893: checking whether localtime caches TZ" >&5
+echo "configure:10935: checking whether localtime caches TZ" >&5
 
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 10897 "configure"
+#line 10939 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
@@ -10928,7 +10970,7 @@ main()
   exit (0);
 }
 EOF
-if { (eval echo configure:10932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:10974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
@@ -10958,9 +11000,9 @@ fi
 
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:10962: checking whether gettimeofday accepts one or two arguments" >&5
+echo "configure:11004: checking whether gettimeofday accepts one or two arguments" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10964 "configure"
+#line 11006 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -10981,7 +11023,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:10985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11027: \"$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
@@ -11003,19 +11045,19 @@ fi
 
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:11007: checking for inline" >&5
+echo "configure:11049: checking for inline" >&5
 
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 11012 "configure"
+#line 11054 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:11019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -11056,17 +11098,17 @@ if test "$__DECC" != "yes"; then
   # 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:11060: checking for working alloca.h" >&5
+echo "configure:11102: checking for working alloca.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11063 "configure"
+#line 11105 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:11070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11112: \"$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
@@ -11090,10 +11132,10 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:11094: checking for alloca" >&5
+echo "configure:11136: checking for alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11097 "configure"
+#line 11139 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -11121,7 +11163,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:11125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11167: \"$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
@@ -11160,10 +11202,10 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:11164: checking whether alloca needs Cray hooks" >&5
+echo "configure:11206: checking whether alloca needs Cray hooks" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11167 "configure"
+#line 11209 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -11187,10 +11229,10 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 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:11191: checking for $ac_func" >&5
+echo "configure:11233: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11194 "configure"
+#line 11236 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11213,7 +11255,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11259: \"$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
@@ -11243,10 +11285,10 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:11247: checking stack direction for C alloca" >&5
+echo "configure:11289: checking stack direction for C alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11250 "configure"
+#line 11292 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -11265,7 +11307,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:11269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
@@ -11295,15 +11337,15 @@ fi
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:11299: checking for vfork.h" >&5
+echo "configure:11341: checking for vfork.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11302 "configure"
+#line 11344 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11349: \"$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*
@@ -11331,10 +11373,10 @@ else
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:11335: checking for working vfork" >&5
+echo "configure:11377: checking for working vfork" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11338 "configure"
+#line 11380 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -11429,7 +11471,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:11433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_vfork_works=yes
 else
@@ -11455,10 +11497,10 @@ fi
 
 
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:11459: checking for working strcoll" >&5
+echo "configure:11501: checking for working strcoll" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11462 "configure"
+#line 11504 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -11468,7 +11510,7 @@ main ()
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:11472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
@@ -11496,10 +11538,10 @@ fi
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11500: checking for $ac_func" >&5
+echo "configure:11542: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11503 "configure"
+#line 11545 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11522,7 +11564,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11568: \"$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
@@ -11550,10 +11592,10 @@ fi
 done
 
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:11554: checking whether getpgrp takes no argument" >&5
+echo "configure:11596: checking whether getpgrp takes no argument" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11557 "configure"
+#line 11599 "configure"
 #include "confdefs.h"
 
 /*
@@ -11608,7 +11650,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:11612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_getpgrp_void=yes
 else
@@ -11635,10 +11677,10 @@ fi
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:11639: checking for working mmap" >&5
+echo "configure:11681: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 11642 "configure"
+#line 11684 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -11671,7 +11713,7 @@ int main (int argc, char *argv[])
   return 1;
 }
 EOF
-if { (eval echo configure:11675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   have_mmap=yes
 else
@@ -11697,9 +11739,9 @@ test "$GNU_MALLOC" != "yes" -a "$have_mmap" != "yes" && rel_alloc=no
 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:11701: checking for M_MMAP_THRESHOLD" >&5
+echo "configure:11743: checking for M_MMAP_THRESHOLD" >&5
     cat > conftest.$ac_ext <<EOF
-#line 11703 "configure"
+#line 11745 "configure"
 #include "confdefs.h"
 #include <malloc.h>
 int main() {
@@ -11711,7 +11753,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:11715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   rel_alloc=no; echo "$ac_t""yes" 1>&6;
 else
@@ -11736,15 +11778,15 @@ EOF
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:11740: checking for termios.h" >&5
+echo "configure:11782: checking for termios.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11743 "configure"
+#line 11785 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11790: \"$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*
@@ -11787,15 +11829,15 @@ else
   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:11791: checking for termio.h" >&5
+echo "configure:11833: checking for termio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11794 "configure"
+#line 11836 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11841: \"$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*
@@ -11827,10 +11869,10 @@ fi
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:11831: checking for socket" >&5
+echo "configure:11873: checking for socket" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11834 "configure"
+#line 11876 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -11853,7 +11895,7 @@ socket();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11899: \"$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
@@ -11868,15 +11910,15 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
   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:11872: checking for netinet/in.h" >&5
+echo "configure:11914: checking for netinet/in.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11875 "configure"
+#line 11917 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11922: \"$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*
@@ -11893,15 +11935,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   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:11897: checking for arpa/inet.h" >&5
+echo "configure:11939: checking for arpa/inet.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11900 "configure"
+#line 11942 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11947: \"$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*
@@ -11926,9 +11968,9 @@ EOF
 }
 
       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:11930: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:11972: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 11932 "configure"
+#line 11974 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -11939,7 +11981,7 @@ int main() {
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:11943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11985: \"$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
@@ -11957,9 +11999,9 @@ else
 fi
 rm -f conftest*
       echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:11961: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:12003: checking "for ip_mreq struct in netinet/in.h"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 11963 "configure"
+#line 12005 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -11969,7 +12011,7 @@ int main() {
 static struct ip_mreq x;
 ; return 0; }
 EOF
-if { (eval echo configure:11973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12015: \"$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
@@ -12000,10 +12042,10 @@ fi
 
 
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:12004: checking for msgget" >&5
+echo "configure:12046: checking for msgget" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12007 "configure"
+#line 12049 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
@@ -12026,7 +12068,7 @@ msgget();
 
 ; return 0; }
 EOF
-if { (eval echo configure:12030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12072: \"$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
@@ -12041,15 +12083,15 @@ if eval "test \"`echo '$ac_cv_func_'msgget`\" = yes"; then
   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:12045: checking for sys/ipc.h" >&5
+echo "configure:12087: checking for sys/ipc.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12048 "configure"
+#line 12090 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12053: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12095: \"$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*
@@ -12066,15 +12108,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   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:12070: checking for sys/msg.h" >&5
+echo "configure:12112: checking for sys/msg.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12073 "configure"
+#line 12115 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12078: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12120: \"$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*
@@ -12112,15 +12154,15 @@ fi
 
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:12116: checking for dirent.h" >&5
+echo "configure:12158: checking for dirent.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12119 "configure"
+#line 12161 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12166: \"$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*
@@ -12147,15 +12189,15 @@ else
   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:12151: checking for sys/dir.h" >&5
+echo "configure:12193: checking for sys/dir.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12154 "configure"
+#line 12196 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12188,15 +12230,15 @@ fi
 
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:12192: checking for nlist.h" >&5
+echo "configure:12234: checking for nlist.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12195 "configure"
+#line 12237 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12242: \"$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*
@@ -12226,22 +12268,22 @@ fi
 
 
 echo "checking "for sound support"" 1>&6
-echo "configure:12230: checking "for sound support"" >&5
+echo "configure:12272: 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:12237: checking for multimedia/audio_device.h" >&5
+echo "configure:12279: checking for multimedia/audio_device.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12240 "configure"
+#line 12282 "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:12245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12287: \"$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*
@@ -12289,12 +12331,12 @@ fi
       if test -z "$native_sound_lib"; then
         
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:12293: checking for ALopenport in -laudio" >&5
+echo "configure:12335: 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 12298 "configure"
+#line 12340 "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
@@ -12305,7 +12347,7 @@ int main() {
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:12309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12351: \"$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
@@ -12336,12 +12378,12 @@ fi
       if test -z "$native_sound_lib"; then
 	
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:12340: checking for AOpenAudio in -lAlib" >&5
+echo "configure:12382: 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 12345 "configure"
+#line 12387 "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
@@ -12352,7 +12394,7 @@ int main() {
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:12356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12398: \"$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
@@ -12390,15 +12432,15 @@ fi
     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:12394: checking for ${dir}/soundcard.h" >&5
+echo "configure:12436: checking for ${dir}/soundcard.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12397 "configure"
+#line 12439 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12444: \"$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*
@@ -12459,15 +12501,15 @@ fi
 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:12463: checking for audio/audiolib.h" >&5
+echo "configure:12505: checking for audio/audiolib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12466 "configure"
+#line 12508 "configure"
 #include "confdefs.h"
 #include <audio/audiolib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12513: \"$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*
@@ -12485,12 +12527,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   
     
 echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6
-echo "configure:12489: checking for AuOpenServer in -laudio" >&5
+echo "configure:12531: 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 12494 "configure"
+#line 12536 "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
@@ -12501,7 +12543,7 @@ int main() {
 AuOpenServer()
 ; return 0; }
 EOF
-if { (eval echo configure:12505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12547: \"$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
@@ -12540,7 +12582,7 @@ EOF
  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 12544 "configure"
+#line 12586 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
@@ -12571,7 +12613,7 @@ if test "$with_esd_sound" != "no"; then
   # 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:12575: checking for $ac_word" >&5
+echo "configure:12617: 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.
@@ -12600,10 +12642,10 @@ fi
     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:12604: checking for esd_play_stream" >&5
+echo "configure:12646: checking for esd_play_stream" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12607 "configure"
+#line 12649 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char esd_play_stream(); below.  */
@@ -12626,7 +12668,7 @@ esd_play_stream();
 
 ; return 0; }
 EOF
-if { (eval echo configure:12630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12672: \"$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
@@ -12677,7 +12719,7 @@ test -z "$with_tty" && with_tty=yes
 
 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:12681: checking for TTY-related features" >&5
+echo "configure:12723: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
@@ -12693,12 +12735,12 @@ EOF
     if test -z "$with_ncurses"; then
     
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:12697: checking for tgetent in -lncurses" >&5
+echo "configure:12739: 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 12702 "configure"
+#line 12744 "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
@@ -12709,7 +12751,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:12713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12755: \"$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
@@ -12742,15 +12784,15 @@ EOF
 
     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:12746: checking for ncurses/curses.h" >&5
+echo "configure:12788: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12749 "configure"
+#line 12791 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12796: \"$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*
@@ -12772,15 +12814,15 @@ fi
 
     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:12776: checking for ncurses/term.h" >&5
+echo "configure:12818: checking for ncurses/term.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12779 "configure"
+#line 12821 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12826: \"$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*
@@ -12810,15 +12852,15 @@ fi
       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:12814: checking for ncurses/curses.h" >&5
+echo "configure:12856: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12817 "configure"
+#line 12859 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12864: \"$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*
@@ -12853,12 +12895,12 @@ fi
 	for lib in curses termlib termcap; do
 	  
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:12857: checking for tgetent in -l$lib" >&5
+echo "configure:12899: 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 12862 "configure"
+#line 12904 "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
@@ -12869,7 +12911,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:12873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12915: \"$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
@@ -12900,12 +12942,12 @@ fi
       else
 	
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:12904: checking for tgetent in -lcurses" >&5
+echo "configure:12946: 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 12909 "configure"
+#line 12951 "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
@@ -12916,7 +12958,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:12920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12962: \"$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
@@ -12934,12 +12976,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:12938: checking for tgetent in -ltermcap" >&5
+echo "configure:12980: 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 12943 "configure"
+#line 12985 "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
@@ -12950,7 +12992,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:12954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12996: \"$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
@@ -12998,15 +13040,15 @@ EOF
 
     test -z "$with_gpm" && { ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for gpm.h""... $ac_c" 1>&6
-echo "configure:13002: checking for gpm.h" >&5
+echo "configure:13044: checking for gpm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13005 "configure"
+#line 13047 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13010: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13052: \"$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*
@@ -13029,12 +13071,12 @@ fi
  }
   test -z "$with_gpm" && { 
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:13033: checking for Gpm_Open in -lgpm" >&5
+echo "configure:13075: 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 13038 "configure"
+#line 13080 "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
@@ -13045,7 +13087,7 @@ int main() {
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:13049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13091: \"$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
@@ -13095,20 +13137,20 @@ test "$with_x11" = "yes" -o "$with_tty" = "yes" && extra_objs="$extra_objs event
 
 test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
   != "no no no" && echo "checking for database support" 1>&6
-echo "configure:13099: checking for database support" >&5
+echo "configure:13141: 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:13104: checking for ndbm.h" >&5
+echo "configure:13146: checking for ndbm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13107 "configure"
+#line 13149 "configure"
 #include "confdefs.h"
 #include <ndbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13154: \"$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*
@@ -13138,12 +13180,12 @@ fi
 if test "$with_database_gdbm" != "no"; then
   
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:13142: checking for dbm_open in -lgdbm" >&5
+echo "configure:13184: 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 13147 "configure"
+#line 13189 "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
@@ -13154,7 +13196,7 @@ int main() {
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:13158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13200: \"$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
@@ -13182,10 +13224,10 @@ fi
 
 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:13186: checking for dbm_open" >&5
+echo "configure:13228: checking for dbm_open" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13189 "configure"
+#line 13231 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -13208,7 +13250,7 @@ dbm_open();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13254: \"$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
@@ -13227,12 +13269,12 @@ else
 
     
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:13231: checking for dbm_open in -ldbm" >&5
+echo "configure:13273: 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 13236 "configure"
+#line 13278 "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
@@ -13243,7 +13285,7 @@ int main() {
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:13247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13289: \"$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
@@ -13284,10 +13326,10 @@ EOF
 
 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:13288: checking for Berkeley db.h" >&5
+echo "configure:13330: checking for Berkeley db.h" >&5
   for header in "db/db.h" "db.h"; do
     cat > conftest.$ac_ext <<EOF
-#line 13291 "configure"
+#line 13333 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13309,7 +13351,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:13313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_file="$header"; break
 else
@@ -13325,9 +13367,9 @@ rm -f conftest*
 
   if test "$with_database_berkdb" != "no"; then
     echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:13329: checking for Berkeley DB version" >&5
+echo "configure:13371: checking for Berkeley DB version" >&5
     cat > conftest.$ac_ext <<EOF
-#line 13331 "configure"
+#line 13373 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 1
@@ -13339,7 +13381,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "yes" >/dev/null 2>&1; then
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 13343 "configure"
+#line 13385 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 2
@@ -13366,10 +13408,10 @@ fi
 rm -f conftest*
 
     echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:13370: checking for $dbfunc" >&5
+echo "configure:13412: checking for $dbfunc" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13373 "configure"
+#line 13415 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $dbfunc(); below.  */
@@ -13392,7 +13434,7 @@ $dbfunc();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13438: \"$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
@@ -13411,12 +13453,12 @@ else
 
     
 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:13415: checking for $dbfunc in -ldb" >&5
+echo "configure:13457: 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 13420 "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
@@ -13427,7 +13469,7 @@ int main() {
 $dbfunc()
 ; return 0; }
 EOF
-if { (eval echo configure:13431: \"$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
@@ -13491,12 +13533,12 @@ fi
 if test "$with_socks" = "yes"; then
   
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:13495: checking for SOCKSinit in -lsocks" >&5
+echo "configure:13537: 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 13500 "configure"
+#line 13542 "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
@@ -13507,7 +13549,7 @@ int main() {
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:13511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13553: \"$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
@@ -13562,22 +13604,22 @@ fi
 
 if test "$with_modules" != "no"; then
   echo "checking for module support" 1>&6
-echo "configure:13566: checking for module support" >&5
+echo "configure:13608: checking for module support" >&5
 
     if test "$with_msw" = "yes"; then
     have_dl=yes;
   else
         ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:13573: checking for dlfcn.h" >&5
+echo "configure:13615: checking for dlfcn.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13576 "configure"
+#line 13618 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13581: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13623: \"$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,16 +13636,16 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
       echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:13598: checking for dlopen in -lc" >&5
+echo "configure:13640: checking for dlopen in -lc" >&5
       cat > conftest.$ac_ext <<EOF
-#line 13600 "configure"
+#line 13642 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:13607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -13612,18 +13654,18 @@ else
   rm -rf conftest*
   
       echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:13616: checking for dlopen in -ldl" >&5
+echo "configure:13658: checking for dlopen in -ldl" >&5
       ac_save_LIBS="$LIBS"
       LIBS="-ldl $LIBS"
       cat > conftest.$ac_ext <<EOF
-#line 13620 "configure"
+#line 13662 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:13627: \"$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*
    have_dl=yes 
 else
@@ -13652,12 +13694,12 @@ EOF
     else
       
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:13656: checking for shl_load in -ldld" >&5
+echo "configure:13698: 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 13661 "configure"
+#line 13703 "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
@@ -13668,7 +13710,7 @@ int main() {
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:13672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13714: \"$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
@@ -13695,12 +13737,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:13699: checking for dld_init in -ldld" >&5
+echo "configure:13741: 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 13704 "configure"
+#line 13746 "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
@@ -13711,7 +13753,7 @@ int main() {
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:13715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13757: \"$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
@@ -13756,7 +13798,7 @@ xehost=$canonical
 xealias=$internal_configuration
 
 echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:13760: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:13802: checking how to build dynamic libraries for ${xehost}" >&5
 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
 case "$xehost" in
 *-*-linux-gnu*) ;;
@@ -13784,9 +13826,9 @@ if test "$GCC" = "yes"; then
   XEGCC=yes
 else
   echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:13788: checking checking whether we are using GNU C" >&5
+echo "configure:13830: checking checking whether we are using GNU C" >&5
   cat > conftest.$ac_ext <<EOF
-#line 13790 "configure"
+#line 13832 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -13808,7 +13850,7 @@ rm -f conftest*
 fi
 
 echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:13812: checking how to produce PIC code" >&5
+echo "configure:13854: checking how to produce PIC code" >&5
 wl=
 
 can_build_shared=yes
@@ -13816,11 +13858,11 @@ if test "$XEGCC" = yes; then
   wl='-Wl,'
 
   case "$xehost_os" in
-  aix3* | aix4* | irix5* | irix6* | osf3* | osf4*)
+  aix[3-9]* | irix[5-9]* | osf[3-9])
     # PIC is the default for these OSes.
     ;;
 
-  aix3* | aix4* | os2*)
+  os2*)
     # We can build DLLs from non-PIC.
     ;;
   amigaos*)
@@ -13845,7 +13887,7 @@ else
     dll_cflags='+Z'
     ;;
 
-  irix5* | irix6*)
+  irix[5-9]*)
     wl='-Wl,'
     # PIC (with -KPIC) is the default.
     ;;
@@ -13854,11 +13896,16 @@ else
     # We can build DLLs from non-PIC.
     ;;
 
-  osf3* | osf4*)
+  osf[3-9]*)
     # All OSF/1 code is PIC.
     wl='-Wl,'
     ;;
 
+  aix[3-9]*)
+    # All AIX code is PIC.
+    wl='-Wl,'
+    ;;
+
   sco3.2v5*)
     dll_cflags='-belf -Kpic'
     wl='-Wl,'
@@ -13904,18 +13951,18 @@ if test -n "$dll_cflags"; then
 
   # 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:13908: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:13955: checking if PIC flag ${dll_cflags} really works" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $dll_cflags -DPIC"
   cat > conftest.$ac_ext <<EOF
-#line 13912 "configure"
+#line 13959 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:13919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13966: \"$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
@@ -13946,13 +13993,13 @@ cc_produces_so=no
 xldf=
 xcldf=
 echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:13950: checking if C compiler can produce shared libraries" >&5
+echo "configure:13997: checking if C compiler can produce shared libraries" >&5
 if test "$XEGCC" = yes; then
   xcldf="-shared"
   xldf="-shared"
 else # Not using GCC
   case "$xehost_os" in
-    aix3* | aix4*)
+    aix[3-9]*)
       xldf="-bE:ELLSONAME.exp -H512 -T512 -bhalt:4 -bM:SRE -bnoentry -lc"
       xcldf="${wl}-bE:ELLSONAME.exp ${wl}-H512 ${wl}-T512 ${wl}-bhalt:4 ${wl}-bM:SRE ${wl}-bnoentry ${wl}-lc"
       ;;
@@ -13971,7 +14018,7 @@ else # Not using GCC
       xcldf="${wl}-b ${wl}+s"
       ;;
 
-    irix5* | irix6* | osf3* | osf4*)
+    irix[5-9]* | osf[3-9]*)
       xcldf="${wl}-shared"
       xldf="-shared"
       ;;
@@ -13997,14 +14044,14 @@ if test -n "$xcldf"; then
   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 14001 "configure"
+#line 14048 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:14008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cc_produces_so=yes
 else
@@ -14029,7 +14076,7 @@ if test -z "$LTLD"; then
   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:14033: checking for ld used by GCC" >&5
+echo "configure:14080: checking for ld used by GCC" >&5
     ac_prog=`($CC -print-prog-name=ld) 2>&5`
     case "$ac_prog" in
     # Accept absolute paths.
@@ -14054,7 +14101,7 @@ echo "configure:14033: checking for ld used by GCC" >&5
     esac
   else
     echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:14058: checking for GNU ld" >&5
+echo "configure:14105: checking for GNU ld" >&5
   fi
 
   if test -z "$LTLD"; then
@@ -14092,7 +14139,7 @@ ld_dynamic_link_flags=
 
 # 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:14096: checking if the linker is GNU ld" >&5
+echo "configure:14143: 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
@@ -14120,7 +14167,7 @@ else
   # 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:14124: checking whether the linker supports shared libraries" >&5
+echo "configure:14171: checking whether the linker supports shared libraries" >&5
   dll_ld=$CC
   dll_ldflags=$LDFLAGS
   ld_shlibs=yes
@@ -14142,7 +14189,7 @@ echo "configure:14124: checking whether the linker supports shared libraries" >&
       dll_ldflags=$xldf
       ;;
 
-    aix4*)
+    aix[4-9]*)
       dll_ldflags=$xcldf
       ;;
 
@@ -14172,7 +14219,7 @@ echo "configure:14124: checking whether the linker supports shared libraries" >&
       dll_ldflags=$xldf
       ;;
 
-    irix5* | irix6*)
+    irix[5-9]*)
       dll_ld=$LTLD
       dll_ldflags=$xldf
       ;;
@@ -14245,11 +14292,7 @@ fi
 
 if test -z "$ld_dynamic_link_flags"; then
   case "$xehost_os" in
-  aix3*)
-    ld_dynamic_link_flags=
-    ;;
-
-  aix4*)
+  aix[3-9]*)
     ld_dynamic_link_flags=
     ;;
 
@@ -14269,7 +14312,7 @@ if test -z "$ld_dynamic_link_flags"; then
     ld_dynamic_link_flags="${wl}-E"
     ;;
 
-  irix5* | irix6*)
+  irix[5-9]*)
     ld_dynamic_link_flags=
     ;;
 
@@ -14335,10 +14378,10 @@ EOF
     for ac_func in dlerror _dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14339: checking for $ac_func" >&5
+echo "configure:14382: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14342 "configure"
+#line 14385 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -14361,7 +14404,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:14365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14408: \"$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
@@ -14400,11 +14443,11 @@ done
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 14404 "configure"
+#line 14447 "configure"
 #include "confdefs.h"
 int main(int c,char *v[]){return 0;}
 EOF
-if { (eval echo configure:14408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:14451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
diff --git a/configure.in b/configure.in
index c7ab828..24cba3d 100644
--- a/configure.in
+++ b/configure.in
@@ -3,10 +3,11 @@ define([AC_INIT_NOTICE],
 [#### Configuration script for XEmacs.  Largely divergent from FSF.
 #### Guess values for system-dependent variables and create Makefiles.
 #### Generated automatically using autoconf version] AC_ACVERSION [
-#### Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+#### Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 #### Copyright (C) 1993-1995 Board of Trustees, University of Illinois.
 #### Copyright (C) 1996, 1997 Sun Microsystems, Inc.
 #### Copyright (C) 1995, 1996 Ben Wing.
+#### Copyright (C) 2000, 2001 Martin Buchholz.
 #### Copyright (C) 1998, 1999 J. Kean Johnston.
 
 ### Don't edit this script!
@@ -1507,18 +1508,7 @@ case "$canonical" in
       *-bsdi3* )		opsys=bsdos3 ;;
       *-bsdi2.1* )		opsys=bsdos2-1 ;;
       *-bsdi2* )		opsys=bsdos2 ;;
-      *-sco3.2v5* )		opsys=sco5 ;
-	dnl This is a pain.  Like the current USL cc, SCO cc -E
-	dnl tokenizes as it preprocesses, making configure very
-	dnl unhappy.  Unfortunately, /lib/cpp does not understand
-	dnl flags like "-b elf", so we have to cheat in order to
-	dnl pick up the right defines for UNEXEC from the s-file.
-	dnl 01/05/95 robertl@dgii.com
-	if test "$dynamic" = "yes" ; then
-		NON_GNU_CPP="/lib/cpp -D_XOPEN_SOURCE -D_SCO_ELF"  ;
-	else
-		NON_GNU_CPP="/lib/cpp -D_XOPEN_SOURCE"  ;
-	fi ;;
+      *-sco3.2v5* )		opsys=sco5 ;;
       *-sysv5* )		opsys=sco7 ;;
       *-386bsd* )	        opsys=386bsd ;;
       *-freebsd* )		opsys=freebsd ;;
@@ -2254,9 +2244,6 @@ fi
 ])dnl
 XE_COMPUTE_RUNPATH()
 
-dnl JKJ REMOVEME
-dnl XE_SHLIB_STUFF
-
 dnl -----------------------------------
 dnl Do some misc autoconf-special tests
 dnl -----------------------------------
@@ -2343,31 +2330,29 @@ AC_CHECK_HEADERS(dnl
   sys/un.h dnl
   ulimit.h dnl
   unistd.h dnl
-  utime.h dnl
 )
 AC_HEADER_SYS_WAIT
 AC_HEADER_STDC
 AC_HEADER_TIME
 AC_DECL_SYS_SIGLIST
 
-dnl Some systems have utime.h but do not declare the struct anyplace.
-AC_MSG_CHECKING(for struct utimbuf)
-AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-#ifdef HAVE_UTIME_H
-#include <utime.h>
-#endif], [static struct utimbuf x; x.actime = x.modtime;],
+
+dnl ----------------------------------------------------------------
+dnl Checking for utime() or utimes().
+dnl We prefer utime, since it is more standard.
+dnl Some systems have utime.h but do not declare the struct anyplace,
+dnl so we use a more sophisticated test for utime than AC_CHECK_FUNCS.
+dnl ----------------------------------------------------------------
+AC_MSG_CHECKING(for utime)
+AC_TRY_COMPILE([#include <sys/types.h>
+#include <utime.h>],
+[struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x);],
   [AC_MSG_RESULT(yes)
-   AC_DEFINE(HAVE_STRUCT_UTIMBUF)],
-  AC_MSG_RESULT(no))
+   AC_DEFINE(HAVE_UTIME)],
+  [AC_MSG_RESULT(no)
+   dnl We don't have utime(); how about utimes()?
+   AC_CHECK_FUNCS(utimes)])
+
 
 dnl checks for typedefs
 AC_TYPE_SIGNAL
@@ -3072,8 +3057,8 @@ if test "$window_system" != "none"; then
     AC_MSG_RESULT($with_xpm)
   fi
   if test "$with_xpm" = "yes"; then
-    dnl #### This code assumes that if AC_CHECK_LIB fails, 
-    dnl #### then it will succeed if FOR_MSW is defined, 
+    dnl #### This code assumes that if AC_CHECK_LIB fails,
+    dnl #### then it will succeed if FOR_MSW is defined,
     dnl #### but doesn't actually verify this assumption.
     AC_DEFINE(HAVE_XPM)
     XE_PREPEND(-lXpm, libs_x)
@@ -3559,7 +3544,7 @@ if test "$need_motif" = "yes" ; then
   XE_COMPUTE_RUNPATH()
 fi
 
-AC_CHECK_FUNCS(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 utimes waitpid vsnprintf fsync ftruncate umask)
+AC_CHECK_FUNCS(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)
 
 dnl ----------------------------------------------------------------
 dnl Check for PTY support functions.
diff --git a/etc/MACHINES b/etc/MACHINES
index 0d3bbf3..78c3c21 100644
--- a/etc/MACHINES
+++ b/etc/MACHINES
@@ -1,1261 +1,45 @@
-This is a list of the status of GNU Emacs on various machines and systems.
+This is a list of the status of XEmacs on various machines and systems.
+See PROBLEMS for particular problems and possible workarounds.
 
-For each system and machine, we give the configuration name you should
-pass to the `configure' script to prepare to build Emacs for that
-system/machine.
+Much effort has gone into making XEmacs work on as many different
+machines, configurations, and compilers as possible.
 
-The `configure' script uses the configuration name to decide which
-machine and operating system description files `src/config.h' should
-include.  The machine description files are all in `src/m', and have
-names similar to, but not identical to, the machine names used in
-configuration names.  The operating system files are all in `src/s',
-and are named similarly.  See the `configure' script if you need to
-know which configuration names use which machine and operating system
-description files.
+Much effort has gone into making XEmacs 64-bit clean.
 
-If you add support for a new configuration, add a section to this
-file, and then edit the `configure' script to tell it which
-configuration name(s) should select your new machine description and
-system description files.
+Much effort has gone into removing system-specific code, and replacing
+such code with autodetection at configure time.
 
-
-Here are the configurations Emacs is intended to work with, with the
-corresponding configuration names.  You can postpend version numbers
-to operating system names (i.e. sunos4.1) or architecture names (i.e.
-hppa1.1).  If you leave out the version number, the `configure' script
-will configure Emacs for the latest version it knows about.
+The XEmacs core should build "out of the box" on most Unix-like systems.
 
-*************************************************************************
-*									*
-*   NOTE: this file is kept in sync with the FSF version, though we	*
-*   expect the information here to be mostly accurate for XEmacs.	*
-*   Bear in mind that the version numbers mentioned in the text below	*
-*   are the FSF numbers, not the Lucid numbers.  For comparison, 	*
-*   FSFmacs 19.26 roughly corresponds to XEmacs 19.11.			*
-*									*
-*************************************************************************
+XEmacs 21.2 was tested and `make check' succeeded on these Unix
+configurations as of 2001-02-10:
 
-Acorn RISCiX (arm-acorn-riscix1.2)
+alphaev56-dec-osf4.0e (both Compaq C and gcc)
+i386-unknown-freebsd4.2
+i386-unknown-netbsdelf1.5
+i586-sco-sysv5uw7.0.1 (both SCO's cc and gcc)
+i686-pc-linux-gnu
+hppa2.0-hp-hpux10.20 (both HP's ANSI cc and gcc)
+mips-sgi-irix6.5 (both MIPSpro cc and gcc)
+rs6000-ibm-aix4.3.0.0 (both IBM's xlc and gcc)
+sparc-sun-solaris2.6 (both Sun's Forte C and gcc)
+sparc-sun-solaris2.7 (both Sun's Forte C and gcc)
+sparc-sun-sunos4.1.4 (gcc)
 
-  Emacs 19.29 has changes that ought to support RISCiX 1.2.
+Some systems have a dual mode 32-bit/64-bit compiler.  On most of
+these, XEmacs requires the --pdump configure option to build
+correctly with the 64-bit version of the compiler.
 
-  Due to a bug in the RISCiX C compiler (3.4.5), emacs must
-  be built with gcc (versions 2.5.8 onwards).
+mips-sgi-irix6.5, CC="gcc -mabi=64"
+mips-sgi-irix6.5, CC="cc -64"
+rs6000-ibm-aix4.3.0.0, CC="cc -q64"
 
-  In addition, you will need GNU sed and GNU make, as the RISCiX release
-  versions of these utilities cannot cope with building emacs-19!
+On most of these systems, XEmacs also builds with a C++ compiler,
+but not "out of the box".  This feature is only for use by the
+maintainers.
 
-    GNU sed should be configured with:
+XEmacs 21.2 is known _not_ to work on any machines with m680x0
+processors.  Sorry, all you sun3 and Unix PC nostalgia buffs out there.
 
-    env 'DEFS=-Dgetopt=gnu_getopt -Dopterr=gnu_opterr -Doptind=gnu_optind \
-            -Doptarg=gnu_optarg' ./configure
-
-    GNU make (3.72+) should be configured with:
-
-    env 'CFLAGS=-Dgetopt=gnu_getopt -Dopterr=gnu_opterr -Doptind=gnu_optind \
-              -Doptarg=gnu_optarg' ./configure
-
-  Emacs may be configured to use the X toolkit, by adding --with-x-toolkit
-  to the configure command.  If you do this, you will need to edit the line
-  in src/Makefile which defines LIBW (about line 59) to read:
-
-  LIBW= -lXaw_n
-
-  This ensures that the non-shared widget library is used.
-
-  It is unlikely that this version of emacs will work with RISCiX 1.1.
-
-Alliant (fx80-alliant-bsd):
-
-  18.52 worked on system version 4.  Previous Emacs versions were
-  known to work on previous system versions.
-
-  If you are using older versions of their operating system, you may
-  need to edit `src/config.h' to use `m/alliant1.h' (on version 1) or
-  `m/alliant.h' (on versions 2 and 3).
-
-Alliant FX/2800 (i860-alliant-bsd)
-
-  Known to work with 19.26 and OS version 2.2, compiler version 1.3.
-
-Alpha (DEC) running OSF/1 (alpha-dec-osf1)
-
-  Worked as of Lucid Emacs 19.8.
-
-Altos 3068 (m68k-altos-sysv)
-
-  18.52 was said to work, provided you don't compile unexec.c with -O.
-
-Amdahl UTS (580-amdahl-sysv)
-
-  Small changes for 18.38 were merged in 18.39.  It is mostly
-  working, but at last report a bug sometimes causes Emacs to
-  grab very large amounts of memory.  No fix or explanation
-  has yet been reported.  It may be possible to find this bug
-  if you find which Emacs command it happens within and then
-  run that command with a breakpoint set at malloc.
-
-  The 5.2u370 compiler is so brain damaged that it is not
-  even worth trying to use it.  Success was obtained with the
-  uts native C compiler on uts version 5.2.5.
-
-Apollo running Domain (m68k-apollo-domain)
-
-  19.29 has a few patches that ought to make things work.
-
-  There are reports of bugs in cc -O on this system.
-
-  In `lib-src/Makefile', don't expect emacsclient and emacsserver to
-  compile.  You might want to remove them from your makefile.
-
-  The Apollo has a bizarre operating system which does not permit
-  Emacs to be dumped with preloaded pure Lisp code.  Therefore, each
-  time you start Emacs on this system, the standard Lisp code is loaded
-  into it.  Expect it to take a long time.  You can prevent loading of
-  the standard Lisp code by specifying the -nl switch.  It must
-  come at the beginning of the command line; only the -t and -batch
-  switches may come before it.
-
-
-  Here is a design for a method of dumping and reloading the relevant
-  necessary impure areas of Emacs.
-
-  On dumping, you need to dump only the array `pure' plus the
-  locations that contain values of forwarded Lisp variables or that are
-  protected for garbage collection.  The former can be found by a
-  garbage- collection-like technique, and the latter are in the
-  staticprolist vector (see alloc.c for both things).
-
-  Reloading would work in an Emacs that has just been started; except
-  when a switch is specified to inhibit this, it would read the dump
-  file and set all the appropriate locations.  The data loaded must be
-  relocated, but that's not hard.  Those locations that are of type
-  Lisp_Object can be found by a technique like garbage-collection, and
-  those of them that point to storage can be relocated.  The other data
-  read from the file will not need to be relocated.
-
-  The switch to inhibit loading the data base would be used when it
-  is time to dump a new data base.
-
-  This would take a few seconds, which is much faster than loading
-  the Lisp code of Emacs from scratch.
-
-AT&T 3b2, 3b5, 3b15, 3b20 (we32k-att-sysv)
-
-  Emacs will probably not work with certain kernel constants too small. 
-
-  In param.h CDLIMIT should be at least (1L << 12) in order to allow 
-  processes to write up to 2 Mbyte files.  This parameter is configurable
-  by normal means in /etc/master.d/kernel; examine that file for the
-  symbol CDLIMIT or ULIMIT, and raise it by several powers of 2.  Then
-  do normal kernel rebuild things via "cd /boot; mkboot -k KERNEL" and so
-  forth.
-
-  In seg.h NSEGP and STACKSEG should be at least 16 and 4 respectively
-  to allow processes with total size of up to 2Mbytes.
-  However, I'm told it is unlikely this would fail to be true.
-
-  The MAXMEM may also prevent Emacs from running.  The file
-  3B-MAXMEM in this directory explains how to increase MAXMEM.
-
-  On some of these machines, you may need to define IN_SCCS_ID
-  in config.h to make Emacs work.  Supposedly you can tell whether
-  this is necessary by checking something in /usr/include/sys/time.h;
-  we do not know precisely what.
-
-AT&T 7300 or 3b1 (m68k-att-sysv)
-
-  18.52 worked.  If you have strange troubles with dumping
-  Emacs, delete the last few lines from `src/m/7300.h' and recompile.
-  These lines are supposed to produce a sharable executable.
-
-  `src/m/7300.h' defines SHORTNAMES because operating system versions
-  older than 3.5 did not support long symbol names.  Version 3.5 does
-  support them, so you can remove the #define SHORTNAMES in that
-  version.
-
-Bull DPX/2 models 2nn or 3nn (m68k-bull-sysv3)
-
-  Minor fixes merged into 19.19, which should work with CC or GCC.
-
-  You should compile with all the POSIX stuff: undef _SYSV and define
-  _POSIX_SOURCE, _XOPEN_SOURCE and _BULL_SOURCE.
-
-  On bos2.00.45 there is a bug that makes the F_SETOWN fcntl
-  call enters in an infinite loop. F_SETOWN_BUG has been defined to avoid 
-  calling it.
-
-Bull DPX/20 (rs6000-bull-bosx)
-
-  Version 19 works.
-
-Bull sps7 (m68k-bull-sysv2)
-
-  Changes partially merged in version 19, but some fixes are probably required.
-
-CCI 5/32, 6/32
-
-  See "Tahoe".
-
-Celerity (celerity-celerity-bsd4.2)
-
-  Version 18.49 worked.  This configuration name is a hack, because we
-  don't know the processor used by Celerities.  If someone
-  who uses a Celerity could get in touch with us, we can teach
-  config.sub a better name for the configuration.
-
-Clipper (clipper-???)
-
-  Version 19 has support for some brand of clipper system.  If you
-  have successfully built Emacs 19 on some sort of clipper system, let
-  us know so we can flesh out this entry.
-
-  Note that the Orion 105 is also a clipper, but some system-related
-  parameters are different.
-
-Convex (c1-convex-bsd, c2-convex-bsd, c32-convex-bsd, c34-convex-bsd,
-        c38-convex-bsd)
-
-  Support updated and residual bugs fixed in 19.26.
-
-Cubix QBx/386 (i386-cubix-sysv)
-
-  Changes merged in 19.1.  Systems before 2/A/0 may fail to compile etags.c
-  due to a compiler bug.
-
-Cydra 5 (cydra-cydrome-sysv)
-
-  18.51 worked in one version of their operating system but stopped
-  working in a newer version.  This has not been fixed.
-
-Data General Aviion (m88k-dg-dgux)
-
-  19.23 works; however, the GCC provided with DGUX 5.4R3.00 fails to
-  compile src/emacs.c.  GCC 2.5.8 does work.
-  The 19.26 pretest was reported to work; no word on which compiler.
-
-  System versions other than DGUX 5.4R3.00 have not been tested.
-
-DECstation (mips-dec-ultrix or mips-dec-osf)
-
-  This machine is the older Mips-based DECstation.
-  Emacs should now work on the Alpha CPU.
-
-  19.25 works on Ultrix 4.2.  The 19.26 pretest was reported to work
-  on Ultrix 4.2a and on 4.4.
-
-  One user reported 19.25 did not work at all with --with-x-toolkit
-  using X11R5 patch level 10, but worked ok with X11R5 pl26.
-
-  See under Ultrix for problems using X windows on Ultrix.
-  Note that this is a MIPS machine.
-
-  For Ultrix versions 4.1 or earlier, you may need to define
-  SYSTEM_MALLOC in `src/m/pmax.h', because XvmsAlloc.o in libX11.a seems
-  to insist on defining malloc itself.
-
-  For Ultrix versions prior to 4.0, you may need to delete
-  the definition of START_FILES from `src/m/pmax.h'.
-
-Motorola Delta 147 (m68k-motorola-sysv)
-
-  The EMacs 19.26 pretest was reported to work.
-
-  Motorola Delta boxes running System V/68 release 3.
-  Tested on 147 board with SVR3V7, no X and gcc.
-  Tested on 167 board with SVR3V7, no X, cc, gnucc and gcc.
-  Reports say it works with X too.
-
-  The installation script chooses the compiler itself.  gnucc is
-  preferred.
-
-Motorola Delta 187 (m88k-motorola-sysv,
-		    m88k-motorola-sysvr4, or
-		    m88k-motorola-m88kbcs)
-
-  The 19.26 pretest was reported to run on SVR3.  However, if you
-  use --with-x-toolkit on svr3, you will have problems compiling some
-  files because time.h and sys/time.h get included twice.
-  One fix is to edit those files to protect against multiple inclusion.
-
-  As of version 19.13, Emacs was reported to run under SYSVr3 and SYSVr4.
- 
-Dual running System V (m68k-dual-sysv)
-
-  As of 17.46, this worked except for a few changes
-  needed in unexec.c.
-
-Dual running Uniplus (m68k-dual-uniplus)
-
-  Worked, as of 17.51.
-
-Elxsi 6400 (elxsi-elxsi-sysv)
-
-  Changes for 12.0 release are in 19.1.
-  Dumping should work now.
-
-Encore machine (ns16k-encore-bsd)
-
-  This machine bizarrely uses 4.2BSD modified to use the COFF format
-  for object files.  Works (as of 18.40).  For the APC processor you
-  must enable two lines at the end of `src/s/umax.h', which are commented
-  out in the file as distributed.
-
-  WARNING: If you compile Emacs with the "-O" compiler switch, you
-  must also use the "-q enter_exits" switch so that all functions have
-  stack frames.  Otherwise routines that call `alloca' all lose.
-
-  A kernel bug in some system versions causes input characters to be lost
-  occasionally.
-
-GEC 63 (local-gec63-usg5.2)
-
-  Changes are partially merged in version 18, but certainly require
-  more work.  Let us know if you get this working, and we'll give it a
-  real configuration name.
-
-Gould Power Node (pn-gould-bsd4.2 or pn-gould-bsd4.3)
-
-  18.36 worked on versions 1.2 and 2.0 of the operating system.
-
-  On UTX/32 2.0, use pn-gould-bsd4.3.
-
-  On UTX/32 1.2 and UTX/32S 1.0, use pn-gould-bsd4.2 and note that
-  compiling `lib-src/sorted-doc' tickles a compiler bug: remove the -g
-  flag to cc in the makefile.
-
-  UTX/32 1.3 has a bug in the bcopy library routine.  Fix it by 
-  #undef BSTRING in `src/m/gould.h'.
-
-  Version 19 incorporates support for releases 2.1 and later of UTX/32.
-  A site running a pre-release of 2.1 should #define RELEASE2_1 in config.h.
-
-Gould NP1 (np1-gould-bsd)
-
-  Version 19 supposedly works.
-
-Harris Night Hawk (m68k-harris-cxux or m88k-harris-cxux)
-
-  This port was added in 19.23.  The configuration actually tested was
-  a Night Hawk 4800 running CX/UX 7.0.
-
-  If you have GCC ported and want to build with it, you probably need to
-  change things (like compiler switches) defined in the s/cxux.h file.
-
-  With CX/UX 7.0 and later releases, you need to build after setting the
-  SDE_TARGET environment variable to COFF (a port using ELF and shared
-  libraries has not yet been done).
-
-Honeywell XPS100 (xps100-honeywell-sysv)
-
-  Config file added in version 19.
-
-Hewlett-Packard 9000 series 200 or 300 (m68k-hp-bsd or m68k-hp-hpux7.)
-
-  Version 19 works under BSD.  The 19.26 pretest was reported
-  to work on HPUX 9.
-
-  These machines are 68000-series CPUs running HP/UX
-  (a derivative of sysV with some BSD features) or BSD 4.3 ported by Utah.
-  The operating system suffix determines which system Emacs is built for.
-
-  Series 200 HPUX runs Emacs only if it has the "HP/UX upgrade".
-
-  If you are running HP/UX release 8.0 or later, you need the optional
-  "C/ANSI C" software in order to build Emacs (older releases of HP/UX
-  do not require any special software).  If the file "/etc/filesets/C"
-  exists on your machine, you have this software, otherwise you do not.
-
-  Note that HP has used two incompatible assembler syntaxes,
-  and has recently changed the format of C function frames.
-  `src/crt0.c' and `src/alloca.s' have been conditionalised for the new
-  assembler and new function-entry sequence.  You may need to define
-  OLD_HP_ASSEMBLER if you are using an older hpux version.  If you
-  have an official (bought from HP) series 300 machine you have
-  the new assembler.  Kernels that are 5.+ or later have new
-  assembler.  A Series 200 that has been upgraded to a 68010
-  processor and a 5.+ kernel has the new compiler.
-
-  Define C_SWITCH_MACHINE to be +X to make a version of Emacs that
-  runs on both 68010 and 68020 based HP/UX's.
-
-  Define HPUX_68010 if you are using the new assembler, for
-  a system that has a 68010 without a 68881.  This is to say,
-  a s200 (upgraded) or s310.
-
-  Define the symbol HPUX_NET if you have the optional network features
-  that include the `netunam' system call.  This is referred to as
-  Network Services (NS/9000) in HP literature.
-
-HP 9000 series 500: not supported.
-
-  The series 500 has a seriously incompatible memory architecture
-  which relocates data in memory during execution of a program,
-  and support for it would be difficult to implement.
-
-HP 9000 series 700 or 800 (Spectrum) (hppa1.0-hp-hpux or hppa1.1-hp-hpux
-				      or ...hpux9shr)
-
-  19.26 is believed to work on HPUX 9 provided you compile with GCC.
-  As of version 19.16, Emacs was reported to build (using GCC) and run
-  on HP 9000/700 series machines running HP/UX versions 8.07 and 9.01.
-
-  Use hppa1.1 for the 700 series and hppa1.0 for the 800
-  series machines.  (Emacs may not actually care which one you use.)
-
-  Use hppa1.1-hp-hpux9shr to use shared libraries on HPUX version 9.
-  You may need to create the X libraries libXaw.a and libXmu.a from
-  the MIT X distribute, and you may need to edit src/Makefile's
-  definition of LIBXT to look like this:
-
-     LIBXT= $(LIBW) -lXmu -lXt $(LIBXTR6) -lXext
-
-  Some people report trouble using the GNU memory allocator under
-  HP/UX version 9.  The problems often manifest as lots of ^@'s in the
-  buffer.
-  
-  We are told that these problems go away if you obtain the latest
-  patches for the HP/UX C compiler.  James J Dempsey
-  <jjd@spserv.bbn.com> says that this set of versions works for him:
-    /bin/cc:
-	    HP92453-01 A.09.28 HP C Compiler
-    /lib/ccom:
-	    HP92453-01 A.09.28 HP C Compiler
-	     HP-UX SLLIC/OPTIMIZER  HP-UX.09.00.23  02/18/93
-	     Ucode Code Generator - HP-UX.09.00.23.5 (patch)  2/18/93
-
-  For 700 series machines, the HP-UX patch needed is known as
-  PHSS_2653.  (Perhaps for 800 series machines as well; we don't
-  know.)  If you are on the Internet, you should be able to obtain
-  this patch by using telnet to access the machine
-  support.mayfield.hp.com and logging in as "hpslreg" and following
-  the instructions there.  Do not ask FSF for further support on
-  this.  If you have any trouble obtaining the patch, contact HP
-  Software Support.
-
-  If your buffer fills up with nulls (^@) at some point, it could well
-  be that problem.  That problem does not happen when people use GCC
-  to compile Emacs.  On the other hand, the HP compiler version 9.34
-  was reported to work for the 19.26 pretest.  9.65 was also reported to work.
-
-  If you turn on the DSUSP character (delayed suspend),
-  Emacs 19.26 does not know how to turn it off on HPUX.
-  You need to turn it off manually.
-
-  If you are running HP/UX release 8.0 or later, you need the optional
-  "C/ANSI C" software in order to build Emacs (older releases of HP/UX
-  do not require any special software).  If the file "/etc/filesets/C"
-  exists on your machine, you have this software, otherwise you do not.
-
-High Level Hardware Orion (orion-highlevel-bsd)
-
-  This is the original microprogrammed hardware.
-  Machine description file ought to work.
-
-High Level Hardware Orion 1/05 (clipper-highlevel-bsd)
-
-  Changes merged in 18.52.  This is the one with the Clipper cpu.
-  Note that systems which lack NFS need LOAD_AVE_TYPE changed to `double'.
-
-  C compiler has a bug; it loops compiling eval.c.
-  Compile it by hand without optimization.
-
-IBM PS/2 (i386-ibm-aix1.1 or i386-ibm-aix1.2)
-
-  Changes merged in version 19.  You may need to copy
-  /usr/lib/samples/hft/hftctl.c to the Emacs src directory.
-
-  i386-ibm-aix1.1 may not work with certain new X window managers, and
-  may be suboptimal.
-
-IBM RS/6000 (rs6000-ibm-aix)
-
-  Emacs 19.26 is believed to work; its pretest was tested.
-
-  At last report, Emacs didn't run well on terminals.  Informed
-  persons say that the tty VMIN and VTIME settings have been
-  corrupted; if you have a fix, please send it to us.
-
-  Compiling with -O using the IBM compiler has been known
-  to make Emacs work incorrectly.  It's reported that on
-  AIX 3.2.5 with an IBM compiler earlier than 1.03.00.14,
-  cc -O fails for some files.  You need to install any
-  PTF containing APAR #IX42810 to bring the compiler to
-  the 1.03.00.14 level to allow optimized compiles.
-  Alternatively, recompiling just emacs.c and extents.c
-  without optimization seems to do the trick as well.
-
-  There are reports that IBM compiler versions earlier than 1.03.00.02
-  fail even without -O.
-
-  As of 19.11, if you strip the Emacs executable, it ceases to work.
-
-  If you are using AIX 3.2.3, you may get a core dump when loading
-  ange-ftp.  You may be able to fix the problem by defining LIBS_TERMCAP
-  as -ltermcap -lcurses.  Please tell us if this fails to work.
-
-  If anyone can fix the above problems, or confirm that they don't happen
-  with certain versions of various programs, we would appreciate it.
-
-IBM RT/PC (romp-ibm-bsd or romp-ibm-aix)
-
-  Use romp-ibm-bsd for the 4.2-like system and romp-ibm-aix for AIX.
-  19.22 is reported to work under bsd.  We don't know about AIX.
-
-  On BSD, if you have trouble, try compiling with a different compiler.
-
-  On AIX, the file /usr/lib/samples/hft/hftctl.c must be compiled into
-  hftctl.o, with this result left in the src directory (hftctl.c is
-  part of the standard AIX distribution).
-
-  window.c must not be compiled with -O on AIX.
-
-Integrated Solutions `Optimum V' (m68k-isi-bsd4.2 or -bsd4.3)
-
-  18.52 said to work on some sort of ISI machine.
-  Version 18.45 worked (running on a Optimum V (VME bus, 68020)
-  BSD 4.2 (3.05e) system).  18.42 is reported to work on
-  a Qbus 68010 system.  Has not been tried on `WorkStation' `Cluster
-  Compute Node' `Cluster WorkStation' or `Server Node'  (Love the
-  StudLYCaps) 
-
-  Compilation with -O is rumored to break something.
-
-  On recent system versions, you may need to undefine the macro UMAX
-  in `lib-src/loadst.c' and `src/getpagesize.h'.  They stupidly defined this
-  in a system header file, which confuses Emacs (which thinks that UMAX
-  indicates the Umax operating system).
-
-Intel 386 (i386-*-isc, 		i386-*-esix,
-	   i386-*-xenix,	i386-*-linux,    i386-*-freebsd,
-	   i386-intsys-sysv,	i386-*-sysv3,
-	   i386-*-sysv4,	i386-*-sysv4.2,
-	   i386-*-sysv5.3,	i386-*-bsd4.2,
-	   i386-*-sco3.2v4,	i386-*-bsd386,   i386-*-386bsd
-	   or i486... or i586...)
-
-  In the above configurations, * means that the manufacturer's name
-  you specify does not matter, and you can use any name you like
-  (but it should not contain any dashes or stars).
-
-  When using the ISC configurations, be sure to specify the isc
-	version number - for example, if you're running ISC 3.0, use
-	i386-unknown-isc3.0 as your configuration name.
-  Use i386-*-esix for Esix; Emacs runs as of version 19.6.
-  Use i386-*-linux for GNU/Linux systems; Emacs runs as of version 19.26.
-  Use i386-intsys-sysv for Integrated Solutions 386 machines.
-  It may also be correct for Microport systems.
-  Use i386-*-sco3.2v4 for SCO 3.2v4; Emacs runs as of version 19.26.
-
-  On GNU/Linux systems, Emacs 19.23 was said to work properly with libc
-  version 4.5.21, but not with 4.5.19.  If your system uses QMAGIC
-  for the executable format, you must edit config.h to define LINUX_QMAGIC.
-
-  On GNU/Linux, configure may fail to put these definitions in config.h:
-
-    #define HAVE_GETTIMEOFDAY
-    #define HAVE_MKDIR
-    #define HAVE_RMDIR
-
-  To work around the problem, add those definitions by hand.
-  It is possible that this problem happens only with X11R6
-  or that newer system versions have fixed it.
-
-  The 19.26 pretest was reported to work on SVR4.3 and on Freebsd.
-
-  Use i386-*-bsd386 for BSDI BSD/386; Emacs runs as of version 19.23.
-  Make on that system is broken; use GNU make instead.
-  Shell bugs in version 1.0 of BSD/386 cause configure
-  to do the wrong thing with --with-x-toolkit; the workaround is to edit
-  configure to run another shell such as bash.
-
-  For System V release 3, use i386-*-sysv3.
-  For System V release 4, use i386-*-sysv4.
-  For System V release 4.2, use i386-*-sysv4.2.
-
-  If you are using Xenix, see notes at end under Xenix.
-  If you are using Esix, see notes at end under Esix.
-  If you are using SCO Unix, see notes at end under SCO.
-
-  On 386bsd, netbsd and freebsd, you should use GNU make, not the
-  system's make.  Assuming it's installed as gmake, do `gmake install
-  MAKE=gmake'.
-
-  If you are using System V release 4.2, you may find that `cc -E'
-  puts spurious spaces in `src/xmakefile'.  If that happens,
-  specify CPP=/lib/cpp as an option when you run make.
-  There is no problem if you compile with GCC.
-    
-  Note that use of Linux with GCC 2.4 and the DLL 4.4 libraries
-  requires the experimental "net 2" network patches (no relation to
-  Berkeley Net 2).  There is a report that (some version of) Linux
-  requires including `/usr/src/linux/include/linux' in buffer.c
-  but no coherent explanation of why that might be so.  If it is so,
-  in current versions of Linux, something else should probably be changed.
-
-  Some sysV.3 systems seem to have bugs in `opendir';
-  for them, alter `config.h' to define NONSYSTEM_DIR_LIBRARY
-  and undefine SYSV_SYSTEM_DIR.
-
-  If you use optimization on V.3, you may need the option -W2,'-y 0'
-  to prevent certain faulty optimization.
-
-  On 386/ix, to link with shared libraries, add #define USG_SHARED_LIBRARIES
-  to config.h.
-
-  On SCO, there are problems in regexp matching when Emacs is compiled
-  with the system compiler.  The compiler version is "Microsoft C
-  version 6", SCO 4.2.0h Dev Sys Maintenance Supplement 01/06/93;
-  Quick C Compiler Version 1.00.46 (Beta).  The solution is to compile
-  with GCC.
-
-  On ISC systems (2.02 and more recent), don't try to use the versions
-  of X that come with the system; use XFree86 instead.
-
-  There is no consistency in the handling of certain system header files
-  on V.3.
-
-  Some versions have sys/sioctl.h, and require it in sysdep.c.
-  But some versions do not have sys/sioctl.h.
-  For a given version of the system, this may depend on whether you have
-  X Windows or TCP/IP.  Define or undefine NO_SIOCTL_H in config.h
-  according to whether you have the file.
-
-  Likewise, some versions have been known to need sys/ttold.h, sys/stream.h,
-  and sys/ptem.h included in sysdep.c.  If your system has these files,
-  try defining NEED_PTEM_H in config.h if you have trouble without it.
-
-  You may find that adding -I/usr/X/include or -I/usr/netinclude or both
-  to CFLAGS avoids compilation errors on certain systems.
-
-  Some versions convince sysdep.c to try to use `struct tchars'
-  but define `struct tc' instead; add `#define tchars tc'
-  to config.h to solve this problem.
-
-Iris 2500 and Iris 2500 Turbo (m68k-sgi-iris3.5 or m68k-sgi-iris3.6)
-
-  Version 18 was said to work; use m68k-sgi-iris3.5 for system version 2.5
-  and m68k-sgi-iris3.6 for system version 3.6.
-  Note that the 3030 is the same as the Iris 2500 Turbo.
-
-Iris 4D (mips-sgi-irix[456].*)
-
-  The 19.26 pretest was reported to work on IRIX 4.0.5 and 5.2.
-  19.23 was reported to work on IRIX 5.2, but you may need to install
-  the "compiler_dev.hdr.internal" subsystem in order to compile unexelfsgi.c.
-  19.22 was known to work on all Silicon Graphics machines running
-  IRIX 4.0.5 or IRIX 5.1.
-
-  Compiling with -O using IRIX compilers prior to 3.10.1 may not work.
-  Don't use -O or use GCC instead.
-
-  Most IRIX 3.3 systems do not have an ANSI C compiler, but a few do.
-  Compile Emacs 18 with the -cckr switch on these machines.
-
-  There is a bug in IRIX 3.3 that can sometimes leave ptys owned by root
-  with a permission of 622.  This causes malfunctions in use of
-  subprocesses of Emacs.  Irix versions 4.0 and later with GNU Emacs
-  versions 18.59 and later fix this bug.
-
-Masscomp (m68k-masscomp-rtu)
-
-  18.36 worked on a 5500DP running RTU v3.1a and compiler version 3.2
-  with minor fixes that are included in 18.37.  However, bizarre behavior
-  was reported for 18.36 on a Masscomp (model and version unknown but probably
-  a 68020 system).  The report sounds like a compiler bug.
-
-  A compiler bug affecting statements like 
-    unsigned char k; unsigned char *p;... x = p[k];
-  has been reported for "C version 1.2 under RTU 3.1".  We do not wish
-  to take the time to install the numerous workarounds required to
-  compensate for this bug.
-
-  For RTU version 3.1, define FIRST_PTY_LETTER to be 'p' in `src/s/rtu.h'
-  (or #undef and redefine it in config.h) so that ptys will be used.
-
-  GNU Emacs is said to have no chance of compiling on RTU versions
-  prior to v3.0.
-
-Megatest (m68k-megatest-bsd)
-
-  Emacs 15 worked; do not have any reports about Emacs 16 or 17
-  but any new bugs are probably not difficult.
-
-Mips (mips-mips-riscos, mips-mips-riscos4.0, or mips-mips-bsd)
-
-  The C compiler on Riscos 4.51 dumps core trying to optimize
-  parts of Emacs.  Try without optimization or try GCC.
-
-  Meanwhile, the linker on that system returns success even if
-  there are undefined symbols; as a result, configure gets the
-  wrong answers to various questions.  No work-around is known
-  except to edit src/config.h by hand to indicate which functions
-  don't exist.
-
-  Use mips-mips-riscos4.0 for RISCOS version 4.
-  Use mips-mips-bsd with the BSD world.
-
-  Note that the proper configuration names for DECstations are
-  mips-dec-ultrix and mips-dec-osf.
-
-  If you are compiling with GCC, then you must run fixincludes;
-  the alternative of using -traditional won't work because
-  the definition of SIGN_EXTEND_CHAR uses the keyword `signed'.
-
-  If the SYSV world is the default, then you probably need the following
-  line in etc/Makefile:
-
-    CFLAGS= -g -systype bsd43
-
-  Some operating systems on MIPS machines give SIGTRAP for division by
-  zero instead of the usual signals.  The only real solution is to fix
-  the system to give a proper signal.
-
-  In the meantime, you can change init_data in data.c if you wish.
-  Change it to handle SIGTRAP as well as SIGFPE.  But this will have a
-  great disadvantage: you will not be able to run Emacs under a
-  debugger.  I think crashing on division by zero is a lesser problem.
-
-  dsg@mitre.org reported needing to use --x-libraries=/bsd43/usr/lib
-  on a riscos4bsd site.  But it is not clear whether this is needed in
-  general or only because of quirks on a particular site.
-
-National Semiconductor 32000 (ns32k-ns-genix)
-
-  This is for a complete machine from National Semiconductor,
-  running Genix.  Changes merged in version 19.
-
-NCR Tower 32 (m68k-ncr-sysv2 or m68k-ncr-sysv3)
-
-  If you are running System V release 2, use m68k-ncr-sysv2.
-  If you are running System V release 3, use m68k-ncr-sysv3.
-
-  These both worked as of 18.56.  If you change `src/ymakefile' so that
-  CFLAGS includes C_OPTIMIZE_SWITCH rather than C_DEBUG_SWITCH, check
-  out the comments in `src/m/tower32.h' (for System V release 2) or
-  `src/m/tower32v3.h' (for System V release 3) about this.
-
-  There is a report that compilation with -O did not work with 18.54
-  under System V release 2.
-
-NCR Intel system (i386-ncr-sysv4.2)
-
-  This system works in 19.31, but if you don't link it with GNU ld,
-  you may need to set LD_RUN_PATH at link time to specify where
-  to find the X libraries.
-
-NeXT (m68k-next-nextstep)
-
-  Emacs 19 has not been tested extensively yet, but it seems to work
-  in a NeXTStep 3.0 terminal window, and under the X server called
-  co-Xist.  You may need to specify -traditional when src/Makefile
-  builds xmakefile.
-
-  NeXT users might want to implement direct operation with NeXTStep,
-  but from the point of view of the GNU project, that is a
-  distraction.
-
-  Thanks to Thorsten Ohl for working on the NeXT port of Emacs 19.
-
-Nixdorf Targon 31 (m68k-nixdorf-sysv)
-
-  Machine description file for version 17 is included in 18
-  but whether it works is not known.
-  `src/unexec.c' bombs if compiled with -O.
-  Note that the "Targon 35" is really a Pyramid.
-
-Nu (TI or LMI) (m68k-nu-sysv)
-
-  Version 18 is believed to work.
-
-Paragon OSF/1 (i860-intel-osf1)
-
-  Changes merged in 19.29.
-
-  There is a bug in OSF/1 make which claims there is a syntax error
-  in the src/xmakefile.  You can successfully build emacs with:
-
-        pmake MAKE=pmake
-
-Plexus (m68k-plexus-sysv)
-
-  Worked as of 17.56.
-
-Pmax (DEC Mips)  (mips-dec-ultrix or mips-dec-osf1)
-
-  See under DECstation, above.
-
-Prime EXL (i386-prime-sysv)
-
-  Minor changes merged in 19.1.
-
-Pyramid (pyramid-pyramid-bsd)
-
-  The 19.26 pretest was observed to work on OSx 5.0, but it is necessary
-  to edit gmalloc.c.  You must add #include <sys/types.h> at the top,
-  and delete the #define for size_t.
-
-  You need to build Emacs in the Berkeley universe with
-  the `ucb' command, as in `ucb make' or `ucb build-install'.
-  
-  In OSx 4.0, it seems necessary to add the following two lines
-  to `src/m/pyramid.h':
-     #define _longjmp longjmp
-     #define _setjmp setjmp
-
-  In Pyramid system 2.5 there has been a compiler bug making
-  Emacs crash just after screen-splitting with Qnil containing 0.
-  A compiler that fixes this is Pyramid customer number 8494,
-  internal number 1923.
-
-  Some versions of the pyramid compiler get fatal
-  errors when the -gx compiler switch is used; if this
-  happens to you, change `src/m/pyramid.h' to define
-  C_DEBUG_SWITCH with an empty definition.
-
-  Some old system versions may require you to define PYRAMID_OLD
-  in when alloca.s is preprocessed, in order to define _longjmp and _setjmp.
-
-Sequent Balance (ns32k-sequent-bsd4.2 or ns32k-sequent-bsd4.3)
-
-  Emacs 18.51 worked on system version 3.0.  18.52 is said to work.
-  Delete some lines at the end of `src/m/sequent.h' for earlier system
-  versions.
-
-Sequent Symmetry (i386-sequent-bsd, i386-sequent-ptx)
-
-  Emacs 19 should work on Dynix (BSD).  However, if you compile with
-  the Sequent compiler, you may find Emacs does not restore the
-  terminal settings on exit.  If this happens, compile with GCC.
-
-  Emacs 19.27 contains patches that should support
-  DYNIX/ptx 1.4 and 2.1 with the native cc compiler.
-
-  Gcc can't compile src/process.c due to a non-standard Sequent asm
-  keyword extension supported by cc and used for the network byte/word
-  swapping functions in the PTX /usr/include/netinet/in.h file.  Gcc
-  2.5.8 includes the file <sys/byteorder.h> which can be included into
-  netinet/in.h to perform these byte/word swapping functions in the
-  same manner.  Patches have been submitted to the FSF against gcc
-  2.6.0 to fix this problem and allow Emacs to be built with gcc.
-
-  If your machine does not have TCP/IP installed, you will have to edit the
-  src/s/ptx.h file and comment out #define TCPIP_INSTALLED.
-
-Siemens Nixdorf RM600 and RM400 (mips-siemens-sysv4)
-
-  Changes merged in 19.29.  This configuration should also work for
-  Pyramid MIS Server running DC-OSX 1.x.  The version configured with
-  `--with-x' works without any modifications, but `--with-x-toolkit'
-  works only if the Athena library and the Toolkit library are linked
-  statically.  For this, edit `src/Makefile' after the `configure' run
-  and modify the lines with `-lXaw' and `-lXt' as follows:
-
-    LIBW= /usr/lib/libXaw.a
-    LIBXT= $(LIBW) -lXmu /usr/lib/libXt.a $(LIBXTR6) -lXext
-
-SONY News (m68k-sony-bsd4.2 or m68k-sony-bsd4.3)
-
-  18.52 worked.  Use m68k-sony-bsd4.3 for system release 3.
-
-SONY News 3000 series (RISC NEWS) (mips-sony-bsd)
-
-  The 19.26 pretest is reported to work.
-
-  Some versions of the operating system give SIGTRAP for division by zero
-  instead of the usual signals.  This causes division by zero
-  to make Emacs crash.  The system should be fixed to give the proper signal.
-  Changing Emacs is not a proper solution, because it would prevent
-  Emacs from working under any debugger.  But you can change init_data
-  in data.c if you wish.
-
-Stardent i860 (i860-stardent-sysv4.0)
-
-  19.26 pretest reported to work.
-
-Stardent 1500 or 3000
-
-  See Titan.
-
-Stride (m68k-stride-sysv)
-
-  Works (most recent news for 18.30) on their release 2.0.
-  For release 2.2, see the end of `src/m/stride.h'.
-  It may be possible to run on their V.1 system but changes
-  in the s- file would be needed.
-
-Sun 3, Sun 4 (sparc), Sun 386 (m68k-sun-sunos, sparc-sun-sunos, i386-sun-sunos,
-			       sparc-sun-sunos4shr, sparc-sun-solaris2.*,
-			       i386-sun-solaris2.*)
-
-  19.26 is believed to work on Sparcs and Sun 3's.  Some people report
-  that Emacs crashes immediately on startup when used with a non-X
-  terminal, but we think this is due to compiling with GCC and failing
-  to use GCC's "fixed" system header files.
-
-  Some Sun versions of X windows use the clipboard, not the selections,
-  for transferring text between clients.  The Cut, Paste and Copy items
-  in the menu bar Edit menu work with the clipboard.
-
-  It's important to include the SunOS version number in the
-  configuration name.  For example, for SunOS release 4.0 on a Sun 3,
-  use `m68k-sun-sunos4.0'; for SunOS release 4.1 on a Sparc, use
-  `sparc-sun-sunos4.1'.  For SunOS release 4.1.3 on a Sparc, use
-  `sparc-sun-sunos4.1.3'.  Use sunos4shr to link with shared libraries
-  on Sunos 4.1.
-
-  (FSF MACHINES file says use of shared libraries does not work with
-  X11R5 or X11R6 on Sunos 4 as of 19.26, but I think this does not
-  apply to XEmacs.)
-
-  Use `m68k' for the 68000-based Sun boxes, `sparc' for Sparcstations,
-  and `i386' for Sun Roadrunners.  i386 calls for Sunos4.0.
-
-  Do not define the environment variable 'KEEP_STATE' while running
-  `configure'.
-
-  FSF MACHINES file says the following: (may not apply to XEmacs)
-
-  If you compile with Sun's ANSI compiler acc, you need additional options
-  when linking temacs, such as
-     /usr/lang/SC2.0.1/values-Xt.o -L/usr/lang/SC2.0.1/cg87 -L/usr/lang/SC2.0.1
-  (those should be added just before the libraries) and you need to
-  add -lansi just before -lc.  The precise file names depend on the
-  compiler version, so we cannot easily arrange to supply them.
-
-  On SunOS 4.1.1, do not use /usr/5bin/cc.  You can use gcc or/usr/bin/cc.
-  Make sure the environment variable LD_LIBRARY_PATH is not defined.
-
-  Some people report crashes on SunOS 4.1.3 if SYSTEM_MALLOC is defined.
-  Others have reported that Emacs works if SYSTEM_MALLOC is defined, and not
-  if it is undefined.  So far we do not know why results vary in this way.
-  The sources are set up so that SYSTEM_MALLOC is defined; if that crashes,
-  or if you want the benefit of the relocating memory allocator, you can
-  try enabling the #undef SYSTEM_MALLOC in src/s/sunos4-1-3.h.
-
-  On Solaris 2, you need to install patch 100947-02 to fix a system bug.
-  Presumably this patch comes from Sun.  You must alter the definition of
-  LD_SWITCH_SYSTEM if your X11 libraries are not in /usr/openwin/lib.
-  You must make sure that /usr/ucblib is not in your LD_LIBRARY_PATH.
-
-  On Solaris 2.2, with a multiprocessor SparcCenter 1000, Emacs 19.17 is
-  reported to hang sometimes if it exits while it has one or more
-  subprocesses (e.g. the `wakeup' subprocess used by `display-time').
-  Emacs and its subprocesses become zombies, and in their zombie state
-  slow down their host and disable rlogin and telnet.  This is most
-  likely due to a bug in Solaris 2.2's multiprocessor support,
-  rather than an Emacs bug.
-
-  On Solaris, do not use /usr/ucb/cc.  Use /opt/SUNWspro/bin/cc.  Make
-  sure that /usr/ccs/bin and /opt/SUNWspro/bin are in your PATH before
-  /usr/ucb.  (Most free software packages have the same requirement on
-  Solaris.)
-
-  If you have trouble using open-network-stream, get the distribution
-  of `bind' (the BSD name-server), build libresolv.a, and link Emacs
-  with -lresolv, by copying the #definition of LIBS_SYSTEM in
-  src/s/sunos4-1.h to src/config.h.  This problem is due to obsolete
-  software in the nonshared standard library.
-
-  If you want to use SunWindows, define HAVE_SUN_WINDOWS
-  in config.h to enable a special interface called `emacstool'.
-  The definition must *precede* the #include "machine.h".
-  System version 3.2 is required for this facility to work.
-
-  We recommend that you instead use the X window system, which
-  has technical advantages, is an industry standard, and is also
-  free software.  The FSF does not support the SunWindows code;
-  we installed it only on the understanding we would not let it
-  divert our efforts from what we think is important.
-
-  If you are compiling for X windows, and the X window library was
-  compiled to use the 68881, then you must edit config.h according
-  the comments at the end of `src/m/sun3.h'.
-
-  Note that Emacs on a Sun is not really as big as it looks.
-  As dumped, it includes around 200k of zeros between the
-  original text section and the original data section
-  (now remapped as part of the text).  These are never
-  swapped in.
-
-  To build a single Emacs that will run on Sun 2 and Sun 3
-  HARDWARE, just build it on the Sun 2.
-
-  On Sunos 4.1.3, the word is that Emacs can loop infinitely
-  on startup with X due perhaps to a bug in Sunos.  Installing all of
-  these Sun patches fixes the problem.  We don't know which of them
-  are really relevant.
-
-    100075-11 100224-06 100347-03 100482-05 100557-02 100623-03 100804-03
-    101080-01 100103-12 100249-09 100496-02 100564-07 100630-02 100891-10
-    101134-01 100170-09 100296-04 100377-09 100507-04 100567-04 100650-02
-    101070-01 101145-01 100173-10 100305-15 100383-06 100513-04 100570-05
-    100689-01 101071-03 101200-02 100178-09 100338-05 100421-03 100536-02
-    100584-05 100784-01 101072-01 101207-01
-
-Tadpole 68K (m68k-tadpole-sysv)
-
-  Changes merged in 19.1.
-
-  You may need to edit Makefile to change the variables LIBDIR and
-  BINDIR from /usr/local to /usr/contrib.
-
-  To give movemail access to /usr/mail, you may need to execute
-
-    chmod 2755 etc/movemail; chgrp mail etc/movemail
-
-Tahoe (tahoe-tahoe-bsd4.2 or tahoe-tahoe-bsd4.3)
-
-  18.52 was known to work on some Tahoes, but a compiler bug intervenes
-  on others.  Some Emacs versions have worked in Unisys 1r4
-  (not in 1r3) and CCI I.21.
-
-  If you have trouble compiling `lib-src/loadst.c', turn off the definition
-  of DKSTAT_HEADER_FILE in `src/m/tahoe.h'.
-
-Tandem Integrity S2 (mips-tandem-sysv)
-
-  Changes merged in 18.56 but subprocess support is turned off.
-  You will probably want to see if you can make subprocesses work.
-
-  You must edit `lib-src/Makefile' to define LOADLIBES = -mld.
-
-Tektronix XD88 (m88k-tektronix-sysv3*)
-
-  The 19.26 pretest was reported to work.
-  Minor changes merged in 19.19.
-
-Tektronix 16000 box (6130?) (ns16k-tektronix-bsd)
-
-  Emacs 17.61 worked.
-
-Tektronix 4300 (m68k-tektronix-bsd)
-
-  Emacs 19.26 pretest reported to work.
-
-Titan P2 or P3 (titan-titan-sysv)
-
-  Changes probably merged in version 19.
-
-Ustation E30 (SS5E) (m68k-unisys-unipl)
-
-  Changes merged in 18.52; don't know whether they work.
-
-Vaxen running Berkeley Unix (vax-dec-bsd4.1, vax-dec-bsd4.2, vax-dec-bsd4.3),
-	      Ultrix (vax-dec-ultrix),
-              System V (vax-dec-sysv0, vax-dec-sysv2), or
-              VMS (vax-dec-vms)
-
-  Works.
-
-  See under Ultrix for problems using X windows on Ultrix (vax-dec-ultrix).
-
-  18.27 worked on System V rel 2 (vax-dec-sysv2).
-
-  18.36 worked on System V rel 0 (vax-dec-sysv0).
-
-  Richard Levitte <levitte@e.kth.se> distributes a set of patches to
-  Emacs 18.59 to make it work nicely under VMS.  Emacs 19 probably
-  won't work very well, or even compile.  Levitte is working on a
-  port, so these problems should be fixed in the near future.
-
-Whitechapel MG1 (ns16k-whitechapel-?)
-
-  May work.  Supposedly no changes were needed except in `src/m/mg1.h'
-  file.  I do not know what Unix version runs on them.
-
-Wicat (m68k-wicat-sysv)
-
-  Changes merged as of 18.6; whether they work is unknown.
-  See comments in `src/m/wicat.h' for things you should change
-  depending on the system and compiler version you have.
-
-Here are notes about some of the systems supported:
-
-Berkeley 4.1 (bsd4.1)
-
-  Works on vaxes.
-
-Berkeley 4.2 (bsd4.2)
-
-  Works on several machines.
-
-Berkeley 4.3 (bsd4.3)
-
-  Works, on Vaxes at least.
-
-Esix
-
-  The following was written for Emacs 18.59 and has been
-  slightly adapted for Emacs 19.  It may need more change to be correct.
-
-  Use s/usg5-4.h for Esix System V 4.0.[34] systems if you also have
-  XFree86.  If you insist on using the Esix X Window libraries, good
-  luck.  s/esix5r4.h provides a starting point, but doesn't seem to
-  work consistently.  The basic problems involve the need to load
-  -lX11 *last* in the link command, and even then some things break.
-  You get best results by installing XFree86 and forgetting about the
-  Esix stuff unless you want to run IXI xdt3, which really only needs
-  the Esix X11 shared libraries.
-
-  To compile with XFree86, make sure that your LD_LIBRARY_PATH
-  contains /usr/X386/lib.  Be careful if you also have the Esix X
-  Window libraries that /usr/X386/lib appears *first* in the
-  LD_LIBRARY_PATH.  Then define C_SWITCH_X_SYSTEM -I/usr/X386/include.
-
-Microport
-
-  See under "Intel 386".
-
-SCO Unix
-  If you have TCP but not X, you need to edit src/s/sco4.h
-  to define HAVE_SOCKETS.
-
-  If you are using MMDF instead of sendmail, you need to remove
-  /usr/lib/sendmail or modify lisp/paths.el before compiling.
-  lisp/paths.el (which is loaded during the build) will attempt to use
-  sendmail if it exists.
-
-  If you are using SMAIL, you need to define the macro
-  SMAIL in config.h.
-
-System V rel 0 (usg5.0)
-
-  Works, on Vaxes and 3bxxx's.
-  There are some problems in 18.37 due to shortnames/cccp problems:
-  use the emacs 17 cpp if you have it.
-
-System V rel 2 (usg5.2)
-
-  Works on various machines.
-  On some (maybe all) machines the library -lPW exists and contains
-  a version of `alloca'.  On these machines, to use it, put
-     #define HAVE_ALLOCA
-     #define LIB_STANDARD -lPW -lc
-  in the `src/m/MACHINENAME.h' file for the machine.
-
-  If you find that the character Meta-DEL makes Emacs crash,
-  find where function init_sys_modes in sysdep.c sets sg.c_cc[VQUIT]
-  and make it store 7 there.  I have as yet no evidence of whether
-  this problem, known in HP/UX, exists in other system V versions.
-
-System V rel 2.2 (usg5.2.2)
-
-  In 5.2.2 AT&T undid, incompatibly, their previous incompatible
-  change to the way the nlist library is called.  A different s- file
-  is used to enable the other interface.
-
-  They call themselves the right choice--can't they choose?
-
-  Emacs version 18 unexec is currently not working properly
-  on 5.2.2.  Nobody knows why yet.  A workaround is to define
-  NO_REMAP.  It is not yet known whether this applies to all
-  machines running 5.2.2.
-
-System V rel 3 (usg5.3)
-
-  Some versions of this system support ptys and BSD-style sockets.
-  On such systems, you should define HAVE_PTYS and HAVE_SOCKETS in config.h.
-
-  If you want to link Emacs with shared libraries, define
-  USG_SHARED_LIBRARIES.
-
-  You may have to add ANSI idempotence #-lines to your sys/types.h
-  file to get Emacs to compile correctly.  This may be necessary on
-  other pre-ANSI systems as well.
-
-  On an AT&T 6386WGS using System V Release 3.2 and X11R3, the X support
-  cannot be made to work.  Whether or not the GNU relocating malloc is
-  used, the symptom is that the first call Emacs makes to sbrk(0) returns
-  (char *)-1.  Sorry, you're stuck with character-only mode.  Try
-  installing Xfree86 to fix this.
-
-System V rel 4.0.3 and 4.0.4 (usg5.4)
-
-  Supported, including shared libraries for ELF, but ptys do not work
-  because TIOCGPGRP fails to work on ptys (but Dell 2.2 seems to have
-  fixed this).  This failure is probably due to a misunderstanding of
-  the consequences of the POSIX spec: many system designers mistakenly
-  think that POSIX requires this feature to fail.  This is untrue;
-  ptys are an extension, and POSIX says that extensions *when used*
-  may change the action of standard facilities in any fashion.
-
-  If you get compilation errors about wrong number of
-  arguments to getpgrp, define GETPGRP_NO_ARG.
-
-  The standard C preprocessor may generate xmakefile incorrectly.  However,
-  /lib/cpp will work, so use `make CPP=/lib/cpp'.  Standard cpp
-  seems to work OK under Dell 2.2.
-
-  Some versions 3 and earlier of V.4, on the Intel 386 and 860, had
-  problems in the X11 libraries.  These prevent Emacs from working
-  with X.  You can use Emacs with X provided your copy of X is based
-  on X11 release 4 or newer, or is Dell's 2.2 (which is a 4.0.3).
-  Unfortunately, the only way you can tell whether your X11 library is
-  new enough is to try compiling Emacs to use X.  If emacs runs, your
-  X11 library is new enough.
-
-  In this context, GSV4 and GSV4i are alternate names for X11R4.
-  OL2.* is X11R3 based.  OL3 is in between X11R3 and X11R4, and may or
-  may not work, depending on who made the Unix system.  If the library
-  libXol is part of the X distribution, then you have X11R3 and Emacs
-  won't work with X.
-
-  Most versions of V.4 support sockets.  If `/usr/lib/libsocket.so'
-  exists, your system supports them.  If yours does not, you must add
-  #undef HAVE_SOCKETS in config.h, after the inclusion of s-usg5-4.h.
-  (Any system that supports Internet should implement sockets.)
-
-Ultrix (bsd4.3)
-
-  Recent versions of Ultrix appear to support the features of Berkeley 4.3.
-  Ultrix was at the BSD 4.2 level for a long time after BSD 4.3 came out.
-
-  Ultrix 3.0 has incompatibilities in its X library if you have the
-  Ultrix version of X (UWS version 2.0).  To solve them, you need to
-  prevent XvmsAlloc.o in Xlib from being used.  Israel Pinkas says:
-
-    I added the following lines to config.h after the X defines:
-
-    #if defined(ultrix) && defined(X11)
-    #define OBJECTS_SYSTEM calloc.o
-    #endif
-
-    Then I ran the following:
-
-    ar x /usr/lib/libc.a calloc.o
-
-  The problem is said to be gone in UWS version 2.1.
-
-Uniplus 5.2 (unipl5.2)
-
-  Works, on Dual machines at least.
-
-VMS (vmsM.N)
-
-  Richard Levitte <levitte@e.kth.se> distributes a set of patches to
-  Emacs 18.59 to make it work nicely under VMS.  Emacs 19 probably
-  won't work very well, or even compile.  Levitte is working on a
-  port, so these problems should be fixed in the near future.
-
-  Note that Emacs for VMS is usually distributed in a special VMS
-  distribution.  See the file ../vms/VMSINSTALL for info on moving
-  Unix distributions to VMS, and other VMS-related topics.
-
-Xenix (xenix)
-
-  Should work in 18.50, but you will need to edit the files
-  `lib-src/Makefile' and `src/ymakefile'
-  (see the comments that mention "Xenix" for what to change.)
-  Compiling Emacs with -O is said not to work.
-
-  If you want Emacs to work with Smail (installed as /usr/bin/smail)
-  then add the line   #define SMAIL  to config.h.
-
-  The file etc/XENIX suggests some useful things to do to Xenix
-  to make the Emacs meta key work.
-
-Local variables:
-mode: indented-text
-fill-prefix: "  "
-End:
+VMS has never been supported by XEmacs.  In fact, all the old VMS code
+inherited from Emacs has been removed.  Sorry, all you VMS fans out there.
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index ae5c8af..2ff3afa 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,38 @@
+2001-02-23  Martin Buchholz <martin@xemacs.org>
+
+	* XEmacs 21.2.45 "Thelxepeia" is released.
+
+2001-02-11  Martin Buchholz  <martin@xemacs.org>
+
+	* Makefile.in.in: Cleanup.
+	Fixes bug: all must depend on make-dump-id.
+	Don't install make-path; only used at build time.
+	Avoid duplicating file lists for maintainability.
+	(PUBLIC_INSTALLABLE_SCRIPTS): More logical naming.
+	(PUBLIC_INSTALLABLE_EXES): Likewise.
+	(PUBLIC_INSTALLABLES): Likewise.
+	(PRIVATE_INSTALLABLE_SCRIPTS): More logical naming.
+	(PRIVATE_INSTALLABLE_EXES): Likewise.
+	(PRIVATE_INSTALLABLES): Likewise.
+	(SCRIPTS): Likewise.
+	(EXES): New.
+	(PROGS): New.
+	(SOURCES): Remove.
+	(BUILD_UTILITIES): New.  Non-installed utilities.
+	(INSTALL_GNUSERV): New.
+	(unlock): Remove obsolete target.
+	(relock): Remove obsolete target.
+	(aixcc.c): Remove.  Obsolete.
+	* aixcc.lex:  Remove.  Obsolete.
+
+2001-02-12  Martin Buchholz  <martin@xemacs.org>
+
+	* make-dump-id.c (main): No longer #include dump-id.h.
+
+2001-02-08  Martin Buchholz  <martin@xemacs.org>
+
+	* gnuserv.c (permitted): Compiler warning fixes.
+
 2001-02-08  Martin Buchholz <martin@xemacs.org>
 
 	* XEmacs 21.2.44 "Thalia" is released.
@@ -45,7 +80,7 @@
 	(C_entries): Don't be fooled by things like XDEFUN.
 	(consider_token): Discard asm pseudo function.
 
-2001-01-25  Francesco Potorti`  <pot@potorti.it>
+2001-01-25  Francesco Potorti`  <pot@gnu.org>
 
 	* etags.c (struct tok): Renamed from struct token.
 	(token): Renamed from tok.
@@ -69,7 +104,7 @@
 	(consider_token, C_entries): Use them.
 	(C_entries): Build proper lisp names for Emacs DEFUNs.
 
-2001-01-15  Francesco Potorti`  <pot@pot.cnuce.cnr.it>
+2001-01-15  Francesco Potorti`  <pot@gnu.org>
 
 	* etags.c (print_language_names): Print filenames in addition to
 	suffixes.
@@ -88,7 +123,7 @@
 	(Makefile_targets): New function, inspired by Assar Westerlund
 	<assar@sics.se>.
 
-2000-11-07  Francesco Potortì  <pot@pot.cnuce.cnr.it>
+2000-11-07  Francesco Potorti`  <pot@gnu.org>
 
 	* etags.c (Texinfo_nodes): Renamed from Texinfo_fuctions and made
 	it conformant to the style of the rest of the code.
@@ -100,11 +135,11 @@
 	potential signed char to int conversion problem.
 	(MSDOS): #undefine befere redefining
 
-2000-02-04  Francesco Potorti`  <F.Potorti@cnuce.cnr.it>
+2000-02-04  Francesco Potorti`  <pot@gnu.org>
 
 	* etags.c (many functions): Add prototypes.
 
-2000-01-31  Francesco Potorti`  <F.Potorti@cnuce.cnr.it>
+2000-01-31  Francesco Potorti`  <pot@gnu.org>
 
 	* etags.c [MSDOS]: Set MSDOS to 1 if #defined, 0 otherwise.
 	(get_compressor_from_suffix, process_file): Use MSDOS in if clause.
diff --git a/lib-src/Makefile.in.in b/lib-src/Makefile.in.in
index 33dd10c..12663b8 100644
--- a/lib-src/Makefile.in.in
+++ b/lib-src/Makefile.in.in
@@ -73,44 +73,65 @@ INSTALL_DATA = @INSTALL_DATA@
 #define NOT_C_CODE
 #include "../src/config.h"
 
-## Things that a user might actually run,
-## which should be installed in bindir.
-#ifdef WIN32_NATIVE
-INSTALLABLES_BASE = etags ctags b2m ootags
-#else
-INSTALLABLES_BASE = etags ctags b2m gnuclient ootags
+#ifndef WIN32_NATIVE
+#define INSTALL_GNUSERV
+#endif
+
+## ----------------------------------------------------------------
+## Things that a user might actually run directly,
+## which should be installed in ${bindir}.
+
+PUBLIC_INSTALLABLE_EXES=\
+#ifdef INSTALL_GNUSERV
+ gnuclient\
 #endif
-INSTALLABLE_SCRIPTS = rcs-checkin gnudoit gnuattach
 #ifdef HAVE_SHLIB
-INSTALLABLES = $(INSTALLABLES_BASE) ellcc
-#else
-INSTALLABLES = $(INSTALLABLES_BASE)
+ ellcc\
+#endif
+ etags ctags b2m ootags
+
+PUBLIC_INSTALLABLE_SCRIPTS=\
+#ifdef INSTALL_GNUSERV
+ gnudoit gnuattach\
 #endif
+ rcs-checkin
+
+PUBLIC_INSTALLABLES = ${PUBLIC_INSTALLABLE_EXES} ${PUBLIC_INSTALLABLE_SCRIPTS}
 
+## ----------------------------------------------------------------
+## Things that XEmacs runs internally on the user's behalf,
+## which should be installed in ${archlibdir}.
 
-## Things that Emacs runs internally, or during the build process,
-## which should not be installed in bindir.
+PRIVATE_INSTALLABLE_EXES=\
+#ifdef INSTALL_GNUSERV
+ gnuserv\
+#endif
 #ifdef WIN32_NATIVE
-UTILITIES= make-path wakeup profile make-docfile digest-doc \
-	sorted-doc movemail cvtmail yow i hexl \
-	mmencode minitar
+ i minitar\
 #else
-UTILITIES= make-path wakeup profile make-docfile digest-doc \
-	sorted-doc movemail cvtmail fakemail yow hexl \
-	gnuserv mmencode
+ fakemail\
 #endif
-## These need to be conditional on I18N3 make-msgfile make-po
+ wakeup profile make-docfile digest-doc\
+ sorted-doc movemail cvtmail yow hexl mmencode
 
-## Like UTILITIES, but they are not system-dependent, and should not be
-## deleted by the distclean target.
 GEN_SCRIPTS = rcs2log vcdiff gzip-el.sh
 PKG_SCRIPTS = add-big-package.sh
-SCRIPTS = $(GEN_SCRIPTS) $(PKG_SCRIPTS)
+PRIVATE_INSTALLABLE_SCRIPTS = $(GEN_SCRIPTS) $(PKG_SCRIPTS)
+
+PRIVATE_INSTALLABLES = ${PRIVATE_INSTALLABLE_EXES} ${PRIVATE_INSTALLABLE_SCRIPTS}
+
+## These need to be conditional on I18N3: make-msgfile make-po
+
+## ----------------------------------------------------------------
+## Things that XEmacs uses during the build process itself.
+## Not installed.
+
+BUILD_UTILITIES = make-path make-dump-id
 
-EXECUTABLES= ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
+EXES    = ${PUBLIC_INSTALLABLE_EXES} ${PRIVATE_INSTALLABLE_EXES} ${BUILD_UTILITIES}
+SCRIPTS = ${PUBLIC_INSTALLABLE_SCRIPTS} ${PRIVATE_INSTALLABLE_SCRIPTS}
+PROGS   = ${EXES} ${SCRIPTS}
 
-SOURCES = COPYING ChangeLog Makefile.in.in README aixcc.lex emacs.csh \
-	makedoc.com *.[chy] $(SCRIPTS)
 ## Additional -D flags for movemail (add to MOVE_FLAGS if desired):
 ## MAIL_USE_POP		Support mail retrieval from a POP mailbox.
 ## MAIL_USE_MMDF		Support MMDF mailboxes.
@@ -171,16 +192,15 @@ ldflags  = $(LDFLAGS) $(ld_switch_general) $(ld_libs_general)
 .c.o:
 	${CC} -c $(cflags) $<
 
-.PHONY : all maybe-blessmail install uninstall
+.PHONY : all maybe-blessmail install uninstall check
 
-all: ${UTILITIES} ${INSTALLABLES} srcdir-symlink.stamp
+all: ${PROGS}
 
 ## Make symlinks for shell scripts if using --srcdir
-srcdir-symlink.stamp:
+${SCRIPTS}:
 	for f in ${SCRIPTS}; do \
 		if test ! -r $$f; then ${LN_S} ${srcdir}/$$f $$f; fi; \
-	done; \
-	touch $@;
+	done
 
 #undef MOVEMAIL_NEEDS_BLESSING
 #if !defined (MAIL_USE_FLOCK) && ! defined (MAIL_USE_LOCKF)
@@ -218,55 +238,45 @@ ${archlibdir}: all
 	@echo; echo "Installing utilities run internally by XEmacs."
 	./make-path ${archlibdir}
 	if test "`(cd ${archlibdir} && $(pwd))`" != "`$(pwd)`"; then \
-	  for f in ${UTILITIES}; do \
+	  for f in ${PRIVATE_INSTALLABLE_EXES}; do \
 	    (cd .. && $(INSTALL_PROGRAM) lib-src/$$f ${archlibdir}/$$f) ; \
 	  done ; \
 	fi
 	if test "`(cd ${archlibdir} && $(pwd))`" \
 	     != "`(cd ${srcdir}     && $(pwd))`"; then \
-	  for f in ${SCRIPTS}; do \
+	  for f in ${PRIVATE_INSTALLABLE_SCRIPTS}; do \
 	    (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$$f ${archlibdir}/$$f); \
 	  done ; \
 	fi
 
-## We do not need to install "wakeup" explicitly, because it will be
-## copied when this whole directory is copied.
 install: ${archlibdir}
 	@echo; echo "Installing utilities for users to run."
-	for file in ${INSTALLABLES} ; do \
+	for file in ${PUBLIC_INSTALLABLE_EXES} ; do \
 	  (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \
 	done
-	for file in ${INSTALLABLE_SCRIPTS} ; do \
+	for file in ${PUBLIC_INSTALLABLE_SCRIPTS} ; do \
 	  (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file}) ; \
 	done
 
 uninstall:
-	(cd ${bindir} && \
-	 $(RM) ${INSTALLABLES} ${INSTALLABLE_SCRIPTS})
-	(cd ${archlibdir} && \
-	 $(RM) ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS})
+	cd ${bindir} && $(RM) ${PUBLIC_INSTALLABLES}
+	cd ${archlibdir} && $(RM) ${PRIVATE_INSTALLABLES}
 
 .PHONY: mostlyclean clean distclean realclean extraclean
 mostlyclean:
 	$(RM) *.o *.i core
 clean: mostlyclean
-	$(RM) ${INSTALLABLES} ${UTILITIES} *.exe
+	$(RM) ${EXES} *.exe
 distclean: clean
-	$(RM) DOC *.tab.c *.tab.h aixcc.c TAGS ellcc.h
+	$(RM) DOC *.tab.c *.tab.h TAGS ellcc.h
 	$(RM) GNUmakefile Makefile Makefile.in blessmail config.values
 realclean: distclean
 extraclean: distclean
 	$(RM) *~ \#*
 
-.PHONY: unlock relock check
-unlock:
-	chmod u+w $(SOURCES)
-relock:
-	chmod u-w $(SOURCES)
-
 ## Test the contents of the directory.
 check:
-	@echo "We don't have any tests for XEmacs yet."
+	@echo "We don't have any tests for lib-src yet."
 
 TAGS: etags
 	etags *.[ch]
@@ -379,12 +389,3 @@ mmencode : ${srcdir}/mmencode.c
 
 make-path: ${srcdir}/make-path.c ../src/config.h
 	$(CC) -Demacs $(cflags) ${srcdir}/make-path.c -o $@
-
-## These are NOT included in INSTALLABLES or UTILITIES.
-## See ../src/Makefile.in.in.
-aixcc: ${srcdir}/aixcc.c
-	$(CC) $(cflags) ${srcdir}/aixcc.c -o $@
-
-aixcc.c: ${srcdir}/aixcc.lex
-	lex ${srcdir}/aixcc.lex
-	mv lex.yy.c aixcc.c
diff --git a/lib-src/gnuserv.c b/lib-src/gnuserv.c
index 2ba5785..3cf78c4 100644
--- a/lib-src/gnuserv.c
+++ b/lib-src/gnuserv.c
@@ -458,8 +458,6 @@ permitted (unsigned long host_addr, int fd)
   char auth_protocol[128];
   char buf[1024];
   int  auth_data_len;
-  int  auth_data_pos;
-  int  auth_mismatches;
 
   if (fd > 0)
     {
@@ -505,7 +503,8 @@ permitted (unsigned long host_addr, int fd)
 	  {
 	    /* Do a compare without comprising info about
 	       the size of the cookie */
-	    auth_mismatches =
+	    int auth_data_pos;
+	    int auth_mismatches =
 	      ( auth_data_len ^
 		server_xauth->data_length );
 
diff --git a/lib-src/make-dump-id.c b/lib-src/make-dump-id.c
index 6ad213d..bfa2f7d 100644
--- a/lib-src/make-dump-id.c
+++ b/lib-src/make-dump-id.c
@@ -64,10 +64,7 @@ main (int argc, char *argv[])
       return EXIT_FAILURE;
     }
 
-  fprintf (f,
-	   "#include <dump-id.h>\n"
-	   "unsigned int dump_id = %uU;\n",
-	   generate_dump_id ());
+  fprintf (f, "unsigned int dump_id = %uU;\n", generate_dump_id ());
 
   if ((fclose (f)) != 0)
     {
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4a77940..2aa8b12 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,83 @@
+2001-02-23  Martin Buchholz <martin@xemacs.org>
+
+	* XEmacs 21.2.45 "Thelxepeia" is released.
+
+2001-01-25  Jason R. Mastaler  <jason@xemacs.org> 
+ 
+        * about.el (xemacs-hackers): update my entry. 
+        * about.el (about-maintainer-info): ditto. 
+        * about.el (about-hackers): ditto. 
+
+2001-02-20  Jan Vroonhof  <jan@xemacs.org>
+
+	* about.el (about-maintainer-info): More vanity info about
+	yours truly.
+
+2001-02-20  Adrian Aichner  <adrian@xemacs.org>
+
+	* build-report.el (build-report-destination): xemacs-build-reports
+	has moved to SourceForge, where mailing list name length is
+	restricted, hence the name change to
+	xemacs-buildreports@xemacs.org.
+	* build-report.el (build-report-keep-regexp): Update default.
+	* build-report.el (build-report-delete-regexp): Ditto.
+	* build-report.el (build-report-make-output-files): Ditto.
+
+2001-02-19  Craig Lanning  <lanning@scra.org>
+
+	* lisp-mode.el: Add indentation specifications for following
+	Common Lisp forms: handler-case, handler-bind, with-slots,
+	with-open-file, with-open-stream, print-unreadable-object.
+
+2001-02-18  Matt Tucker  <tuck@whistlingfish.net>
+
+	* font-lock.el (font-lock-set-defaults-1):
+	Move initialization of `font-lock-cache-position' so that it's set
+	even if font-lock-keywords is already defined.
+
+2001-02-17  Matt Tucker  <tuck@whistlingfish.net>
+
+	* autoload.el (generate-file-autoloads-1):
+	Use `emacs-lisp-mode-syntax-table' instead of
+	`lisp-mode-syntax-table'.
+	* lisp-mode.el (lisp-mode-syntax-table):
+	Get rid of old checks for `parse-partial-sexp' version.
+	Make `|' (pipe) string delimiter instead of punctuation.
+
+2001-02-16  Martin Buchholz  <martin@xemacs.org>
+
+	* window.el (save-selected-window):
+	Use gensym for better macro hygiene.
+
+2001-02-06  Mike Sperber <mike@xemacs.org>
+
+	* dump-paths.el:
+	* startup.el (startup-setup-paths): Set and use
+	`mule-lisp-directory'.
+	(startup-setup-paths-warning): Ditto.
+
+	* setup-paths.el (paths-find-mule-lisp-directory): Added.
+	(paths-construct-load-path): Consider `mule-lisp-directory'.
+
+2001-02-07  Matt Tucker  <tuck@whistlingfish.net>
+
+	* font-lock.el: Syntax table improvements used.  A few random
+	changes are not specified below.
+	(font-lock-fontify-string-delimiters):
+	(font-lock-syntactic-keywords):
+	(font-lock-cache-state nil):
+	(font-lock-cache-position):
+	New variables.
+	(font-lock-set-syntax):
+	(font-lock-apply-syntactic-highlight):
+	(font-lock-fontify-syntactic-anchored-keywords):
+	(font-lock-fontify-syntactic-keywords-region):
+	(font-lock-eval-keywords):
+	New functions.
+	(font-lock-remove-face):
+	(font-lock-fontify-syntactically-region):
+	Use syntax properties.
+
 2001-02-08  Martin Buchholz <martin@xemacs.org>
 
 	* XEmacs 21.2.44 "Thalia" is released.
diff --git a/lisp/about.el b/lisp/about.el
index decbd08..7c3a89e 100644
--- a/lisp/about.el
+++ b/lisp/about.el
@@ -65,8 +65,9 @@
     (dkindred "Darrell Kindred"	  "dkindred@cmu.edu")
     (dv       "Didier Verna"      "didier@xemacs.org")
     (hniksic  "Hrvoje Niksic"     "hniksic@xemacs.org")
+	(jan      "Jan Vroonhof"      "jan@xemacs.org")
     (jareth   "Jareth Hein"       "jareth@camelot.co.jp")
-    (jason    "Jason Mastaler"	  "jason@xemacs.org")
+    (jason    "Jason R. Mastaler" "jason@xemacs.org")
     (jens     "Jens Lautenbacher" "jens@lemcbed.lem.uni-karlsruhe.de")
     (jmiller  "Jeff Miller"       "jmiller@smart.net")
     (juhp     "Jens-Ulrik Holger Petersen" "petersen@kurims.kyoto-u.ac.jp")
@@ -781,6 +782,27 @@ After that (and all the remaining exams) I'm looking forward to make a
 living out of my hobbies -- computers (and graphics). But because I
 have no deadline for the exams and XEmacs betas are released at a high
 rate this may take some time...\n"))
+	(jan
+	 (widget-insert "\
+Jan Vroonhof has been using XEmacs since he needed to write .tex files
+for his work as a physics and maths student at the Univerisity of Leiden.
+His XEmacs hacking started when XEmacs kept freezing up under a his
+window manager. He submitted a fix and has been hooked every since.
+
+Apart from hunting down more redisplay bugs he has worked on such
+things as improvements to the package system, implementing lazy-shot,
+a short stint at tracking patches and currently acts as a guardian
+of the XEmacs custom subsystem and gnuserv.
+
+XEmacs has followed him first to Switserland where he did a maths
+doctorate at the ETH in Zurich, working on a conjecture by Migdal on
+the behavior of vertex corrections in Electron-Phonon theory.  Finally
+sharing a house with his loved one, he now lives in Oxford (UK)
+working on the Jeode Java Virtual Machine, which like XEmacs is
+portable, implements a language, includes a non-trivial bit of
+graphics and a garbage collector, but is multithreaded to boot!
+Unfortunately his XEmacs time is directly limited by the amount of
+traffic on the M40.\n"))
     (jareth
      (widget-insert "\
 Jareth Hein is a mountain boy who abandoned his home state of Colorado
@@ -968,12 +990,12 @@ My homepage is ")
      (widget-insert ".\n"))
     (jason
      (widget-insert "\
-Beta tester, manager of the various XEmacs mailing lists and
-binary kit manager.  Also, originator and maintainer of the gnus.org
-domain.
+Beta tester, manager of the various XEmacs mailing lists and binary
+kit manager.  Also, originator and maintainer of the gnus.org domain.
 
-Jason resides in Albuquerque, New Mexico where he keeps himself
-busy with studies at the university and consulting work.
+Jason resides in Northern New Mexico where he works as a Systems
+Scientist(tm) in the Los Alamos National Laboratory's Advanced
+Computing Group.
 
 See: ")
       (about-url-link 'jason "Visit Jason's homepage")
@@ -1103,13 +1125,19 @@ and portability fixes.  Lars is a student at the Institute of
 Informatics at the University of Oslo.  He is currently plumbing away
 at his majors work at the Institute of Physics, working on an SCI
 project connected with CASCADE and CERN and stuff.\n")
+	(about-show-linked-info 'jan "\
+Apart from hunting down redisplay bugs Jan has worked on such
+things as improvements to the package system, implementing lazy-shot,
+a short stint at tracking patches and currently acts as a guardian
+of the XEmacs custom subsystem and gnuserv. Having finished his PhD
+he is now working on Java virtual machines.\n")
     (about-show-linked-info 'jens "\
 I'm currently working at the University of Karlsruhe, Germany on
 getting my diploma thesis on Supersymmetry (uuh, that's physics) done.
 After that (and all the remaining exams) I'm looking forward to make a
 living out of my hobbies -- computers (and graphics). But because I
 have no deadline for the exams and XEmacs betas are released at a high
-rate this may take some time...\n")
+rate this may take some time...\n")	
     (about-show-linked-info 'jareth "\
 Jareth Hein is a mountain boy who abandoned his home state of Colorado
 for the perpetual state of chaos known as Tokyo in a failed attempt to
@@ -1209,8 +1237,8 @@ Author of the XEmacs Drag'n'Drop API.\n")
     (about-show-linked-info 'juhp "\
 Author of \"find-func.el\".\n")
     (about-show-linked-info 'jason "\
-Beta tester and manager of the various XEmacs mailing lists.
-Originator and maintainer of the gnus.org domain.\n")
+Beta tester, manager of the various XEmacs mailing lists and binary
+kit manager.  Also, originator and maintainer of the gnus.org domain.\n")
     (about-show-linked-info 'jmiller "\
 Beta tester and last hacker of calendar.\n")
     (about-show-linked-info 'chr "\
@@ -1507,7 +1535,6 @@ above.  We couldn't have done it without them.\n\n"
        (print-short "UENO Fumihiro" "7m2vej@ritp.ye.IHI.CO.JP")
        (print-short "Aki Vehtari" "Aki.Vehtari@hut.fi")
        (print-short "Juan E. Villacis" "jvillaci@cs.indiana.edu")
-       (print-short "Jan Vroonhof" "vroonhof@math.ethz.ch")
        (print-short "Vladimir Vukicevic" "vladimir@intrepid.com")
        (print-short "Charles G. Waldman" "cgw@fnal.gov")
        (print-short "David Walte" "djw18@cornell.edu")
diff --git a/lisp/autoload.el b/lisp/autoload.el
index f1ee483..195885d 100644
--- a/lisp/autoload.el
+++ b/lisp/autoload.el
@@ -167,7 +167,7 @@ are used."
 	    (let ((find-file-hooks nil)
 		  (enable-local-variables nil))
 	      (set-buffer (or visited (find-file-noselect file)))
-	      (set-syntax-table lisp-mode-syntax-table))
+	      (set-syntax-table emacs-lisp-mode-syntax-table))
 	    (save-excursion
 	      (save-restriction
 		(widen)
diff --git a/lisp/build-report.el b/lisp/build-report.el
index b3797f3..b35fd05 100644
--- a/lisp/build-report.el
+++ b/lisp/build-report.el
@@ -4,7 +4,7 @@
 
 ;; Author: Adrian Aichner <adrian@xemacs.org>
 ;; Date: Sun., Apr. 20, 1997-2000.
-;; Version: $Revision: 1.5.2.6 $
+;; Version: $Revision: 1.5.2.7 $
 ;; Keywords: internal
 
 ;; This file is part of XEmacs.
@@ -87,8 +87,9 @@ xemacs_codename\\s-*=\\s-*\"\\([^\"]+\\)\""
   :group 'build)
 
 (defcustom build-report-destination
-  (quote ("XEmacs Build Reports List <xemacs-build-reports@xemacs.org>"
-          "XEmacs Beta List <xemacs-beta@xemacs.org>"))
+  (list
+   "XEmacs Build Reports List <xemacs-buildreports@xemacs.org>"
+   "XEmacs Beta List <xemacs-beta@xemacs.org>")
   "*The list of mail addresses XEmacs Build Reports should most likely
 go to."
   :type '(repeat
@@ -98,12 +99,22 @@ go to."
   :group 'build-report)
 
 (defcustom build-report-keep-regexp
-  (quote ("^\\(cd\\|n?make\\)\\s-" "errors?" "warnings?"
-          "pure.*\\(space\\|size\\)" "hides\\b" "strange" "shadowings"
-          "^Compil\\(ing\\s-+in\\|ation\\)" "^Using" "not\\s-+found"
-          "^While\\s-+compiling.*\\(\n\\s-+.+\\)*" "^Note:"
-          "Installing" "[Ff]ile(s) copied"
-          "\\s-+tests\\s-+"))
+  (list
+   "^\\(cd\\|n?make\\)\\s-"
+   "errors?"
+   "warnings?"
+   "pure.*\\(space\\|size\\)"
+   "hides\\b"
+   "strange"
+   "shadowings"
+   "^Compil\\(ing\\s-+in\\|ation\\)"
+   "^Using"
+   "not\\s-+found"
+   "^While\\s-+compiling.*\\(\n\\s-+.+\\)*"
+   "^Note:"
+   "Installing"
+   "[Ff]ile(s) copied"
+   "\\s-+tests\\s-+")
   "*Regexp of make process output lines to keep in the report."
   :type '(repeat
           :custom-show t
@@ -112,7 +123,10 @@ go to."
   :group 'build-report)
 
 (defcustom build-report-delete-regexp
-  (quote ("confl.*with.*auto-inlining" "^Formatting:"))
+  (list
+   "confl.*with.*auto-inlining"
+   "^Formatting:"
+   "(100%) tests successful")
   "*Regexp of make process output lines to delete from the report."
   :type '(repeat
           :custom-show t
@@ -136,7 +150,12 @@ go to."
   :group 'build-report)
 
 (defcustom build-report-make-output-files
-  (quote ("beta.err"))
+  (list
+   "beta.err"
+   "xemacs-make-all.err" 
+   "xemacs-make-check-temacs.err"
+   "xemacs-make-check.err"
+   "xemacs-make-install.err")
   "*List of Filenames where stdout and stderr of XEmacs make process
 have been stored.  These are relative to
 `build-report-make-output-dir`.  You'll have to run make with output
diff --git a/lisp/dump-paths.el b/lisp/dump-paths.el
index 9381a0c..ed3d568 100644
--- a/lisp/dump-paths.el
+++ b/lisp/dump-paths.el
@@ -62,6 +62,16 @@
   (if debug-paths
       (princ (format "lisp-directory:\n%S\n" lisp-directory)
 	     'external-debugging-output))
+  (if (featurep 'mule)
+      (progn
+	(setq mule-lisp-directory
+	      (paths-find-mule-lisp-directory roots
+					      lisp-directory))
+	(if debug-paths
+	    (princ (format "mule-lisp-directory:\n%S\n"
+			   mule-lisp-directory)
+		   'external-debugging-output)))
+    (setq mule-lisp-directory '()))
   (setq site-directory (and (null inhibit-site-lisp)
 			    (paths-find-site-lisp-directory roots)))
   (if (and debug-paths (null inhibit-site-lisp))
@@ -73,7 +83,8 @@
 					     late-package-load-path
 					     '()
 					     lisp-directory
-					     site-directory))
+					     site-directory
+					     mule-lisp-directory))
 
   (setq module-directory (paths-find-module-directory roots))
   (if debug-paths
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index edc5964..9373594 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -313,6 +313,12 @@ megabyte for buffers in `rmail-mode', and size is irrelevant otherwise."
 				      (integer :tag "size")))))
   :group 'font-lock)
 
+;;;###autoload
+(defcustom font-lock-fontify-string-delimiters nil
+  "*If non-nil, apply font-lock-string-face to string delimiters as well as
+string text when fontifying."
+  :type 'boolean
+  :group 'font-lock)
 
 ;; Fontification variables:
 
@@ -438,6 +444,45 @@ dramatically slow things down!
 ;;;###autoload
 (make-variable-buffer-local 'font-lock-keywords)
 
+;;;###autoload
+(defvar font-lock-syntactic-keywords nil
+  "A list of the syntactic keywords to highlight.
+Can be the list or the name of a function or variable whose value is the list.
+See `font-lock-keywords' for a description of the form of this list;
+the differences are listed below.  MATCH-HIGHLIGHT should be of the form:
+
+ (MATCH SYNTAX OVERRIDE LAXMATCH)
+
+where SYNTAX can be of the form (SYNTAX-CODE . MATCHING-CHAR), the name of a
+syntax table, or an expression whose value is such a form or a syntax table.
+OVERRIDE cannot be `prepend' or `append'.
+
+For example, an element of the form highlights syntactically:
+
+ (\"\\\\$\\\\(#\\\\)\" 1 (1 . nil))
+
+ a hash character when following a dollar character, with a SYNTAX-CODE of
+ 1 (meaning punctuation syntax).  Assuming that the buffer syntax table does
+ specify hash characters to have comment start syntax, the element will only
+ highlight hash characters that do not follow dollar characters as comments
+ syntactically.
+
+ (\"\\\\('\\\\).\\\\('\\\\)\"
+  (1 (7 . ?'))
+  (2 (7 . ?')))
+
+ both single quotes which surround a single character, with a SYNTAX-CODE of
+ 7 (meaning string quote syntax) and a MATCHING-CHAR of a single quote (meaning
+ a single quote matches a single quote).  Assuming that the buffer syntax table
+ does not specify single quotes to have quote syntax, the element will only
+ highlight single quotes of the form 'c' as strings syntactically.
+ Other forms, such as foo'bar or 'fubar', will not be highlighted as strings.
+
+This is normally set via `font-lock-defaults'."
+)
+;;;###autoload
+(make-variable-buffer-local 'font-lock-syntactic-keywords)
+
 (defvar font-lock-defaults nil
   "The defaults font Font Lock mode for the current buffer.
 Normally, do not set this directly.  If you are writing a major mode,
@@ -511,15 +556,15 @@ If this is nil, the major mode's syntax table is used.
 This is normally set via `font-lock-defaults'.")
 (make-variable-buffer-local 'font-lock-syntax-table)
 
-;; These are used in the FSF version in syntactic font-locking.
-;; We do this all in C.
-;;; These record the parse state at a particular position, always the
-;;; start of a line.  Used to make
-;;; `font-lock-fontify-syntactically-region' faster.
-;(defvar font-lock-cache-position nil)
-;(defvar font-lock-cache-state nil)
-;(make-variable-buffer-local 'font-lock-cache-position)
-;(make-variable-buffer-local 'font-lock-cache-state)
+;; These record the parse state at a particular position, always the start of a
+;; line.  Used to make `font-lock-fontify-syntactically-region' faster.
+;; Previously, `font-lock-cache-position' was just a buffer position.  However,
+;; under certain situations, this occasionally resulted in mis-fontification.
+;; I think the "situations" were deletion with Lazy Lock mode's deferral.  sm.
+(defvar font-lock-cache-state nil)
+(defvar font-lock-cache-position nil)
+(make-variable-buffer-local 'font-lock-cache-state)
+(make-variable-buffer-local 'font-lock-cache-position)
 
 ;; If this is nil, we only use the beginning of the buffer if we can't use
 ;; `font-lock-cache-position' and `font-lock-cache-state'.
@@ -944,7 +989,14 @@ See the variable `font-lock-keywords' for customization."
 (defsubst font-lock-remove-face (start end)
   ;; Remove any syntax highlighting on the characters in the range.
   (put-nonduplicable-text-property start end 'face nil)
-  (put-nonduplicable-text-property start end 'font-lock nil))
+  (put-nonduplicable-text-property start end 'font-lock nil)
+  (if lookup-syntax-properties
+      (put-nonduplicable-text-property start end 'syntax-table nil)))
+
+(defsubst font-lock-set-syntax (start end syntax)
+  ;; Set the face on the characters in the range.
+  (put-nonduplicable-text-property start end 'syntax-table syntax)
+  (put-nonduplicable-text-property start end 'font-lock t))
 
 (defsubst font-lock-any-faces-p (start end)
   ;; Return non-nil if we've put any syntax highlighting on
@@ -1084,8 +1136,10 @@ This can take a while for large buffers."
 	  ;; Use the fontification syntax table, if any.
 	  (if font-lock-syntax-table (set-syntax-table font-lock-syntax-table))
 	  ;; Now do the fontification.
-	  (if font-lock-keywords-only
-	      (font-lock-unfontify-region beg end)
+	  (font-lock-unfontify-region beg end)
+	  (when font-lock-syntactic-keywords
+	    (font-lock-fontify-syntactic-keywords-region beg end))
+	  (unless font-lock-keywords-only
 	    (font-lock-fontify-syntactically-region beg end loudly))
 	  (font-lock-fontify-keywords-region beg end loudly))
       ;; Clean up.
@@ -1222,118 +1276,6 @@ buffer modifications are performed or a buffer is reverted.")
 
 ;; Syntactic fontification functions.
 
-;; Note: Here is the FSF version.  Our version is much faster because
-;; of the C support we provide.  This may be useful for reference,
-;; however, and perhaps there is something useful here that should
-;; be merged into our version.
-;;
-;(defun font-lock-fontify-syntactically-region (start end &optional loudly)
-;  "Put proper face on each string and comment between START and END.
-;START should be at the beginning of a line."
-;  (let ((synstart (if comment-start-skip
-;		       (concat "\\s\"\\|" comment-start-skip)
-;		     "\\s\""))
-;	 (comstart (if comment-start-skip
-;		       (concat "\\s<\\|" comment-start-skip)
-;		     "\\s<"))
-;	 state prev prevstate)
-;    (if loudly (message "Fontifying %s... (syntactically...)" (buffer-name)))
-;    (save-restriction
-;      (widen)
-;      (goto-char start)
-;      ;;
-;      ;; Find the state at the `beginning-of-line' before `start'.
-;      (if (eq start font-lock-cache-position)
-;	   ;; Use the cache for the state of `start'.
-;	   (setq state font-lock-cache-state)
-;	 ;; Find the state of `start'.
-;	 (if (null font-lock-beginning-of-syntax-function)
-;	     ;; Use the state at the previous cache position, if any, or
-;	     ;; otherwise calculate from `point-min'.
-;	     (if (or (null font-lock-cache-position)
-;		     (< start font-lock-cache-position))
-;		 (setq state (parse-partial-sexp (point-min) start))
-;	       (setq state (parse-partial-sexp font-lock-cache-position start
-;					       nil nil font-lock-cache-state)))
-;	   ;; Call the function to move outside any syntactic block.
-;	   (funcall font-lock-beginning-of-syntax-function)
-;	   (setq state (parse-partial-sexp (point) start)))
-;	 ;; Cache the state and position of `start'.
-;	 (setq font-lock-cache-state state
-;	       font-lock-cache-position start))
-;      ;;
-;      ;; If the region starts inside a string, show the extent of it.
-;      (if (nth 3 state)
-;	   (let ((beg (point)))
-;	     (while (and (re-search-forward "\\s\"" end 'move)
-;			 (nth 3 (parse-partial-sexp beg (point)
-;						    nil nil state))))
-;	     (put-text-property beg (point) 'face font-lock-string-face)
-;	     (setq state (parse-partial-sexp beg (point) nil nil state))))
-;      ;;
-;      ;; Likewise for a comment.
-;      (if (or (nth 4 state) (nth 7 state))
-;	   (let ((beg (point)))
-;	     (save-restriction
-;	       (narrow-to-region (point-min) end)
-;	       (condition-case nil
-;		   (progn
-;		     (re-search-backward comstart (point-min) 'move)
-;		     (forward-comment 1)
-;		     ;; forward-comment skips all whitespace,
-;		     ;; so go back to the real end of the comment.
-;		     (skip-chars-backward " \t"))
-;		 (error (goto-char end))))
-;	     (put-text-property beg (point) 'face font-lock-comment-face)
-;	     (setq state (parse-partial-sexp beg (point) nil nil state))))
-;      ;;
-;      ;; Find each interesting place between here and `end'.
-;      (while (and (< (point) end)
-;		   (setq prev (point) prevstate state)
-;		   (re-search-forward synstart end t)
-;		   (progn
-;		     ;; Clear out the fonts of what we skip over.
-;		     (remove-text-properties prev (point) '(face nil))
-;		     ;; Verify the state at that place
-;		     ;; so we don't get fooled by \" or \;.
-;		     (setq state (parse-partial-sexp prev (point)
-;						     nil nil state))))
-;	 (let ((here (point)))
-;	   (if (or (nth 4 state) (nth 7 state))
-;	       ;;
-;	       ;; We found a real comment start.
-;	       (let ((beg (match-beginning 0)))
-;		 (goto-char beg)
-;		 (save-restriction
-;		   (narrow-to-region (point-min) end)
-;		   (condition-case nil
-;		       (progn
-;			 (forward-comment 1)
-;			 ;; forward-comment skips all whitespace,
-;			 ;; so go back to the real end of the comment.
-;			 (skip-chars-backward " \t"))
-;		     (error (goto-char end))))
-;		 (put-text-property beg (point) 'face
-;				    font-lock-comment-face)
-;		 (setq state (parse-partial-sexp here (point) nil nil state)))
-;	     (if (nth 3 state)
-;		 ;;
-;		 ;; We found a real string start.
-;		 (let ((beg (match-beginning 0)))
-;		   (while (and (re-search-forward "\\s\"" end 'move)
-;			       (nth 3 (parse-partial-sexp here (point)
-;							  nil nil state))))
-;		   (put-text-property beg (point) 'face font-lock-string-face)
-;		   (setq state (parse-partial-sexp here (point)
-;						   nil nil state))))))
-;	 ;;
-;	 ;; Make sure `prev' is non-nil after the loop
-;	 ;; only if it was set on the very last iteration.
-;	 (setq prev nil)))
-;    ;;
-;    ;; Clean up.
-;    (and prev (remove-text-properties prev end '(face nil)))))
-
 (defun font-lock-lisp-like (mode)
   ;; Note: (or (get mode 'font-lock-lisp-like) (string-match ...)) is
   ;; not enough because the property needs to be able to specify a nil
@@ -1344,52 +1286,77 @@ buffer modifications are performed or a buffer is reverted.")
     ;; in add-log, but I think this encompasses more modes.
     (string-match "lisp\\|scheme" (symbol-name mode))))
 
+;; fontify-syntactically-region used to use syntactically-sectionize, which
+;; was supposedly much faster than the FSF version because it was written in
+;; C. However, the FSF version uses parse-partial-sexp, which is also
+;; written in C, and the benchmarking I did showed the
+;; syntactically-sectionize code to be slower overall. So here's the FSF
+;; version, modified to support font-lock-doc-string-face.
+;; -- mct 2000-12-29
 (defun font-lock-fontify-syntactically-region (start end &optional loudly)
   "Put proper face on each string and comment between START and END.
 START should be at the beginning of a line."
   (if font-lock-keywords-only
       nil
+
+    ;; #### Shouldn't this just be using 'loudly??
     (when (and font-lock-verbose
 	       (>= (- end start) font-lock-message-threshold))
       (progress-feedback-with-label 'font-lock
 				    "Fontifying %s... (syntactically)" 5
 				    (buffer-name)))
-    (font-lock-unfontify-region start end loudly)
     (goto-char start)
-    (if (> end (point-max)) (setq end (point-max)))
-    (let ((lisp-like (font-lock-lisp-like major-mode)))
-      (syntactically-sectionize
-       #'(lambda (s e context depth)
-	   (let (face)
-	     (cond ((eq context 'string)
-		    (setq face
-			  ;; #### It would be nice if we handled
-			  ;; Python and other non-Lisp languages with
-			  ;; docstrings correctly.
-			  (if (and lisp-like (= depth 1))
-			      ;; really we should only use this if
-			      ;;  in position 3 depth 1, but that's
-			      ;;  too expensive to compute.
-			      'font-lock-doc-string-face
-			    'font-lock-string-face)))
-		   ((or (eq context 'comment)
-			(eq context 'block-comment))
-		    (setq face 'font-lock-comment-face)
-;		 ;; Don't fontify whitespace at the beginning of lines;
-;		 ;;  otherwise comment blocks may not line up with code.
-;		 ;; (This is sometimes a good idea, sometimes not; in any
-;		 ;; event it should be in C for speed --jwz)
-;		 (save-excursion
-;		     (goto-char s)
-;		     (while (prog1 (search-forward "\n" (1- e) 'move)
-;			      (setq face 'font-lock-comment-face)
-;			      (setq e (point)))
-;		       (skip-chars-forward " \t\n")
-;		       (setq s (point)))
-		   ))
-	     (font-lock-set-face s e face)))
-       start end)
-      )))
+
+    (let ((lisp-like (font-lock-lisp-like major-mode))
+	  (cache (marker-position font-lock-cache-position))
+	  state string beg depth)
+      ;;
+      ;; Find the state at the `beginning-of-line' before `start'.
+      (if (eq start cache)
+	  ;; Use the cache for the state of `start'.
+	  (setq state font-lock-cache-state)
+	;; Find the state of `start'.
+	(if (null font-lock-beginning-of-syntax-function)
+	    ;; Use the state at the previous cache position, if any, or
+	    ;; otherwise calculate from `point-min'.
+	    (if (or (null cache) (< start cache))
+		(setq state (parse-partial-sexp (point-min) start))
+	      (setq state (parse-partial-sexp cache start nil nil
+					      font-lock-cache-state)))
+	  ;; Call the function to move outside any syntactic block.
+	  (funcall font-lock-beginning-of-syntax-function)
+	  (setq state (parse-partial-sexp (point) start)))
+	;; Cache the state and position of `start'.
+	(setq font-lock-cache-state state)
+	(set-marker font-lock-cache-position start))
+      ;;
+      ;; If the region starts inside a string or comment, show the extent of it.
+      (when (or (nth 3 state) (nth 4 state))
+	(setq string (nth 3 state) beg (point))
+	(setq state (parse-partial-sexp (point) end nil nil state 'syntax-table))
+	(font-lock-set-face beg (point) (if string 
+					    font-lock-string-face
+					  font-lock-comment-face)))
+      ;;
+      ;; Find each interesting place between here and `end'.
+      (while (and (< (point) end)
+		  (progn
+		    (setq state (parse-partial-sexp (point) end nil nil state
+						    'syntax-table))
+		    (or (nth 3 state) (nth 4 state))))
+	(setq depth (nth 0 state) string (nth 3 state) beg (nth 8 state))
+	(setq state (parse-partial-sexp (point) end nil nil state 'syntax-table))
+	(if string
+	    ;; #### It would be nice if we handled Python and other
+	    ;; non-Lisp languages with docstrings correctly.
+	    (let ((face (if (and lisp-like (= depth 1))
+			    'font-lock-doc-string-face
+			  'font-lock-string-face)))
+	      (if font-lock-fontify-string-delimiters
+		  (font-lock-set-face beg (point) face)
+		(font-lock-set-face (+ beg 1) (- (point) 1) face)))
+	  (font-lock-set-face beg (point)
+			      font-lock-comment-face))))))
 
 ;;; Additional text property functions.
 
@@ -1473,6 +1440,101 @@ Optional argument OBJECT is the string or buffer containing the text."
        object)
       (setq start next))))
 
+;;; Syntactic regexp fontification functions (taken from FSF Emacs 20.7.1)
+
+;; These syntactic keyword pass functions are identical to those keyword pass
+;; functions below, with the following exceptions; (a) they operate on
+;; `font-lock-syntactic-keywords' of course, (b) they are all `defun' as speed
+;; is less of an issue, (c) eval of property value does not occur JIT as speed
+;; is less of an issue, (d) OVERRIDE cannot be `prepend' or `append' as it
+;; makes no sense for `syntax-table' property values, (e) they do not do it
+;; LOUDLY as it is not likely to be intensive.
+
+(defun font-lock-apply-syntactic-highlight (highlight)
+  "Apply HIGHLIGHT following a match.
+ HIGHLIGHT should be of the form MATCH-HIGHLIGHT,
+ see `font-lock-syntactic-keywords'."
+  (let* ((match (nth 0 highlight))
+ 	 (start (match-beginning match)) (end (match-end match))
+ 	 (value (nth 1 highlight))
+ 	 (override (nth 2 highlight)))
+    (unless (numberp (car-safe value))
+      (setq value (eval value)))
+    (cond ((not start)
+ 	   ;; No match but we might not signal an error.
+ 	   (or (nth 3 highlight)
+ 	       (error "No match %d in highlight %S" match highlight)))
+ 	  ((not override)
+ 	   ;; Cannot override existing fontification.
+ 	   (or (map-extents 'extent-property (current-buffer)
+			    start end 'syntax-table)
+	       (font-lock-set-syntax start end value)))
+ 	  ((eq override t)
+ 	   ;; Override existing fontification.
+	   (font-lock-set-syntax start end value))
+ 	  ((eq override 'keep)
+ 	   ;; Keep existing fontification.
+ 	   (font-lock-fillin-text-property start end
+					   'syntax-table 'font-lock value)))))
+
+(defun font-lock-fontify-syntactic-anchored-keywords (keywords limit)
+  "Fontify according to KEYWORDS until LIMIT.
+ KEYWORDS should be of the form MATCH-ANCHORED, see `font-lock-keywords',
+ LIMIT can be modified by the value of its PRE-MATCH-FORM."
+  (let ((matcher (nth 0 keywords)) (lowdarks (nthcdr 3 keywords)) highlights
+ 	;; Evaluate PRE-MATCH-FORM.
+ 	(pre-match-value (eval (nth 1 keywords))))
+    ;; Set LIMIT to value of PRE-MATCH-FORM or the end of line.
+    (if (and (numberp pre-match-value) (> pre-match-value (point)))
+ 	(setq limit pre-match-value)
+      (save-excursion (end-of-line) (setq limit (point))))
+    (save-match-data
+      ;; Find an occurrence of `matcher' before `limit'.
+      (while (if (stringp matcher)
+ 		 (re-search-forward matcher limit t)
+ 	       (funcall matcher limit))
+ 	;; Apply each highlight to this instance of `matcher'.
+ 	(setq highlights lowdarks)
+ 	(while highlights
+ 	  (font-lock-apply-syntactic-highlight (car highlights))
+ 	  (setq highlights (cdr highlights)))))
+    ;; Evaluate POST-MATCH-FORM.
+    (eval (nth 2 keywords))))
+
+(defun font-lock-fontify-syntactic-keywords-region (start end)
+  "Fontify according to `font-lock-syntactic-keywords' between START and END.
+START should be at the beginning of a line."
+;;  ;; If `font-lock-syntactic-keywords' is a symbol, get the real keywords.
+  (when (symbolp font-lock-syntactic-keywords)
+    (setq font-lock-syntactic-keywords (font-lock-eval-keywords
+					font-lock-syntactic-keywords)))
+  ;; If `font-lock-syntactic-keywords' is not compiled, compile it.
+  (unless (eq (car font-lock-syntactic-keywords) t)
+    (setq font-lock-syntactic-keywords (font-lock-compile-keywords
+					font-lock-syntactic-keywords)))
+  ;; Get down to business.
+  (let ((case-fold-search font-lock-keywords-case-fold-search)
+	(keywords (cdr font-lock-syntactic-keywords))
+	keyword matcher highlights)
+    (while keywords
+      ;; Find an occurrence of `matcher' from `start' to `end'.
+      (setq keyword (car keywords) matcher (car keyword))
+      (goto-char start)
+      (while (if (stringp matcher)
+		 (re-search-forward matcher end t)
+	       (funcall matcher end))
+	;; Apply each highlight to this instance of `matcher', which may be
+	;; specific highlights or more keywords anchored to `matcher'.
+	(setq highlights (cdr keyword))
+	(while highlights
+	  (if (numberp (car (car highlights)))
+	      (font-lock-apply-syntactic-highlight (car highlights))
+	    (font-lock-fontify-syntactic-anchored-keywords (car highlights)
+							   end))
+	  (setq highlights (cdr highlights)))
+	)
+      (setq keywords (cdr keywords)))))
+
 ;;; Regexp fontification functions.
 
 (defsubst font-lock-apply-highlight (highlight)
@@ -1636,6 +1698,14 @@ START should be at the beginning of a line."
 	(t				; Hopefully (MATCHER HIGHLIGHT ...)
 	 keyword)))
 
+(defun font-lock-eval-keywords (keywords)
+  ;; Evalulate KEYWORDS if a function (funcall) or variable (eval) name.
+  (if (listp keywords)
+      keywords
+    (font-lock-eval-keywords (if (fboundp keywords)
+				 (funcall keywords)
+			       (eval keywords)))))
+
 (defun font-lock-choose-keywords (keywords level)
   ;; Return LEVELth element of KEYWORDS.  A LEVEL of nil is equal to a
   ;; LEVEL of 0, a LEVEL of t is equal to (1- (length KEYWORDS)).
@@ -1713,7 +1783,7 @@ START should be at the beginning of a line."
 			     (font-lock-find-font-lock-defaults major-mode)))
 	       (keywords (font-lock-choose-keywords
 			  (nth 0 defaults) font-lock-maximum-decoration)))
-	  
+
 	  ;; Keywords?
 	  (setq font-lock-keywords (if (fboundp keywords)
 				       (funcall keywords)
@@ -1779,6 +1849,7 @@ START should be at the beginning of a line."
 		 (setq font-lock-beginning-of-syntax-function
 		       'beginning-of-defun)))))
 
+    (setq font-lock-cache-position (make-marker))
     (setq font-lock-defaults-computed t)))
 
 
diff --git a/lisp/lisp-mode.el b/lisp/lisp-mode.el
index 8fcec45..254ad36 100644
--- a/lisp/lisp-mode.el
+++ b/lisp/lisp-mode.el
@@ -170,19 +170,11 @@
 (if (not lisp-mode-syntax-table)
     (progn (setq lisp-mode-syntax-table
 		 (copy-syntax-table emacs-lisp-mode-syntax-table))
-	   (modify-syntax-entry ?\| "\"   " lisp-mode-syntax-table)
 	   (modify-syntax-entry ?\[ "_   " lisp-mode-syntax-table)
 	   ;; XEmacs changes
 	   (modify-syntax-entry ?\] "_   " lisp-mode-syntax-table)
-           ;;
-           ;; If emacs was compiled with NEW_SYNTAX, then do
-           ;;  CL's #| |# block comments.
-           (if (= 8 (length (parse-partial-sexp (point) (point))))
-               (progn
-                 (modify-syntax-entry ?#  "' 58" lisp-mode-syntax-table)
-                 (modify-syntax-entry ?|  ". 67" lisp-mode-syntax-table))
-	     ;; else, old style
-	     (modify-syntax-entry ?\| "\"   " lisp-mode-syntax-table))))
+	   (modify-syntax-entry ?#  "' 58" lisp-mode-syntax-table)
+	   (modify-syntax-entry ?|  "\" 67" lisp-mode-syntax-table)))
 
 (define-abbrev-table 'lisp-mode-abbrev-table ())
 
@@ -802,6 +794,8 @@ of the start of the containing expression."
 (put 'if 'lisp-indent-function 2)
 (put 'catch 'lisp-indent-function 1)
 (put 'condition-case 'lisp-indent-function 2)
+(put 'handler-case 'lisp-indent-function 1)
+(put 'handler-bind 'lisp-indent-function 1)
 (put 'call-with-condition-handler 'lisp-indent-function 2)
 (put 'unwind-protect 'lisp-indent-function 1)
 (put 'save-current-buffer 'lisp-indent-function 0)
@@ -811,12 +805,16 @@ of the start of the containing expression."
 (put 'with-temp-buffer 'lisp-indent-function 0)
 (put 'with-output-to-string 'lisp-indent-function 0)
 (put 'with-output-to-temp-buffer 'lisp-indent-function 1)
+(put 'with-slots 'lisp-indent-function 2)
+(put 'with-open-file 'lisp-indent-function 1)
+(put 'with-open-stream 'lisp-indent-function 1)
 (put 'eval-after-load 'lisp-indent-function 1)
 (put 'display-message 'lisp-indent-function 1)
 (put 'display-warning 'lisp-indent-function 1)
 (put 'lmessage 'lisp-indent-function 2)
 (put 'lwarn 'lisp-indent-function 2)
 (put 'global-set-key 'lisp-indent-function 1)
+(put 'print-unreadable-object 'lisp-indent-function 1)
 
 (defun indent-sexp (&optional endpos)
   "Indent each line of the list starting just after point.
diff --git a/lisp/setup-paths.el b/lisp/setup-paths.el
index d22ba46..c7a3bf1 100644
--- a/lisp/setup-paths.el
+++ b/lisp/setup-paths.el
@@ -38,12 +38,15 @@
 
 ;;; Code:
 
-(defvar paths-core-load-path-depth 1
+(defvar paths-core-load-path-depth 0
   "Depth of load-path searches in core Lisp paths.")
 
 (defvar paths-site-load-path-depth 1
   "Depth of load-path searches in site Lisp paths.")
 
+(defvar paths-mule-load-path-depth 0
+  "Depth of load-path searches in Mule Lisp paths.")
+
 (defvar paths-default-info-directories
   (mapcar (function
 	   (lambda (dirlist)
@@ -73,6 +76,19 @@
 				nil
 				configure-lisp-directory))
 
+(defun paths-find-mule-lisp-directory (roots &optional lisp-directory)
+  "Find the Mule Lisp directory of the XEmacs hierarchy."
+  ;; #### kludge
+  (if lisp-directory
+      (let ((guess
+	     (file-name-as-directory
+	      (paths-construct-path (list lisp-directory "mule")))))
+	(if (paths-file-readable-directory-p guess)
+	    guess
+	  (paths-find-version-directory roots "mule-lisp"
+					nil
+					configure-mule-lisp-directory)))))
+
 (defun paths-find-module-directory (roots)
   "Find the main modules directory of the XEmacs hierarchy."
   (paths-find-architecture-directory roots "modules"
@@ -81,7 +97,7 @@
 (defun paths-construct-load-path
   (roots early-package-load-path late-package-load-path last-package-load-path
 	 lisp-directory
-	 &optional site-lisp-directory)
+	 &optional site-lisp-directory mule-lisp-directory)
   "Construct the load path."
   (let* ((envvar-value (getenv "EMACSLOADPATH"))
 	 (env-load-path
@@ -91,6 +107,10 @@
 	  (and site-lisp-directory
 	       (paths-find-recursive-load-path (list site-lisp-directory)
 					       paths-site-load-path-depth)))
+	 (mule-lisp-load-path
+	  (and mule-lisp-directory
+	       (paths-find-recursive-load-path (list mule-lisp-directory)
+					       paths-mule-load-path-depth)))
 	 (lisp-load-path
 	  (and lisp-directory
 	       (paths-find-recursive-load-path (list lisp-directory)
@@ -99,6 +119,7 @@
 	    early-package-load-path
 	    site-lisp-load-path
 	    late-package-load-path
+	    mule-lisp-load-path
 	    lisp-load-path
 	    last-package-load-path)))
 
diff --git a/lisp/startup.el b/lisp/startup.el
index c821f84..394074c 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1276,6 +1276,17 @@ It's idempotent, so call this as often as you like!"
       (princ (format "lisp-directory:\n%S\n" lisp-directory)
 	     'external-debugging-output))
 
+  (if (featurep 'mule)
+      (progn
+	(setq mule-lisp-directory
+	      (paths-find-mule-lisp-directory roots
+					      lisp-directory))
+	(if debug-paths
+	    (princ (format "mule-lisp-directory:\n%S\n"
+			   mule-lisp-directory)
+		   'external-debugging-output)))
+    (setq mule-lisp-directory '()))
+
   (setq site-directory (and (null inhibit-site-lisp)
 			    (paths-find-site-lisp-directory roots)))
 
@@ -1288,7 +1299,8 @@ It's idempotent, so call this as often as you like!"
 					     late-package-load-path
 					     last-package-load-path
 					     lisp-directory
-					     site-directory))
+					     site-directory
+					     mule-lisp-directory))
 
   (setq Info-directory-list
 	(paths-construct-info-path roots
@@ -1355,6 +1367,9 @@ It's idempotent, so call this as often as you like!"
 	(erase-buffer)
 	(buffer-disable-undo (current-buffer))
 	(if (null lisp-directory) (push "lisp-directory" warnings))
+	(if (and (featurep 'mule)
+		 (null mule-lisp-directory))
+	    (push "mule-lisp-directory" warnings))
 	(if (null exec-directory) (push "exec-directory" warnings))
 	(if (null data-directory) (push "data-directory" warnings))
 	(if (null doc-directory)  (push "doc-directory"  warnings))
diff --git a/lisp/window.el b/lisp/window.el
index cfd37e7..fbd0335 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -130,12 +130,14 @@ Any other non-nil value means search all devices."
   (eq window (active-minibuffer-window)))
 
 (defmacro save-selected-window (&rest body)
-  "Execute BODY, then select the window that was selected before BODY."
-  `(let ((save-selected-window-window (selected-window)))
+  "Execute BODY, then select the window that was selected before BODY.
+The value returned is the value of the last form in BODY."
+  (let ((old-window (gensym "ssw")))
+  `(let ((,old-window (selected-window)))
      (unwind-protect
 	 (progn ,@body)
-       (when (window-live-p save-selected-window-window)
-	 (select-window save-selected-window-window)))))
+       (when (window-live-p ,old-window)
+	 (select-window ,old-window))))))
 
 (defmacro with-selected-window (window &rest body)
   "Execute forms in BODY with WINDOW as the selected window.
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index d3dad72..12f1c4e 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,13 @@
+2001-02-23  Martin Buchholz <martin@xemacs.org>
+
+	* XEmacs 21.2.45 "Thelxepeia" is released.
+
+2001-02-16  Raymond Toy  <toy@rtp.ericsson.se>
+
+	* lwlib-Xaw.c: Always include ATHENA_AsciiText_h_ to get the
+	text-field widget.
+	(xaw_creation_table): Always include the text-field widget
+
 2001-02-08  Martin Buchholz <martin@xemacs.org>
 
 	* XEmacs 21.2.44 "Thalia" is released.
diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index 1bdafcd..a52b231 100644
--- a/lwlib/lwlib-Xaw.c
+++ b/lwlib/lwlib-Xaw.c
@@ -46,10 +46,8 @@ Boston, MA 02111-1307, USA.  */
 #include "xlwradio.h"
 #include "xlwcheckbox.h"
 #include "xlwgauge.h"
-#ifndef NEED_MOTIF
 #include ATHENA_AsciiText_h_
 #endif
-#endif
 #include <X11/Xatom.h>
 
 static void xaw_generic_callback (Widget, XtPointer, XtPointer);
@@ -838,7 +836,7 @@ xaw_create_progress (widget_instance *instance)
   return scale;
 }
 
-#ifndef NEED_MOTIF
+#if defined(LWLIB_WIDGETS_ATHENA)
 #define TEXT_BUFFER_SIZE 128
 static Widget
 xaw_create_text_field (widget_instance *instance)
@@ -890,9 +888,7 @@ xaw_creation_table [] =
 #ifdef LWLIB_WIDGETS_ATHENA
   {"button",		xaw_create_button		},
   { "label", 		xaw_create_label_field		},
-#ifndef NEED_MOTIF
   {"text-field",		xaw_create_text_field		},
-#endif
   {"progress",		xaw_create_progress		},
 #endif
   {NULL, NULL}
diff --git a/man/ChangeLog b/man/ChangeLog
index e92f405..320621f 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,11 @@
+2001-02-23  Martin Buchholz <martin@xemacs.org>
+
+	* XEmacs 21.2.45 "Thelxepeia" is released.
+
+2001-02-10  Martin Buchholz  <martin@xemacs.org>
+
+	* xemacs/programs.texi (Tag Syntax): Port to makeinfo 3.
+
 2001-02-08  Martin Buchholz <martin@xemacs.org>
 
 	* XEmacs 21.2.44 "Thalia" is released.
diff --git a/man/xemacs/programs.texi b/man/xemacs/programs.texi
index 87b61c4..5ee3f5c 100644
--- a/man/xemacs/programs.texi
+++ b/man/xemacs/programs.texi
@@ -1084,7 +1084,7 @@ In La@TeX{} text, the argument of any of the commands @code{\chapter},
 tag.@refill
 
 Other commands can make tags as well, if you specify them in the
-environment variable @env{TEXTAGS} before invoking @code{etags}.  The
+environment variable @code{TEXTAGS} before invoking @code{etags}.  The
 value of this environment variable should be a colon-separated list of
 command names.  For example,
 
diff --git a/netinstall/ChangeLog b/netinstall/ChangeLog
index f5ec0e4..80895ce 100644
--- a/netinstall/ChangeLog
+++ b/netinstall/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-23  Martin Buchholz <martin@xemacs.org>
+
+	* XEmacs 21.2.45 "Thelxepeia" is released.
+
 2001-02-08  Martin Buchholz <martin@xemacs.org>
 
 	* XEmacs 21.2.44 "Thalia" is released.
@@ -195,5 +199,5 @@
 
 	* all: port from cygwin setup.
 
-%%% $Id: ChangeLog,v 1.1.2.16 2001/02/02 19:47:47 andyp Exp $
-$Revision: 1.1.2.16 $
+%%% $Id: ChangeLog,v 1.1.2.17 2001/02/08 07:20:42 martinb Exp $
+$Revision: 1.1.2.17 $
diff --git a/nt/ChangeLog b/nt/ChangeLog
index dc6c984..ca87cd7 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,13 @@
+2001-02-23  Martin Buchholz <martin@xemacs.org>
+
+	* XEmacs 21.2.45 "Thelxepeia" is released.
+
+2001-02-09  Martin Buchholz  <martin@xemacs.org>
+
+	* config.h (HAVE_UTIME): New.
+	* config.h (HAVE_UTIME_H): Remove.
+	* config.h (HAVE_STRUCT_UTIMBUF): Remove.
+
 2001-02-08  Martin Buchholz <martin@xemacs.org>
 
 	* XEmacs 21.2.44 "Thalia" is released.
diff --git a/nt/config.h b/nt/config.h
index 6dd1f1c..8d8dae2 100644
--- a/nt/config.h
+++ b/nt/config.h
@@ -150,7 +150,6 @@ Boston, MA 02111-1307, USA.  */
 #undef HAVE_MACH_MACH_H
 #undef HAVE_SYS_TIMEB_H
 #undef HAVE_UNISTD_H
-#undef HAVE_UTIME_H
 #undef HAVE_SYS_WAIT_H
 #undef HAVE_LIBGEN_H
 #undef WORDS_BIGENDIAN
@@ -175,9 +174,6 @@ Boston, MA 02111-1307, USA.  */
 /* Define if `sys_siglist' is declared by <signal.h>. */
 #undef SYS_SIGLIST_DECLARED
 
-/* Define if `struct utimbuf' is declared by <utime.h>.  */
-#undef HAVE_STRUCT_UTIMBUF
-
 /* Define if `struct timeval' is declared by <sys/time.h>.  */
 #define HAVE_TIMEVAL
 
@@ -258,6 +254,7 @@ Boston, MA 02111-1307, USA.  */
 #undef HAVE_SIGSETJMP
 #define HAVE_STRERROR
 #undef HAVE_TZSET
+#undef HAVE_UTIME
 #undef HAVE_UTIMES
 #undef HAVE_WAITPID
 #undef HAVE_VSNPRINTF
diff --git a/src/ChangeLog b/src/ChangeLog
index 16e7d55..1a6d69c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,184 @@
+2001-02-23  Martin Buchholz <martin@xemacs.org>
+
+	* XEmacs 21.2.45 "Thelxepeia" is released.
+
+2001-02-21  Martin Buchholz  <martin@xemacs.org>
+
+	* lisp-union.h (XSETINT): 
+	(XSETCHAR):
+	(XSETOBJ): 
+	Reverse previous change of 2001-02-06.
+
+2001-02-20  Matt Tucker  <tuck@whistlingfish.net>
+
+	Fix `VALID_BYTIND_P' crashes in regex.c when using narrowed
+	buffers.
+	* syntax.h (SYNTAX_CACHE_BYTE_TO_CHAR):
+	* syntax.h (SYNTAX_CACHE_OBJECT_BYTE_TO_CHAR):
+	Add `BI_BUF_BEGV' to bytepos before calculating bufpos.
+	* regex.c (POS_AS_IN_BUFFER): removed
+	* regex.c (re_search_2):
+	* regex.c (re_match_2):
+	Don't use an offset of 1 when calculating buffer positions, since
+	`BI_BUF_BEGV' does it already.
+
+2001-02-18  Wim Dumon  <wim@easics.be>
+
+	* insdel.c (prepare_to_modify_buffer): Also check for
+	supersession when clash-detection is enabled. 
+
+2001-02-17  Matt Tucker  <tuck@whistlingfish.net>
+
+	* regex.c (re_match_2_internal):
+	Convert temp characters from 'const unsigned char' to 're_char'.
+	Fix crashing bug with extended characters under mule.
+	* syntax.c (Qsyntax_table): Moved from vars_of_syntax to
+	syms_of_syntax. Use defsymbol to define. Fixes hanging bug with
+	font-lock, pdump, and new syntax-table code.
+	* syntax.c (find_start_of_comment):
+	(find_end_of_comment):
+	(forward-comment):
+	Fix crashing bugs involving moving beyond end of buffer.
+	* syntax.c (find_start_of_comment):
+	Fixed logic to allow proper detection of cases where the same
+	character is used to end both a two-char comment start and a
+	two-char comment end sequence. Fixes `(forward-comment -1)'.
+	* syntax.c (find_start_of_comment):
+	Return position just past last comment-end character for all cases
+	(previously was only done for two-char comment-end sequences).
+	* syntax.c (forward-comment):
+	Take value returned from `find_end_of_comment', rather than
+	incrementing it.
+	* syntax.h (SYNTAX_CACHE_BYTE_TO_CHAR):
+	Properly deal with BUFFERP (syntax_cache.object)
+
+2001-02-17  Martin Buchholz  <martin@xemacs.org>
+
+	* alloc.c (Fgarbage_collect): 
+	* alloc.c (make_bit_vector_from_byte_vector):
+	-Wsign-compare-correctness.
+
+2001-02-16  Martin Buchholz  <martin@xemacs.org>
+
+	* lisp-union.h (XSETINT): Eliminate unnecessary temp var.
+	(XSETCHAR): Likewise.
+	(XSETOBJ): Likewise.
+
+2001-02-15  Martin Buchholz  <martin@xemacs.org>
+
+	* mule-canna.c (canna-func-delete_previous): 
+	Rename to canna-func-delete-previous.
+
+2001-02-14  Martin Buchholz  <martin@xemacs.org>
+
+	* mule-ccl.c (ccl_driver): Warning suppression.  Use countof.
+
+2001-02-13  Matt Tucker  <tuck@whistlingfish.net>
+
+	* font-lock.c (find_context): Fix C++ compile errors introduced by
+	recent patch
+
+2001-02-13  Martin Buchholz  <martin@xemacs.org>
+
+	* s/aix4.h: Later versions of IBM C compiler need a bug workaround
+	pragma, but earlier ones barf on the same pragma.
+
+2001-02-06  Mike Sperber <mike@xemacs.org>
+
+	* emacs.c (complex_vars_of_emacs): Add `mule-lisp-directory' and
+	`configure-mule-lisp-directory'.
+
+2001-02-12  Martin Buchholz  <martin@xemacs.org>
+
+	Make sure dump-id.c is compiled in the same way as other .c's.
+	Fixes pdump compilation failure with HP's cc, which defaults to K&R.
+	* dump-id.h: Remove.
+	* emacs.c: Move dump-id.h into dumper.h.
+	* dumper.h: Move dump-id.h into dumper.h.
+	* Makefile.in.in:
+	Use standard .c.o rule for building dump-id.o.
+	Remove preprocessor flags from link command.
+	Add dump-id.o to ${otherobjs} if PDUMP.
+
+2001-02-07  Matt Tucker  <tuck@whistlingfish.net>
+
+	Port FSF 20.7 syntax table improvements.
+	* syntax.c.
+	* syntax.h.
+
+	Fixups for new syntax table stuff.
+	* dired.c: Include syntax.c.
+	(Fdirectory_files): Initialize regex_match_object and
+	regex_emacs_buffer.
+	* extents.h: EXFUN Fnext_extent_change, Fprevious_extent_change,
+	and Fget_char_property.
+
+	Use ported FSF 20.7 syntax table improvements.
+	* font-lock.c.
+	* regex.c.
+	* search.c.
+	
+2001-02-09  Martin Buchholz  <martin@xemacs.org>
+
+	* regex.c (Boolean): Renamed to `re_bool', to avoid conflict with
+	Unixware's enum boolean from sys/types.h.
+
+2001-02-10  Martin Buchholz  <martin@xemacs.org>
+
+	Fix support for building with latest Purify.
+	* Makefile.in.in (PURIFY_LIBS): Remove thread flags.
+	(PURIFY_FLAGS): Likewise.
+
+2001-02-09  Martin Buchholz  <martin@xemacs.org>
+
+	* fileio.c (lisp_string_set_file_times): New.
+	* fileio.c (Fcopy_file): Use it.
+	Fixes bug:
+	(copy-file filename non-ascii-filename t t)
+	==> No such file or directory, non-ascii-filename
+
+2001-02-10  Martin Buchholz  <martin@xemacs.org>
+
+	* glyphs-x.c (generate_cursor_fg_bg): Avoid a warning.
+	USHRT_MAX seems clearer than ~0 anyways.
+
+2001-02-09  Martin Buchholz  <martin@xemacs.org>
+
+	dumper improvements.  Inspired by Olivier.
+	* dumper.c (pdump_max_align): New.
+	* dumper.c (pdump_add_entry): Use pdump_max_align.
+	* dumper.c (pdump_get_entry_list): Likewise.
+	* dumper.c (pdump_scan_by_alignment): Likewise.
+	Don't iterate through unnecessary alignments.
+	* dumper.c (pdump_file_get): No need to align result of malloc().
+	* dumper.c (pdump_mallocadr): Remove.  
+	The result of malloc() is guaranteed to be maximally aligned.
+	* dumper.c: s/elmt/elt/g;
+	* dumper.c (pdump_object_table): Allocate dynamically, not statically.
+	* dumper.c (pdump_alert_undump_object): Likewise.
+	* dumper.c (pdump_align_table): 
+	Don't support alignments > 64.
+	Store ALIGNOF's, not shift counts, in table.
+
+2001-02-09  Martin Buchholz  <martin@xemacs.org>
+
+	* s/mingw32.h (HAVE_STRUCT_UTIMBUF): Remove.
+	* s/windowsnt.h (HAVE_STRUCT_UTIMBUF): Remove.
+	* systime.h: Use HAVE_UTIME.
+	* sysdep.c (struct utimbuf): Remove.
+	* sysdep.c (set_file_times): Prefer utime() to utimes().
+	* config.h.in (HAVE_UTIME): New.
+	* config.h.in (HAVE_UTIME_H): Remove.
+	* config.h.in (HAVE_STRUCT_UTIMBUF): Remove.
+
+2001-02-09  Martin Buchholz  <martin@xemacs.org>
+
+	* s/aix4.h: Hide #pragmas inside #ifndef NOT_C_CODE.
+
+2001-02-08  Martin Buchholz  <martin@xemacs.org>
+
+	* s/irix6-0.h: Use the standard system memmove, not bcopy.
+
 2001-02-08  Martin Buchholz <martin@xemacs.org>
 
 	* XEmacs 21.2.44 "Thalia" is released.
diff --git a/src/Makefile.in.in b/src/Makefile.in.in
index bfc4a46..0b2c9cf 100644
--- a/src/Makefile.in.in
+++ b/src/Makefile.in.in
@@ -31,11 +31,10 @@ PROGNAME=@PROGNAME@
 #ifdef PDUMP
 DUMP_TARGET = ${PROGNAME}.dmp
 EXE_TARGET  = ${PROGNAME}
-ID_FILE     = dump-id.c
+DUMP_ID     = dump-id.o
 #else
 DUMP_TARGET = ${PROGNAME}
 EXE_TARGET  = temacs
-ID_FILE     =
 #endif
 
 all: ${DUMP_TARGET}
@@ -450,12 +449,11 @@ link_deps=\
  $(start_files) ${objs} ${otherobjs}\
  $(lwlib_deps) $(dynodump_deps)
 
-temacs_deps=\
- $(link_deps) $(ID_FILE)
+temacs_deps = $(link_deps) ${DUMP_ID}
 
 temacs_link_args=\
- ${start_flags} ${ldflags} -I${srcdir} \
- -o $@ ${start_files} ${objs} ${otherobjs} ${ID_FILE} ${LIBES}
+ ${start_flags} ${ldflags}\
+ -o $@ ${start_files} ${objs} ${otherobjs} ${DUMP_ID} ${LIBES}
 
 ${EXE_TARGET}: $(temacs_deps)
 	$(LD) $(temacs_link_args)
@@ -512,14 +510,14 @@ debug-temacs: ${EXE_TARGET}
 ##
 ## Purify
 PURIFY_PROG  = purify
+PURIFY_LIBS  =
 PURIFY_FLAGS =\
 #ifdef PDUMP
  -search-mmaps=yes\
 #endif
- -chain-length=32 -ignore-signals=SIGPOLL -threads=yes\
- -cache-dir=${srcdir}/purecache -always-use-cache-dir=yes
+ -chain-length=32 -ignore-signals=SIGPOLL\
+ -cache-dir=${blddir}/purecache -always-use-cache-dir=yes
 
-PURIFY_LIBS  = -lpthread
 puremacs: $(temacs_deps)
 	$(PURIFY_PROG) $(PURIFY_FLAGS) $(LD) $(temacs_link_args) $(PURIFY_LIBS)
 	cp $@ ${EXE_TARGET}
diff --git a/src/alloc.c b/src/alloc.c
index 7c71faf..50de95c 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1315,7 +1315,7 @@ make_bit_vector (size_t length, Lisp_Object bit)
 Lisp_Object
 make_bit_vector_from_byte_vector (unsigned char *bytevec, size_t length)
 {
-  int i;
+  size_t i;
   Lisp_Bit_Vector *p = make_bit_vector_internal (length);
 
   for (i = 0; i < length; i++)
@@ -3533,7 +3533,7 @@ Garbage collection happens automatically if you cons more than
        ())
 {
   Lisp_Object pl = Qnil;
-  int i;
+  unsigned int i;
   int gc_count_vector_total_size = 0;
 
   garbage_collect_1 ();
@@ -3548,7 +3548,7 @@ Garbage collection happens automatically if you cons more than
           const char *name = lrecord_implementations_table[i]->name;
 	  int len = strlen (name);
 	  /* save this for the FSFmacs-compatible part of the summary */
-	  if (i == lrecord_vector.lrecord_type_index)
+	  if (i == lrecord_type_vector)
 	    gc_count_vector_total_size =
 	      lcrecord_stats[i].bytes_in_use + lcrecord_stats[i].bytes_freed;
 
diff --git a/src/config.h.in b/src/config.h.in
index 8857fa9..feb9e47 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -222,7 +222,6 @@ void *alloca ();
 #undef HAVE_SYS_UN_H
 #undef HAVE_ULIMIT_H
 #undef HAVE_UNISTD_H
-#undef HAVE_UTIME_H
 
 #undef HAVE_SYS_WAIT_H
 #undef HAVE_LIBINTL_H
@@ -253,9 +252,6 @@ void *alloca ();
 /* Is `sys_siglist' declared by <signal.h>? */
 #undef SYS_SIGLIST_DECLARED
 
-/* Is `struct utimbuf' declared by <utime.h>? */
-#undef HAVE_STRUCT_UTIMBUF
-
 /* Is `struct timeval' declared by <sys/time.h>? */
 #undef HAVE_TIMEVAL
 
@@ -329,6 +325,7 @@ void *alloca ();
 #undef HAVE_TZSET
 #undef HAVE_ULIMIT
 #undef HAVE_USLEEP
+#undef HAVE_UTIME
 #undef HAVE_UTIMES
 #undef HAVE_WAITPID
 #undef HAVE_VSNPRINTF
@@ -497,12 +494,12 @@ void *alloca ();
    determine where XEmacs' memory is going. */
 #undef MEMORY_USAGE_STATS
 
-/* Define QUANTIFY if using Quantify from Rational/Pure/Atria Software.
+/* Define QUANTIFY if using Quantify from Rational Software.
    This adds some additional calls to control data collection.
    It is only intended for use by the developers. */
 #undef QUANTIFY
 
-/* Define QUANTIFY if using Purify from Rational/Pure/Atria Software.
+/* Define PURIFY if using Purify from Rational Software.
    It is only intended for use by the developers. */
 #undef PURIFY
 
diff --git a/src/depend b/src/depend
index f56ff6c..32e15f9 100644
--- a/src/depend
+++ b/src/depend
@@ -88,17 +88,17 @@ debug.o: $(LISP_H) bytecode.h debug.h
 device.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h conslots.h console.h device.h elhash.h events.h faces.h frame.h frameslots.h glyphs.h gui.h keymap.h mule-charset.h redisplay.h scrollbar.h specifier.h sysdep.h syssignal.h systime.h toolbar.h window.h winslots.h
 dgif_lib.o: $(LISP_H) gifrlib.h sysfile.h
 dialog.o: $(LISP_H) conslots.h console.h device.h frame.h frameslots.h glyphs.h gui.h redisplay.h scrollbar.h specifier.h toolbar.h window.h winslots.h
-dired.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h commands.h elhash.h mule-charset.h ndir.h opaque.h regex.h sysdep.h sysdir.h sysfile.h syspwd.h systime.h
+dired.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h commands.h elhash.h mule-charset.h ndir.h opaque.h regex.h syntax.h sysdep.h sysdir.h sysfile.h syspwd.h systime.h
 doc.o: $(LISP_H) buffer.h bufslots.h bytecode.h casetab.h chartab.h insdel.h keymap.h mule-charset.h sysfile.h
 doprnt.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h lstream.h mule-charset.h
 dragdrop.o: $(LISP_H) dragdrop.h
-dumper.o: $(LISP_H) conslots.h console-stream.h console.h dump-id.h dumper.h elhash.h nt.h specifier.h sysfile.h syswindows.h
+dumper.o: $(LISP_H) conslots.h console-stream.h console.h dumper.h elhash.h nt.h specifier.h sysfile.h syswindows.h
 dynarr.o: $(LISP_H)
 ecrt0.o: config.h
 editfns.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h commands.h conslots.h console.h device.h events.h extents.h frame.h frameslots.h glyphs.h gui.h insdel.h line-number.h mule-charset.h redisplay.h scrollbar.h specifier.h sysdep.h sysfile.h syspwd.h systime.h toolbar.h window.h winslots.h
 eldap.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h eldap.h mule-charset.h opaque.h sysdep.h
 elhash.o: $(LISP_H) bytecode.h elhash.h
-emacs.o: $(LISP_H) backtrace.h buffer.h bufslots.h casetab.h chartab.h commands.h conslots.h console.h device.h dump-id.h dumper.h frame.h frameslots.h glyphs.h gui.h mule-charset.h nt.h paths.h process.h redisplay.h scrollbar.h specifier.h sysdep.h sysdll.h sysfile.h syssignal.h systime.h systty.h syswindows.h toolbar.h window.h winslots.h
+emacs.o: $(LISP_H) backtrace.h buffer.h bufslots.h casetab.h chartab.h commands.h conslots.h console.h device.h dumper.h frame.h frameslots.h glyphs.h gui.h mule-charset.h nt.h paths.h process.h redisplay.h scrollbar.h specifier.h sysdep.h sysdll.h sysfile.h syssignal.h systime.h systty.h syswindows.h toolbar.h window.h winslots.h
 emodules.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h conslots.h console.h device.h emodules.h file-coding.h frame.h frameslots.h glyphs.h gui.h insdel.h lstream.h mule-charset.h redisplay.h scrollbar.h specifier.h sysdep.h sysdll.h toolbar.h window.h winslots.h
 esd.o: $(LISP_H) miscplay.h
 eval.o: $(LISP_H) backtrace.h buffer.h bufslots.h bytecode.h casetab.h chartab.h commands.h conslots.h console.h mule-charset.h opaque.h
@@ -187,7 +187,7 @@ sunOS-fix.o: config.h
 sunplay.o: $(LISP_H) nativesound.h sysdep.h syssignal.h
 sunpro.o: $(LISP_H)
 symbols.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h conslots.h console.h elhash.h mule-charset.h
-syntax.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h mule-charset.h syntax.h
+syntax.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h extents.h mule-charset.h syntax.h
 sysdep.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h conslots.h console-stream.h console-tty.h console.h device.h events.h frame.h frameslots.h glyphs.h gui.h mule-charset.h ndir.h nt.h ntheap.h process.h redisplay.h scrollbar.h specifier.h sysdep.h sysdir.h sysfile.h sysproc.h syssignal.h systime.h systty.h syswait.h syswindows.h toolbar.h window.h winslots.h
 sysdll.o: config.h sysdll.h
 termcap.o: $(LISP_H) conslots.h console.h device.h
diff --git a/src/dired.c b/src/dired.c
index 48f9a28..bfbae2d 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -33,6 +33,7 @@ Boston, MA 02111-1307, USA.  */
 #include "elhash.h"
 #include "regex.h"
 #include "opaque.h"
+#include "syntax.h"
 
 Lisp_Object Vcompletion_ignored_extensions;
 Lisp_Object Qdirectory_files;
@@ -123,6 +124,9 @@ If FILES-ONLY is the symbol t, then only the "files" in the directory
   if (!d)
     report_file_error ("Opening directory", list1 (directory));
 
+  regex_match_object = Qt;
+  regex_emacs_buffer = current_buffer;
+
   record_unwind_protect (close_directory_unwind, make_opaque_ptr ((void *)d));
 
   /* Loop reading blocks */
diff --git a/src/dumper.c b/src/dumper.c
index d4bf7db..644d98f 100644
--- a/src/dumper.c
+++ b/src/dumper.c
@@ -24,7 +24,6 @@ Boston, MA 02111-1307, USA.  */
 #include <config.h>
 #include "lisp.h"
 
-#include "dump-id.h"
 #include "specifier.h"
 #include "elhash.h"
 #include "sysfile.h"
@@ -227,60 +226,54 @@ static HANDLE pdump_hMap = INVALID_HANDLE_VALUE;
 
 static void (*pdump_free) (void);
 
-static const unsigned char pdump_align_table[256] =
+static unsigned char pdump_align_table[] =
 {
-  8, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
-  4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
-  5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
-  4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
-  6, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
-  4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
-  5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
-  4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
-  7, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
-  4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
-  5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
-  4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
-  6, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
-  4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
-  5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
-  4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0
+  64, 1, 2, 1, 4, 1, 2, 1, 8, 1, 2, 1, 4, 1, 2, 1,
+  16, 1, 2, 1, 4, 1, 2, 1, 8, 1, 2, 1, 4, 1, 2, 1,
+  32, 1, 2, 1, 4, 1, 2, 1, 8, 1, 2, 1, 4, 1, 2, 1,
+  16, 1, 2, 1, 4, 1, 2, 1, 8, 1, 2, 1, 4, 1, 2, 1
 };
 
-typedef struct pdump_entry_list_elmt
+static inline unsigned int
+pdump_size_to_align (size_t size)
 {
-  struct pdump_entry_list_elmt *next;
+  return pdump_align_table[size % countof (pdump_align_table)];
+}
+
+typedef struct pdump_entry_list_elt
+{
+  struct pdump_entry_list_elt *next;
   const void *obj;
   size_t size;
   int count;
   EMACS_INT save_offset;
-} pdump_entry_list_elmt;
+} pdump_entry_list_elt;
 
 typedef struct
 {
-  pdump_entry_list_elmt *first;
+  pdump_entry_list_elt *first;
   int align;
   int count;
 } pdump_entry_list;
 
-typedef struct pdump_struct_list_elmt
+typedef struct pdump_struct_list_elt
 {
   pdump_entry_list list;
   const struct struct_description *sdesc;
-} pdump_struct_list_elmt;
+} pdump_struct_list_elt;
 
 typedef struct
 {
-  pdump_struct_list_elmt *list;
+  pdump_struct_list_elt *list;
   int count;
   int size;
 } pdump_struct_list;
 
-static pdump_entry_list pdump_object_table[256];
+static pdump_entry_list *pdump_object_table;
 static pdump_entry_list pdump_opaque_data_list;
 static pdump_struct_list pdump_struct_table;
 
-static int pdump_alert_undump_object[256];
+static int *pdump_alert_undump_object;
 
 static unsigned long cur_offset;
 static size_t max_size;
@@ -290,7 +283,7 @@ static FILE *pdump_out;
 
 #define PDUMP_HASHSIZE 200001
 
-static pdump_entry_list_elmt **pdump_hash;
+static pdump_entry_list_elt **pdump_hash;
 
 /* Since most pointers are eight bytes aligned, the >>3 allows for a better hash */
 static int
@@ -299,11 +292,11 @@ pdump_make_hash (const void *obj)
   return ((unsigned long)(obj)>>3) % PDUMP_HASHSIZE;
 }
 
-static pdump_entry_list_elmt *
+static pdump_entry_list_elt *
 pdump_get_entry (const void *obj)
 {
   int pos = pdump_make_hash (obj);
-  pdump_entry_list_elmt *e;
+  pdump_entry_list_elt *e;
 
   assert (obj != 0);
 
@@ -323,8 +316,7 @@ static void
 pdump_add_entry (pdump_entry_list *list, const void *obj, size_t size,
 		 int count)
 {
-  pdump_entry_list_elmt *e;
-  int align;
+  pdump_entry_list_elt *e;
   int pos = pdump_make_hash (obj);
 
   while ((e = pdump_hash[pos]) != 0)
@@ -337,7 +329,7 @@ pdump_add_entry (pdump_entry_list *list, const void *obj, size_t size,
 	pos = 0;
     }
 
-  e = xnew (pdump_entry_list_elmt);
+  e = xnew (pdump_entry_list_elt);
 
   e->next = list->first;
   e->obj = obj;
@@ -348,10 +340,12 @@ pdump_add_entry (pdump_entry_list *list, const void *obj, size_t size,
   list->count += count;
   pdump_hash[pos] = e;
 
-  align = pdump_align_table[size & 255];
+  {
+    int align = pdump_size_to_align (size);
 
-  if (align < list->align)
-    list->align = align;
+    if (align < list->align)
+      list->align = align;
+  }
 }
 
 static pdump_entry_list *
@@ -368,12 +362,12 @@ pdump_get_entry_list (const struct struct_description *sdesc)
 	pdump_struct_table.size = 10;
       else
 	pdump_struct_table.size = pdump_struct_table.size * 2;
-      pdump_struct_table.list = (pdump_struct_list_elmt *)
+      pdump_struct_table.list = (pdump_struct_list_elt *)
 	xrealloc (pdump_struct_table.list,
-		  pdump_struct_table.size * sizeof (pdump_struct_list_elmt));
+		  pdump_struct_table.size * sizeof (pdump_struct_list_elt));
     }
   pdump_struct_table.list[pdump_struct_table.count].list.first = 0;
-  pdump_struct_table.list[pdump_struct_table.count].list.align = 8;
+  pdump_struct_table.list[pdump_struct_table.count].list.align = ALIGNOF (max_align_t);
   pdump_struct_table.list[pdump_struct_table.count].list.count = 0;
   pdump_struct_table.list[pdump_struct_table.count].sdesc = sdesc;
 
@@ -628,15 +622,15 @@ pdump_register_struct (const void *data,
 }
 
 static void
-pdump_dump_data (pdump_entry_list_elmt *elmt,
+pdump_dump_data (pdump_entry_list_elt *elt,
 		 const struct lrecord_description *desc)
 {
-  size_t size = elmt->size;
-  int count = elmt->count;
+  size_t size = elt->size;
+  int count = elt->count;
   if (desc)
     {
       int pos, i;
-      memcpy (pdump_buf, elmt->obj, size*count);
+      memcpy (pdump_buf, elt->obj, size*count);
 
       for (i=0; i<count; i++)
 	{
@@ -648,7 +642,7 @@ pdump_dump_data (pdump_entry_list_elmt *elmt,
 	      switch (desc[pos].type)
 		{
 		case XD_SPECIFIER_END:
-		  desc = ((const Lisp_Specifier *)(elmt->obj))->methods->extra_description;
+		  desc = ((const Lisp_Specifier *)(elt->obj))->methods->extra_description;
 		  goto restart;
 		case XD_SIZE_T:
 		case XD_INT:
@@ -659,7 +653,7 @@ pdump_dump_data (pdump_entry_list_elmt *elmt,
 		  {
 		    EMACS_INT val = desc[pos].data1;
 		    if (XD_IS_INDIRECT (val))
-		      val = pdump_get_indirect_count (val, desc, elmt->obj);
+		      val = pdump_get_indirect_count (val, desc, elt->obj);
 		    *(int *)rdata = val;
 		    break;
 		  }
@@ -675,15 +669,15 @@ pdump_dump_data (pdump_entry_list_elmt *elmt,
 		case XD_LO_LINK:
 		  {
 		    Lisp_Object obj = *(Lisp_Object *)rdata;
-		    pdump_entry_list_elmt *elmt1;
+		    pdump_entry_list_elt *elt1;
 		    for (;;)
 		      {
-			elmt1 = pdump_get_entry (XRECORD_LHEADER (obj));
-			if (elmt1)
+			elt1 = pdump_get_entry (XRECORD_LHEADER (obj));
+			if (elt1)
 			  break;
 			obj = *(Lisp_Object *)(desc[pos].offset + (char *)(XRECORD_LHEADER (obj)));
 		      }
-		    *(EMACS_INT *)rdata = elmt1->save_offset;
+		    *(EMACS_INT *)rdata = elt1->save_offset;
 		    break;
 		  }
 		case XD_LISP_OBJECT:
@@ -702,7 +696,7 @@ pdump_dump_data (pdump_entry_list_elmt *elmt,
 		    EMACS_INT num = desc[pos].data1;
 		    int j;
 		    if (XD_IS_INDIRECT (num))
-		      num = pdump_get_indirect_count (num, desc, elmt->obj);
+		      num = pdump_get_indirect_count (num, desc, elt->obj);
 
 		    for (j=0; j<num; j++)
 		      {
@@ -727,7 +721,7 @@ pdump_dump_data (pdump_entry_list_elmt *elmt,
 	    }
 	}
     }
-  fwrite (desc ? pdump_buf : elmt->obj, size, count, pdump_out);
+  fwrite (desc ? pdump_buf : elt->obj, size, count, pdump_out);
 }
 
 static void
@@ -806,58 +800,43 @@ pdump_reloc_one (void *data, EMACS_INT delta,
 }
 
 static void
-pdump_allocate_offset (pdump_entry_list_elmt *elmt,
+pdump_allocate_offset (pdump_entry_list_elt *elt,
 		       const struct lrecord_description *desc)
 {
-  size_t size = elmt->count * elmt->size;
-  elmt->save_offset = cur_offset;
+  size_t size = elt->count * elt->size;
+  elt->save_offset = cur_offset;
   if (size>max_size)
     max_size = size;
   cur_offset += size;
 }
 
 static void
-pdump_scan_by_alignment (void (*f)(pdump_entry_list_elmt *,
+pdump_scan_by_alignment (void (*f)(pdump_entry_list_elt *,
 				   const struct lrecord_description *))
 {
-  int align, i;
-  const struct lrecord_description *idesc;
-  pdump_entry_list_elmt *elmt;
-  for (align=8; align>=0; align--)
+  int align;
+
+  for (align = ALIGNOF (max_align_t); align; align>>=1)
     {
+      int i;
+      pdump_entry_list_elt *elt;
+
       for (i=0; i<lrecord_type_count; i++)
 	if (pdump_object_table[i].align == align)
-	  {
-	    elmt = pdump_object_table[i].first;
-	    if (!elmt)
-	      continue;
-	    idesc = lrecord_implementations_table[i]->description;
-	    while (elmt)
-	      {
-		f (elmt, idesc);
-		elmt = elmt->next;
-	      }
-	  }
+	  for (elt = pdump_object_table[i].first; elt; elt = elt->next)
+	    f (elt, lrecord_implementations_table[i]->description);
 
       for (i=0; i<pdump_struct_table.count; i++)
-	if (pdump_struct_table.list[i].list.align == align)
-	  {
-	    elmt = pdump_struct_table.list[i].list.first;
-	    idesc = pdump_struct_table.list[i].sdesc->description;
-	    while (elmt)
-	      {
-		f (elmt, idesc);
-		elmt = elmt->next;
-	      }
-	  }
-
-      elmt = pdump_opaque_data_list.first;
-      while (elmt)
 	{
-	  if (pdump_align_table[elmt->size & 255] == align)
-	    f (elmt, 0);
-	  elmt = elmt->next;
+	  pdump_struct_list_elt list = pdump_struct_table.list[i];
+	  if (list.list.align == align)
+	    for (elt = list.list.first; elt; elt = elt->next)
+	      f (elt, list.sdesc->description);
 	}
+
+      for (elt = pdump_opaque_data_list.first; elt; elt = elt->next)
+	if (pdump_size_to_align (elt->size) == align)
+	  f (elt, 0);
     }
 }
 
@@ -892,22 +871,22 @@ static void
 pdump_dump_rtables (void)
 {
   int i;
-  pdump_entry_list_elmt *elmt;
+  pdump_entry_list_elt *elt;
   pdump_reloc_table rt;
 
   for (i=0; i<lrecord_type_count; i++)
     {
-      elmt = pdump_object_table[i].first;
-      if (!elmt)
+      elt = pdump_object_table[i].first;
+      if (!elt)
 	continue;
       rt.desc = lrecord_implementations_table[i]->description;
       rt.count = pdump_object_table[i].count;
       PDUMP_WRITE_ALIGNED (pdump_reloc_table, rt);
-      while (elmt)
+      while (elt)
 	{
-	  EMACS_INT rdata = pdump_get_entry (elmt->obj)->save_offset;
+	  EMACS_INT rdata = pdump_get_entry (elt->obj)->save_offset;
 	  PDUMP_WRITE_ALIGNED (EMACS_INT, rdata);
-	  elmt = elmt->next;
+	  elt = elt->next;
 	}
     }
 
@@ -917,20 +896,20 @@ pdump_dump_rtables (void)
 
   for (i=0; i<pdump_struct_table.count; i++)
     {
-      elmt = pdump_struct_table.list[i].list.first;
+      elt = pdump_struct_table.list[i].list.first;
       rt.desc = pdump_struct_table.list[i].sdesc->description;
       rt.count = pdump_struct_table.list[i].list.count;
       PDUMP_WRITE_ALIGNED (pdump_reloc_table, rt);
-      while (elmt)
+      while (elt)
 	{
-	  EMACS_INT rdata = pdump_get_entry (elmt->obj)->save_offset;
+	  EMACS_INT rdata = pdump_get_entry (elt->obj)->save_offset;
 	  int j;
-	  for (j=0; j<elmt->count; j++)
+	  for (j=0; j<elt->count; j++)
 	    {
 	      PDUMP_WRITE_ALIGNED (EMACS_INT, rdata);
-	      rdata += elmt->size;
+	      rdata += elt->size;
 	    }
-	  elmt = elmt->next;
+	  elt = elt->next;
 	}
     }
   rt.desc = 0;
@@ -953,27 +932,27 @@ pdump_dump_root_objects (void)
       pdump_static_Lisp_Object obj;
       obj.address = Dynarr_at (pdump_root_objects, i);
       obj.value   = * obj.address;
-      
+
       if (POINTER_TYPE_P (XTYPE (obj.value)))
 	obj.value = wrap_object ((void *) pdump_get_entry (XRECORD_LHEADER (obj.value))->save_offset);
-      
+
       PDUMP_WRITE (pdump_static_Lisp_Object, obj);
     }
 
   for (i=0; i<Dynarr_length (pdump_weak_object_chains); i++)
     {
-      pdump_entry_list_elmt *elmt;
+      pdump_entry_list_elt *elt;
       pdump_static_Lisp_Object obj;
 
       obj.address = Dynarr_at (pdump_weak_object_chains, i);
       obj.value   = * obj.address;
-      
+
       for (;;)
 	{
 	  const struct lrecord_description *desc;
 	  int pos;
-	  elmt = pdump_get_entry (XRECORD_LHEADER (obj.value));
-	  if (elmt)
+	  elt = pdump_get_entry (XRECORD_LHEADER (obj.value));
+	  if (elt)
 	    break;
 	  desc = XRECORD_LHEADER_IMPLEMENTATION (obj.value)->description;
 	  for (pos = 0; desc[pos].type != XD_LO_LINK; pos++)
@@ -981,7 +960,7 @@ pdump_dump_root_objects (void)
 
 	  obj.value = *(Lisp_Object *)(desc[pos].offset + (char *)(XRECORD_LHEADER (obj.value)));
 	}
-      obj.value = wrap_object ((void *) elmt->save_offset);
+      obj.value = wrap_object ((void *) elt->save_offset);
 
       PDUMP_WRITE (pdump_static_Lisp_Object, obj);
     }
@@ -995,6 +974,15 @@ pdump (void)
   int none;
   pdump_header header;
 
+  pdump_object_table = xnew_array (pdump_entry_list, lrecord_type_count);
+  pdump_alert_undump_object = xnew_array (int, lrecord_type_count);
+
+  assert (ALIGNOF (max_align_t) <= pdump_align_table[0]);
+
+  for (i = 0; i < countof (pdump_align_table); i++)
+    if (pdump_align_table[i] > ALIGNOF (max_align_t))
+      pdump_align_table[i] = ALIGNOF (max_align_t);
+
   flush_all_buffer_local_cache ();
 
   /* These appear in a DEFVAR_LISP, which does a staticpro() */
@@ -1007,12 +995,12 @@ pdump (void)
   dump_add_opaque (&lrecord_markers,
 		   lrecord_type_count * sizeof (lrecord_markers[0]));
 
-  pdump_hash = xnew_array_and_zero (pdump_entry_list_elmt *, PDUMP_HASHSIZE);
+  pdump_hash = xnew_array_and_zero (pdump_entry_list_elt *, PDUMP_HASHSIZE);
 
   for (i=0; i<lrecord_type_count; i++)
     {
       pdump_object_table[i].first = 0;
-      pdump_object_table[i].align = 8;
+      pdump_object_table[i].align = ALIGNOF (max_align_t);
       pdump_object_table[i].count = 0;
       pdump_alert_undump_object[i] = 0;
     }
@@ -1020,7 +1008,7 @@ pdump (void)
   pdump_struct_table.size = -1;
 
   pdump_opaque_data_list.first = 0;
-  pdump_opaque_data_list.align = 8;
+  pdump_opaque_data_list.align = ALIGNOF (max_align_t);
   pdump_opaque_data_list.count = 0;
   depth = 0;
 
@@ -1279,12 +1267,10 @@ pdump_resource_get (void)
 
 #else /* !WIN32_NATIVE */
 
-static void *pdump_mallocadr;
-
 static void
 pdump_file_free (void)
 {
-  xfree (pdump_mallocadr);
+  xfree (pdump_start);
 }
 
 #ifdef HAVE_MMAP
@@ -1326,9 +1312,8 @@ pdump_file_get (const char *path)
     }
 #endif /* HAVE_MMAP */
 
-  pdump_mallocadr = xmalloc (pdump_length+255);
+  pdump_start = xnew_array (char, pdump_length);
   pdump_free = pdump_file_free;
-  pdump_start = (char *)((255 + (unsigned long)pdump_mallocadr) & ~255);
   read (fd, pdump_start, pdump_length);
 
   close (fd);
@@ -1340,9 +1325,8 @@ pdump_file_get (const char *path)
 static int
 pdump_file_try (char *exe_path)
 {
-  char *w;
+  char *w = exe_path + strlen (exe_path);
 
-  w = exe_path + strlen (exe_path);
   do
     {
       sprintf (w, "-%s-%08x.dmp", EMACS_VERSION, dump_id);
diff --git a/src/dumper.h b/src/dumper.h
index 901bd1c..d89e28d 100644
--- a/src/dumper.h
+++ b/src/dumper.h
@@ -26,5 +26,6 @@ Boston, MA 02111-1307, USA.  */
 void pdump_objects_unmark (void);
 void pdump (void);
 int pdump_load (const char *argv0);
+extern unsigned int dump_id;
 
 #endif /* INCLUDED_dumper_h */
diff --git a/src/emacs.c b/src/emacs.c
index 2659e88..2133082 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -181,7 +181,6 @@ version 18.59 released October 31, 1992.
 #include "systime.h"
 
 #ifdef PDUMP
-#include "dump-id.h"
 #include "dumper.h"
 #endif
 
@@ -284,6 +283,7 @@ Lisp_Object Vemacs_program_name, Vemacs_program_version;
 Lisp_Object Vexec_path;
 Lisp_Object Vexec_directory, Vconfigure_exec_directory;
 Lisp_Object Vlisp_directory, Vconfigure_lisp_directory;
+Lisp_Object Vmule_lisp_directory, Vconfigure_mule_lisp_directory;
 Lisp_Object Vmodule_directory, Vconfigure_module_directory;
 Lisp_Object Vsite_module_directory, Vconfigure_site_module_directory;
 Lisp_Object Vconfigure_package_path;
@@ -3590,6 +3590,22 @@ configure's idea of what `lisp-directory' will be.
   Vconfigure_lisp_directory = Qnil;
 #endif
 
+  DEFVAR_LISP ("mule-lisp-directory", &Vmule_lisp_directory /*
+*Directory of Mule Lisp files that come with XEmacs.
+*/ );
+  Vmule_lisp_directory = Qnil;
+
+  DEFVAR_LISP ("configure-mule-lisp-directory", &Vconfigure_mule_lisp_directory /*
+For internal use by the build procedure only.
+configure's idea of what `mule-lisp-directory' will be.
+*/ );
+#ifdef PATH_MULELOADSEARCH
+  Vconfigure_mule_lisp_directory = Ffile_name_as_directory
+    (build_string ((char *) PATH_MULELOADSEARCH));
+#else
+  Vconfigure_mule_lisp_directory = Qnil;
+#endif
+
   DEFVAR_LISP ("module-directory", &Vmodule_directory /*
 *Directory of core dynamic modules that come with XEmacs.
 */ );
diff --git a/src/extents.h b/src/extents.h
index d8afb56..4b40311 100644
--- a/src/extents.h
+++ b/src/extents.h
@@ -315,7 +315,10 @@ EXFUN (Fextent_start_position, 1);
 EXFUN (Fmake_extent, 3);
 EXFUN (Fprevious_single_property_change, 4);
 EXFUN (Fset_extent_endpoints, 4);
+EXFUN (Fnext_extent_change, 2);
+EXFUN (Fprevious_extent_change, 2);
 EXFUN (Fset_extent_parent, 2);
+EXFUN (Fget_char_property, 4);
 
 extern int inside_undo;
 extern int in_modeline_generation;
diff --git a/src/fileio.c b/src/fileio.c
index 5a6d477..692e49e 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1676,6 +1676,16 @@ barf_or_query_if_file_exists (Lisp_Object absname, const char *querystring,
   return;
 }
 
+/* A slightly higher-level interface than `set_file_times' */
+static int
+lisp_string_set_file_times (Lisp_Object filename,
+			    EMACS_TIME atime, EMACS_TIME mtime)
+{
+  char *ext_filename;
+  LISP_STRING_TO_EXTERNAL (filename, ext_filename, Qfile_name);
+  return set_file_times (ext_filename, atime, mtime);
+}
+
 DEFUN ("copy-file", Fcopy_file, 2, 4,
        "fCopy file: \nFCopy %s to file: \np\nP", /*
 Copy FILENAME to NEWNAME.  Both args must be strings.
@@ -1813,8 +1823,7 @@ A prefix arg makes KEEP-TIME non-nil.
 	    EMACS_TIME atime, mtime;
 	    EMACS_SET_SECS_USECS (atime, st.st_atime, 0);
 	    EMACS_SET_SECS_USECS (mtime, st.st_mtime, 0);
-	    if (set_file_times ((char *) XSTRING_DATA (newname), atime,
-				mtime))
+	    if (lisp_string_set_file_times (newname, atime, mtime))
 	      report_file_error ("I/O error", list1 (newname));
 	  }
 	chmod ((const char *) XSTRING_DATA (newname),
diff --git a/src/font-lock.c b/src/font-lock.c
index 6cd74d7..a58655d 100644
--- a/src/font-lock.c
+++ b/src/font-lock.c
@@ -59,7 +59,9 @@ enum syntactic_context
   context_none,
   context_string,
   context_comment,
-  context_block_comment
+  context_block_comment,
+  context_generic_comment,
+  context_generic_string
 };
 
 enum block_comment_context
@@ -333,6 +335,8 @@ setup_context_cache (struct buffer *buf, Bufpos pt)
       context_cache.style = comment_style_none;
       context_cache.scontext = '\000';
       context_cache.depth = 0;
+      /* #### shouldn't this be checking the character's syntax instead of
+         explicitly testing for backslash characters? */
       context_cache.backslash_p = ((pt > 1) &&
 				   (BUF_FETCH_CHAR (buf, pt - 1) == '\\'));
       /* Note that the BOL context cache may not be at the beginning
@@ -387,24 +391,24 @@ setup_context_cache (struct buffer *buf, Bufpos pt)
   }
 }
 
-#define SYNTAX_START_STYLE(table, c1, c2)				 \
-  (SYNTAX_STYLES_MATCH_START_P (table, c1, c2, SYNTAX_COMMENT_STYLE_A) ? \
-   comment_style_a :							 \
-   SYNTAX_STYLES_MATCH_START_P (table, c1, c2, SYNTAX_COMMENT_STYLE_B) ? \
-   comment_style_b :							 \
-   comment_style_none)
-
-#define SYNTAX_END_STYLE(table, c1, c2)					\
-  (SYNTAX_STYLES_MATCH_END_P (table, c1, c2, SYNTAX_COMMENT_STYLE_A) ?	\
+#define SYNTAX_START_STYLE(c1, c2)					\
+  (SYNTAX_CODES_MATCH_START_P (c1, c2, SYNTAX_COMMENT_STYLE_A) ?	\
    comment_style_a :							\
-   SYNTAX_STYLES_MATCH_END_P (table, c1, c2, SYNTAX_COMMENT_STYLE_B) ?	\
+   SYNTAX_CODES_MATCH_START_P (c1, c2, SYNTAX_COMMENT_STYLE_B) ?	\
    comment_style_b :							\
    comment_style_none)
 
-#define SINGLE_SYNTAX_STYLE(table, c)					\
-      (SYNTAX_STYLES_MATCH_1CHAR_P (table, c, SYNTAX_COMMENT_STYLE_A) ?	\
+#define SYNTAX_END_STYLE(c1, c2)				\
+  (SYNTAX_CODES_MATCH_END_P (c1, c2, SYNTAX_COMMENT_STYLE_A) ?	\
+   comment_style_a :						\
+   SYNTAX_CODES_MATCH_END_P (c1, c2, SYNTAX_COMMENT_STYLE_B) ?	\
+   comment_style_b :						\
+   comment_style_none)
+
+#define SINGLE_SYNTAX_STYLE(c)						\
+      (SYNTAX_CODE_MATCHES_1CHAR_P (c, SYNTAX_COMMENT_STYLE_A) ?	\
        comment_style_a :						\
-       SYNTAX_STYLES_MATCH_1CHAR_P (table, c, SYNTAX_COMMENT_STYLE_B) ?	\
+       SYNTAX_CODE_MATCHES_1CHAR_P (c, SYNTAX_COMMENT_STYLE_B) ?	\
        comment_style_b :						\
        comment_style_none)
 
@@ -414,17 +418,27 @@ static void
 find_context (struct buffer *buf, Bufpos pt)
 {
   /* This function can GC */
+#ifndef emacs
   Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
   Lisp_Object syntaxtab = buf->syntax_table;
+#endif
   Emchar prev_c, c;
+  int prev_syncode, syncode;
   Bufpos target = pt;
   setup_context_cache (buf, pt);
   pt = context_cache.cur_point;
 
+  SETUP_SYNTAX_CACHE (pt - 1, 1);
   if (pt > BUF_BEGV (buf))
-    c = BUF_FETCH_CHAR (buf, pt - 1);
+    {
+      c = BUF_FETCH_CHAR (buf, pt - 1);
+      syncode = SYNTAX_CODE_FROM_CACHE (mirrortab, c);
+    }
   else
-    c = '\n'; /* to get bol_context_cache at point-min */
+    {
+      c = '\n'; /* to get bol_context_cache at point-min */
+      syncode = Swhitespace;
+    }
 
   for (; pt < target; pt++, context_cache.cur_point = pt)
     {
@@ -459,8 +473,11 @@ find_context (struct buffer *buf, Bufpos pt)
 	    }
 	}
 
+      UPDATE_SYNTAX_CACHE_FORWARD (pt);
       prev_c = c;
+      prev_syncode = syncode;
       c = BUF_FETCH_CHAR (buf, pt);
+      syncode = SYNTAX_CODE_FROM_CACHE (mirrortab, c);
 
       if (prev_c == '\n')
 	bol_context_cache = context_cache;
@@ -471,7 +488,7 @@ find_context (struct buffer *buf, Bufpos pt)
 	  continue;
 	}
 
-      switch (SYNTAX (mirrortab, c))
+      switch (SYNTAX_FROM_CACHE (mirrortab, c))
 	{
 	case Sescape:
 	  context_cache.backslash_p = 1;
@@ -492,13 +509,13 @@ find_context (struct buffer *buf, Bufpos pt)
 	    {
 	      context_cache.context = context_comment;
 	      context_cache.ccontext = ccontext_none;
-	      context_cache.style = SINGLE_SYNTAX_STYLE (mirrortab, c);
+	      context_cache.style = SINGLE_SYNTAX_STYLE (syncode);
 	      if (context_cache.style == comment_style_none) abort ();
 	    }
 	  break;
 
 	case Sendcomment:
-	  if (context_cache.style != SINGLE_SYNTAX_STYLE (mirrortab, c))
+	  if (context_cache.style != SINGLE_SYNTAX_STYLE (syncode))
 	    ;
 	  else if (context_cache.context == context_comment)
 	    {
@@ -525,7 +542,8 @@ find_context (struct buffer *buf, Bufpos pt)
 	      }
             else if (context_cache.context == context_none)
 	      {
-		Lisp_Object stringtermobj = syntax_match (syntaxtab, c);
+		Lisp_Object stringtermobj =
+		  syntax_match (syntax_cache.current_syntax_table, c);
 		Emchar stringterm;
 
 		if (CHARP (stringtermobj))
@@ -538,6 +556,35 @@ find_context (struct buffer *buf, Bufpos pt)
 	      }
             break;
           }
+
+	case Scomment_fence:
+	  {
+	    if (context_cache.context == context_generic_comment)
+	      {
+		context_cache.context = context_none;
+	      }
+	    else if (context_cache.context == context_none)
+	      {
+		context_cache.context = context_generic_comment;
+		context_cache.ccontext = ccontext_none;
+	      }
+	    break;
+	  }
+
+	case Sstring_fence:
+	  {
+	    if (context_cache.context == context_generic_string)
+	      {
+		context_cache.context = context_none;
+	      }
+	    else if (context_cache.context == context_none)
+	      {
+		context_cache.context = context_generic_string;
+		context_cache.ccontext = ccontext_none;
+	      }
+	    break;
+	  }
+
 	default:
 	  ;
 	}
@@ -546,18 +593,18 @@ find_context (struct buffer *buf, Bufpos pt)
 	 Now we've got to hack multi-char sequences that start
 	 and end block comments.
        */
-      if ((SYNTAX_COMMENT_BITS (mirrortab, c) &
+      if ((SYNTAX_CODE_COMMENT_BITS (syncode) &
 	   SYNTAX_SECOND_CHAR_START) &&
 	  context_cache.context == context_none &&
 	  context_cache.ccontext == ccontext_start1 &&
-	  SYNTAX_START_P (mirrortab, prev_c, c) /* the two chars match */
+	  SYNTAX_CODES_START_P (prev_syncode, syncode) /* the two chars match */
 	  )
 	{
 	  context_cache.ccontext = ccontext_start2;
-	  context_cache.style = SYNTAX_START_STYLE (mirrortab, prev_c, c);
+	  context_cache.style = SYNTAX_START_STYLE (prev_syncode, syncode);
 	  if (context_cache.style == comment_style_none) abort ();
 	}
-      else if ((SYNTAX_COMMENT_BITS (mirrortab, c) &
+      else if ((SYNTAX_CODE_COMMENT_BITS (syncode) &
 		SYNTAX_FIRST_CHAR_START) &&
 	       context_cache.context == context_none &&
 	       (context_cache.ccontext == ccontext_none ||
@@ -566,29 +613,30 @@ find_context (struct buffer *buf, Bufpos pt)
 	  context_cache.ccontext = ccontext_start1;
 	  context_cache.style = comment_style_none; /* should be this already*/
 	}
-      else if ((SYNTAX_COMMENT_BITS (mirrortab, c) &
+      else if ((SYNTAX_CODE_COMMENT_BITS (syncode) &
 		SYNTAX_SECOND_CHAR_END) &&
 	       context_cache.context == context_block_comment &&
 	       context_cache.ccontext == ccontext_end1 &&
-	       SYNTAX_END_P (mirrortab, prev_c, c) &&
+	       SYNTAX_CODES_END_P (prev_syncode, syncode) &&
 	       /* the two chars match */
 	       context_cache.style ==
-	       SYNTAX_END_STYLE (mirrortab, prev_c, c)
+	       SYNTAX_END_STYLE (prev_syncode, syncode)
 	       )
 	{
 	  context_cache.context = context_none;
 	  context_cache.ccontext = ccontext_none;
 	  context_cache.style = comment_style_none;
 	}
-      else if ((SYNTAX_COMMENT_BITS (mirrortab, c) &
+      else if ((SYNTAX_CODE_COMMENT_BITS (syncode) &
 		SYNTAX_FIRST_CHAR_END) &&
 	       context_cache.context == context_block_comment &&
-	       (context_cache.style ==
-		SYNTAX_END_STYLE (mirrortab, c,
-				  BUF_FETCH_CHAR (buf, pt+1))) &&
+	       context_cache.style == SINGLE_SYNTAX_STYLE (syncode) &&
 	       (context_cache.ccontext == ccontext_start2 ||
 		context_cache.ccontext == ccontext_end1))
-	/* #### is it right to check for end1 here?? */
+	/* #### is it right to check for end1 here?? 
+	   yes, because this might be a repetition of the first char
+	   of a comment-end sequence. ie, '/xxx foo xxx/' or
+	   '/xxx foo x/', where 'x' = '*' -- mct */
 	{
 	  if (context_cache.style == comment_style_none) abort ();
 	  context_cache.ccontext = ccontext_end1;
@@ -627,10 +675,12 @@ context_to_symbol (enum syntactic_context context)
 {
   switch (context)
     {
-    case context_none:		return Qnil;
-    case context_string:	return Qstring;
-    case context_comment:	return Qcomment;
-    case context_block_comment:	return Qblock_comment;
+    case context_none:			return Qnil;
+    case context_string:		return Qstring;
+    case context_comment:		return Qcomment;
+    case context_block_comment:		return Qblock_comment;
+    case context_generic_comment:	return Qblock_comment;
+    case context_generic_string:	return Qstring;
     default: abort (); return Qnil; /* suppress compiler warning */
     }
 }
@@ -721,7 +771,9 @@ WARNING: this may alter match-data.
       if (this_context == context_block_comment &&
 	  context_cache.ccontext == ccontext_start2)
 	estart -= 2;
-      else if (this_context == context_comment)
+      else if (this_context == context_comment
+	       || this_context == context_generic_comment
+	       )
 	estart -= 1;
 
       edepth = context_cache.depth;
@@ -737,7 +789,9 @@ WARNING: this may alter match-data.
 	 a part of the comment.
        */
       if ((this_context == context_block_comment ||
-	   this_context == context_comment)
+	   this_context == context_comment
+	   || this_context == context_generic_comment
+	   )
 	  && pt < e)
 	eend++;
 
diff --git a/src/frame.c b/src/frame.c
index ba8f379..3f2ee3b 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -925,7 +925,7 @@ set_frame_selected_window (struct frame *f, Lisp_Object window)
 }
 
 DEFUN ("set-frame-selected-window", Fset_frame_selected_window, 2, 2, 0, /*
-Set the selected window of frame object FRAME to WINDOW.
+Set the selected window of FRAME to WINDOW.
 If FRAME is nil, the selected frame is used.
 If FRAME is the selected frame, this makes WINDOW the selected window.
 */
@@ -1962,7 +1962,7 @@ Return non NIL if FRAME is now "visible" (actually in use for display).
 A frame that is not visible is not updated, and, if it works through a
 window system, may not show at all.
 N.B. Under X "visible" means Mapped. It the window is mapped but not
-actually visible on screen then frame_visible returns 'hidden.
+actually visible on screen then `frame-visible-p' returns 'hidden.
 */
        (frame))
 {
@@ -2001,8 +2001,8 @@ frame is iconified, it will not be visible.
 DEFUN ("visible-frame-list", Fvisible_frame_list, 0, 1, 0, /*
 Return a list of all frames now "visible" (being updated).
 If DEVICE is specified only frames on that device will be returned.
-Note that under virtual window managers not all these frame are necessarily
-really updated.
+Note that under virtual window managers not all these frames are
+necessarily really updated.
 */
        (device))
 {
diff --git a/src/glyphs-x.c b/src/glyphs-x.c
index f37d3ba..8c29839 100644
--- a/src/glyphs-x.c
+++ b/src/glyphs-x.c
@@ -798,7 +798,7 @@ generate_cursor_fg_bg (Lisp_Object device, Lisp_Object *foreground,
   else
     {
       xbg->pixel = 0;
-      xbg->red = xbg->green = xbg->blue = ~0;
+      xbg->red = xbg->green = xbg->blue = USHRT_MAX;
     }
 }
 
diff --git a/src/insdel.c b/src/insdel.c
index 520507a..937c3eb 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -2324,16 +2324,15 @@ prepare_to_modify_buffer (struct buffer *buf, Bufpos start, Bufpos end,
   if (!NILP (buf->filename) && lockit &&
       BUF_SAVE_MODIFF (buf) >= BUF_MODIFF (buf))
     {
-#ifdef CLASH_DETECTION
-      if (!NILP (buf->file_truename))
-	/* Make binding buffer-file-name to nil effective.  */
-	lock_file (buf->file_truename);
-#else
       /* At least warn if this file has changed on disk since it was visited.*/
       if (NILP (Fverify_visited_file_modtime (buffer))
 	  && !NILP (Ffile_exists_p (buf->filename)))
 	call1_in_buffer (buf, intern ("ask-user-about-supersession-threat"),
 			 buf->filename);
+#ifdef CLASH_DETECTION
+      if (!NILP (buf->file_truename))
+	/* Make binding buffer-file-name to nil effective.  */
+	lock_file (buf->file_truename);
 #endif /* not CLASH_DETECTION */
     }
   UNGCPRO;
diff --git a/src/mule-canna.c b/src/mule-canna.c
index 78e9eb3..224acc3 100644
--- a/src/mule-canna.c
+++ b/src/mule-canna.c
@@ -1445,7 +1445,7 @@ For canna
 */ );
   canna_fn_DeleteNext = IROHA_FN_DeleteNext;
 
-  DEFVAR_INT ("canna-func-delete_previous", &canna_fn_DeletePrevious  /*
+  DEFVAR_INT ("canna-func-delete-previous", &canna_fn_DeletePrevious  /*
 
 */ );
   canna_fn_DeletePrevious = IROHA_FN_DeletePrevious;
diff --git a/src/mule-ccl.c b/src/mule-ccl.c
index 0dbec5b..9a38087 100644
--- a/src/mule-ccl.c
+++ b/src/mule-ccl.c
@@ -1585,7 +1585,7 @@ ccl_driver (struct ccl_program *ccl,
 			  /* +1 is for including separator. */
 			  point = -point + 1;
 			  if (mapping_stack_pointer
-			      >= &mapping_stack[MAX_MAP_SET_LEVEL])
+			      >= mapping_stack + countof (mapping_stack))
 			    CCL_INVALID_CMD;
 			  PUSH_MAPPING_STACK (map_set_rest_length - point,
 					      reg[rrr]);
@@ -1666,7 +1666,7 @@ ccl_driver (struct ccl_program *ccl,
 		      else if (SYMBOLP (content))
 			{
 			  if (mapping_stack_pointer
-			      >= &mapping_stack[MAX_MAP_SET_LEVEL])
+			      >= mapping_stack + countof (mapping_stack))
 			    CCL_INVALID_CMD;
 			  PUSH_MAPPING_STACK (map_set_rest_length, reg[rrr]);
 			  PUSH_MAPPING_STACK (map_set_rest_length, op);
diff --git a/src/regex.c b/src/regex.c
index 151e80d..b3725da 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -47,6 +47,14 @@
 #define _GNU_SOURCE 1
 #endif
 
+#ifdef emacs
+/* Converts the pointer to the char to BEG-based offset from the start.	 */
+#define PTR_TO_OFFSET(d) (MATCHING_IN_FIRST_STRING			\
+			  ? (d) - string1 : (d) - (string2 - size1))
+#else
+#define PTR_TO_OFFSET(d) 0
+#endif
+
 /* We assume non-Mule if emacs isn't defined. */
 #ifndef emacs
 #undef MULE
@@ -179,6 +187,8 @@ init_syntax_once (void)
 #endif /* SYNTAX_TABLE */
 
 #define SYNTAX_UNSAFE(ignored, c) re_syntax_table[c]
+#undef SYNTAX_FROM_CACHE
+#define SYNTAX_FROM_CACHE SYNTAX_UNSAFE
 
 #define RE_TRANSLATE(c) translate[(unsigned char) (c)]
 #define TRANSLATE_P(tr) tr
@@ -368,7 +378,7 @@ void *alloca ();
 /* Type of source-pattern and string chars.  */
 typedef const unsigned char re_char;
 
-typedef char boolean;
+typedef char re_bool;
 #define false 0
 #define true 1
 
@@ -1780,10 +1790,10 @@ static void insert_op1 (re_opcode_t op, unsigned char *loc, int arg,
 			unsigned char *end);
 static void insert_op2 (re_opcode_t op, unsigned char *loc, int arg1, int arg2,
 			unsigned char *end);
-static boolean at_begline_loc_p (re_char *pattern, re_char *p,
+static re_bool at_begline_loc_p (re_char *pattern, re_char *p,
 				 reg_syntax_t syntax);
-static boolean at_endline_loc_p (re_char *p, re_char *pend, int syntax);
-static boolean group_in_compile_stack (compile_stack_type compile_stack,
+static re_bool at_endline_loc_p (re_char *p, re_char *pend, int syntax);
+static re_bool group_in_compile_stack (compile_stack_type compile_stack,
 				       regnum_t regnum);
 static reg_errcode_t compile_range (re_char **p_ptr, re_char *pend,
 				    RE_TRANSLATE_TYPE translate,
@@ -1796,12 +1806,12 @@ static reg_errcode_t compile_extended_range (re_char **p_ptr,
 					     reg_syntax_t syntax,
 					     Lisp_Object rtab);
 #endif /* MULE */
-static boolean group_match_null_string_p (unsigned char **p,
+static re_bool group_match_null_string_p (unsigned char **p,
 					  unsigned char *end,
 					  register_info_type *reg_info);
-static boolean alt_match_null_string_p (unsigned char *p, unsigned char *end,
+static re_bool alt_match_null_string_p (unsigned char *p, unsigned char *end,
 					register_info_type *reg_info);
-static boolean common_op_match_null_string_p (unsigned char **p,
+static re_bool common_op_match_null_string_p (unsigned char **p,
 					      unsigned char *end,
 					      register_info_type *reg_info);
 static int bcmp_translate (const unsigned char *s1, const unsigned char *s2,
@@ -2048,11 +2058,11 @@ regex_compile (re_char *pattern, int size, reg_syntax_t syntax,
 
           {
 	    /* true means zero/many matches are allowed. */
-	    boolean zero_times_ok = c != '+';
-            boolean many_times_ok = c != '?';
+	    re_bool zero_times_ok = c != '+';
+            re_bool many_times_ok = c != '?';
 
             /* true means match shortest string possible. */
-            boolean minimal = false;
+            re_bool minimal = false;
 
             /* If there is a sequence of repetition chars, collapse it
                down to just one (the right one).  We can't combine
@@ -2156,7 +2166,7 @@ regex_compile (re_char *pattern, int size, reg_syntax_t syntax,
             else
               {
                 /* Are we optimizing this jump?  */
-                boolean keep_string_p = false;
+                re_bool keep_string_p = false;
 
                 if (many_times_ok)
                   { /* More than one repetition is allowed, so put in
@@ -2232,9 +2242,9 @@ regex_compile (re_char *pattern, int size, reg_syntax_t syntax,
         case '[':
           {
 	    /* XEmacs change: this whole section */
-            boolean had_char_class = false;
+            re_bool had_char_class = false;
 #ifdef MULE
-	    boolean has_extended_chars = false;
+	    re_bool has_extended_chars = false;
 	    REGISTER Lisp_Object rtab = Qnil;
 #endif
 
@@ -2416,18 +2426,18 @@ regex_compile (re_char *pattern, int size, reg_syntax_t syntax,
                     if (c == ':' && *p == ']')
                       {
                         int ch;
-                        boolean is_alnum = STREQ (str, "alnum");
-                        boolean is_alpha = STREQ (str, "alpha");
-                        boolean is_blank = STREQ (str, "blank");
-                        boolean is_cntrl = STREQ (str, "cntrl");
-                        boolean is_digit = STREQ (str, "digit");
-                        boolean is_graph = STREQ (str, "graph");
-                        boolean is_lower = STREQ (str, "lower");
-                        boolean is_print = STREQ (str, "print");
-                        boolean is_punct = STREQ (str, "punct");
-                        boolean is_space = STREQ (str, "space");
-                        boolean is_upper = STREQ (str, "upper");
-                        boolean is_xdigit = STREQ (str, "xdigit");
+                        re_bool is_alnum = STREQ (str, "alnum");
+                        re_bool is_alpha = STREQ (str, "alpha");
+                        re_bool is_blank = STREQ (str, "blank");
+                        re_bool is_cntrl = STREQ (str, "cntrl");
+                        re_bool is_digit = STREQ (str, "digit");
+                        re_bool is_graph = STREQ (str, "graph");
+                        re_bool is_lower = STREQ (str, "lower");
+                        re_bool is_print = STREQ (str, "print");
+                        re_bool is_punct = STREQ (str, "punct");
+                        re_bool is_space = STREQ (str, "space");
+                        re_bool is_upper = STREQ (str, "upper");
+                        re_bool is_xdigit = STREQ (str, "xdigit");
 
                         if (!IS_CHAR_CLASS (str))
 			  FREE_STACK_RETURN (REG_ECTYPE);
@@ -3213,11 +3223,11 @@ insert_op2 (re_opcode_t op, unsigned char *loc, int arg1, int arg2,
    after an alternative or a begin-subexpression.  We assume there is at
    least one character before the ^.  */
 
-static boolean
+static re_bool
 at_begline_loc_p (re_char *pattern, re_char *p, reg_syntax_t syntax)
 {
   re_char *prev = p - 2;
-  boolean prev_prev_backslash = prev > pattern && prev[-1] == '\\';
+  re_bool prev_prev_backslash = prev > pattern && prev[-1] == '\\';
 
   return
        /* After a subexpression?  */
@@ -3230,11 +3240,11 @@ at_begline_loc_p (re_char *pattern, re_char *p, reg_syntax_t syntax)
 /* The dual of at_begline_loc_p.  This one is for $.  We assume there is
    at least one character after the $, i.e., `P < PEND'.  */
 
-static boolean
+static re_bool
 at_endline_loc_p (re_char *p, re_char *pend, int syntax)
 {
   re_char *next = p;
-  boolean next_backslash = *next == '\\';
+  re_bool next_backslash = *next == '\\';
   re_char *next_next = p + 1 < pend ? p + 1 : 0;
 
   return
@@ -3250,7 +3260,7 @@ at_endline_loc_p (re_char *p, re_char *pend, int syntax)
 /* Returns true if REGNUM is in one of COMPILE_STACK's elements and
    false if it's not.  */
 
-static boolean
+static re_bool
 group_in_compile_stack (compile_stack_type compile_stack, regnum_t regnum)
 {
   int this_element;
@@ -3421,10 +3431,10 @@ re_compile_fastmap (struct re_pattern_buffer *bufp)
      proven otherwise.  We set this false at the bottom of switch
      statement, to which we get only if a particular path doesn't
      match the empty string.  */
-  boolean path_can_be_null = true;
+  re_bool path_can_be_null = true;
 
   /* We aren't doing a `succeed_n' to begin with.  */
-  boolean succeed_n_p = false;
+  re_bool succeed_n_p = false;
 
   assert (fastmap != NULL && p != NULL);
 
@@ -3624,8 +3634,22 @@ re_compile_fastmap (struct re_pattern_buffer *bufp)
 	  }
 
 #ifdef emacs
+	case wordbound:
+	case notwordbound:
+	case wordbeg:
+	case wordend:
+	case notsyntaxspec:
+	case syntaxspec:
+	  /* This match depends on text properties.  These end with
+	     aborting optimizations.  */
+	  bufp->can_be_null = 1;
+	  goto done;
+
+#ifdef emacs
+#if 0   /* Removed during syntax-table properties patch -- 2000/12/07 mct */
         case syntaxspec:
 	  k = *p++;
+#endif
 	  matchsyntax:
 #ifdef MULE
 	  for (j = 0; j < 0x80; j++)
@@ -3665,8 +3689,10 @@ re_compile_fastmap (struct re_pattern_buffer *bufp)
 	  break;
 
 
+#if 0   /* Removed during syntax-table properties patch -- 2000/12/07 mct */
 	case notsyntaxspec:
 	  k = *p++;
+#endif
 	  matchnotsyntax:
 #ifdef MULE
 	  for (j = 0; j < 0x80; j++)
@@ -3704,6 +3730,7 @@ re_compile_fastmap (struct re_pattern_buffer *bufp)
 	      fastmap[j] = 1;
 #endif /* MULE */
 	  break;
+#endif /* emacs */
 
 #ifdef MULE
 /* 97/2/17 jhod category patch */
@@ -3730,10 +3757,12 @@ re_compile_fastmap (struct re_pattern_buffer *bufp)
         case endline:
 	case begbuf:
 	case endbuf:
+#ifndef emacs
 	case wordbound:
 	case notwordbound:
 	case wordbeg:
 	case wordend:
+#endif
         case push_dummy_failure:
           continue;
 
@@ -3974,6 +4003,18 @@ re_search_2 (struct re_pattern_buffer *bufp, const char *str1,
 	}
     }
 
+#ifdef emacs
+  /* In a forward search for something that starts with \=.
+     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)
+	      - startpos;
+      if (range < 0)
+	return -1;
+    }
+#endif /* emacs */
+
   /* Update the fastmap now if not correct already.  */
   if (fastmap && !bufp->fastmap_accurate)
     if (re_compile_fastmap (bufp) == -2)
@@ -3995,6 +4036,15 @@ re_search_2 (struct re_pattern_buffer *bufp, const char *str1,
   }
 #endif
 
+#ifdef emacs
+    SETUP_SYNTAX_CACHE_FOR_OBJECT (regex_match_object,
+				   regex_emacs_buffer,
+				   SYNTAX_CACHE_OBJECT_BYTE_TO_CHAR (regex_match_object,
+								     regex_emacs_buffer,
+								     startpos),
+				   1);
+#endif
+
   /* Loop through the string, looking for a place to start matching.  */
   for (;;)
     {
@@ -4258,9 +4308,21 @@ re_match_2 (struct re_pattern_buffer *bufp, const char *string1,
 	    int size1, const char *string2, int size2, int pos,
 	    struct re_registers *regs, int stop)
 {
-  int result = re_match_2_internal (bufp, (re_char *) string1, size1,
-				    (re_char *) string2, size2,
-				    pos, regs, stop);
+  int result;
+
+#ifdef emacs
+    SETUP_SYNTAX_CACHE_FOR_OBJECT (regex_match_object,
+				   regex_emacs_buffer,
+				   SYNTAX_CACHE_OBJECT_BYTE_TO_CHAR (regex_match_object,
+								     regex_emacs_buffer,
+								     pos),
+				   1);
+#endif
+
+  result = re_match_2_internal (bufp, (re_char *) string1, size1,
+				(re_char *) string2, size2,
+				pos, regs, stop);
+
   alloca (0);
   return result;
 }
@@ -4395,10 +4457,10 @@ re_match_2_internal (struct re_pattern_buffer *bufp, re_char *string1,
 
   /* 1 if this match ends in the same string (string1 or string2)
      as the best previous match.  */
-  boolean same_str_p;
+  re_bool same_str_p;
 
   /* 1 if this match is the best seen so far.  */
-  boolean best_match_p;
+  re_bool best_match_p;
 
   DEBUG_PRINT1 ("\n\nEntering re_match_2.\n");
 
@@ -4759,7 +4821,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, re_char *string1,
 	case charset_not:
 	  {
 	    REGISTER unsigned char c;
-	    boolean not_p = (re_opcode_t) *(p - 1) == charset_not;
+	    re_bool not_p = (re_opcode_t) *(p - 1) == charset_not;
 
             DEBUG_PRINT2 ("EXECUTING charset%s.\n", not_p ? "_not" : "");
 
@@ -4786,7 +4848,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, re_char *string1,
 	case charset_mule_not:
 	  {
 	    REGISTER Emchar c;
-	    boolean not_p = (re_opcode_t) *(p - 1) == charset_mule_not;
+	    re_bool not_p = (re_opcode_t) *(p - 1) == charset_mule_not;
 
             DEBUG_PRINT2 ("EXECUTING charset_mule%s.\n", not_p ? "_not" : "");
 
@@ -4933,7 +4995,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, re_char *string1,
                || just_past_start_mem == p - 1)
 	      && (p + 2) < pend)
             {
-              boolean is_a_jump_n = false;
+              re_bool is_a_jump_n = false;
 
               p1 = p + 2;
               mcnt = 0;
@@ -5478,17 +5540,34 @@ re_match_2_internal (struct re_pattern_buffer *bufp, re_char *string1,
 	      result = 1;
 	    else
 	      {
-		const unsigned char *d_before =
-		  (const unsigned char *) POS_BEFORE_GAP_UNSAFE (d);
-		const unsigned char *d_after =
-		  (const unsigned char *) POS_AFTER_GAP_UNSAFE (d);
+		re_char *d_before = POS_BEFORE_GAP_UNSAFE (d);
+		re_char *d_after = POS_AFTER_GAP_UNSAFE (d);
+
+		/* emch1 is the character before d, syn1 is the syntax of emch1,
+		   emch2 is the character at d, and syn2 is the syntax of emch2. */
 		Emchar emch1, emch2;
+		int syn1, syn2;
+#ifdef emacs
+		int pos_before;
+#endif
 
 		DEC_CHARPTR (d_before);
 		emch1 = charptr_emchar (d_before);
 		emch2 = charptr_emchar (d_after);
-		result = (WORDCHAR_P_UNSAFE (emch1) !=
-			  WORDCHAR_P_UNSAFE (emch2));
+
+#ifdef emacs
+		pos_before = SYNTAX_CACHE_BYTE_TO_CHAR (PTR_TO_OFFSET (d)) - 1;
+		UPDATE_SYNTAX_CACHE (pos_before);
+#endif
+		syn1 = SYNTAX_FROM_CACHE (XCHAR_TABLE (regex_emacs_buffer->mirror_syntax_table),
+					  emch1);
+#ifdef emacs
+		UPDATE_SYNTAX_CACHE_FORWARD (pos_before + 1);
+#endif
+		syn2 = SYNTAX_FROM_CACHE (XCHAR_TABLE (regex_emacs_buffer->mirror_syntax_table),
+					  emch2);
+
+		result = ((syn1 == Sword) != (syn2 == Sword));
 	      }
 	    if (result == should_succeed)
 	      break;
@@ -5502,6 +5581,8 @@ re_match_2_internal (struct re_pattern_buffer *bufp, re_char *string1,
 
 	case wordbeg:
           DEBUG_PRINT1 ("EXECUTING wordbeg.\n");
+	  if (AT_STRINGS_END (d))
+	    goto fail;
 	  {
 	    /* XEmacs: this originally read:
 
@@ -5509,23 +5590,33 @@ re_match_2_internal (struct re_pattern_buffer *bufp, re_char *string1,
 	      break;
 
 	      */
-	    const unsigned char *dtmp =
-	      (const unsigned char *) POS_AFTER_GAP_UNSAFE (d);
+	    re_char *dtmp = POS_AFTER_GAP_UNSAFE (d);
 	    Emchar emch = charptr_emchar (dtmp);
-	    if (!WORDCHAR_P_UNSAFE (emch))
+#ifdef emacs
+	    int charpos = SYNTAX_CACHE_BYTE_TO_CHAR (PTR_TO_OFFSET (d));
+	    UPDATE_SYNTAX_CACHE (charpos);
+#endif
+	    if (SYNTAX_FROM_CACHE (XCHAR_TABLE (regex_emacs_buffer->mirror_syntax_table),
+				   emch) != Sword)
 	      goto fail;
 	    if (AT_STRINGS_BEG (d))
 	      break;
-	    dtmp = (const unsigned char *) POS_BEFORE_GAP_UNSAFE (d);
+	    dtmp = POS_BEFORE_GAP_UNSAFE (d);
 	    DEC_CHARPTR (dtmp);
 	    emch = charptr_emchar (dtmp);
-	    if (!WORDCHAR_P_UNSAFE (emch))
+#ifdef emacs
+	    UPDATE_SYNTAX_CACHE_BACKWARD (charpos - 1);
+#endif
+	    if (SYNTAX_FROM_CACHE (XCHAR_TABLE (regex_emacs_buffer->mirror_syntax_table),
+				   emch) != Sword)
 	      break;
 	    goto fail;
 	  }
 
 	case wordend:
           DEBUG_PRINT1 ("EXECUTING wordend.\n");
+	  if (AT_STRINGS_BEG (d))
+	    goto fail;
 	  {
 	    /* XEmacs: this originally read:
 
@@ -5535,20 +5626,27 @@ re_match_2_internal (struct re_pattern_buffer *bufp, re_char *string1,
 
 	      The or condition is incorrect (reversed).
 	      */
-	    const unsigned char *dtmp;
+	    re_char *dtmp;
 	    Emchar emch;
-	    if (AT_STRINGS_BEG (d))
-	      goto fail;
-	    dtmp = (const unsigned char *) POS_BEFORE_GAP_UNSAFE (d);
+#ifdef emacs
+	    int charpos = SYNTAX_CACHE_BYTE_TO_CHAR (PTR_TO_OFFSET (d)) - 1;
+	    UPDATE_SYNTAX_CACHE (charpos);
+#endif
+	    dtmp = POS_BEFORE_GAP_UNSAFE (d);
 	    DEC_CHARPTR (dtmp);
 	    emch = charptr_emchar (dtmp);
-	    if (!WORDCHAR_P_UNSAFE (emch))
+	    if (SYNTAX_FROM_CACHE (XCHAR_TABLE (regex_emacs_buffer->mirror_syntax_table),
+				   emch) != Sword)
 	      goto fail;
 	    if (AT_STRINGS_END (d))
 	      break;
-	    dtmp = (const unsigned char *) POS_AFTER_GAP_UNSAFE (d);
+	    dtmp = POS_AFTER_GAP_UNSAFE (d);
 	    emch = charptr_emchar (dtmp);
-	    if (!WORDCHAR_P_UNSAFE (emch))
+#ifdef emacs
+	    UPDATE_SYNTAX_CACHE_FORWARD (charpos + 1);
+#endif
+	    if (SYNTAX_FROM_CACHE (XCHAR_TABLE (regex_emacs_buffer->mirror_syntax_table),
+				   emch) != Sword)
 	      break;
 	    goto fail;
 	  }
@@ -5556,7 +5654,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, re_char *string1,
 #ifdef emacs
   	case before_dot:
           DEBUG_PRINT1 ("EXECUTING before_dot.\n");
- 	  if (!regex_emacs_buffer_p
+ 	  if (! (NILP (regex_match_object) || BUFFERP (regex_match_object))
 	      || (BUF_PTR_BYTE_POS (regex_emacs_buffer, (unsigned char *) d)
 		  >= BUF_PT (regex_emacs_buffer)))
   	    goto fail;
@@ -5564,7 +5662,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, re_char *string1,
 
   	case at_dot:
           DEBUG_PRINT1 ("EXECUTING at_dot.\n");
- 	  if (!regex_emacs_buffer_p
+ 	  if (! (NILP (regex_match_object) || BUFFERP (regex_match_object))
 	      || (BUF_PTR_BYTE_POS (regex_emacs_buffer, (unsigned char *) d)
 		  != BUF_PT (regex_emacs_buffer)))
   	    goto fail;
@@ -5572,7 +5670,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, re_char *string1,
 
   	case after_dot:
           DEBUG_PRINT1 ("EXECUTING after_dot.\n");
-          if (!regex_emacs_buffer_p
+          if (! (NILP (regex_match_object) || BUFFERP (regex_match_object))
 	      || (BUF_PTR_BYTE_POS (regex_emacs_buffer, (unsigned char *) d)
 		  <= BUF_PT (regex_emacs_buffer)))
   	    goto fail;
@@ -5602,9 +5700,15 @@ re_match_2_internal (struct re_pattern_buffer *bufp, re_char *string1,
 	    Emchar emch;
 
 	    REGEX_PREFETCH ();
+#ifdef emacs
+	    {
+	      int charpos = SYNTAX_CACHE_BYTE_TO_CHAR (PTR_TO_OFFSET (d));
+	      UPDATE_SYNTAX_CACHE (charpos);
+	    }
+#endif
+
 	    emch = charptr_emchar ((const Bufbyte *) d);
-	    matches = (SYNTAX_UNSAFE
-		       (XCHAR_TABLE (regex_emacs_buffer->mirror_syntax_table),
+	    matches = (SYNTAX_FROM_CACHE (regex_emacs_buffer->mirror_syntax_table,
 			emch) == (enum syntaxcode) mcnt);
 	    INC_CHARPTR (d);
 	    if (matches != should_succeed)
@@ -5692,7 +5796,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, re_char *string1,
 	  assert (p <= pend);
           if (p < pend)
             {
-              boolean is_a_jump_n = false;
+              re_bool is_a_jump_n = false;
 
               /* If failed to a backwards jump that's part of a repetition
                  loop, need to pop this failure point and use the next one.  */
@@ -5745,7 +5849,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, re_char *string1,
 
    We don't handle duplicates properly (yet).  */
 
-static boolean
+static re_bool
 group_match_null_string_p (unsigned char **p, unsigned char *end,
 			   register_info_type *reg_info)
 {
@@ -5853,7 +5957,7 @@ group_match_null_string_p (unsigned char **p, unsigned char *end,
    It expects P to be the first byte of a single alternative and END one
    byte past the last. The alternative can contain groups.  */
 
-static boolean
+static re_bool
 alt_match_null_string_p (unsigned char *p, unsigned char *end,
 			 register_info_type *reg_info)
 {
@@ -5889,12 +5993,12 @@ alt_match_null_string_p (unsigned char *p, unsigned char *end,
 
    Sets P to one after the op and its arguments, if any.  */
 
-static boolean
+static re_bool
 common_op_match_null_string_p (unsigned char **p, unsigned char *end,
 			       register_info_type *reg_info)
 {
   int mcnt;
-  boolean ret;
+  re_bool ret;
   int reg_no;
   unsigned char *p1 = *p;
 
@@ -6220,7 +6324,7 @@ regexec (const regex_t *preg, const char *string, size_t nmatch,
   struct re_registers regs;
   regex_t private_preg;
   int len = strlen (string);
-  boolean want_reg_info = !preg->no_sub && nmatch > 0;
+  re_bool want_reg_info = !preg->no_sub && nmatch > 0;
 
   private_preg = *preg;
 
diff --git a/src/s/aix4.h b/src/s/aix4.h
index adf3195..fe19cda 100644
--- a/src/s/aix4.h
+++ b/src/s/aix4.h
@@ -14,19 +14,24 @@
 /* Forward declarations for xlc warning suppressions */
 struct ether_addr;
 struct sockaddr_dl;
-#endif /* C code */
 
-/* getaddrinfo is broken in AIX 4.3 as per IY04165.
-   At this time (2/21/2000), there's no PTF available.
-   -- Mike Sperber <mike@xemacs.org> */
+#ifdef __xlC__			/* "eXceLlent C compiler" ?! */
+#if __xlC__ >= 1200
+/* IBM's C compiler miscompiles bytecount_to_charcount at high levels
+   of optimization.  From IBM's docs:
 
-#undef HAVE_GETADDRINFO
-
-#ifdef __xlC__
-/* IBM's C compiler miscompiles this function.  From IBM's docs:
    -qstrict turns off the following optimizations:
 
    Performing code motion and scheduling on computations such as loads
    and floating-point computations that may trigger an exception. */
 #pragma option_override (bytecount_to_charcount, "opt(strict,yes)")
+#endif /* recent IBM C compiler */
 #endif /* IBM's C compiler */
+
+#endif /* C code */
+
+/* getaddrinfo is broken in AIX 4.3 as per IY04165.
+   At this time (2/21/2000), there's no PTF available.
+   -- Mike Sperber <mike@xemacs.org> */
+
+#undef HAVE_GETADDRINFO
diff --git a/src/s/irix6-0.h b/src/s/irix6-0.h
index 920f67f..afcbe2d 100644
--- a/src/s/irix6-0.h
+++ b/src/s/irix6-0.h
@@ -4,3 +4,5 @@
 
 /* Irix 6.2 doesn't need -lw */
 #undef NEED_LIBW
+
+#undef memmove /* Use the standard system memmove() */
diff --git a/src/s/mingw32.h b/src/s/mingw32.h
index c0e8b0c..ef6c2ac 100644
--- a/src/s/mingw32.h
+++ b/src/s/mingw32.h
@@ -205,7 +205,6 @@ gid_t getegid (void);
 #define HAVE_TIMEVAL
 #define HAVE_GETPAGESIZE
 #define getpagesize() 4096
-/*#define HAVE_STRUCT_UTIMBUF*/
 #ifndef HAVE_H_ERRNO
 #define HAVE_H_ERRNO
 #endif
diff --git a/src/s/windowsnt.h b/src/s/windowsnt.h
index 985dbe3..184da5e 100644
--- a/src/s/windowsnt.h
+++ b/src/s/windowsnt.h
@@ -226,7 +226,6 @@ typedef int pid_t;
 
 #define HAVE_MOUSE
 #define HAVE_H_ERRNO
-#define HAVE_STRUCT_UTIMBUF
 
 /* Compatibility macros. Some used to be routines in nt.c */
 #define strcasecmp(x,y) _stricmp(x,y)
diff --git a/src/search.c b/src/search.c
index 169e1d7..bb12714 100644
--- a/src/search.c
+++ b/src/search.c
@@ -312,8 +312,8 @@ looking_at_1 (Lisp_Object string, struct buffer *buf, int posix)
   s1 = p2 - p1;
   s2 = BI_BUF_ZV (buf) - p2;
 
+  regex_match_object = Qnil;
   regex_emacs_buffer = buf;
-  regex_emacs_buffer_p = 1;
   i = re_match_2 (bufp, (char *) BI_BUF_BYTE_ADDRESS (buf, p1),
 		  s1, (char *) BI_BUF_BYTE_ADDRESS (buf, p2), s2,
 		  BI_BUF_PT (buf) - BI_BUF_BEGV (buf), &search_regs,
@@ -403,8 +403,8 @@ string_match_1 (Lisp_Object regexp, Lisp_Object string, Lisp_Object start,
   QUIT;
   {
     Bytecount bis = charcount_to_bytecount (XSTRING_DATA (string), s);
+    regex_match_object = string;
     regex_emacs_buffer = buf;
-    regex_emacs_buffer_p = 0;
     val = re_search (bufp, (char *) XSTRING_DATA (string),
 		     XSTRING_LENGTH (string), bis,
 		     XSTRING_LENGTH (string) - bis,
@@ -495,8 +495,8 @@ fast_string_match (Lisp_Object regexp,  const Bufbyte *nonreloc,
     }
 
   /* #### evil current-buffer dependency */
+  regex_match_object = reloc;
   regex_emacs_buffer = current_buffer;
-  regex_emacs_buffer_p = 0;
   val = re_search (bufp, (char *) newnonreloc + offset, length, 0,
 		   length, 0);
 
@@ -784,7 +784,9 @@ skip_chars (struct buffer *buf, int forwardp, int syntaxp,
   unsigned char fastmap[0400];
   int negate = 0;
   REGISTER int i;
+#ifndef emacs
   Lisp_Char_Table *syntax_table = XCHAR_TABLE (buf->mirror_syntax_table);
+#endif
   Bufpos limit;
 
   if (NILP (lim))
@@ -880,6 +882,7 @@ skip_chars (struct buffer *buf, int forwardp, int syntaxp,
 
     if (syntaxp)
       {
+	SETUP_SYNTAX_CACHE_FOR_BUFFER (buf, BUF_PT (buf), forwardp ? 1 : -1);
 	/* All syntax designators are normal chars so nothing strange
 	   to worry about */
 	if (forwardp)
@@ -887,20 +890,26 @@ skip_chars (struct buffer *buf, int forwardp, int syntaxp,
 	    while (BUF_PT (buf) < limit
 		   && fastmap[(unsigned char)
                               syntax_code_spec
-			      [(int) SYNTAX (syntax_table,
-					     BUF_FETCH_CHAR
-					     (buf, BUF_PT (buf)))]])
-	      BUF_SET_PT (buf, BUF_PT (buf) + 1);
+			      [(int) SYNTAX_FROM_CACHE (syntax_table,
+							BUF_FETCH_CHAR
+							(buf, BUF_PT (buf)))]])
+	      {
+		BUF_SET_PT (buf, BUF_PT (buf) + 1);
+		UPDATE_SYNTAX_CACHE_FORWARD (BUF_PT (buf));
+	      }
 	  }
 	else
 	  {
 	    while (BUF_PT (buf) > limit
 		   && fastmap[(unsigned char)
                               syntax_code_spec
-			      [(int) SYNTAX (syntax_table,
-					     BUF_FETCH_CHAR
-					     (buf, BUF_PT (buf) - 1))]])
-	      BUF_SET_PT (buf, BUF_PT (buf) - 1);
+			      [(int) SYNTAX_FROM_CACHE (syntax_table,
+							BUF_FETCH_CHAR
+							(buf, BUF_PT (buf) - 1))]])
+	      {
+		BUF_SET_PT (buf, BUF_PT (buf) - 1);
+		UPDATE_SYNTAX_CACHE_BACKWARD (BUF_PT (buf) - 1);
+	      }
 	  }
       }
     else
@@ -1160,13 +1169,13 @@ search_buffer (struct buffer *buf, Lisp_Object string, Bufpos bufpos,
       p2 = BI_BUF_CEILING_OF (buf, p1);
       s1 = p2 - p1;
       s2 = BI_BUF_ZV (buf) - p2;
+      regex_match_object = Qnil;
 
       while (n < 0)
 	{
 	  Bytecount val;
 	  QUIT;
           regex_emacs_buffer = buf;
-	  regex_emacs_buffer_p = 1;
 	  val = re_search_2 (bufp,
 			     (char *) BI_BUF_BYTE_ADDRESS (buf, p1), s1,
 			     (char *) BI_BUF_BYTE_ADDRESS (buf, p2), s2,
@@ -1205,7 +1214,6 @@ search_buffer (struct buffer *buf, Lisp_Object string, Bufpos bufpos,
 	  Bytecount val;
 	  QUIT;
           regex_emacs_buffer = buf;
-	  regex_emacs_buffer_p = 1;
           val = re_search_2 (bufp,
 			     (char *) BI_BUF_BYTE_ADDRESS (buf, p1), s1,
 			     (char *) BI_BUF_BYTE_ADDRESS (buf, p2), s2,
diff --git a/src/syntax.c b/src/syntax.c
index a3bbcc2..28df567 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -28,6 +28,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "buffer.h"
 #include "syntax.h"
+#include "extents.h"
 
 /* Here is a comment from Ken'ichi HANDA <handa@etl.go.jp>
    explaining the purpose of the Sextword syntax category:
@@ -55,6 +56,12 @@ two such characters.  */
 /* Mule 2.4 doesn't seem to have Sextword - I'm removing it -- mrb */
 /* Recovered by tomo */
 
+#define ST_COMMENT_STYLE 0x101
+#define ST_STRING_STYLE  0x102
+
+Lisp_Object Qsyntax_table;
+int lookup_syntax_properties;
+
 Lisp_Object Qsyntax_table_p;
 
 int words_include_escapes;
@@ -74,8 +81,9 @@ int no_quit_in_re_search;
    and the like. */
 struct buffer *regex_emacs_buffer;
 
-/* Tell the regex routines whether buffer is used or not. */
-int regex_emacs_buffer_p;
+/* In Emacs, this is the string or buffer in which we
+   are matching.  It is used for looking up syntax properties.	*/
+Lisp_Object regex_match_object;
 
 Lisp_Object Vstandard_syntax_table;
 
@@ -88,7 +96,7 @@ struct lisp_parse_state
   int depth;		/* Depth at end of parsing */
   Emchar instring;	/* -1 if not within string, else desired terminator */
   int incomment;	/* Nonzero if within a comment at end of parsing */
-  int comstyle;		/* comment style a=0, or b=1 */
+  int comstyle;		/* comment style a=0, or b=1, or ST_COMMENT_STYLE */
   int quoted;		/* Nonzero if just after an escape char at end of
 			   parsing */
   Bufpos thislevelstart;/* Char number of most recent start-of-expression
@@ -96,7 +104,9 @@ struct lisp_parse_state
   Bufpos prevlevelstart;/* Char number of start of containing expression */
   Bufpos location;	/* Char number at which parsing stopped */
   int mindepth;		/* Minimum depth seen while scanning  */
-  Bufpos comstart;	/* Position just after last comment starter  */
+  Bufpos comstr_start;	/* Position just after last comment/string starter  */
+  Lisp_Object levelstarts;	/* Char numbers of starts-of-expression
+                                   of levels (starting from outermost).  */
 };
 
 /* These variables are a cache for finding the start of a defun.
@@ -120,7 +130,6 @@ static Bufpos
 find_defun_start (struct buffer *buf, Bufpos pos)
 {
   Bufpos tem;
-  Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
 
   /* Use previous finding, if it's valid and applies to this inquiry.  */
   if (buf == find_start_buffer
@@ -136,10 +145,13 @@ find_defun_start (struct buffer *buf, Bufpos pos)
   /* Back up to start of line.  */
   tem = find_next_newline (buf, pos, -1);
 
+  SETUP_SYNTAX_CACHE (tem, 1);
   while (tem > BUF_BEGV (buf))
     {
+      UPDATE_SYNTAX_CACHE_BACKWARD(tem);
+
       /* Open-paren at start of line means we found our defun-start.  */
-      if (SYNTAX (mirrortab, BUF_FETCH_CHAR (buf, tem)) == Sopen)
+      if (SYNTAX_FROM_CACHE (mirrortab, BUF_FETCH_CHAR (buf, tem)) == Sopen)
 	break;
       /* Move to beg of previous line.  */
       tem = find_next_newline (buf, tem, -2);
@@ -223,6 +235,104 @@ BUFFER defaults to the current buffer if omitted.
   return syntax_table;
 }
 
+/* The current syntax state */
+struct syntax_cache syntax_cache;
+
+
+/* 
+   Update syntax_cache to an appropriate setting for position POS
+
+   The sign of COUNT gives the relative position of POS wrt the
+   previously valid interval.  (not currently used)
+
+   `syntax_cache.*_change' are the next and previous positions at
+   which syntax_code and c_s_t will need to be recalculated.
+
+   #### Currently this code uses 'get-char-property', which will
+   return the "last smallest" extent at a given position. In cases
+   where overlapping extents are defined, this code will simply use
+   whatever is returned by get-char-property.
+
+   It might be worth it at some point to merge provided syntax tables
+   outward to the current buffer. */
+
+void
+update_syntax_cache (int pos, int count, int init)
+{
+  Lisp_Object tmp_table;
+
+  if (init)
+    {
+      syntax_cache.prev_change = -1;
+      syntax_cache.next_change = -1;
+    }
+
+  if (pos > syntax_cache.prev_change &&
+      pos < syntax_cache.next_change)
+    {
+      /* do nothing */
+    }
+  else
+    {
+      if (NILP (syntax_cache.object) || EQ (syntax_cache.object, Qt))
+	{
+	  int get_change_before = pos + 1;
+
+	  tmp_table = Fget_char_property (make_int(pos), Qsyntax_table,
+					  make_buffer (syntax_cache.buffer), Qnil);
+	  syntax_cache.next_change =
+	    XINT (Fnext_extent_change (make_int (pos > 0 ? pos : 1),
+				       make_buffer (syntax_cache.buffer)));
+
+	  if (get_change_before < 1)
+	    get_change_before = 1;
+	  else if (get_change_before > BUF_ZV (syntax_cache.buffer))
+	    get_change_before = BUF_ZV (syntax_cache.buffer);
+
+	  syntax_cache.prev_change =
+	    XINT (Fprevious_extent_change (make_int (get_change_before),
+					   make_buffer (syntax_cache.buffer)));
+	}
+      else
+	{
+	  int get_change_before = pos + 1;
+
+	  tmp_table = Fget_char_property (make_int(pos), Qsyntax_table,
+					  syntax_cache.object, Qnil);
+	  syntax_cache.next_change =
+	    XINT (Fnext_extent_change (make_int (pos >= 0 ? pos : 0),
+				       syntax_cache.object));
+
+	  if (get_change_before < 0)
+	    get_change_before = 0;
+	  else if (get_change_before > XSTRING_LENGTH(syntax_cache.object))
+	    get_change_before = XSTRING_LENGTH(syntax_cache.object);
+
+	  syntax_cache.prev_change =
+	    XINT (Fprevious_extent_change (make_int (pos >= 0 ? pos : 0),
+					   syntax_cache.object));
+	}
+
+      if (EQ (Fsyntax_table_p (tmp_table), Qt))
+	{
+	  syntax_cache.use_code = 0;
+	  syntax_cache.current_syntax_table =
+	    XCHAR_TABLE (tmp_table)->mirror_table;
+	} 
+      else if (CONSP (tmp_table) && INTP (XCAR (tmp_table)))
+	{
+	  syntax_cache.use_code = 1;
+	  syntax_cache.syntax_code = XINT (XCAR(tmp_table));
+	}
+      else 
+	{
+	  syntax_cache.use_code = 0;
+	  syntax_cache.current_syntax_table =
+	    syntax_cache.buffer->mirror_syntax_table;
+	}
+    }
+}
+
 /* Convert a letter which signifies a syntax code
    into the code it signifies.
    This is used by modify-syntax-entry, and other things. */
@@ -246,10 +356,10 @@ const unsigned char syntax_spec_code[0400] =
   0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377,   /* `, a, ... */
   0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377,
   0377, 0377, 0377, 0377, 0377, 0377, 0377, (char) Sword,
-  0377, 0377, 0377, 0377, 0377, 0377, 0377, 0377
+  0377, 0377, 0377, 0377, (char) Sstring_fence, 0377, 0377, 0377
 };
 
-const unsigned char syntax_code_spec[] =  " .w_()'\"$\\/<>@";
+const unsigned char syntax_code_spec[] =  " .w_()'\"$\\/<>@!|";
 
 DEFUN ("syntax-designator-chars", Fsyntax_designator_chars, 0, 0, 0, /*
 Return a string of the recognized syntax designator chars.
@@ -351,10 +461,11 @@ Bufpos
 scan_words (struct buffer *buf, Bufpos from, int count)
 {
   Bufpos limit = count > 0 ? BUF_ZV (buf) : BUF_BEGV (buf);
-  Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
   Emchar ch0, ch1;
   enum syntaxcode code;
 
+  SETUP_SYNTAX_CACHE_FOR_BUFFER (buf, from, count);
+
   /* #### is it really worth it to hand expand both cases? JV */
   while (count > 0)
     {
@@ -365,8 +476,9 @@ scan_words (struct buffer *buf, Bufpos from, int count)
 	  if (from == limit)
 	    return 0;
 
+	  UPDATE_SYNTAX_CACHE_FORWARD (from);
 	  ch0 = BUF_FETCH_CHAR (buf, from);
-	  code = SYNTAX_UNSAFE (mirrortab, ch0);
+	  code = SYNTAX_FROM_CACHE (mirrortab, ch0);
 
 	  from++;
 	  if (words_include_escapes
@@ -380,8 +492,9 @@ scan_words (struct buffer *buf, Bufpos from, int count)
 
       while (from != limit)
 	{
+	  UPDATE_SYNTAX_CACHE_FORWARD (from);
 	  ch1 = BUF_FETCH_CHAR (buf, from);
-	  code = SYNTAX_UNSAFE (mirrortab, ch1);
+	  code = SYNTAX_FROM_CACHE (mirrortab, ch1);
 	  if (!(words_include_escapes
 		&& (code == Sescape || code == Scharquote)))
 	    if (code != Sword
@@ -407,10 +520,11 @@ scan_words (struct buffer *buf, Bufpos from, int count)
 	  if (from == limit)
 	    return 0;
 
+	  UPDATE_SYNTAX_CACHE_BACKWARD (from - 1);
 	  ch1 = BUF_FETCH_CHAR (buf, from - 1);
-	  code = SYNTAX_UNSAFE (mirrortab, ch1);
-
+	  code = SYNTAX_FROM_CACHE (mirrortab, ch1);
 	  from--;
+
 	  if (words_include_escapes
 	      && (code == Sescape || code == Scharquote))
 	    break;
@@ -422,8 +536,10 @@ scan_words (struct buffer *buf, Bufpos from, int count)
 
       while (from != limit)
 	{
+	  UPDATE_SYNTAX_CACHE_BACKWARD (from - 1);
 	  ch0 = BUF_FETCH_CHAR (buf, from - 1);
-	  code = SYNTAX_UNSAFE (mirrortab, ch0);
+	  code = SYNTAX_FROM_CACHE (mirrortab, ch0);
+
 	  if (!(words_include_escapes
 		&& (code == Sescape || code == Scharquote)))
 	    if (code != Sword
@@ -485,11 +601,11 @@ static void scan_sexps_forward (struct buffer *buf,
 				int commentstop);
 
 static int
-find_start_of_comment (struct buffer *buf, Bufpos from, Bufpos stop, int mask)
+find_start_of_comment (struct buffer *buf, Bufpos from, Bufpos stop,
+		       int comstyle)
 {
   Emchar c;
   enum syntaxcode code;
-  Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
 
   /* Look back, counting the parity of string-quotes,
      and recording the comment-starters seen.
@@ -507,52 +623,86 @@ find_start_of_comment (struct buffer *buf, Bufpos from, Bufpos stop, int mask)
   Bufpos comstart_pos = 0;
   int comstart_parity = 0;
   int styles_match_p = 0;
+  /* mask to match comment styles against; for ST_COMMENT_STYLE, this
+     will get set to SYNTAX_COMMENT_STYLE_B, but never get checked */
+  int mask = comstyle ? SYNTAX_COMMENT_STYLE_B : SYNTAX_COMMENT_STYLE_A;
 
   /* At beginning of range to scan, we're outside of strings;
      that determines quote parity to the comment-end.  */
   while (from != stop)
     {
+      int syncode;
+
       /* Move back and examine a character.  */
       from--;
+      UPDATE_SYNTAX_CACHE_BACKWARD (from);
 
       c = BUF_FETCH_CHAR (buf, from);
-      code = SYNTAX_UNSAFE (mirrortab, c);
+      code = SYNTAX_FROM_CACHE (mirrortab, c);
+      syncode = SYNTAX_CODE_FROM_CACHE (mirrortab, c);
 
       /* is this a 1-char comment end sequence? if so, try
 	 to see if style matches previously extracted mask */
       if (code == Sendcomment)
 	{
-	  styles_match_p = SYNTAX_STYLES_MATCH_1CHAR_P (mirrortab, c, mask);
-	}
-
-      /* otherwise, is this a 2-char comment end sequence? */
-      else if (from >= stop
-	       && SYNTAX_END_P (mirrortab, c, BUF_FETCH_CHAR (buf, from+1)))
-	{
-	  code = Sendcomment;
 	  styles_match_p =
-	    SYNTAX_STYLES_MATCH_END_P (mirrortab, c,
-				       BUF_FETCH_CHAR (buf, from+1),
-				       mask);
+	    SYNTAX_CODE_COMMENT_1CHAR_MASK (syncode) & mask;
 	}
 
       /* or are we looking at a 1-char comment start sequence
 	 of the style matching mask? */
-      else if (code == Scomment
-	       && SYNTAX_STYLES_MATCH_1CHAR_P (mirrortab, c, mask))
+      else if (code == Scomment)
 	{
-	  styles_match_p = 1;
+	  styles_match_p =
+	    SYNTAX_CODE_COMMENT_1CHAR_MASK (syncode) & mask;
 	}
 
-      /* or possibly, a 2-char comment start sequence */
-      else if (from >= stop
-	       && SYNTAX_STYLES_MATCH_START_P (mirrortab, c,
-					       BUF_FETCH_CHAR (buf, from+1),
-					       mask))
-	{
-	  code = Scomment;
-	  styles_match_p = 1;
-	}
+      /* otherwise, is this a 2-char comment end or start sequence? */
+      else if (from > stop)
+	do
+	  {
+	    /* 2-char comment end sequence? */
+	    if (SYNTAX_CODE_END_SECOND_P (syncode))
+	      {
+		int prev_syncode;
+		UPDATE_SYNTAX_CACHE_BACKWARD (from - 1);
+		prev_syncode =
+		  SYNTAX_CODE_FROM_CACHE (mirrortab, BUF_FETCH_CHAR (buf, from - 1));
+
+		if (SYNTAX_CODES_END_P (prev_syncode, syncode))
+		  {
+		    code = Sendcomment;
+		    styles_match_p =
+		      SYNTAX_CODES_COMMENT_MASK_END (prev_syncode, syncode);
+		    from--;
+		    UPDATE_SYNTAX_CACHE_BACKWARD (from);
+		    c = BUF_FETCH_CHAR (buf, from);
+
+		    /* Found a comment-end sequence, so skip past the
+		       check for a comment-start */
+		    break;
+		  }
+	      }
+
+	    /* 2-char comment start sequence? */
+	    if (SYNTAX_CODE_START_SECOND_P (syncode))
+	      {
+		int prev_syncode;
+		UPDATE_SYNTAX_CACHE_BACKWARD (from - 1);
+		prev_syncode =
+		  SYNTAX_CODE_FROM_CACHE (mirrortab, BUF_FETCH_CHAR (buf, from - 1));
+
+		if (SYNTAX_CODES_START_P (prev_syncode, syncode))
+		  {
+		    code = Scomment;
+		    styles_match_p =
+		      SYNTAX_CODES_COMMENT_MASK_START (prev_syncode, syncode);
+		    from--;
+		    UPDATE_SYNTAX_CACHE_BACKWARD (from);
+		    c = BUF_FETCH_CHAR (buf, from);
+		  }
+	      }
+	  } while (0);
 
       /* Ignore escaped characters.  */
       if (char_quoted (buf, from))
@@ -570,6 +720,19 @@ find_start_of_comment (struct buffer *buf, Bufpos from, Bufpos stop, int mask)
 	    string_lossage = 1;
 	}
 
+      if (code == Sstring_fence || code == Scomment_fence)
+	{
+	  parity ^= 1;
+	  if (my_stringend == 0)
+	    my_stringend =
+	      code == Sstring_fence ? ST_STRING_STYLE : ST_COMMENT_STYLE;
+	  /* If we have two kinds of string delimiters.
+	     There's no way to grok this scanning backwards.  */
+	  else if (my_stringend != (code == Sstring_fence 
+				    ? ST_STRING_STYLE : ST_COMMENT_STYLE))
+	    string_lossage = 1;
+	}
+
       /* Record comment-starters according to that
 	 quote-parity to the comment-end.  */
       if (code == Scomment && styles_match_p)
@@ -611,42 +774,81 @@ find_start_of_comment (struct buffer *buf, Bufpos from, Bufpos stop, int mask)
       scan_sexps_forward (buf, &state, find_defun_start (buf, comment_end),
 			  comment_end - 1, -10000, 0, Qnil, 0);
       if (state.incomment)
-	from = state.comstart;
+	from = state.comstr_start;
       else
 	/* We can't grok this as a comment; scan it normally.  */
 	from = comment_end;
+      UPDATE_SYNTAX_CACHE_FORWARD (from - 1);
     }
   return from;
 }
 
 static Bufpos
-find_end_of_comment (struct buffer *buf, Bufpos from, Bufpos stop, int mask)
+find_end_of_comment (struct buffer *buf, Bufpos from, Bufpos stop, int comstyle)
 {
   int c;
-  Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+  int prev_code;
+  /* mask to match comment styles against; for ST_COMMENT_STYLE, this
+     will get set to SYNTAX_COMMENT_STYLE_B, but never get checked */
+  int mask = comstyle ? SYNTAX_COMMENT_STYLE_B : SYNTAX_COMMENT_STYLE_A;
 
+  /* This is only called by functions which have already set up the
+     syntax_cache and are keeping it up-to-date */
   while (1)
     {
       if (from == stop)
 	{
 	  return -1;
 	}
+
+      UPDATE_SYNTAX_CACHE_FORWARD (from);
       c = BUF_FETCH_CHAR (buf, from);
-      if (SYNTAX_UNSAFE (mirrortab, c) == Sendcomment
-	  && SYNTAX_STYLES_MATCH_1CHAR_P (mirrortab, c, mask))
+
+      /* Test for generic comments */
+      if (comstyle == ST_COMMENT_STYLE)
+ 	{
+	  if (SYNTAX_FROM_CACHE (mirrortab, c) == Scomment_fence)
+	    {
+	      from++;
+	      UPDATE_SYNTAX_CACHE_FORWARD (from);
+	      break;
+	    }
+	  from++;
+	  continue; /* No need to test other comment styles in a
+                       generic comment */
+	}
+      else
+
+	if (SYNTAX_FROM_CACHE (mirrortab, c) == Sendcomment
+	    && SYNTAX_CODE_MATCHES_1CHAR_P
+	    (SYNTAX_CODE_FROM_CACHE (mirrortab, c), mask))
 	/* we have encountered a comment end of the same style
 	   as the comment sequence which began this comment
 	   section */
-	break;
+	  {
+	    from++;
+	    UPDATE_SYNTAX_CACHE_FORWARD (from);
+	    break;
+	  }
 
+      prev_code = SYNTAX_CODE_FROM_CACHE (mirrortab, c);
       from++;
+      UPDATE_SYNTAX_CACHE_FORWARD (from);
       if (from < stop
-	  && SYNTAX_STYLES_MATCH_END_P (mirrortab, c,
-					BUF_FETCH_CHAR (buf, from), mask))
+	  && SYNTAX_CODES_MATCH_END_P
+	  (prev_code,
+	   SYNTAX_CODE_FROM_CACHE (mirrortab, BUF_FETCH_CHAR (buf, from)),
+	   mask)
+
+	  )
 	/* we have encountered a comment end of the same style
 	   as the comment sequence which began this comment
 	   section */
-	{ from++; break; }
+	{
+	  from++;
+	  UPDATE_SYNTAX_CACHE_FORWARD (from);
+	  break;
+	}
     }
   return from;
 }
@@ -674,9 +876,9 @@ COUNT defaults to 1, and BUFFER defaults to the current buffer.
   Bufpos stop;
   Emchar c;
   enum syntaxcode code;
+  int syncode;
   EMACS_INT n;
   struct buffer *buf = decode_buffer (buffer, 0);
-  Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
 
   if (NILP (count))
     n = 1;
@@ -688,6 +890,7 @@ COUNT defaults to 1, and BUFFER defaults to the current buffer.
 
   from = BUF_PT (buf);
 
+  SETUP_SYNTAX_CACHE (from, n);
   while (n > 0)
     {
       QUIT;
@@ -695,7 +898,7 @@ COUNT defaults to 1, and BUFFER defaults to the current buffer.
       stop = BUF_ZV (buf);
       while (from < stop)
 	{
-	  int mask = 0;         /* mask for finding matching comment style */
+	  int comstyle = 0;     /* mask for finding matching comment style */
 
 	  if (char_quoted (buf, from))
 	    {
@@ -703,8 +906,10 @@ COUNT defaults to 1, and BUFFER defaults to the current buffer.
 	      continue;
 	    }
 
+	  UPDATE_SYNTAX_CACHE_FORWARD (from);
 	  c = BUF_FETCH_CHAR (buf, from);
-	  code = SYNTAX (mirrortab, c);
+	  code = SYNTAX_FROM_CACHE (mirrortab, c);
+	  syncode = SYNTAX_CODE_FROM_CACHE (mirrortab, c);
 
 	  if (code == Scomment)
 	    {
@@ -713,28 +918,44 @@ COUNT defaults to 1, and BUFFER defaults to the current buffer.
 		 we must record the comment style this character begins
 		 so that later, only a comment end of the same style actually
 		 ends the comment section */
-	      mask = SYNTAX_COMMENT_1CHAR_MASK (mirrortab, c);
+	      comstyle = SYNTAX_CODE_COMMENT_1CHAR_MASK (syncode)
+		== SYNTAX_COMMENT_STYLE_A ? 0 : 1;
 	    }
 
-	  else if (from < stop
-		   && SYNTAX_START_P (mirrortab, c, BUF_FETCH_CHAR (buf, from+1)))
+	  else if (code == Scomment_fence)
 	    {
-	      /* we have encountered a 2char comment start sequence and we
-		 are ignoring all text inside comments. we must record
-		 the comment style this sequence begins so that later,
-		 only a comment end of the same style actually ends
-		 the comment section */
-	      code = Scomment;
-	      mask = SYNTAX_COMMENT_MASK_START (mirrortab, c,
-						BUF_FETCH_CHAR (buf, from+1));
 	      from++;
+	      code = Scomment;
+	      comstyle = ST_COMMENT_STYLE;
+ 	    }
+
+	  else if (from < stop
+		   && SYNTAX_CODE_START_FIRST_P (syncode))
+	    {
+	      int next_syncode;
+	      UPDATE_SYNTAX_CACHE_FORWARD (from + 1);
+	      next_syncode =
+		SYNTAX_CODE_FROM_CACHE (mirrortab, 
+					BUF_FETCH_CHAR (buf, from + 1));
+
+	      if (SYNTAX_CODES_START_P (syncode, next_syncode))
+		{
+		  /* we have encountered a 2char comment start sequence and we
+		     are ignoring all text inside comments. we must record
+		     the comment style this sequence begins so that later,
+		     only a comment end of the same style actually ends
+		     the comment section */
+		  code = Scomment;
+		  comstyle =
+		    SYNTAX_CODES_COMMENT_MASK_START (syncode, next_syncode)
+		    == SYNTAX_COMMENT_STYLE_A ? 0 : 1;
+		  from++;
+		}
 	    }
 
 	  if (code == Scomment)
 	    {
-	      Bufpos newfrom;
-
-	      newfrom = find_end_of_comment (buf, from, stop, mask);
+	      Bufpos newfrom = find_end_of_comment (buf, from, stop, comstyle);
 	      if (newfrom < 0)
 		{
 		  /* we stopped because from==stop */
@@ -767,7 +988,7 @@ COUNT defaults to 1, and BUFFER defaults to the current buffer.
       stop = BUF_BEGV (buf);
       while (from > stop)
 	{
-          int mask = 0;         /* mask for finding matching comment style */
+          int comstyle = 0;     /* mask for finding matching comment style */
 
 	  from--;
 	  if (char_quoted (buf, from))
@@ -777,39 +998,53 @@ COUNT defaults to 1, and BUFFER defaults to the current buffer.
 	    }
 
 	  c = BUF_FETCH_CHAR (buf, from);
-	  code = SYNTAX (mirrortab, c);
+	  code = SYNTAX_FROM_CACHE (mirrortab, c);
+	  syncode = SYNTAX_CODE_FROM_CACHE (mirrortab, c);
 
 	  if (code == Sendcomment)
 	    {
 	      /* we have found a single char end comment. we must record
 		 the comment style encountered so that later, we can match
 		 only the proper comment begin sequence of the same style */
-	      mask = SYNTAX_COMMENT_1CHAR_MASK (mirrortab, c);
+	      comstyle = SYNTAX_CODE_COMMENT_1CHAR_MASK (syncode)
+		== SYNTAX_COMMENT_STYLE_A ? 0 : 1;
 	    }
 
-	  else if (from > stop
-		   && SYNTAX_END_P (mirrortab, BUF_FETCH_CHAR (buf, from - 1), c)
-		   && !char_quoted (buf, from - 1))
+	  else if (code == Scomment_fence)
 	    {
-	      /* We must record the comment style encountered so that
-		 later, we can match only the proper comment begin
-		 sequence of the same style.  */
 	      code = Sendcomment;
-	      mask = SYNTAX_COMMENT_MASK_END (mirrortab,
-					      BUF_FETCH_CHAR (buf, from - 1),
-					      c);
-	      from--;
+	      comstyle = ST_COMMENT_STYLE;
+	    }
+
+	  else if (from > stop
+		   && SYNTAX_CODE_END_SECOND_P (syncode))
+	    {
+	      int prev_syncode;
+	      UPDATE_SYNTAX_CACHE_BACKWARD (from - 1);
+	      prev_syncode =
+		SYNTAX_CODE_FROM_CACHE (mirrortab,
+					BUF_FETCH_CHAR (buf, from - 1));
+	      if (SYNTAX_CODES_END_P (prev_syncode, syncode))
+		{
+		  /* We must record the comment style encountered so that
+		     later, we can match only the proper comment begin
+		     sequence of the same style.  */
+		  code = Sendcomment;
+		  comstyle = SYNTAX_CODES_COMMENT_MASK_END
+		    (prev_syncode, syncode) == SYNTAX_COMMENT_STYLE_A ? 0 : 1;
+		  from--;
+		}
 	    }
 
 	  if (code == Sendcomment)
  	    {
- 	      from = find_start_of_comment (buf, from, stop, mask);
+ 	      from = find_start_of_comment (buf, from, stop, comstyle);
  	      break;
             }
 
 	  else if (code != Swhitespace
-		   && SYNTAX (mirrortab, c) != Scomment
-		   && SYNTAX (mirrortab, c) != Sendcomment)
+		   && code != Scomment
+		   && code != Sendcomment)
 	    {
 	      BUF_SET_PT (buf, from + 1);
 	      return Qnil;
@@ -833,12 +1068,12 @@ scan_lists (struct buffer *buf, Bufpos from, int count, int depth,
   int quoted;
   int mathexit = 0;
   enum syntaxcode code;
+  int syncode;
   int min_depth = depth;    /* Err out if depth gets less than this. */
-  Lisp_Object syntaxtab = buf->syntax_table;
-  Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
 
   if (depth > 0) min_depth = 0;
 
+  SETUP_SYNTAX_CACHE_FOR_BUFFER (buf, from, count);
   while (count > 0)
     {
       QUIT;
@@ -846,35 +1081,47 @@ scan_lists (struct buffer *buf, Bufpos from, int count, int depth,
       stop = BUF_ZV (buf);
       while (from < stop)
 	{
-          int mask = 0;         /* mask for finding matching comment style */
+          int comstyle = 0;     /* mask for finding matching comment style */
 
+	  UPDATE_SYNTAX_CACHE_FORWARD (from);
 	  c = BUF_FETCH_CHAR (buf, from);
-	  code = SYNTAX_UNSAFE (mirrortab, c);
+	  code = SYNTAX_FROM_CACHE (mirrortab, c);
+	  syncode = SYNTAX_CODE_FROM_CACHE (mirrortab, c);
 	  from++;
 
 	  /* a 1-char comment start sequence */
 	  if (code == Scomment && parse_sexp_ignore_comments)
 	    {
-	      mask = SYNTAX_COMMENT_1CHAR_MASK (mirrortab, c);
+	      comstyle = SYNTAX_CODE_COMMENT_1CHAR_MASK (syncode) ==
+		SYNTAX_COMMENT_STYLE_A ? 0 : 1;
 	    }
 
 	  /* else, a 2-char comment start sequence? */
 	  else if (from < stop
-		   && SYNTAX_START_P (mirrortab, c, BUF_FETCH_CHAR (buf, from))
+		   && SYNTAX_CODE_START_FIRST_P (syncode)
 		   && parse_sexp_ignore_comments)
 	    {
+	      int next_syncode;
+	      UPDATE_SYNTAX_CACHE_FORWARD (from);
+	      next_syncode =
+		SYNTAX_CODE_FROM_CACHE (mirrortab, BUF_FETCH_CHAR (buf, from));
+
+	      if (SYNTAX_CODES_START_P (syncode, next_syncode))
+		{
 	      /* we have encountered a comment start sequence and we
 		 are ignoring all text inside comments. we must record
 		 the comment style this sequence begins so that later,
 		 only a comment end of the same style actually ends
 		 the comment section */
 	      code = Scomment;
-	      mask = SYNTAX_COMMENT_MASK_START (mirrortab, c,
-						BUF_FETCH_CHAR (buf, from));
+		  comstyle = SYNTAX_CODES_COMMENT_MASK_START
+		    (syncode, next_syncode) == SYNTAX_COMMENT_STYLE_A ? 0 : 1;
 	      from++;
 	    }
+	    }
+	  UPDATE_SYNTAX_CACHE_FORWARD (from);
 
-	  if (SYNTAX_PREFIX_UNSAFE (mirrortab, c))
+	  if (SYNTAX_CODE_PREFIX (syncode))
 	    continue;
 
 	  switch (code)
@@ -890,7 +1137,9 @@ scan_lists (struct buffer *buf, Bufpos from, int count, int depth,
 	      /* This word counts as a sexp; return at end of it. */
 	      while (from < stop)
 		{
-		  switch (SYNTAX (mirrortab, BUF_FETCH_CHAR (buf, from)))
+		  UPDATE_SYNTAX_CACHE_FORWARD (from);
+		  switch (SYNTAX_FROM_CACHE (mirrortab,
+					     BUF_FETCH_CHAR (buf, from)))
 		    {
 		    case Scharquote:
 		    case Sescape:
@@ -908,11 +1157,15 @@ scan_lists (struct buffer *buf, Bufpos from, int count, int depth,
 		}
 	      goto done;
 
+	    case Scomment_fence:
+	      comstyle = ST_COMMENT_STYLE;
 	    case Scomment:
 	      if (!parse_sexp_ignore_comments)
 		break;
+	      UPDATE_SYNTAX_CACHE_FORWARD (from);
 	      {
-		Bufpos newfrom = find_end_of_comment (buf, from, stop, mask);
+		Bufpos newfrom =
+		  find_end_of_comment (buf, from, stop, comstyle);
 		if (newfrom < 0)
 		  {
 		    /* we stopped because from == stop in search forward */
@@ -952,25 +1205,38 @@ scan_lists (struct buffer *buf, Bufpos from, int count, int depth,
 	      }
 	    break;
 
+	    case Sstring_fence:
 	    case Sstring:
               {
+		Emchar stringterm;
+
+		if (code != Sstring_fence)
+		  {
 		/* XEmacs change: call syntax_match on character */
                 Emchar ch = BUF_FETCH_CHAR (buf, from - 1);
-		Lisp_Object stermobj = syntax_match (syntaxtab, ch);
-		Emchar stringterm;
+		    Lisp_Object stermobj =
+		      syntax_match (syntax_cache.current_syntax_table, ch);
 
 		if (CHARP (stermobj))
 		  stringterm = XCHAR (stermobj);
 		else
 		  stringterm = ch;
+		  }
+		else
+		  stringterm = '\0'; /* avoid compiler warnings */
 
                 while (1)
 		  {
 		    if (from >= stop)
 		      goto lose;
-		    if (BUF_FETCH_CHAR (buf, from) == stringterm)
+		    UPDATE_SYNTAX_CACHE_FORWARD (from);
+		    c = BUF_FETCH_CHAR (buf, from);
+		    if (code == Sstring
+			? c == stringterm
+			: SYNTAX_FROM_CACHE (mirrortab, c) == Sstring_fence)
 		      break;
-		    switch (SYNTAX (mirrortab, BUF_FETCH_CHAR (buf, from)))
+
+		    switch (SYNTAX_FROM_CACHE (mirrortab, c))
 		      {
 		      case Scharquote:
 		      case Sescape:
@@ -1009,40 +1275,53 @@ scan_lists (struct buffer *buf, Bufpos from, int count, int depth,
       stop = BUF_BEGV (buf);
       while (from > stop)
 	{
-          int mask = 0;         /* mask for finding matching comment style */
+          int comstyle = 0;     /* mask for finding matching comment style */
 
 	  from--;
+	  UPDATE_SYNTAX_CACHE_BACKWARD (from);
           quoted = char_quoted (buf, from);
 	  if (quoted)
+	    {
 	    from--;
+	      UPDATE_SYNTAX_CACHE_BACKWARD (from);
+	    }
 
 	  c = BUF_FETCH_CHAR (buf, from);
-	  code = SYNTAX_UNSAFE (mirrortab, c);
+	  code = SYNTAX_FROM_CACHE (mirrortab, c);
+	  syncode = SYNTAX_CODE_FROM_CACHE (mirrortab, c);
 
 	  if (code == Sendcomment && parse_sexp_ignore_comments)
 	    {
 	      /* we have found a single char end comment. we must record
 		 the comment style encountered so that later, we can match
 		 only the proper comment begin sequence of the same style */
-	      mask = SYNTAX_COMMENT_1CHAR_MASK (mirrortab, c);
+	      comstyle = SYNTAX_CODE_COMMENT_1CHAR_MASK (syncode)
+		== SYNTAX_COMMENT_STYLE_A ? 0 : 1;
 	    }
 
 	  else if (from > stop
-		   && SYNTAX_END_P (mirrortab, BUF_FETCH_CHAR (buf, from-1), c)
+		   && SYNTAX_CODE_END_SECOND_P (syncode)
 		   && !char_quoted (buf, from - 1)
 		   && parse_sexp_ignore_comments)
 	    {
+	      int prev_syncode;
+	      UPDATE_SYNTAX_CACHE_BACKWARD (from - 1);
+	      prev_syncode = SYNTAX_CODE_FROM_CACHE
+		(mirrortab, BUF_FETCH_CHAR (buf, from - 1));
+
+	      if (SYNTAX_CODES_END_P (prev_syncode, syncode))
+		{
 	      /* we must record the comment style encountered so that
 		 later, we can match only the proper comment begin
 		 sequence of the same style */
 	      code = Sendcomment;
-	      mask = SYNTAX_COMMENT_MASK_END (mirrortab,
-					      BUF_FETCH_CHAR (buf, from - 1),
-					      c);
+		  comstyle = SYNTAX_CODES_COMMENT_MASK_END
+		    (prev_syncode, syncode) == SYNTAX_COMMENT_STYLE_A ? 0 : 1;
 	      from--;
 	    }
+	    }
 
-	  if (SYNTAX_PREFIX_UNSAFE (mirrortab, c))
+	  if (SYNTAX_CODE_PREFIX (syncode))
 	    continue;
 
 	  switch (quoted ? Sword : code)
@@ -1054,14 +1333,15 @@ scan_lists (struct buffer *buf, Bufpos from, int count, int depth,
 		 passing it. */
 	      while (from > stop)
 		{
-		  enum syntaxcode syncode;
+		  UPDATE_SYNTAX_CACHE_BACKWARD (from);
 		  quoted = char_quoted (buf, from - 1);
 
 		  if (quoted)
 		    from--;
 		  if (! (quoted
                          || (syncode =
-			     SYNTAX (mirrortab, BUF_FETCH_CHAR (buf, from - 1)))
+			     SYNTAX_FROM_CACHE (mirrortab,
+						BUF_FETCH_CHAR (buf, from - 1)))
 			 == Sword
 			 || syncode == Ssymbol
 			 || syncode == Squote))
@@ -1097,29 +1377,48 @@ scan_lists (struct buffer *buf, Bufpos from, int count, int depth,
 	      }
 	    break;
 
+	    case Scomment_fence:
+	      comstyle = ST_COMMENT_STYLE;
 	    case Sendcomment:
 	      if (parse_sexp_ignore_comments)
-		from = find_start_of_comment (buf, from, stop, mask);
+		from = find_start_of_comment (buf, from, stop, comstyle);
 	      break;
 
+	    case Sstring_fence:
 	    case Sstring:
               {
+		Emchar stringterm;
+
+		if (code != Sstring_fence)
+		  {
 		/* XEmacs change: call syntax_match() on character */
                 Emchar ch = BUF_FETCH_CHAR (buf, from);
-		Lisp_Object stermobj = syntax_match (syntaxtab, ch);
-		Emchar stringterm;
+		    Lisp_Object stermobj =
+		      syntax_match (syntax_cache.current_syntax_table, ch);
 
 		if (CHARP (stermobj))
 		  stringterm = XCHAR (stermobj);
 		else
 		  stringterm = ch;
+		  }
+		else
+		  stringterm = '\0'; /* avoid compiler warnings */
 
                 while (1)
 		  {
 		    if (from == stop) goto lose;
-		    if (!char_quoted (buf, from - 1)
-			&& stringterm == BUF_FETCH_CHAR (buf, from - 1))
+
+		    UPDATE_SYNTAX_CACHE_BACKWARD (from - 1);
+		    c = BUF_FETCH_CHAR (buf, from - 1);
+
+		    if ((code == Sstring
+			? c == stringterm
+			 : SYNTAX_FROM_CACHE (mirrortab, c) == Sstring_fence)
+			&& !char_quoted (buf, from - 1))
+		      {
 		      break;
+		      }
+
 		    from--;
 		  }
                 from--;
@@ -1154,13 +1453,20 @@ char_quoted (struct buffer *buf, Bufpos pos)
   enum syntaxcode code;
   Bufpos beg = BUF_BEGV (buf);
   int quoted = 0;
-  Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+  Bufpos startpos = pos;
+
+  while (pos > beg)
+    {
+      UPDATE_SYNTAX_CACHE_BACKWARD (pos - 1);
+      code = SYNTAX_FROM_CACHE (mirrortab, BUF_FETCH_CHAR (buf, pos - 1));
+
+      if (code != Scharquote && code != Sescape)
+	break;
+      pos--;
+      quoted = !quoted;
+    }
 
-  while (pos > beg
-	 && ((code = SYNTAX (mirrortab, BUF_FETCH_CHAR (buf, pos - 1)))
-	     == Scharquote
-	     || code == Sescape))
-    pos--, quoted = !quoted;
+  UPDATE_SYNTAX_CACHE (startpos);
   return quoted;
 }
 
@@ -1236,11 +1542,18 @@ Optional arg BUFFER defaults to the current buffer.
   struct buffer *buf = decode_buffer (buffer, 0);
   Bufpos beg = BUF_BEGV (buf);
   Bufpos pos = BUF_PT (buf);
+#ifndef emacs
   Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
+#endif
+  Emchar c = '\0'; /* initialize to avoid compiler warnings */
+
+
+  SETUP_SYNTAX_CACHE_FOR_BUFFER (buf, pos, -1);
 
   while (pos > beg && !char_quoted (buf, pos - 1)
-	 && (SYNTAX (mirrortab, BUF_FETCH_CHAR (buf, pos - 1)) == Squote
-	     || SYNTAX_PREFIX (mirrortab, BUF_FETCH_CHAR (buf, pos - 1))))
+	 /* Previous statement updates syntax table.  */
+	 && (SYNTAX_FROM_CACHE (mirrortab, c = BUF_FETCH_CHAR (buf, pos - 1)) == Squote
+	     || SYNTAX_CODE_PREFIX (SYNTAX_CODE_FROM_CACHE (mirrortab, c))))
     pos--;
 
   BUF_SET_PT (buf, pos);
@@ -1273,18 +1586,17 @@ scan_sexps_forward (struct buffer *buf, struct lisp_parse_state *stateptr,
 			   when the depth becomes negative.  */
   int mindepth;		/* Lowest DEPTH value seen.  */
   int start_quoted = 0;		/* Nonzero means starting after a char quote */
+  int boundary_stop = commentstop == -1;
   Lisp_Object tem;
-  int mask;				     /* comment mask */
-  Lisp_Object syntaxtab = buf->syntax_table;
-  Lisp_Char_Table *mirrortab = XCHAR_TABLE (buf->mirror_syntax_table);
 
+  SETUP_SYNTAX_CACHE (from, 1);
   if (NILP (oldstate))
     {
       depth = 0;
       state.instring = -1;
       state.incomment = 0;
       state.comstyle = 0;	/* comment style a by default */
-      mask = SYNTAX_COMMENT_STYLE_A;
+      state.comstr_start = -1;	/* no comment/string seen.  */
     }
   else
     {
@@ -1298,10 +1610,12 @@ scan_sexps_forward (struct buffer *buf, struct lisp_parse_state *stateptr,
       oldstate = Fcdr (oldstate);
       oldstate = Fcdr (oldstate);
       tem = Fcar (oldstate);    /* elt 3, instring */
-      state.instring = !NILP (tem) ? XINT (tem) : -1;
+      state.instring = ( !NILP (tem) 
+			 ? ( INTP (tem) ? XINT (tem) : ST_STRING_STYLE) 
+			 : -1);
 
-      oldstate = Fcdr (oldstate); /* elt 4, incomment */
-      tem = Fcar (oldstate);
+      oldstate = Fcdr (oldstate);
+      tem = Fcar (oldstate);    /* elt 4, incomment */
       state.incomment = !NILP (tem);
 
       oldstate = Fcdr (oldstate);
@@ -1309,13 +1623,33 @@ scan_sexps_forward (struct buffer *buf, struct lisp_parse_state *stateptr,
       start_quoted = !NILP (tem);
 
       /* if the eighth element of the list is nil, we are in comment style
-	 a. if it is non-nil, we are in comment style b */
+	 a; if it is t, we are in comment style b; if it is 'syntax-table,
+	 we are in a generic comment */
       oldstate = Fcdr (oldstate);
       oldstate = Fcdr (oldstate);
+      tem = Fcar (oldstate);    /* elt 7, comment style a/b/fence */
+      state.comstyle = NILP (tem) ? 0 : ( EQ (tem, Qsyntax_table)
+					  ? ST_COMMENT_STYLE : 1 );
+
+      oldstate = Fcdr (oldstate); /* elt 8, start of last comment/string */
+      tem = Fcar (oldstate);
+      state.comstr_start = NILP (tem) ? -1 : XINT (tem);
+
+      /* elt 9, char numbers of starts-of-expression of levels
+         (starting from outermost). */
       oldstate = Fcdr (oldstate);
-      tem = Fcar (oldstate);    /* elt 8, comment style a */
-      state.comstyle = !NILP (tem);
-      mask = state.comstyle ? SYNTAX_COMMENT_STYLE_B : SYNTAX_COMMENT_STYLE_A;
+      tem = Fcar (oldstate);    /* elt 9, intermediate data for
+				   continuation of parsing (subject
+				   to change). */
+      while (!NILP (tem))	/* >= second enclosing sexps.  */
+	{
+	  curlevel->last = XINT (Fcar (tem));
+	  if (++curlevel == endlevel)
+	    error ("Nesting too deep for parser");
+	  curlevel->prev = -1;
+	  curlevel->last = -1;
+	  tem = Fcdr (tem);
+	}
     }
   state.quoted = 0;
   mindepth = depth;
@@ -1335,39 +1669,56 @@ scan_sexps_forward (struct buffer *buf, struct lisp_parse_state *stateptr,
 
   while (from < end)
     {
+      Emchar c;
+      int syncode;
+
       QUIT;
 
-      code = SYNTAX (mirrortab, BUF_FETCH_CHAR (buf, from));
+      UPDATE_SYNTAX_CACHE_FORWARD (from);
+      c = BUF_FETCH_CHAR (buf, from);
+      code = SYNTAX_FROM_CACHE (mirrortab, c);
+      syncode = SYNTAX_CODE_FROM_CACHE (mirrortab, c);
       from++;
 
-      if (code == Scomment)
-	{
 	  /* record the comment style we have entered so that only the
 	     comment-ender sequence (or single char) of the same style
 	     actually terminates the comment section. */
-	  mask = SYNTAX_COMMENT_1CHAR_MASK (mirrortab,
-					    BUF_FETCH_CHAR (buf, from-1));
-	  state.comstyle = (mask == SYNTAX_COMMENT_STYLE_B);
-	  state.comstart = from - 1;
+      if (code == Scomment)
+	{
+	  state.comstyle =
+	    SYNTAX_CODE_COMMENT_1CHAR_MASK (syncode)
+	    == SYNTAX_COMMENT_STYLE_A ? 0 : 1;
+	  state.comstr_start = from - 1;
+	}
+
+      /* a generic comment delimiter? */
+      else if (code == Scomment_fence)
+	{
+	  state.comstyle = ST_COMMENT_STYLE;
+	  state.comstr_start = from - 1;
+	  code = Scomment;
 	}
 
       else if (from < end &&
-	       SYNTAX_START_P (mirrortab, BUF_FETCH_CHAR (buf, from-1),
-			       BUF_FETCH_CHAR (buf, from)))
+	       SYNTAX_CODE_START_FIRST_P (syncode))
+	{
+	  int next_syncode;
+	  UPDATE_SYNTAX_CACHE_FORWARD (from);
+	  next_syncode =
+	    SYNTAX_CODE_FROM_CACHE (mirrortab, BUF_FETCH_CHAR (buf, from));
+
+	  if (SYNTAX_CODES_START_P (syncode, next_syncode))
 	{
-	  /* Record the comment style we have entered so that only
-	     the comment-end sequence of the same style actually
-	     terminates the comment section.  */
 	  code = Scomment;
-	  mask = SYNTAX_COMMENT_MASK_START (mirrortab,
-                                            BUF_FETCH_CHAR (buf, from-1),
-					    BUF_FETCH_CHAR (buf, from));
-	  state.comstyle = (mask == SYNTAX_COMMENT_STYLE_B);
-	  state.comstart = from-1;
+	      state.comstyle = SYNTAX_CODES_COMMENT_MASK_START
+		(syncode, next_syncode) == SYNTAX_COMMENT_STYLE_A ? 0 : 1;
+	      state.comstr_start = from - 1;
 	  from++;
+	      UPDATE_SYNTAX_CACHE_FORWARD (from);
+	    }
 	}
 
-      if (SYNTAX_PREFIX (mirrortab, BUF_FETCH_CHAR (buf, from - 1)))
+      if (SYNTAX_CODE_PREFIX (syncode))
 	continue;
       switch (code)
 	{
@@ -1387,7 +1738,8 @@ scan_sexps_forward (struct buffer *buf, struct lisp_parse_state *stateptr,
 	symstarted:
 	  while (from < end)
 	    {
-	      switch (SYNTAX (mirrortab, BUF_FETCH_CHAR (buf, from)))
+	      UPDATE_SYNTAX_CACHE_FORWARD (from);
+	      switch (SYNTAX_FROM_CACHE (mirrortab, BUF_FETCH_CHAR (buf, from)))
 		{
 		case Scharquote:
 		case Sescape:
@@ -1409,11 +1761,13 @@ scan_sexps_forward (struct buffer *buf, struct lisp_parse_state *stateptr,
 
 	case Scomment:
 	  state.incomment = 1;
+	  if (commentstop || boundary_stop) goto done;
 	startincomment:
-	  if (commentstop)
+	  if (commentstop == 1)
 	    goto done;
+	  UPDATE_SYNTAX_CACHE_FORWARD (from);
 	  {
-	    Bufpos newfrom = find_end_of_comment (buf, from, end, mask);
+	    Bufpos newfrom = find_end_of_comment (buf, from, end, state.comstyle);
 	    if (newfrom < 0)
 	      {
 		/* we terminated search because from == end */
@@ -1424,7 +1778,7 @@ scan_sexps_forward (struct buffer *buf, struct lisp_parse_state *stateptr,
 	  }
 	  state.incomment = 0;
 	  state.comstyle = 0;		     /* reset the comment style */
-	  mask = 0;
+	  if (boundary_stop) goto done;
 	  break;
 
 	case Sopen:
@@ -1450,28 +1804,49 @@ scan_sexps_forward (struct buffer *buf, struct lisp_parse_state *stateptr,
 	  break;
 
 	case Sstring:
-          {
-            Emchar ch;
+	case Sstring_fence:
+	  state.comstr_start = from - 1;
             if (stopbefore) goto stop; /* this arg means stop at sexp start */
             curlevel->last = from - 1;
-	    /* XEmacs change: call syntax_match() on character */
-            ch = BUF_FETCH_CHAR (buf, from - 1);
+	  if (code == Sstring_fence)
 	    {
-	      Lisp_Object stermobj = syntax_match (syntaxtab, ch);
+	      state.instring = ST_STRING_STYLE;
+	    }
+	  else
+	    {
+	      /* XEmacs change: call syntax_match() on character */
+	      Emchar ch = BUF_FETCH_CHAR (buf, from - 1);
+	      Lisp_Object stermobj =
+		syntax_match (syntax_cache.current_syntax_table, ch);
 
 	      if (CHARP (stermobj))
 		state.instring = XCHAR (stermobj);
 	      else
 		state.instring = ch;
-	    }
           }
+	  if (boundary_stop) goto done;
 	startinstring:
 	  while (1)
 	    {
+	      enum syntaxcode temp_code;
+
 	      if (from >= end) goto done;
-	      if (BUF_FETCH_CHAR (buf, from) == state.instring) break;
-	      switch (SYNTAX (mirrortab, BUF_FETCH_CHAR (buf, from)))
+
+	      UPDATE_SYNTAX_CACHE_FORWARD (from);
+	      c = BUF_FETCH_CHAR (buf, from);
+	      temp_code = SYNTAX_FROM_CACHE (mirrortab, c);
+
+	      if (
+		  state.instring != ST_STRING_STYLE &&
+		  temp_code == Sstring &&
+		  c == state.instring) break;
+
+	      switch (temp_code)
 		{
+		case Sstring_fence:
+		  if (state.instring == ST_STRING_STYLE)
+		    goto string_end;
+		  break;
 		case Scharquote:
 		case Sescape:
                   {
@@ -1485,9 +1860,11 @@ scan_sexps_forward (struct buffer *buf, struct lisp_parse_state *stateptr,
 		}
 	      from++;
 	    }
+	string_end:
 	  state.instring = -1;
 	  curlevel->prev = curlevel->last;
 	  from++;
+	  if (boundary_stop) goto done;
 	  break;
 
 	case Smath:
@@ -1497,6 +1874,7 @@ scan_sexps_forward (struct buffer *buf, struct lisp_parse_state *stateptr,
         case Spunct:
         case Squote:
         case Sendcomment:
+	case Scomment_fence:
 	case Sinherit:
         case Smax:
           break;
@@ -1517,6 +1895,10 @@ scan_sexps_forward (struct buffer *buf, struct lisp_parse_state *stateptr,
   state.prevlevelstart
     = (curlevel == levelstart) ? -1 : (curlevel - 1)->last;
   state.location = from;
+  state.levelstarts = Qnil;
+  while (--curlevel >= levelstart)
+    state.levelstarts = Fcons (make_int (curlevel->last),
+			       state.levelstarts);
 
   *stateptr = state;
 }
@@ -1527,24 +1909,31 @@ Parsing stops at TO or when certain criteria are met;
  point is set to where parsing stops.
 If fifth arg OLDSTATE is omitted or nil,
  parsing assumes that FROM is the beginning of a function.
-Value is a list of eight elements describing final state of parsing:
+Value is a list of nine elements describing final state of parsing:
  0. depth in parens.
  1. character address of start of innermost containing list; nil if none.
  2. character address of start of last complete sexp terminated.
  3. non-nil if inside a string.
-    (It is the character that will terminate the string.)
+    (It is the character that will terminate the string,
+     or t if the string should be terminated by an explicit
+     `syntax-table' property.)
  4. t if inside a comment.
  5. t if following a quote character.
  6. the minimum paren-depth encountered during this scan.
- 7. nil if in comment style a, or not in a comment; t if in comment style b
+ 7. nil if in comment style a, or not in a comment; t if in comment style b;
+    `syntax-table' if given by an explicit `syntax-table' property.
+ 8. character address of start of last comment or string; nil if none.
+ 9. Intermediate data for continuation of parsing (subject to change).
 If third arg TARGETDEPTH is non-nil, parsing stops if the depth
 in parentheses becomes equal to TARGETDEPTH.
 Fourth arg STOPBEFORE non-nil means stop when come to
  any character that starts a sexp.
-Fifth arg OLDSTATE is an eight-element list like what this function returns.
+Fifth arg OLDSTATE is a nine-element list like what this function returns.
 It is used to initialize the state of the parse.  Its second and third
 elements are ignored.
-Sixth arg COMMENTSTOP non-nil means stop at the start of a comment.
+Sixth arg COMMENTSTOP non-nil means stop at the start of a comment. If it
+is `syntax-table', stop after the start of a comment or a string, or after
+the end of a comment or string.
 */
        (from, to, targetdepth, stopbefore, oldstate, commentstop, buffer))
 {
@@ -1565,17 +1954,24 @@ Sixth arg COMMENTSTOP non-nil means stop at the start of a comment.
   get_buffer_range_char (buf, from, to, &start, &end, 0);
   scan_sexps_forward (buf, &state, start, end,
 		      target, !NILP (stopbefore), oldstate,
-		      !NILP (commentstop));
-
+		      (NILP (commentstop)
+		       ? 0 : (EQ (commentstop, Qsyntax_table) ? -1 : 1)));
   BUF_SET_PT (buf, state.location);
 
   /* reverse order */
   val = Qnil;
-  val = Fcons (state.comstyle  ? Qt : Qnil, val);
+  val = Fcons (state.levelstarts, val);
+  val = Fcons ((state.incomment || (state.instring >= 0))
+	       ? make_int (state.comstr_start) : Qnil, val);
+  val = Fcons (state.comstyle  ? (state.comstyle == ST_COMMENT_STYLE
+				  ? Qsyntax_table : Qt) : Qnil, val);
   val = Fcons (make_int (state.mindepth),   val);
   val = Fcons (state.quoted    ? Qt : Qnil, val);
   val = Fcons (state.incomment ? Qt : Qnil, val);
-  val = Fcons (state.instring       < 0 ? Qnil : make_int (state.instring),       val);
+  val = Fcons (state.instring < 0
+	       ? Qnil
+	       : (state.instring == ST_STRING_STYLE
+		  ? Qt : make_int (state.instring)), val);
   val = Fcons (state.thislevelstart < 0 ? Qnil : make_int (state.thislevelstart), val);
   val = Fcons (state.prevlevelstart < 0 ? Qnil : make_int (state.prevlevelstart), val);
   val = Fcons (make_int (state.depth), val);
@@ -1672,6 +2068,7 @@ void
 syms_of_syntax (void)
 {
   defsymbol (&Qsyntax_table_p, "syntax-table-p");
+  defsymbol (&Qsyntax_table, "syntax-table");
 
   DEFSUBR (Fsyntax_table_p);
   DEFSUBR (Fsyntax_table);
@@ -1701,6 +2098,15 @@ Non-nil means `forward-sexp', etc., should treat comments as whitespace.
 */ );
   parse_sexp_ignore_comments = 0;
 
+  DEFVAR_BOOL ("lookup-syntax-properties", &lookup_syntax_properties /*
+Non-nil means `forward-sexp', etc., grant `syntax-table' property.
+The value of this property should be either a syntax table, or a cons
+of the form (SYNTAXCODE . MATCHCHAR), SYNTAXCODE being the numeric
+syntax code, MATCHCHAR being nil or the character to match (which is
+relevant only for open/close type.
+*/ );
+  lookup_syntax_properties = 1;
+
   DEFVAR_BOOL ("words-include-escapes", &words_include_escapes /*
 Non-nil means `forward-word', etc., should treat escape chars part of words.
 */ );
diff --git a/src/syntax.h b/src/syntax.h
index 4b2709b..75ac2c3 100644
--- a/src/syntax.h
+++ b/src/syntax.h
@@ -61,6 +61,10 @@ enum syntaxcode
   Scomment,	/* a comment-starting character */
   Sendcomment,	/* a comment-ending character */
   Sinherit,	/* use the standard syntax table for this character */
+  Scomment_fence, /* Starts/ends comment which is delimited on the
+		     other side by a char with the same syntaxcode.  */
+  Sstring_fence,  /* Starts/ends string which is delimited on the
+		     other side by a char with the same syntaxcode.  */
   Smax	 /* Upper bound on codes that are meaningful */
 };
 
@@ -254,8 +258,219 @@ Lisp_Object syntax_match (Lisp_Object table, Emchar ch);
 
 extern int no_quit_in_re_search;
 extern struct buffer *regex_emacs_buffer;
-extern int regex_emacs_buffer_p;
+
+/* This is the string or buffer in which we are matching.  It is used
+   for looking up syntax properties.  */
+extern Lisp_Object regex_match_object;
 
 void update_syntax_table (Lisp_Char_Table *ct);
 
+#ifdef emacs
+
+extern int lookup_syntax_properties;
+
+struct syntax_cache
+{
+  int use_code;				/* Whether to use syntax_code
+					   or current_syntax_table. */
+  struct buffer* buffer;		/* The buffer the current syntax cache
+					   applies to. */
+  Lisp_Object object;			/* The buffer or string the current
+					   syntax cache applies to. */
+  int syntax_code;			/* Syntax code of current char. */
+  Lisp_Object current_syntax_table;	/* Syntax table for current pos. */
+  Lisp_Object old_prop;			/* Syntax-table prop at prev pos. */
+
+  Bufpos next_change;			/* Position of the next extent
+                                           change. */
+  Bufpos prev_change;			/* Position of the previous
+                                           extent change. */
+};
+extern struct syntax_cache syntax_cache;
+
+void update_syntax_cache (int pos, int count, int init);
+
+/* Make syntax cache state good for CHARPOS, assuming it is
+   currently good for a position before CHARPOS.  */
+#define UPDATE_SYNTAX_CACHE_FORWARD(pos)	\
+   (lookup_syntax_properties			\
+    ? (update_syntax_cache ((pos), 1, 0), 1)	\
+    : 0)
+
+/* Make syntax cache state good for CHARPOS, assuming it is
+   currently good for a position after CHARPOS.  */
+#define UPDATE_SYNTAX_CACHE_BACKWARD(pos)	\
+   (lookup_syntax_properties			\
+    ? (update_syntax_cache ((pos), -1, 0), 1)	\
+    : 0)
+
+/* Make syntax cache state good for CHARPOS */
+#define UPDATE_SYNTAX_CACHE(pos)		\
+   (lookup_syntax_properties			\
+    ? (update_syntax_cache ((pos), 0, 0), 1)	\
+    : 0)
+
+#define SYNTAX_FROM_CACHE(table, c)			\
+   SYNTAX_FROM_CODE (SYNTAX_CODE_FROM_CACHE (table, c))
+
+#define SYNTAX_CODE_FROM_CACHE(table, c)				\
+  ( syntax_cache.use_code						\
+      ? syntax_cache.syntax_code					\
+      : SYNTAX_CODE (XCHAR_TABLE (syntax_cache.current_syntax_table),	\
+		     c)							\
+ )
+
+/* Convert the byte offset BYTEPOS into a character position,
+   for the object recorded in syntax_cache with SETUP_SYNTAX_TABLE_FOR_OBJECT.
+
+   The value is meant for use in the UPDATE_SYNTAX_TABLE... macros.
+   These macros do nothing when parse_sexp_lookup_properties is 0,
+   so we return 0 in that case, for speed.  */
+#define SYNTAX_CACHE_BYTE_TO_CHAR(bytepos)					\
+  (! lookup_syntax_properties							\
+   ? 0										\
+   : STRINGP (syntax_cache.object)						\
+   ? bytecount_to_charcount (XSTRING_DATA (syntax_cache.object), bytepos)	\
+   : (BUFFERP (syntax_cache.object) || NILP (syntax_cache.object))		\
+   ? bytind_to_bufpos (syntax_cache.buffer,					\
+		       bytepos + BI_BUF_BEGV (syntax_cache.buffer))		\
+   : (bytepos))
+
+#define SYNTAX_CACHE_OBJECT_BYTE_TO_CHAR(obj, buf, bytepos)	\
+  (! lookup_syntax_properties					\
+   ? 0								\
+   : STRINGP (obj)						\
+   ? bytecount_to_charcount (XSTRING_DATA (obj), bytepos)	\
+   : (BUFFERP (obj) || NILP (obj))				\
+   ? bytind_to_bufpos (buf, bytepos + BI_BUF_BEGV (buf))	\
+   : (bytepos))
+
+#else  /* not emacs */
+
+#define update_syntax_cache(pos, count, init)
+#define UPDATE_SYNTAX_CACHE_FORWARD(pos)
+#define UPDATE_SYNTAX_CACHE_BACKWARD(pos)
+#define UPDATE_SYNTAX_CACHE(pos)
+#define SYNTAX_FROM_CACHE SYNTAX
+#define SYNTAX_CODE_FROM_CACHE SYNTAX_CODE
+
+#endif /* emacs */
+
+#define SETUP_SYNTAX_CACHE(FROM, COUNT)				\
+  do {								\
+    syntax_cache.buffer = current_buffer;			\
+    syntax_cache.object = Qnil;					\
+    syntax_cache.current_syntax_table				\
+      = current_buffer->mirror_syntax_table;			\
+    syntax_cache.use_code = 0;					\
+    if (lookup_syntax_properties)				\
+      update_syntax_cache ((COUNT) > 0 ? (FROM) : (FROM) - 1,	\
+			   (COUNT), 1);				\
+  } while (0)
+
+#define SETUP_SYNTAX_CACHE_FOR_BUFFER(BUFFER, FROM, COUNT)	\
+  do {								\
+    syntax_cache.buffer = (BUFFER);				\
+    syntax_cache.object = Qnil;					\
+    syntax_cache.current_syntax_table =				\
+      syntax_cache.buffer->mirror_syntax_table;			\
+    syntax_cache.use_code = 0;					\
+    if (lookup_syntax_properties)				\
+      update_syntax_cache ((FROM) + ((COUNT) > 0 ? 0 : -1),	\
+			   (COUNT), 1);				\
+  } while (0)
+
+#define SETUP_SYNTAX_CACHE_FOR_OBJECT(OBJECT, BUFFER, FROM, COUNT)	\
+  do {									\
+    syntax_cache.buffer = (BUFFER);					\
+    syntax_cache.object = (OBJECT);					\
+    if (NILP (syntax_cache.object))					\
+      {									\
+        /* do nothing */;						\
+      }									\
+    else if (EQ (syntax_cache.object, Qt))				\
+      {									\
+        /* do nothing */;						\
+      }									\
+    else if (STRINGP (syntax_cache.object))				\
+      {									\
+        /* do nothing */;						\
+      }									\
+    else if (BUFFERP (syntax_cache.object))				\
+      {									\
+        syntax_cache.buffer = XBUFFER (syntax_cache.object);		\
+      }									\
+    else								\
+      {									\
+        /* OBJECT must be buffer/string/t/nil */			\
+        assert(0);							\
+      }									\
+    syntax_cache.current_syntax_table					\
+      = syntax_cache.buffer->mirror_syntax_table;			\
+    syntax_cache.use_code = 0;						\
+    if (lookup_syntax_properties)					\
+      update_syntax_cache ((FROM) + ((COUNT) > 0 ? 0 : -1),		\
+			   (COUNT), 1);					\
+  } while (0)
+
+#define SYNTAX_CODE_PREFIX(c) \
+  ((c >> 7) & 1)
+
+#define SYNTAX_CODE_COMMENT_BITS(c) \
+  ((c >> 16) &0xff)
+
+#define SYNTAX_CODES_START_P(a, b)                                    \
+  (((SYNTAX_CODE_COMMENT_BITS (a) & SYNTAX_FIRST_CHAR_START) >> 2)    \
+   & (SYNTAX_CODE_COMMENT_BITS (b) & SYNTAX_SECOND_CHAR_START))
+
+#define SYNTAX_CODES_END_P(a, b)                                    \
+  (((SYNTAX_CODE_COMMENT_BITS (a) & SYNTAX_FIRST_CHAR_END) >> 2)    \
+   & (SYNTAX_CODE_COMMENT_BITS (b) & SYNTAX_SECOND_CHAR_END))
+
+#define SYNTAX_CODES_COMMENT_MASK_START(a, b)			\
+  (SYNTAX_CODES_MATCH_START_P (a, b, SYNTAX_COMMENT_STYLE_A) 	\
+   ? SYNTAX_COMMENT_STYLE_A					\
+   : (SYNTAX_CODES_MATCH_START_P (a, b, SYNTAX_COMMENT_STYLE_B)	\
+      ? SYNTAX_COMMENT_STYLE_B					\
+      : 0))
+#define SYNTAX_CODES_COMMENT_MASK_END(a, b)			\
+  (SYNTAX_CODES_MATCH_END_P (a, b, SYNTAX_COMMENT_STYLE_A) 	\
+   ? SYNTAX_COMMENT_STYLE_A					\
+   : (SYNTAX_CODES_MATCH_END_P (a, b, SYNTAX_COMMENT_STYLE_B)	\
+      ? SYNTAX_COMMENT_STYLE_B					\
+      : 0))
+
+#define SYNTAX_CODE_START_FIRST_P(a) \
+  (SYNTAX_CODE_COMMENT_BITS (a) & SYNTAX_FIRST_CHAR_START)
+
+#define SYNTAX_CODE_START_SECOND_P(a) \
+  (SYNTAX_CODE_COMMENT_BITS (a) & SYNTAX_SECOND_CHAR_START)
+
+#define SYNTAX_CODE_END_FIRST_P(a) \
+  (SYNTAX_CODE_COMMENT_BITS (a) & SYNTAX_FIRST_CHAR_END)
+
+#define SYNTAX_CODE_END_SECOND_P(a) \
+  (SYNTAX_CODE_COMMENT_BITS (a) & SYNTAX_SECOND_CHAR_END)
+
+
+#define SYNTAX_CODES_MATCH_START_P(a, b, mask)				\
+  ((SYNTAX_CODE_COMMENT_BITS (a) & SYNTAX_FIRST_CHAR_START & (mask))	\
+   && (SYNTAX_CODE_COMMENT_BITS (b)					\
+       & SYNTAX_SECOND_CHAR_START & (mask)))
+
+#define SYNTAX_CODES_MATCH_END_P(a, b, mask)				\
+  ((SYNTAX_CODE_COMMENT_BITS (a) & SYNTAX_FIRST_CHAR_END & (mask))	\
+   && (SYNTAX_CODE_COMMENT_BITS (b) & SYNTAX_SECOND_CHAR_END & (mask)))
+
+#define SYNTAX_CODE_MATCHES_1CHAR_P(a, mask)	\
+  ((SYNTAX_CODE_COMMENT_BITS (a) & (mask)))
+
+#define SYNTAX_CODE_COMMENT_1CHAR_MASK(a)			\
+  ((SYNTAX_CODE_MATCHES_1CHAR_P (a, SYNTAX_COMMENT_STYLE_A)	\
+    ? SYNTAX_COMMENT_STYLE_A					\
+    : (SYNTAX_CODE_MATCHES_1CHAR_P (a, SYNTAX_COMMENT_STYLE_B)	\
+       ? SYNTAX_COMMENT_STYLE_B					\
+       : 0)))
+
+
 #endif /* INCLUDED_syntax_h_ */
diff --git a/src/sysdep.c b/src/sysdep.c
index 12cd3de..e327cff 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -140,22 +140,6 @@ static void hft_reset (struct console *c);
 #include <sys/termio.h>
 #endif
 
-/* ------------------------------- */
-/*          miscellaneous          */
-/* ------------------------------- */
-
-#ifndef HAVE_UTIMES
-#ifndef HAVE_STRUCT_UTIMBUF
-/* We want to use utime rather than utimes, but we couldn't find the
-   structure declaration.  We'll use the traditional one.  */
-struct utimbuf
-{
-  long actime;
-  long modtime;
-};
-#endif
-#endif
-
 
 /************************************************************************/
 /*                         subprocess control                           */
@@ -3364,17 +3348,20 @@ gettimeofday (struct timeval *tp, struct timezone *tzp)
 int
 set_file_times (char *filename, EMACS_TIME atime, EMACS_TIME mtime)
 {
-#ifdef HAVE_UTIMES
-  struct timeval tv[2];
-  tv[0] = atime;
-  tv[1] = mtime;
-  return utimes (filename, tv);
-#else /* not HAVE_UTIMES */
+#if defined (HAVE_UTIME)
   struct utimbuf utb;
   utb.actime = EMACS_SECS (atime);
   utb.modtime = EMACS_SECS (mtime);
   return utime (filename, &utb);
-#endif /* not HAVE_UTIMES */
+#elif defined (HAVE_UTIMES)
+  struct timeval tv[2];
+  tv[0] = atime;
+  tv[1] = mtime;
+  return utimes (filename, tv);
+#else
+  /* No file times setting function available. */
+  return -1;
+#endif
 }
 
 /* */
diff --git a/src/systime.h b/src/systime.h
index e51ac51..2a56a89 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -63,7 +63,7 @@ void gettimeofday (struct timeval *, struct timezone *);
 
 #endif /* WIN32_NATIVE */
 
-#ifdef HAVE_UTIME_H
+#ifdef HAVE_UTIME
 # include <utime.h>
 #endif
 
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 7a7f6da..c6a3000 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,18 @@
+2001-02-23  Martin Buchholz <martin@xemacs.org>
+
+	* XEmacs 21.2.45 "Thelxepeia" is released.
+
+2001-02-20  Matt Tucker  <tuck@whistlingfish.net>
+
+	* automated/syntax-tests.el: remove debug message
+
+2001-02-17  Matt Tucker  <tuck@whistlingfish.net>
+
+	* automated/syntax-tests.el:
+	Added tests for syntax-table extents.
+	Added regression tests for fencepost bugs with
+	`find_start_of_comment' and `find_end_of_comment'.
+
 2001-02-08  Martin Buchholz <martin@xemacs.org>
 
 	* XEmacs 21.2.44 "Thalia" is released.
diff --git a/tests/automated/syntax-tests.el b/tests/automated/syntax-tests.el
index e848e11..f5a063c 100644
--- a/tests/automated/syntax-tests.el
+++ b/tests/automated/syntax-tests.el
@@ -100,3 +100,43 @@
   (test-backward-word "WO " 3)
   (test-backward-word "W !" 3)
   (test-backward-word "WO !" 4))
+
+;; Works like test-forward-word, except for the following:
+;; after <string> is inserted, the syntax-table <apply-syntax>
+;; is applied to position <apply-pos>.
+;; <apply-pos> can be in the form (start . end), or can be a
+;; character position.
+(defun test-syntax-table (string apply-pos apply-syntax stop)
+  (goto-char (point-max))
+  (unless (consp apply-pos)
+	(setq apply-pos `(,apply-pos . ,(+ 1 apply-pos))))
+  (let ((point (point)))
+	(insert string)
+	(put-text-property (+ point (car apply-pos)) (+ point (cdr apply-pos))
+					   'syntax-table apply-syntax)
+	(goto-char point)
+	(forward-word 1)
+	(Assert (eq (point) (+ point stop)))))
+
+;; test syntax-table extents
+(with-temp-buffer
+  ;; Apply punctuation to word
+  (test-syntax-table "WO" 1 `(,(syntax-string-to-code ".")) 1)
+  ;; Apply word to punctuation
+  (test-syntax-table "W." 1 `(,(syntax-string-to-code "w")) 2))
+
+;; Test forward-comment at buffer boundaries
+(with-temp-buffer
+  (c-mode)
+  (insert "// comment\n")
+  (forward-comment -2)
+  (Assert (eq (point) (point-min)))
+
+  (let ((point (point)))
+	(insert "/* comment */")
+	(goto-char point)
+	(forward-comment 2)
+	(Assert (eq (point) (point-max)))
+
+	;; this last used to crash
+	(parse-partial-sexp point (point-max))))
diff --git a/version.sh b/version.sh
index 336189a..c6601fc 100644
--- a/version.sh
+++ b/version.sh
@@ -2,8 +2,8 @@
 emacs_is_beta=t
 emacs_major_version=21
 emacs_minor_version=2
-emacs_beta_version=44
-xemacs_codename="Thalia"
+emacs_beta_version=45
+xemacs_codename="Thelxepeia"
 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=8