Mercurial > hg > xemacs-beta

--- a/CHANGES-beta	Mon Aug 13 10:17:09 2007 +0200
+++ b/CHANGES-beta	Mon Aug 13 10:17:54 2007 +0200
@@ -1,4 +1,14 @@
 							-*- indented-text -*-
+to 20.5 beta21 "Golden Guernsey"
+-- Package interface standard 1.0
+-- Cygwin stuffs from Andy Piper
+-- Miscellaneous patches from Kyle Jones
+-- Miscellaneous patches from Martin Buchholz
+-- Experimental Shared Library support courtesy of Joshua Rowe, and integration
+   courtesy of Hrvoje Niksic
+-- Miscellaneous patches from Hrvoje Niksic
+-- Miscellaneous bug fixes
+
 to 20.5 beta20 "Don"
 -- Miscellaneous patches from Damon Lipparelli, Jens Petersen, Karl Hegbloom,
    and Christoph Wedler
--- a/ChangeLog	Mon Aug 13 10:17:09 2007 +0200
+++ b/ChangeLog	Mon Aug 13 10:17:54 2007 +0200
@@ -1,3 +1,15 @@
+1998-01-25  SL Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 20.5-beta21 is released.
+
+Wed Jan 21 10:49:47 1998  Andy Piper  <andyp@parallax.co.uk>
+
+	* configure.in: check for coff.h
+
+1998-01-21  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* configure.in: Added support for `--with-shlib'.
+
 1998-01-18  SL Baur  <steve@altair.xemacs.org>

 	* XEmacs 20.5-beta20 is released.
--- a/configure	Mon Aug 13 10:17:09 2007 +0200
+++ b/configure	Mon Aug 13 10:17:54 2007 +0200
@@ -338,6 +338,7 @@
 	use_assertions	| \
 	memory_usage_stats | \
 	with_clash_detection | \
+	with_shlib | \
 	no_doc_file )
 	  	  case "$val" in
 	    y | ye | yes )	val=yes ;;
@@ -629,7 +630,7 @@

 if test -z "$configuration"; then
   echo $ac_n "checking "host system type"""... $ac_c" 1>&6
-echo "configure:633: checking "host system type"" >&5
+echo "configure:634: checking "host system type"" >&5
     if configuration=`${CONFIG_SHELL-/bin/sh} $srcdir/config.guess | \
     sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'` ; then
     echo "$ac_t""$configuration" 1>&6
@@ -643,7 +644,7 @@
 fi

 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:647: checking whether ln -s works" >&5
+echo "configure:648: checking whether ln -s works" >&5

 rm -f conftestdata
 if ln -s X conftestdata 2>/dev/null
@@ -820,7 +821,7 @@


 echo "checking "the configuration name"" 1>&6
-echo "configure:824: checking "the configuration name"" >&5
+echo "configure:825: checking "the configuration name"" >&5
 internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'`
 if canonical=`$srcdir/config.sub "$internal_configuration"` ; then : ; else
   exit $?
@@ -1267,6 +1268,20 @@
  fi
 fi

+if test "$with_shlib" = "yes"; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_SHLIB
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_SHLIB 1
+EOF
+}
+
+  extra_objs="$extra_objs dlopen.o" &&  if test "$extra_verbose" = "yes"; then
+   echo "    xemacs will be linked with \"dlopen.o\""
+ fi
+fi
+
 test -n "$compiler" && CC="$compiler"
 if test "$with_gcc" = "no"; then   case "$CC" in "" | *gcc* ) CC="${NON_GNU_CC-cc}" ;; esac
 fi
@@ -1277,7 +1292,7 @@
 # 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:1281: checking for $ac_word" >&5
+echo "configure:1296: checking for $ac_word" >&5

 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1303,7 +1318,7 @@
   # 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:1307: checking for $ac_word" >&5
+echo "configure:1322: checking for $ac_word" >&5

 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1348,7 +1363,7 @@
 fi

 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1352: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1367: 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'
@@ -1360,11 +1375,11 @@
 cross_compiling=no

 cat > conftest.$ac_ext <<EOF
-#line 1364 "configure"
+#line 1379 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1384,19 +1399,19 @@
   { 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:1388: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1403: 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:1393: checking whether we are using GNU C" >&5
+echo "configure:1408: 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:1400: \"$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:1415: \"$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
@@ -1410,7 +1425,7 @@
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1414: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1429: checking whether ${CC-cc} accepts -g" >&5

 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -1439,7 +1454,7 @@
   # 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:1443: checking for $ac_word" >&5
+echo "configure:1458: checking for $ac_word" >&5

 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1465,7 +1480,7 @@
   # 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:1469: checking for $ac_word" >&5
+echo "configure:1484: checking for $ac_word" >&5

 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1510,7 +1525,7 @@
 fi

 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1514: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1529: 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'
@@ -1522,11 +1537,11 @@
 cross_compiling=no

 cat > conftest.$ac_ext <<EOF
-#line 1526 "configure"
+#line 1541 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1546,19 +1561,19 @@
   { 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:1550: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1565: 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:1555: checking whether we are using GNU C" >&5
+echo "configure:1570: 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:1562: \"$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:1577: \"$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
@@ -1572,7 +1587,7 @@
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1576: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1591: checking whether ${CC-cc} accepts -g" >&5

 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -1601,7 +1616,7 @@
   # 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:1605: checking for $ac_word" >&5
+echo "configure:1620: checking for $ac_word" >&5

 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1627,7 +1642,7 @@
   # 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:1631: 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.
@@ -1672,7 +1687,7 @@
 fi

 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1676: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1691: 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'
@@ -1684,11 +1699,11 @@
 cross_compiling=no

 cat > conftest.$ac_ext <<EOF
-#line 1688 "configure"
+#line 1703 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1708,19 +1723,19 @@
   { 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:1712: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1727: 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:1717: checking whether we are using GNU C" >&5
+echo "configure:1732: 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:1724: \"$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:1739: \"$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
@@ -1734,7 +1749,7 @@
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1738: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1753: checking whether ${CC-cc} accepts -g" >&5

 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -1767,7 +1782,7 @@
 test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP"

 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1771: checking how to run the C preprocessor" >&5
+echo "configure:1786: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1780,13 +1795,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1784 "configure"
+#line 1799 "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:1790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1805: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1797,13 +1812,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1801 "configure"
+#line 1816 "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:1807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1826,9 +1841,9 @@


 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1830: checking for AIX" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1832 "configure"
+echo "configure:1845: checking for AIX" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1847 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -1855,9 +1870,9 @@


 echo $ac_n "checking for GNU libc""... $ac_c" 1>&6
-echo "configure:1859: checking for GNU libc" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1861 "configure"
+echo "configure:1874: checking for GNU libc" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1876 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
@@ -1869,7 +1884,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:1873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_glibc=yes
 else
@@ -1890,9 +1905,9 @@


 echo $ac_n "checking whether we are using SunPro C""... $ac_c" 1>&6
-echo "configure:1894: checking whether we are using SunPro C" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1896 "configure"
+echo "configure:1909: checking whether we are using SunPro C" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1911 "configure"
 #include "confdefs.h"

 int main() {
@@ -1903,7 +1918,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:1907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   __sunpro_c=yes
 else
@@ -2179,7 +2194,7 @@
  fi

 echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:2183: checking for dynodump" >&5
+echo "configure:2198: checking for dynodump" >&5
 if test "$unexec" != "unexsol2.o"; then
   echo "$ac_t""no" 1>&6
 else
@@ -2277,19 +2292,19 @@

 if test "$add_runtime_path" = "yes"; then
       echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:2281: checking "for runtime libraries flag"" >&5
+echo "configure:2296: checking "for runtime libraries flag"" >&5
   dash_r=""
   for try_dash_r in "-R" "-R " "-rpath "; do
     xe_check_libs="${try_dash_r}/no/such/file-or-directory"
     cat > conftest.$ac_ext <<EOF
-#line 2286 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+#line 2301 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:2308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   dash_r="$try_dash_r"
 else
@@ -2387,7 +2402,7 @@
 # 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:2391: checking for $ac_word" >&5
+echo "configure:2406: checking for $ac_word" >&5

 if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -2440,7 +2455,7 @@
 # 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:2444: checking for a BSD compatible install" >&5
+echo "configure:2459: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then

   IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
@@ -2491,7 +2506,7 @@
 # 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:2495: checking for $ac_word" >&5
+echo "configure:2510: checking for $ac_word" >&5

 if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -2522,15 +2537,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2526: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2529 "configure"
+echo "configure:2541: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2544 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2563,15 +2578,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2567: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2570 "configure"
+echo "configure:2582: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2585 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2600,19 +2615,19 @@
 fi
 done

-for ac_hdr in linux/version.h kstat.h sys/pstat.h inttypes.h sys/un.h
+for ac_hdr in linux/version.h kstat.h sys/pstat.h inttypes.h sys/un.h coff.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2608: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2611 "configure"
+echo "configure:2623: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2626 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2642,10 +2657,10 @@
 done

 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:2646: checking for sys/wait.h that is POSIX.1 compatible" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2649 "configure"
+echo "configure:2661: checking for sys/wait.h that is POSIX.1 compatible" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2664 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -2661,7 +2676,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:2665: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -2685,10 +2700,10 @@
 fi

 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2689: checking for ANSI C header files" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2692 "configure"
+echo "configure:2704: checking for ANSI C header files" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2707 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2696,7 +2711,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2713,7 +2728,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2717 "configure"
+#line 2732 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2731,7 +2746,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2735 "configure"
+#line 2750 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2749,7 +2764,7 @@
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
 cat > conftest.$ac_ext <<EOF
-#line 2753 "configure"
+#line 2768 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2760,7 +2775,7 @@
 exit (0); }

 EOF
-if { (eval echo configure:2764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:2779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   :
 else
@@ -2785,10 +2800,10 @@
 fi

 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2789: checking whether time.h and sys/time.h may both be included" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2792 "configure"
+echo "configure:2804: checking whether time.h and sys/time.h may both be included" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2807 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -2797,7 +2812,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:2801: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -2821,10 +2836,10 @@
 fi

 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:2825: checking for sys_siglist declaration in signal.h or unistd.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2828 "configure"
+echo "configure:2840: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2843 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -2836,7 +2851,7 @@
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:2840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -2861,9 +2876,9 @@


 echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6
-echo "configure:2865: checking for struct utimbuf" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2867 "configure"
+echo "configure:2880: checking for struct utimbuf" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2882 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -2882,7 +2897,7 @@
 static struct utimbuf x; x.actime = x.modtime;
 ; return 0; }
 EOF
-if { (eval echo configure:2886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2901: \"$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
@@ -2902,10 +2917,10 @@
 rm -f conftest*

 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2906: checking return type of signal handlers" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2909 "configure"
+echo "configure:2921: checking return type of signal handlers" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2924 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -2922,7 +2937,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:2926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -2944,10 +2959,10 @@


 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2948: checking for size_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2951 "configure"
+echo "configure:2963: checking for size_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2966 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2978,10 +2993,10 @@
 fi

 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:2982: checking for pid_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2985 "configure"
+echo "configure:2997: checking for pid_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3000 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3012,10 +3027,10 @@
 fi

 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3016: checking for uid_t in sys/types.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3019 "configure"
+echo "configure:3031: checking for uid_t in sys/types.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3034 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -3051,10 +3066,10 @@
 fi

 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:3055: checking for mode_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3058 "configure"
+echo "configure:3070: checking for mode_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3073 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3085,10 +3100,10 @@
 fi

 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3089: checking for off_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3092 "configure"
+echo "configure:3104: checking for off_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3107 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3120,9 +3135,9 @@


 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:3124: checking for struct timeval" >&5
-cat > conftest.$ac_ext <<EOF
-#line 3126 "configure"
+echo "configure:3139: checking for struct timeval" >&5
+cat > conftest.$ac_ext <<EOF
+#line 3141 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -3138,7 +3153,7 @@
 static struct timeval x; x.tv_sec = x.tv_usec;
 ; return 0; }
 EOF
-if { (eval echo configure:3142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
   HAVE_TIMEVAL=yes
@@ -3160,10 +3175,10 @@
 rm -f conftest*

 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:3164: checking whether struct tm is in sys/time.h or time.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3167 "configure"
+echo "configure:3179: checking whether struct tm is in sys/time.h or time.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3182 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -3171,7 +3186,7 @@
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:3175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -3195,10 +3210,10 @@
 fi

 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:3199: checking for tm_zone in struct tm" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3202 "configure"
+echo "configure:3214: checking for tm_zone in struct tm" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3217 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -3206,7 +3221,7 @@
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:3210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_zone=yes
 else
@@ -3229,10 +3244,10 @@

 else
   echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:3233: checking for tzname" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3236 "configure"
+echo "configure:3248: checking for tzname" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3251 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -3242,7 +3257,7 @@
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:3246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_var_tzname=yes
 else
@@ -3268,10 +3283,10 @@


 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3272: checking for working const" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3275 "configure"
+echo "configure:3287: checking for working const" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3290 "configure"
 #include "confdefs.h"

 int main() {
@@ -3320,7 +3335,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:3324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -3345,7 +3360,7 @@


 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:3349: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:3364: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`

 cat > conftestmake <<\EOF
@@ -3370,12 +3385,12 @@


 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3374: checking whether byte ordering is bigendian" >&5
+echo "configure:3389: 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 3379 "configure"
+#line 3394 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3386,11 +3401,11 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3405: \"$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 3394 "configure"
+#line 3409 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3401,7 +3416,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -3418,7 +3433,7 @@
 rm -f conftest*
 if test $ac_cv_c_bigendian = unknown; then
 cat > conftest.$ac_ext <<EOF
-#line 3422 "configure"
+#line 3437 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -3431,7 +3446,7 @@
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:3435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_c_bigendian=no
 else
@@ -3457,10 +3472,10 @@


 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:3461: checking size of short" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3464 "configure"
+echo "configure:3476: checking size of short" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3479 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -3471,7 +3486,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:3475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -3498,10 +3513,10 @@
   exit 1
 fi
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:3502: checking size of int" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3505 "configure"
+echo "configure:3517: checking size of int" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3520 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -3512,7 +3527,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:3516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -3533,10 +3548,10 @@


 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:3537: checking size of long" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3540 "configure"
+echo "configure:3552: checking size of long" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3555 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -3547,7 +3562,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:3551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -3568,10 +3583,10 @@


 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:3572: checking size of long long" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3575 "configure"
+echo "configure:3587: checking size of long long" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3590 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -3582,7 +3597,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:3586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3601: \"$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
@@ -3603,10 +3618,10 @@


 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:3607: checking size of void *" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3610 "configure"
+echo "configure:3622: checking size of void *" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3625 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -3617,7 +3632,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:3621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3636: \"$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
@@ -3639,7 +3654,7 @@


 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:3643: checking for long file names" >&5
+echo "configure:3658: 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:
@@ -3686,12 +3701,12 @@


 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:3690: checking for sin in -lm" >&5
+echo "configure:3705: 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 3695 "configure"
+#line 3710 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3702,7 +3717,7 @@
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:3706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3744,14 +3759,14 @@


 cat > conftest.$ac_ext <<EOF
-#line 3748 "configure"
+#line 3763 "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:3755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_INVERSE_HYPERBOLIC
@@ -3768,7 +3783,7 @@
 rm -f conftest*

 echo "checking type of mail spool file locking" 1>&6
-echo "configure:3772: checking type of mail spool file locking" >&5
+echo "configure:3787: checking type of mail spool file locking" >&5
 test -z "$mail_locking" -a "$mail_use_flock" = "yes" && mail_locking=flock
 test -z "$mail_locking" -a "$mail_use_lockf" = "yes" && mail_locking=lockf
 if   test "$mail_locking" = "lockf"; then { test "$extra_verbose" = "yes" && cat << \EOF
@@ -3792,12 +3807,12 @@


 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:3796: checking for kstat_open in -lkstat" >&5
+echo "configure:3811: 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 3801 "configure"
+#line 3816 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3808,7 +3823,7 @@
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:3812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3842,12 +3857,12 @@


 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:3846: checking for kvm_read in -lkvm" >&5
+echo "configure:3861: 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 3851 "configure"
+#line 3866 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3858,7 +3873,7 @@
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:3862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3892,12 +3907,12 @@


 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:3896: checking for cma_open in -lpthreads" >&5
+echo "configure:3911: 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 3901 "configure"
+#line 3916 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3908,7 +3923,7 @@
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:3912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3944,7 +3959,7 @@
 fi

 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:3948: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:3963: 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;
@@ -3955,7 +3970,7 @@

 if test "$opsys" = "sol2" && test "$OS_RELEASE" -ge 56; then
   echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:3959: checking for \"-z ignore\" linker flag" >&5
+echo "configure:3974: 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 ;;
@@ -3965,7 +3980,7 @@


 echo "checking "for specified window system"" 1>&6
-echo "configure:3969: checking "for specified window system"" >&5
+echo "configure:3984: checking "for specified window system"" >&5

 if test "$with_x11" != "no"; then
     test "$x_includes $x_libraries" != "NONE NONE" && \
@@ -3995,7 +4010,7 @@
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:3999: checking for X" >&5
+echo "configure:4014: checking for X" >&5

 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -4055,12 +4070,12 @@

   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 4059 "configure"
+#line 4074 "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:4064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4129,14 +4144,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4133 "configure"
+#line 4148 "configure"
 #include "confdefs.h"

 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:4140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -4245,17 +4260,17 @@
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:4249: checking whether -R must be followed by a space" >&5
+echo "configure:4264: 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 4252 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:4259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+#line 4267 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:4274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -4271,14 +4286,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 4275 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:4282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+#line 4290 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:4297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -4314,12 +4329,12 @@
 else

 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:4318: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:4333: 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 4323 "configure"
+#line 4338 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4330,7 +4345,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:4334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4354,12 +4369,12 @@
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then

 echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:4358: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:4373: 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 4363 "configure"
+#line 4378 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4370,7 +4385,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:4374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4399,10 +4414,10 @@
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:4403: checking for gethostbyname" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4406 "configure"
+echo "configure:4418: checking for gethostbyname" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4421 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -4425,7 +4440,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:4429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -4446,12 +4461,12 @@
     if test $ac_cv_func_gethostbyname = no; then

 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4450: checking for gethostbyname in -lnsl" >&5
+echo "configure:4465: 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 4455 "configure"
+#line 4470 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4462,7 +4477,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:4466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4492,10 +4507,10 @@
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:4496: checking for connect" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4499 "configure"
+echo "configure:4511: checking for connect" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4514 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -4518,7 +4533,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:4522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -4541,12 +4556,12 @@
 xe_msg_checking="for connect in -lsocket"
 test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:4545: checking "$xe_msg_checking"" >&5
+echo "configure:4560: 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 4550 "configure"
+#line 4565 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4557,7 +4572,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:4561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4581,10 +4596,10 @@

     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:4585: checking for remove" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4588 "configure"
+echo "configure:4600: checking for remove" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4603 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -4607,7 +4622,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:4611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -4628,12 +4643,12 @@
     if test $ac_cv_func_remove = no; then

 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:4632: checking for remove in -lposix" >&5
+echo "configure:4647: 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 4637 "configure"
+#line 4652 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4644,7 +4659,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:4648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4668,10 +4683,10 @@

     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:4672: checking for shmat" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4675 "configure"
+echo "configure:4687: checking for shmat" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4690 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -4694,7 +4709,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:4698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -4715,12 +4730,12 @@
     if test $ac_cv_func_shmat = no; then

 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:4719: checking for shmat in -lipc" >&5
+echo "configure:4734: 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 4724 "configure"
+#line 4739 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4731,7 +4746,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:4735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4765,12 +4780,12 @@
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.

 echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:4769: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:4784: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lICE "
 cat > conftest.$ac_ext <<EOF
-#line 4774 "configure"
+#line 4789 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4781,7 +4796,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:4785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4818,22 +4833,22 @@

 if test "$window_system" = "none"; then
   echo "checking for MS-Windows" 1>&6
-echo "configure:4822: checking for MS-Windows" >&5
+echo "configure:4837: checking for MS-Windows" >&5

 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:4825: checking for main in -lgdi32" >&5
+echo "configure:4840: 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 4830 "configure"
+#line 4845 "configure"
 #include "confdefs.h"

 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:4837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4977,7 +4992,7 @@
   fi

     echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:4981: checking for X defines extracted by xmkmf" >&5
+echo "configure:4996: checking for X defines extracted by xmkmf" >&5
   rm -fr conftestdir
   if mkdir conftestdir; then
     cd conftestdir
@@ -5009,15 +5024,15 @@

     ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:5013: checking for X11/Intrinsic.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5016 "configure"
+echo "configure:5028: checking for X11/Intrinsic.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5031 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5041,12 +5056,12 @@


 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:5045: checking for XOpenDisplay in -lX11" >&5
+echo "configure:5060: 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 5050 "configure"
+#line 5065 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5057,7 +5072,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:5061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5082,12 +5097,12 @@
 xe_msg_checking="for XGetFontProperty in -lX11"
 test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:5086: checking "$xe_msg_checking"" >&5
+echo "configure:5101: 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 5091 "configure"
+#line 5106 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5098,7 +5113,7 @@
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:5102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5125,12 +5140,12 @@


 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:5129: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:5144: 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 5134 "configure"
+#line 5149 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5141,7 +5156,7 @@
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:5145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5164,12 +5179,12 @@


 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:5168: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:5183: 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 5173 "configure"
+#line 5188 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5180,7 +5195,7 @@
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:5184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5203,14 +5218,14 @@


   echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:5207: checking the version of X11 being used" >&5
+echo "configure:5222: checking the version of X11 being used" >&5
   cat > conftest.$ac_ext <<EOF
-#line 5209 "configure"
+#line 5224 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
     main(int c, char* v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:5214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:5229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ./conftest foobar; x11_release=$?
 else
@@ -5234,15 +5249,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5238: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5241 "configure"
+echo "configure:5253: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5256 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5261: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5273,7 +5288,7 @@


     echo $ac_n "checking for XFree86""... $ac_c" 1>&6
-echo "configure:5277: checking for XFree86" >&5
+echo "configure:5292: checking for XFree86" >&5
   if test -d "/usr/X386/include" -o \
           -f "/etc/XF86Config"    -o \
 	  -f "/etc/X11/XF86Config" -o \
@@ -5293,12 +5308,12 @@

     test -z "$with_xmu" && {
 echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:5297: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:5312: 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 5302 "configure"
+#line 5317 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5309,7 +5324,7 @@
 XmuReadBitmapDataFromFile()
 ; return 0; }
 EOF
-if { (eval echo configure:5313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5348,19 +5363,19 @@


 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:5352: checking for main in -lXbsd" >&5
+echo "configure:5367: 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 5357 "configure"
+#line 5372 "configure"
 #include "confdefs.h"

 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5419,7 +5434,7 @@
 esac

 echo "checking for session-management option" 1>&6
-echo "configure:5423: checking for session-management option" >&5;
+echo "configure:5438: checking for session-management option" >&5;
 if test "$with_session" != "no"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_SESSION
@@ -5434,15 +5449,15 @@
 test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
 test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6
-echo "configure:5438: checking for X11/Xauth.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5441 "configure"
+echo "configure:5453: checking for X11/Xauth.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5456 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5461: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5465,12 +5480,12 @@
  }
 test -z "$with_xauth" && {
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:5469: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:5484: 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 5474 "configure"
+#line 5489 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5481,7 +5496,7 @@
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:5485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5541,15 +5556,15 @@
       for dir in "" "Tt/" "desktop/" ; do
     ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6
-echo "configure:5545: checking for ${dir}tt_c.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5548 "configure"
+echo "configure:5560: checking for ${dir}tt_c.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5563 "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:5553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5578,12 +5593,12 @@
 xe_msg_checking="for tt_message_create in -ltt"
 test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:5582: checking "$xe_msg_checking"" >&5
+echo "configure:5597: 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 5587 "configure"
+#line 5602 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5594,7 +5609,7 @@
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:5598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5643,15 +5658,15 @@

 test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6
-echo "configure:5647: checking for Dt/Dt.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5650 "configure"
+echo "configure:5662: checking for Dt/Dt.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5665 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5670: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5674,12 +5689,12 @@
  }
 test -z "$with_cde" && {
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:5678: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:5693: 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 5683 "configure"
+#line 5698 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5690,7 +5705,7 @@
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:5694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5730,13 +5745,13 @@
 if test "$with_x11" = "yes"; then

   echo "checking for X11 graphics libraries" 1>&6
-echo "configure:5734: checking for X11 graphics libraries" >&5
+echo "configure:5749: checking for X11 graphics libraries" >&5

     echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:5737: checking for Xpm - no older than 3.4f" >&5
+echo "configure:5752: checking for Xpm - no older than 3.4f" >&5
   xe_check_libs=-lXpm
   test -z "$with_xpm" && { cat > conftest.$ac_ext <<EOF
-#line 5740 "configure"
+#line 5755 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
   int main(int c, char **v) {
@@ -5746,7 +5761,7 @@
 		  0 ;
   }
 EOF
-if { (eval echo configure:5750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:5765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ./conftest foobar; xpm_status=$?;
     if test "$xpm_status" = "0"; then with_xpm=yes; else with_xpm=no; fi;
@@ -5784,15 +5799,15 @@

     test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:5788: checking for compface.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5791 "configure"
+echo "configure:5803: checking for compface.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5806 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5796: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5811: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5815,12 +5830,12 @@
  }
   test -z "$with_xface" && {
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:5819: checking for UnGenFace in -lcompface" >&5
+echo "configure:5834: 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 5824 "configure"
+#line 5839 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5831,7 +5846,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:5835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5867,15 +5882,15 @@

     test "$with_imagick" != "no" && { ac_safe=`echo "magick/magick.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for magick/magick.h""... $ac_c" 1>&6
-echo "configure:5871: checking for magick/magick.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5874 "configure"
+echo "configure:5886: checking for magick/magick.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5889 "configure"
 #include "confdefs.h"
 #include <magick/magick.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5894: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5895,15 +5910,15 @@
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "X11/magick/magick.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/magick/magick.h""... $ac_c" 1>&6
-echo "configure:5899: checking for X11/magick/magick.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5902 "configure"
+echo "configure:5914: checking for X11/magick/magick.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5917 "configure"
 #include "confdefs.h"
 #include <X11/magick/magick.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5937,12 +5952,12 @@
             z_libs=""

 echo $ac_n "checking for inflateInit_ in -lz""... $ac_c" 1>&6
-echo "configure:5941: checking for inflateInit_ in -lz" >&5
+echo "configure:5956: checking for inflateInit_ in -lz" >&5
 ac_lib_var=`echo z'_'inflateInit_ | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lz "
 cat > conftest.$ac_ext <<EOF
-#line 5946 "configure"
+#line 5961 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5953,7 +5968,7 @@
 inflateInit_()
 ; return 0; }
 EOF
-if { (eval echo configure:5957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5971,12 +5986,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inflateInit_ in -lgz""... $ac_c" 1>&6
-echo "configure:5975: checking for inflateInit_ in -lgz" >&5
+echo "configure:5990: checking for inflateInit_ in -lgz" >&5
 ac_lib_var=`echo gz'_'inflateInit_ | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lgz "
 cat > conftest.$ac_ext <<EOF
-#line 5980 "configure"
+#line 5995 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5987,7 +6002,7 @@
 inflateInit_()
 ; return 0; }
 EOF
-if { (eval echo configure:5991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6014,12 +6029,12 @@
     imagick_libs=""

 echo $ac_n "checking for XDPSPixelsPerPoint in -ldps""... $ac_c" 1>&6
-echo "configure:6018: checking for XDPSPixelsPerPoint in -ldps" >&5
+echo "configure:6033: checking for XDPSPixelsPerPoint in -ldps" >&5
 ac_lib_var=`echo dps'_'XDPSPixelsPerPoint | sed 'y%./+-%__p_%'`

 xe_check_libs="-ldpstk -ldps "
 cat > conftest.$ac_ext <<EOF
-#line 6023 "configure"
+#line 6038 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6030,7 +6045,7 @@
 XDPSPixelsPerPoint()
 ; return 0; }
 EOF
-if { (eval echo configure:6034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6052,12 +6067,12 @@


 echo $ac_n "checking for FPX_SetToolkitMemoryLimit in -lfpx""... $ac_c" 1>&6
-echo "configure:6056: checking for FPX_SetToolkitMemoryLimit in -lfpx" >&5
+echo "configure:6071: checking for FPX_SetToolkitMemoryLimit in -lfpx" >&5
 ac_lib_var=`echo fpx'_'FPX_SetToolkitMemoryLimit | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lfpx "
 cat > conftest.$ac_ext <<EOF
-#line 6061 "configure"
+#line 6076 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6068,7 +6083,7 @@
 FPX_SetToolkitMemoryLimit()
 ; return 0; }
 EOF
-if { (eval echo configure:6072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6090,12 +6105,12 @@


 echo $ac_n "checking for DF24getdims in -ldf""... $ac_c" 1>&6
-echo "configure:6094: checking for DF24getdims in -ldf" >&5
+echo "configure:6109: checking for DF24getdims in -ldf" >&5
 ac_lib_var=`echo df'_'DF24getdims | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ldf "
 cat > conftest.$ac_ext <<EOF
-#line 6099 "configure"
+#line 6114 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6106,7 +6121,7 @@
 DF24getdims()
 ; return 0; }
 EOF
-if { (eval echo configure:6110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6128,12 +6143,12 @@


 echo $ac_n "checking for jbg_dec_init in -ljbig""... $ac_c" 1>&6
-echo "configure:6132: checking for jbg_dec_init in -ljbig" >&5
+echo "configure:6147: checking for jbg_dec_init in -ljbig" >&5
 ac_lib_var=`echo jbig'_'jbg_dec_init | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ljbig "
 cat > conftest.$ac_ext <<EOF
-#line 6137 "configure"
+#line 6152 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6144,7 +6159,7 @@
 jbg_dec_init()
 ; return 0; }
 EOF
-if { (eval echo configure:6148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6166,12 +6181,12 @@


 echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-echo "configure:6170: checking for jpeg_read_header in -ljpeg" >&5
+echo "configure:6185: checking for jpeg_read_header in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ljpeg "
 cat > conftest.$ac_ext <<EOF
-#line 6175 "configure"
+#line 6190 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6182,7 +6197,7 @@
 jpeg_read_header()
 ; return 0; }
 EOF
-if { (eval echo configure:6186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6204,12 +6219,12 @@


 echo $ac_n "checking for OpenMPEG in -lmpeg""... $ac_c" 1>&6
-echo "configure:6208: checking for OpenMPEG in -lmpeg" >&5
+echo "configure:6223: checking for OpenMPEG in -lmpeg" >&5
 ac_lib_var=`echo mpeg'_'OpenMPEG | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lmpeg "
 cat > conftest.$ac_ext <<EOF
-#line 6213 "configure"
+#line 6228 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6220,7 +6235,7 @@
 OpenMPEG()
 ; return 0; }
 EOF
-if { (eval echo configure:6224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6242,12 +6257,12 @@


 echo $ac_n "checking for TT_Init_FreeType in -lttf""... $ac_c" 1>&6
-echo "configure:6246: checking for TT_Init_FreeType in -lttf" >&5
+echo "configure:6261: checking for TT_Init_FreeType in -lttf" >&5
 ac_lib_var=`echo ttf'_'TT_Init_FreeType | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lttf "
 cat > conftest.$ac_ext <<EOF
-#line 6251 "configure"
+#line 6266 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6258,7 +6273,7 @@
 TT_Init_FreeType()
 ; return 0; }
 EOF
-if { (eval echo configure:6262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6282,12 +6297,12 @@
 xe_msg_checking="for png_create_read_struct in -lpng"
 test -n "$z_libs" && xe_msg_checking="$xe_msg_checking using extra libs $z_libs"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6286: checking "$xe_msg_checking"" >&5
+echo "configure:6301: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo png'_'png_create_read_struct | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lpng $z_libs"
 cat > conftest.$ac_ext <<EOF
-#line 6291 "configure"
+#line 6306 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6298,7 +6313,7 @@
 png_create_read_struct()
 ; return 0; }
 EOF
-if { (eval echo configure:6302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6320,12 +6335,12 @@


 echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:6324: checking for TIFFOpen in -ltiff" >&5
+echo "configure:6339: checking for TIFFOpen in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`

 xe_check_libs="$z_libs -ltiff "
 cat > conftest.$ac_ext <<EOF
-#line 6329 "configure"
+#line 6344 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6336,7 +6351,7 @@
 TIFFOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:6340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6356,12 +6371,12 @@
 xe_msg_checking="for TIFFOpen in -ltiff"
 test -n "-ljpeg $z_libs" && xe_msg_checking="$xe_msg_checking using extra libs -ljpeg $z_libs"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6360: checking "$xe_msg_checking"" >&5
+echo "configure:6375: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ltiff -ljpeg $z_libs"
 cat > conftest.$ac_ext <<EOF
-#line 6365 "configure"
+#line 6380 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6372,7 +6387,7 @@
 TIFFOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:6376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6400,12 +6415,12 @@
   }
   test -z "$with_imagick" && {
 echo $ac_n "checking for MogrifyImage in -lMagick""... $ac_c" 1>&6
-echo "configure:6404: checking for MogrifyImage in -lMagick" >&5
+echo "configure:6419: checking for MogrifyImage in -lMagick" >&5
 ac_lib_var=`echo Magick'_'MogrifyImage | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lMagick "
 cat > conftest.$ac_ext <<EOF
-#line 6409 "configure"
+#line 6424 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6416,7 +6431,7 @@
 MogrifyImage()
 ; return 0; }
 EOF
-if { (eval echo configure:6420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6452,12 +6467,12 @@


 echo $ac_n "checking for XawScrollbarSetThumb in -lXaw""... $ac_c" 1>&6
-echo "configure:6456: checking for XawScrollbarSetThumb in -lXaw" >&5
+echo "configure:6471: checking for XawScrollbarSetThumb in -lXaw" >&5
 ac_lib_var=`echo Xaw'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lXaw "
 cat > conftest.$ac_ext <<EOF
-#line 6461 "configure"
+#line 6476 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6468,7 +6483,7 @@
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:6472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6492,15 +6507,15 @@

     ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:6496: checking for Xm/Xm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6499 "configure"
+echo "configure:6511: checking for Xm/Xm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6514 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6519: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6517,12 +6532,12 @@
   echo "$ac_t""yes" 1>&6

 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:6521: checking for XmStringFree in -lXm" >&5
+echo "configure:6536: 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 6526 "configure"
+#line 6541 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6533,7 +6548,7 @@
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:6537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6790,7 +6805,7 @@

 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
-echo "configure:6794: checking for Mule-related features" >&5
+echo "configure:6809: checking for Mule-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
@@ -6807,15 +6822,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6811: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6814 "configure"
+echo "configure:6826: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6829 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6846,12 +6861,12 @@


 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:6850: checking for strerror in -lintl" >&5
+echo "configure:6865: 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 6855 "configure"
+#line 6870 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6862,7 +6877,7 @@
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:6866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6895,19 +6910,19 @@


   echo "checking for Mule input methods" 1>&6
-echo "configure:6899: checking for Mule input methods" >&5
+echo "configure:6914: checking for Mule input methods" >&5
       test -z "$with_xim" -a "$opsys" != "sol2" && with_xim=no
   case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6
-echo "configure:6903: checking for XIM" >&5
+echo "configure:6918: checking for XIM" >&5

 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:6906: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:6921: 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 6911 "configure"
+#line 6926 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6918,7 +6933,7 @@
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:6922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6983,15 +6998,15 @@

     if test "$with_xfs" = "yes" ; then
     echo "checking for XFontSet" 1>&6
-echo "configure:6987: checking for XFontSet" >&5
+echo "configure:7002: checking for XFontSet" >&5

 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:6990: checking for XmbDrawString in -lX11" >&5
+echo "configure:7005: 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 6995 "configure"
+#line 7010 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7002,7 +7017,7 @@
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:7006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7042,15 +7057,15 @@
     test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
   test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6
-echo "configure:7046: checking for wnn/jllib.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7049 "configure"
+echo "configure:7061: checking for wnn/jllib.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7064 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7075,10 +7090,10 @@
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7079: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7082 "configure"
+echo "configure:7094: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7097 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7101,7 +7116,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:7105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7130,12 +7145,12 @@

     test "$ac_cv_func_crypt" != "yes" && {
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:7134: checking for crypt in -lcrypt" >&5
+echo "configure:7149: 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 7139 "configure"
+#line 7154 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7146,7 +7161,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:7150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7180,12 +7195,12 @@
   fi
     test -z "$with_wnn" && {
 echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6
-echo "configure:7184: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:7199: 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 7189 "configure"
+#line 7204 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7196,7 +7211,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:7200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7233,12 +7248,12 @@
  fi

 echo $ac_n "checking for jl_fi_dic_list in -lwnn""... $ac_c" 1>&6
-echo "configure:7237: checking for jl_fi_dic_list in -lwnn" >&5
+echo "configure:7252: checking for jl_fi_dic_list in -lwnn" >&5
 ac_lib_var=`echo wnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lwnn "
 cat > conftest.$ac_ext <<EOF
-#line 7242 "configure"
+#line 7257 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7249,7 +7264,7 @@
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:7253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7281,15 +7296,15 @@

     test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6
-echo "configure:7285: checking for canna/RK.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7288 "configure"
+echo "configure:7300: checking for canna/RK.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7303 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7308: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7312,12 +7327,12 @@
  }
   test -z "$with_canna" && {
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:7316: checking for RkBgnBun in -lRKC" >&5
+echo "configure:7331: 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 7321 "configure"
+#line 7336 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7328,7 +7343,7 @@
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:7332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7351,12 +7366,12 @@
  }
   test -z "$with_canna" && {
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:7355: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:7370: 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 7360 "configure"
+#line 7375 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7367,7 +7382,7 @@
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:7371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7416,12 +7431,12 @@
   libs_x="-lXm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXm\" to \$libs_x"; fi

 echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6
-echo "configure:7420: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:7435: 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 7425 "configure"
+#line 7440 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7432,7 +7447,7 @@
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:7436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7505,10 +7520,10 @@
 for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask strcasecmp strerror tzset ulimit usleep utimes waitpid
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7509: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7512 "configure"
+echo "configure:7524: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7527 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7531,7 +7546,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:7535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7568,10 +7583,10 @@
     for ac_func in realpath
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7572: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7575 "configure"
+echo "configure:7587: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7590 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7594,7 +7609,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:7598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7627,16 +7642,16 @@
 esac

 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:7631: checking whether netdb declares h_errno" >&5
-cat > conftest.$ac_ext <<EOF
-#line 7633 "configure"
+echo "configure:7646: checking whether netdb declares h_errno" >&5
+cat > conftest.$ac_ext <<EOF
+#line 7648 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:7640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF
@@ -7656,16 +7671,16 @@
 rm -f conftest*

 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:7660: checking for sigsetjmp" >&5
-cat > conftest.$ac_ext <<EOF
-#line 7662 "configure"
+echo "configure:7675: checking for sigsetjmp" >&5
+cat > conftest.$ac_ext <<EOF
+#line 7677 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:7669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7684: \"$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
@@ -7685,11 +7700,11 @@
 rm -f conftest*

 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:7689: checking whether localtime caches TZ" >&5
+echo "configure:7704: checking whether localtime caches TZ" >&5

 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 7693 "configure"
+#line 7708 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
@@ -7724,7 +7739,7 @@
   exit (0);
 }
 EOF
-if { (eval echo configure:7728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
@@ -7753,9 +7768,9 @@

 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday cannot accept two arguments""... $ac_c" 1>&6
-echo "configure:7757: checking whether gettimeofday cannot accept two arguments" >&5
-cat > conftest.$ac_ext <<EOF
-#line 7759 "configure"
+echo "configure:7772: checking whether gettimeofday cannot accept two arguments" >&5
+cat > conftest.$ac_ext <<EOF
+#line 7774 "configure"
 #include "confdefs.h"

 #ifdef TIME_WITH_SYS_TIME
@@ -7777,7 +7792,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:7781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
 else
@@ -7799,19 +7814,19 @@


 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:7803: checking for inline" >&5
+echo "configure:7818: checking for inline" >&5

 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 7808 "configure"
+#line 7823 "configure"
 #include "confdefs.h"

 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:7815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -7861,17 +7876,17 @@
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:7865: checking for working alloca.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7868 "configure"
+echo "configure:7880: checking for working alloca.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7883 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:7875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -7895,10 +7910,10 @@
 fi

 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:7899: checking for alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7902 "configure"
+echo "configure:7914: checking for alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7917 "configure"
 #include "confdefs.h"

 #ifdef __GNUC__
@@ -7921,7 +7936,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:7925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -7960,10 +7975,10 @@


 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:7964: checking whether alloca needs Cray hooks" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7967 "configure"
+echo "configure:7979: checking whether alloca needs Cray hooks" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7982 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -7987,10 +8002,10 @@
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7991: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7994 "configure"
+echo "configure:8006: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8009 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8013,7 +8028,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:8017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8043,10 +8058,10 @@
 fi

 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:8047: checking stack direction for C alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8050 "configure"
+echo "configure:8062: checking stack direction for C alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8065 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -8065,7 +8080,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:8069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
@@ -8093,15 +8108,15 @@

 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:8097: checking for vfork.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8100 "configure"
+echo "configure:8112: checking for vfork.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8115 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8120: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8129,10 +8144,10 @@
 fi

 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:8133: checking for working vfork" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8136 "configure"
+echo "configure:8148: checking for working vfork" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8151 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -8227,7 +8242,7 @@
   }
 }
 EOF
-if { (eval echo configure:8231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_func_vfork_works=yes
 else
@@ -8252,10 +8267,10 @@


 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:8256: checking for working strcoll" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8259 "configure"
+echo "configure:8271: checking for working strcoll" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8274 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -8265,7 +8280,7 @@
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:8269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
@@ -8292,10 +8307,10 @@
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8296: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8299 "configure"
+echo "configure:8311: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8314 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8318,7 +8333,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:8322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8346,10 +8361,10 @@
 done

 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:8350: checking whether getpgrp takes no argument" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8353 "configure"
+echo "configure:8365: checking whether getpgrp takes no argument" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8368 "configure"
 #include "confdefs.h"

 /*
@@ -8404,7 +8419,7 @@
 }

 EOF
-if { (eval echo configure:8408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_func_getpgrp_void=yes
 else
@@ -8430,10 +8445,10 @@


 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:8434: checking for working mmap" >&5
+echo "configure:8449: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 8437 "configure"
+#line 8452 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -8466,7 +8481,7 @@
   return 1;
 }
 EOF
-if { (eval echo configure:8470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   have_mmap=yes
 else
@@ -8500,15 +8515,15 @@

 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:8504: checking for termios.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8507 "configure"
+echo "configure:8519: checking for termios.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8522 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8551,15 +8566,15 @@
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termio.h""... $ac_c" 1>&6
-echo "configure:8555: checking for termio.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8558 "configure"
+echo "configure:8570: checking for termio.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8573 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8578: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8591,10 +8606,10 @@


 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:8595: checking for socket" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8598 "configure"
+echo "configure:8610: checking for socket" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8613 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -8617,7 +8632,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:8621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -8632,15 +8647,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6
-echo "configure:8636: checking for netinet/in.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8639 "configure"
+echo "configure:8651: checking for netinet/in.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8654 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8657,15 +8672,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6
-echo "configure:8661: checking for arpa/inet.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8664 "configure"
+echo "configure:8676: checking for arpa/inet.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8679 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8690,9 +8705,9 @@
 }

       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:8694: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:8709: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 8696 "configure"
+#line 8711 "configure"
 #include "confdefs.h"

 #include <sys/types.h>
@@ -8703,7 +8718,7 @@
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:8707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_SOCKADDR_SUN_LEN
@@ -8734,10 +8749,10 @@


 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:8738: checking for msgget" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8741 "configure"
+echo "configure:8753: checking for msgget" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8756 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
@@ -8760,7 +8775,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:8764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_msgget=yes"
 else
@@ -8775,15 +8790,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6
-echo "configure:8779: checking for sys/ipc.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8782 "configure"
+echo "configure:8794: checking for sys/ipc.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8797 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8800,15 +8815,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
-echo "configure:8804: checking for sys/msg.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8807 "configure"
+echo "configure:8819: checking for sys/msg.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8822 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8846,15 +8861,15 @@

 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:8850: checking for dirent.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8853 "configure"
+echo "configure:8865: checking for dirent.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8868 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8881,15 +8896,15 @@
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6
-echo "configure:8885: checking for sys/dir.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8888 "configure"
+echo "configure:8900: checking for sys/dir.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8903 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8922,15 +8937,15 @@

 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:8926: checking for nlist.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8929 "configure"
+echo "configure:8941: checking for nlist.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8944 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8949: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8960,7 +8975,7 @@


 echo "checking "for sound support"" 1>&6
-echo "configure:8964: checking "for sound support"" >&5
+echo "configure:8979: checking "for sound support"" >&5
 case "$with_sound" in
   native | both ) with_native_sound=yes;;
   nas    | no   ) with_native_sound=no;;
@@ -8971,15 +8986,15 @@
     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:8975: checking for multimedia/audio_device.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8978 "configure"
+echo "configure:8990: checking for multimedia/audio_device.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8993 "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:8983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9027,12 +9042,12 @@
       if test -z "$native_sound_lib"; then

 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:9031: checking for ALopenport in -laudio" >&5
+echo "configure:9046: 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 9036 "configure"
+#line 9051 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9043,7 +9058,7 @@
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:9047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9074,12 +9089,12 @@
       if test -z "$native_sound_lib"; then

 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:9078: checking for AOpenAudio in -lAlib" >&5
+echo "configure:9093: 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 9083 "configure"
+#line 9098 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9090,7 +9105,7 @@
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:9094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9128,15 +9143,15 @@
     for dir in "machine" "sys" "linux"; do
       ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6
-echo "configure:9132: checking for ${dir}/soundcard.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9135 "configure"
+echo "configure:9147: checking for ${dir}/soundcard.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9150 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9206,7 +9221,7 @@
  fi
   libs_x="-laudio $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-laudio\" to \$libs_x"; fi
       cat > conftest.$ac_ext <<EOF
-#line 9210 "configure"
+#line 9225 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
@@ -9233,7 +9248,7 @@

 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:9237: checking for TTY-related features" >&5
+echo "configure:9252: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
@@ -9249,12 +9264,12 @@
     if test -z "$with_ncurses"; then

 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:9253: checking for tgetent in -lncurses" >&5
+echo "configure:9268: 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 9258 "configure"
+#line 9273 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9265,7 +9280,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:9269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9298,15 +9313,15 @@

     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:9302: checking for ncurses/curses.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9305 "configure"
+echo "configure:9317: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9320 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9328,15 +9343,15 @@

     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:9332: checking for ncurses/term.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9335 "configure"
+echo "configure:9347: checking for ncurses/term.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9350 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9366,15 +9381,15 @@
       c_switch_site="$c_switch_site -I/usr/include/ncurses"
       ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:9370: checking for ncurses/curses.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9373 "configure"
+echo "configure:9385: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9388 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9409,12 +9424,12 @@
 	for lib in curses termlib termcap; do

 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:9413: checking for tgetent in -l$lib" >&5
+echo "configure:9428: 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 9418 "configure"
+#line 9433 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9425,7 +9440,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:9429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9456,12 +9471,12 @@
       else

 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:9460: checking for tgetent in -lcurses" >&5
+echo "configure:9475: 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 9465 "configure"
+#line 9480 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9472,7 +9487,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:9476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9490,12 +9505,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:9494: checking for tgetent in -ltermcap" >&5
+echo "configure:9509: 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 9499 "configure"
+#line 9514 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9506,7 +9521,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:9510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9554,15 +9569,15 @@

     test -z "$with_gpm" && { ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for gpm.h""... $ac_c" 1>&6
-echo "configure:9558: checking for gpm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9561 "configure"
+echo "configure:9573: checking for gpm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9576 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9566: \"$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`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9585,12 +9600,12 @@
  }
   test -z "$with_gpm" && {
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:9589: checking for Gpm_Open in -lgpm" >&5
+echo "configure:9604: 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 9594 "configure"
+#line 9609 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9601,7 +9616,7 @@
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:9605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9650,17 +9665,17 @@


 echo "checking for database support" 1>&6
-echo "configure:9654: checking for database support" >&5
+echo "configure:9669: checking for database support" >&5

 if test "$with_database_gnudbm" != "no"; then

 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:9659: checking for dbm_open in -lgdbm" >&5
+echo "configure:9674: 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 9664 "configure"
+#line 9679 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9671,7 +9686,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:9675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9693,10 +9708,10 @@

   if test "$with_database_gnudbm" != "yes"; then
     echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:9697: checking for dbm_open" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9700 "configure"
+echo "configure:9712: checking for dbm_open" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9715 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -9719,7 +9734,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:9723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else
@@ -9755,10 +9770,10 @@

 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:9759: checking for dbm_open" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9762 "configure"
+echo "configure:9774: checking for dbm_open" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9777 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -9781,7 +9796,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:9785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else
@@ -9802,12 +9817,12 @@
   if test "$need_libdbm" != "no"; then

 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:9806: checking for dbm_open in -ldbm" >&5
+echo "configure:9821: 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 9811 "configure"
+#line 9826 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9818,7 +9833,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:9822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9855,10 +9870,10 @@

 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for dbopen""... $ac_c" 1>&6
-echo "configure:9859: checking for dbopen" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9862 "configure"
+echo "configure:9874: checking for dbopen" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9877 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbopen(); below.  */
@@ -9881,7 +9896,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:9885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_dbopen=yes"
 else
@@ -9902,12 +9917,12 @@
   if test "$need_libdb" != "no"; then

 echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6
-echo "configure:9906: checking for dbopen in -ldb" >&5
+echo "configure:9921: checking for dbopen in -ldb" >&5
 ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ldb "
 cat > conftest.$ac_ext <<EOF
-#line 9911 "configure"
+#line 9926 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9918,7 +9933,7 @@
 dbopen()
 ; return 0; }
 EOF
-if { (eval echo configure:9922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9942,7 +9957,7 @@
   if test "$with_database_berkdb" = "yes"; then
     for path in "db/db.h" "db.h"; do
 cat > conftest.$ac_ext <<EOF
-#line 9946 "configure"
+#line 9961 "configure"
 #include "confdefs.h"
 #ifdef HAVE_INTTYPES_H
 #define __BIT_TYPES_DEFINED__
@@ -9960,7 +9975,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:9964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_path="$path"; break
 else
@@ -10012,12 +10027,12 @@
 if test "$with_socks" = "yes"; then

 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:10016: checking for SOCKSinit in -lsocks" >&5
+echo "configure:10031: 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 10021 "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
@@ -10028,7 +10043,7 @@
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:10032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
--- a/configure.in	Mon Aug 13 10:17:09 2007 +0200
+++ b/configure.in	Mon Aug 13 10:17:54 2007 +0200
@@ -485,6 +485,7 @@
 	use_assertions	| \
 	memory_usage_stats | \
 	with_clash_detection | \
+	with_shlib | \
 	no_doc_file )
 	  dnl Make sure the value given was either "yes" or "no".
 	  case "$val" in
@@ -1443,6 +1444,11 @@
   XE_ADD_OBJS(filelock.o)
 fi

+if test "$with_shlib" = "yes"; then
+  AC_DEFINE(HAVE_SHLIB)
+  XE_ADD_OBJS(dlopen.o)
+fi
+
 dnl Choose a compiler from (in order)
 dnl --compiler, env var CC, with_gcc=no && ${NON_GNU_CC:-cc}, AC_PROG_CC
 test -n "$compiler" && CC="$compiler"
@@ -1932,7 +1938,7 @@
 dnl checks for header files
 AC_CHECK_HEADERS(mach/mach.h sys/stropts.h sys/timeb.h sys/time.h unistd.h)
 AC_CHECK_HEADERS(utime.h locale.h libgen.h fcntl.h ulimit.h)
-AC_CHECK_HEADERS(linux/version.h kstat.h sys/pstat.h inttypes.h sys/un.h)
+AC_CHECK_HEADERS(linux/version.h kstat.h sys/pstat.h inttypes.h sys/un.h coff.h)
 AC_HEADER_SYS_WAIT
 AC_HEADER_STDC
 AC_HEADER_TIME
--- a/lisp/ChangeLog	Mon Aug 13 10:17:09 2007 +0200
+++ b/lisp/ChangeLog	Mon Aug 13 10:17:54 2007 +0200
@@ -1,3 +1,44 @@
+1998-01-24  SL Baur  <steve@altair.xemacs.org>
+
+	* package-info.el (pi-last-mod-date): New function.
+	(pi-author-version): New function.
+	(batch-update-package-info): Use them.
+
+1998-01-23  Colin Rafferty  <colin@xemacs.org>
+
+	* frame.el (get-frame-for-buffer-default-to-current): Create.
+	(get-frame-for-buffer-noselect): Allow user to use current frame
+	with `get-frame-for-buffer-default-to-current'.
+
+1998-01-22  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* bytecomp.el (byte-compile-output-file-form): Set print-gensym.
+	(byte-compile-output-docform): Ditto.
+	(byte-compile-compiled-obj-to-list): Ditto.
+
+1998-01-22  Kyle Jones  <kyle_jones@wonderworks.com>
+
+	* startup.el (command-line-1): Removed code that ran
+	  buffer-menu.
+
+1998-01-21  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* help-macro.el (make-help-screen): Bind `help-read-key' via flet.
+
+1998-01-17  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* frame.el (suspend-emacs-or-iconify-frame): Check using
+	`device-on-window-system-p' instead of explicitly checking for X,
+	so that the same logic works for MS Windows.
+	(suspend-or-iconify-emacs): Ditto.
+
+1998-01-14  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* about.el (about-maintainer-info): Andy Piper is back.
+	(xemacs-hackers): Updated Andy Piper's email address.
+	(about-hackers): Added Jonathan Harris.
+	(about-hackers): Updated Tibor Polgar's email address.
+
 1998-01-18  SL Baur  <steve@altair.xemacs.org>

 	* about.el: Add xemacs.org email manager.
--- a/lisp/about.el	Mon Aug 13 10:17:09 2007 +0200
+++ b/lisp/about.el	Mon Aug 13 10:17:54 2007 +0200
@@ -77,7 +77,7 @@
     (mrb      "Martin Buchholz"   "mrb@sun.eng.com")
     (ograf    "Oliver Graf"       "ograf@fga.de")
     (pez      "Peter Pezaris"	  "pez@dwwc.com")
-    (piper    "Andy Piper"        "andy@parallax.co.uk")
+    (piper    "Andy Piper"        "andyp@parallax.co.uk")
     (rickc    "Rick Campbell"     "rickc@lehman.com")
     (rossini  "Anthony Rossini"	  "rossini@stat.sc.edu")
     (vin      "Vin Shelton"	  "acs@acm.org")
@@ -720,7 +720,10 @@
     (piper
      (widget-insert "\
 Author of the original \"fake\" XEmacs toolbar, and outl-mouse for
-mouse gesture based outlining.  Accomplished kludge contributor.\n"))
+mouse gesture based outlining.  Accomplished kludge contributor.
+
+Andy has recently rejoined the XEmacs team to help port XEmacs to
+MS Windows operating systems.\n"))
     (bw
      (widget-insert "\
 Author of the Hyperbole everyday information management hypertext
@@ -772,7 +775,7 @@
      (about-url-link 'marcpa "Visit POWER 911")
      (widget-insert "\
 Previously, I worked at Softimage Inc., now a Microsoft company
-(eeekkk!), as a UNIX system administrator.  This is where I've been
+\(eeekkk!), as a UNIX system administrator.  This is where I've been
 converted to NT.

 In a previous life, I was a programmer/sysadmin at CRIM (Centre de
@@ -996,8 +999,6 @@
        " <" address ">\n\n")
       ;; Display the actual info
       (about-maintainer-info entry)
-      ;; I don't use `about-finish-buffer' because I want "Remove" to
-      ;; kill the buffer.
       (widget-insert "\n")
       (about-finish-buffer 'kill)
       (forward-line 2))))
@@ -1302,6 +1303,7 @@
        (print-short "ChangGil Han" "cghan@phys401.phys.pusan.ac.kr")
        (print-short "Derek Harding" "dharding@lssec.bt.co.uk")
        (print-short "Michael Harnois" "mharnois@sbt.net")
+       (print-short "Jonathan Harris" "jharris@tardis.co.uk")
        (print-short "John Haxby" "J.Haxby@isode.com")
        (print-short "Karl M. Hegbloom" "karlheg@inetarena.com")
        (print-short "Benedikt Heinen" "beh@icemark.thenet.ch")
@@ -1380,7 +1382,7 @@
        (print-short "Sudeep Kumar Palat" "palat@idt.unit.no")
        (print-short "Joel Peterson" "tarzan@aosi.com")
        (print-short "Thomas A. Peterson" "tap@src.honeywell.com")
-       (print-short "Tibor Polgar" "tlp00@eng.amdahl.com")
+       (print-short "Tibor Polgar" "tibor@alteon.com")
        (print-short "Frederic Poncin" "fp@info.ucl.ac.be")
        (print-short "E. Rehmi Post" "rehmi@asylum.sf.ca.us")
        (print-short "Martin Pottendorfer" "Martin.Pottendorfer@aut.alcatel.at")
--- a/lisp/byte-optimize.el	Mon Aug 13 10:17:09 2007 +0200
+++ b/lisp/byte-optimize.el	Mon Aug 13 10:17:54 2007 +0200
@@ -1412,7 +1412,7 @@
     menubar-show-keybindings completion-ignore-case
     canna-empty-info canna-through-info canna-underline
     canna-inhibit-hankakukana x-handle-non-fully-specified-fonts
-    print-escape-newlines print-readably print-gensym
+    print-escape-newlines print-readably
     delete-exited-processes truncate-partial-width-windows
     visible-bell no-redraw-on-reenter cursor-in-echo-area
     inhibit-warning-display parse-sexp-ignore-comments words-include-escapes
--- a/lisp/bytecomp.el	Mon Aug 13 10:17:09 2007 +0200
+++ b/lisp/bytecomp.el	Mon Aug 13 10:17:54 2007 +0200
@@ -1777,7 +1777,9 @@
 	  (print-length nil)
 	  (print-level nil)
 	  (print-readably t)	; print #[] for bytecode, 'x for (quote x)
-	  (print-gensym nil))	; this is too dangerous for now
+	  ;; Emacs 19 can't handle gensyms well.
+	  (print-gensym (if byte-compile-emacs19-compatibility nil
+			    t)))
       (princ "\n" byte-compile-outbuffer)
       (prin1 form byte-compile-outbuffer)
       nil)))
@@ -1825,7 +1827,12 @@
 	 (insert (car info))
 	 (let ((print-escape-newlines t)
 	       (print-readably t)	; print #[] for bytecode, 'x for (quote x)
-	       (print-gensym nil)	; this is too dangerous for now
+	       ;; Use a cons cell to say that we want
+	       ;; print-gensym-alist not to be cleared between calls
+	       ;; to print functions.
+	       (print-gensym (if byte-compile-emacs19-compatibility nil
+			       '(t)))
+	       print-gensym-alist
 	       (index 0))
 	   (prin1 (car form) byte-compile-outbuffer)
 	   (while (setq form (cdr form))
@@ -2042,7 +2049,11 @@
   ;; Much better than creating them and then "uncreating" them
   ;; like this.
   (read (concat "("
-		(substring (let ((print-readably t))
+		(substring (let ((print-readably t)
+				 (print-gensym
+				  (if byte-compile-emacs19-compatibility nil
+				    '(t)))
+				 (print-gensym-alist nil))
 			     (prin1-to-string obj))
 			   2 -1)
 		")")))
--- a/lisp/frame.el	Mon Aug 13 10:17:09 2007 +0200
+++ b/lisp/frame.el	Mon Aug 13 10:17:54 2007 +0200
@@ -757,21 +757,22 @@
 (defun suspend-or-iconify-emacs ()
   "Calls iconify-emacs if frame is an X frame, otherwise calls suspend-emacs"
   (interactive)
-  (cond
-   ((eq (frame-type) 'x)
-    (iconify-emacs))
-   ((and (eq (frame-type) 'tty)
-	 (console-tty-controlling-process (selected-console)))
-    (suspend-console (selected-console)))
-   (t
-    (suspend-emacs))))
+  (cond ((device-on-window-system-p)
+	 (iconify-emacs))
+	((and (eq (frame-type) 'tty)
+	      (console-tty-controlling-process (selected-console)))
+	 (suspend-console (selected-console)))
+	(t
+	 (suspend-emacs))))

 ;; This is quite a mouthful, but it should be descriptive, as it's
-;; bound to C-z
+;; bound to C-z.  FSF takes the easy way out by binding C-z to
+;; different things depending on window-system.  We can't do the same,
+;; because we allow simultaneous X and TTY consoles.
 (defun suspend-emacs-or-iconify-frame ()
   "Iconify current frame if it is an X frame, otherwise suspend Emacs."
   (interactive)
-  (cond ((eq (frame-type) 'x)
+  (cond ((device-on-window-system-p)
 	 (iconify-frame))
 	((and (eq (frame-type) 'tty)
 	      (console-tty-controlling-process (selected-console)))
@@ -901,6 +902,11 @@
 	(set-window-buffer w buffer))
     fr))

+(defcustom get-frame-for-buffer-default-to-current nil
+  "*When non-nil, `get-frame-for-buffer' will default to the current frame."
+  :type 'boolean
+  :group 'frames)
+
 (defun get-frame-for-buffer-noselect (buffer
 				      &optional not-this-window-p on-frame)
   "Return a frame in which to display BUFFER.
@@ -1006,6 +1012,13 @@
 	    (get-frame-for-buffer-make-new-frame buffer)
 	  (car frames))))

+     ;;
+     ;; This buffer's mode did not express a preference for a frame of a
+     ;; particular name.  However, the user wants the frame to be the
+     ;; current one in that case.
+     ;;
+     (get-frame-for-buffer-default-to-current nil)
+
      (t
       ;;
       ;; This buffer's mode did not express a preference for a frame of a
--- a/lisp/help-macro.el	Mon Aug 13 10:17:09 2007 +0200
+++ b/lisp/help-macro.el	Mon Aug 13 10:17:54 2007 +0200
@@ -76,23 +76,6 @@
   :type 'boolean
   :group 'help-appearance)

-;;;###autoload
-(defun help-read-key (prompt)
-  (let (events)
-    (while (not (key-press-event-p
-		 (aref (setq events (read-key-sequence prompt)) 0)))
-      ;; Mouse clicks are not part of the help feature, so reexecute
-      ;; them in the standard environment.
-      (mapc 'dispatch-event events))
-    (let ((key (nconc (event-modifiers (aref events 0))
-		      (list (event-key (aref events 0))))))
-      ;; Make the HELP key translate to C-h.
-      (when (lookup-key function-key-map key)
-	(setq key (lookup-key function-key-map key)))
-      (if (eq (length key) 1)
-	  (car key)
-	key))))
-
 (defmacro make-help-screen (fname help-line help-text helped-map)
   "Construct help-menu function name FNAME.
 When invoked, FNAME shows HELP-LINE and reads a command using HELPED-MAP.
@@ -103,71 +86,89 @@
   `(defun ,fname ()
      ,help-text
      (interactive)
-     (let ((line-prompt
-	    (substitute-command-keys ,help-line)))
-       (when three-step-help
-	 (message "%s" line-prompt))
-       (let* ((help-screen (documentation (quote ,fname)))
-	      ;; We bind overriding-local-map for very small
-	      ;; sections, *excluding* where we switch buffers
-	      ;; and where we execute the chosen help command.
-	      (local-map (make-sparse-keymap))
-	      (minor-mode-map-alist nil)
-	      (prev-frame (selected-frame))
-	      config new-frame key)
-	 (unwind-protect
-	     (progn
-	       (set-keymap-parents local-map (list ,helped-map))
-	       (cond (three-step-help
-		      (let* ((overriding-local-map local-map))
-			(setq key (help-read-key nil))))
-		     (t
-		      (setq key ??)))
-	       (when (or (equal key ??)
-			 (equal key (list help-char)))
-		 (setq config (current-window-configuration))
-		 (switch-to-buffer-other-window "*Help*")
-		 (and (not (eq (window-frame (selected-window))
-			       prev-frame))
-		      (setq new-frame (window-frame (selected-window))
-			    config nil))
-		 (setq buffer-read-only nil)
-		 (erase-buffer)
-		 (insert help-screen)
-		 (help-mode)
-		 (goto-char (point-min))
-		 (while (member key `((,help-char) ?? (control v) space ?\177
-				      delete backspace (meta v)))
-		   (ignore-errors
-		     (cond ((member key '((control v) space))
-			    (scroll-up))
-			   ((member key '(?\177 delete (meta v) backspace))
-			    (scroll-down))))
-		   (let ((cursor-in-echo-area t)
-			 (overriding-local-map local-map))
-		     (setq key (help-read-key
-				(format "Type one of the options listed%s: "
-					(if (pos-visible-in-window-p
-					     (point-max))
-					    "" " or Space to scroll")))))))
-	       ;; We don't need the prompt any more.
-	       (message nil)
-	       (let ((defn (lookup-key local-map key)))
-		 (cond (defn
-			 (when config
-			   (set-window-configuration config)
-			   (setq config nil))
-			 (when new-frame
-			   (iconify-frame new-frame)
-			   (setq new-frame nil))
-			 (call-interactively defn))
+     (flet ((help-read-key (prompt)
+	      ;; This is in `flet' to avoid problems with autoloading.
+	      ;; #### The function is ill-conceived -- there should be
+	      ;; a way to do it without all the hassle!
+	      (let (events)
+		(while (not (key-press-event-p
+			     (aref (setq events (read-key-sequence prompt)) 0)))
+		  ;; Mouse clicks are not part of the help feature, so
+		  ;; reexecute them in the standard environment.
+		  (mapc 'dispatch-event events))
+		(let ((key (nconc (event-modifiers (aref events 0))
+				  (list (event-key (aref events 0))))))
+		  ;; Make the HELP key translate to C-h.
+		  (when (lookup-key function-key-map key)
+		    (setq key (lookup-key function-key-map key)))
+		  (if (eq (length key) 1)
+		      (car key)
+		    key)))))
+       (let ((line-prompt
+	      (substitute-command-keys ,help-line)))
+	 (when three-step-help
+	   (message "%s" line-prompt))
+	 (let* ((help-screen (documentation (quote ,fname)))
+		;; We bind overriding-local-map for very small
+		;; sections, *excluding* where we switch buffers and
+		;; where we execute the chosen help command.
+		(local-map (make-sparse-keymap))
+		(minor-mode-map-alist nil)
+		(prev-frame (selected-frame))
+		config new-frame key)
+	   (unwind-protect
+	       (progn
+		 (set-keymap-parents local-map (list ,helped-map))
+		 (cond (three-step-help
+			(let* ((overriding-local-map local-map))
+			  (setq key (help-read-key nil))))
 		       (t
-			(ding)))))
-	   (and (get-buffer "*Help*")
-		(bury-buffer "*Help*"))
-	   (and new-frame (iconify-frame new-frame))
-	   (and config
-		(set-window-configuration config)))))))
+			(setq key ??)))
+		 (when (or (equal key ??)
+			   (equal key (list help-char)))
+		   (setq config (current-window-configuration))
+		   (switch-to-buffer-other-window "*Help*")
+		   (and (not (eq (window-frame (selected-window))
+				 prev-frame))
+			(setq new-frame (window-frame (selected-window))
+			      config nil))
+		   (setq buffer-read-only nil)
+		   (erase-buffer)
+		   (insert help-screen)
+		   (help-mode)
+		   (goto-char (point-min))
+		   (while (member key `((,help-char) ?? (control v) space ?\177
+					delete backspace (meta v)))
+		     (ignore-errors
+		       (cond ((member key '((control v) space))
+			      (scroll-up))
+			     ((member key '(?\177 delete (meta v) backspace))
+			      (scroll-down))))
+		     (let ((cursor-in-echo-area t)
+			   (overriding-local-map local-map))
+		       (setq key (help-read-key
+				  (format "Type one of the options listed%s: "
+					  (if (pos-visible-in-window-p
+					       (point-max))
+					      "" " or Space to scroll")))))))
+		 ;; We don't need the prompt any more.
+		 (message nil)
+		 (let ((defn (lookup-key local-map key)))
+		   (cond (defn
+			   (when config
+			     (set-window-configuration config)
+			     (setq config nil))
+			   (when new-frame
+			     (iconify-frame new-frame)
+			     (setq new-frame nil))
+			   (call-interactively defn))
+			 (t
+			  (ding)))))
+	     (and (get-buffer "*Help*")
+		  (bury-buffer "*Help*"))
+	     (and new-frame (iconify-frame new-frame))
+	     (and config
+		  (set-window-configuration config))))))))

 ;;; help-macro.el
--- a/lisp/package-get-base.el	Mon Aug 13 10:17:09 2007 +0200
+++ b/lisp/package-get-base.el	Mon Aug 13 10:17:54 2007 +0200
@@ -1,587 +1,1140 @@
 (setq package-get-base
 '((footnote
-  (version "1.01"
-   filename "footnote-1.01-pkg.tar.gz"
-   md5sum "6cca2b03fe2ed76f664a398d436bf954"
-   size 17986
+  (standards-version 1.0
+   version "1.02"
+   author-version "0.18"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "SL Baur <steve@xemacs.org>"
+   distribution stable
+   priority low
+   category "comm"
+   dump nil
+   description "Footnoting in mail message editing modes."
+   filename "footnote-1.02-pkg.tar.gz"
+   md5sum "9c4e614eab727d58d1cb850b4334a533"
+   size 18018
    provides (footnote)
    requires (mail-lib xemacs-base)
    type regular
 ))
 (gnats
-  (version "1.01"
-   filename "gnats-1.01-pkg.tar.gz"
-   md5sum "6bfb95bc283102cbbe0a5fc7b3f7d727"
-   size 126295
+  (standards-version 1.0
+   version "1.02"
+   author-version "3.101"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority high
+   category "comm"
+   dump nil
+   description "XEmacs bug reports."
+   filename "gnats-1.02-pkg.tar.gz"
+   md5sum "89cd5144aa36dede739d845b65b3fd2a"
+   size 126343
    provides (gnats gnats-admin send-pr)
    requires (mail-lib xemacs-base)
    type regular
 ))
 (gnus
-  (version "1.02"
+  (standards-version 1.0
+   version "1.03"
+   author-version "0.22q"
+   date "1998-01-24"
+   build-date "1998-01-25"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority medium
+   category "comm"
+   dump nil
    description "The Gnus Newsreader and Mailreader."
-   filename "gnus-1.02-pkg.tar.gz"
-   md5sum "ec5ed0322e46b8f672997d27a128b58e"
-   size 1663754
+   filename "gnus-1.03-pkg.tar.gz"
+   md5sum "89614e38ec293f82996246140dae1a05"
+   size 1664505
    provides (gnus message)
    requires (gnus w3 mh-e mailcrypt rmail mail-lib xemacs-base)
    type regular
 ))
 (mailcrypt
-  (version "1.02"
-   filename "mailcrypt-1.02-pkg.tar.gz"
-   md5sum "a4bdb22e770882d1bf465e46736d67e3"
-   size 66763
+  (standards-version 1.0
+   version "1.03"
+   author-version "3.4"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "comm"
+   dump nil
+   description "Support for messaging encryption with PGP."
+   filename "mailcrypt-1.03-pkg.tar.gz"
+   md5sum "39f5b5f57f557dc760ef49be5275e97f"
+   size 66815
    provides (mailcrypt)
    requires (gnus vm mail-lib xemacs-base)
    type regular
 ))
 (mh-e
-  (version "1.03"
-   filename "mh-e-1.03-pkg.tar.gz"
-   md5sum "3a82a8fd5c3d69b375b8e6191edef061"
-   size 128925
+  (standards-version 1.0
+   version "1.04"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution contrib
+   priority low
+   category "comm"
+   dump nil
+   description "Front end support for MH."
+   filename "mh-e-1.04-pkg.tar.gz"
+   md5sum "f412f2a82ac7005c788880119d1f75d5"
+   size 128979
    provides (mh-e)
    requires (mail-lib xemacs-base)
    type regular
 ))
 (net-utils
-  (version "1.01"
-   filename "net-utils-1.01-pkg.tar.gz"
-   md5sum "a5e186be46e80d01367ca1b2923655e6"
-   size 48550
+  (standards-version 1.0
+   version "1.02"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "comm"
+   dump nil
+   description "Miscellaneous Networking Utilities."
+   filename "net-utils-1.02-pkg.tar.gz"
+   md5sum "c2391219560bd5edf83e25eacf773236"
+   size 48538
    provides (ilisp-browse-cltl2 emacsbug feedmail metamail rcompile shadowfile webjump webster-www)
    requires (w3 efs mail-lib xemacs-base)
-   type regular
+   type single
 ))
 (ph
-  (version "1.01"
-   filename "ph-1.01-pkg.tar.gz"
-   md5sum "f7e686b77eb427a505a10348a0e9ec59"
-   size 27483
+  (standards-version 1.0
+   version "1.02"
+   author-version "2.6"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "comm"
+   dump nil
+   description "LDAP support."
+   filename "ph-1.02-pkg.tar.gz"
+   md5sum "db0d1c059d645624c2cf38a006a9d837"
+   size 27560
    provides (ph)
    requires (xemacs-base)
    type regular
 ))
 (rmail
-  (version "1.01"
-   filename "rmail-1.01-pkg.tar.gz"
-   md5sum "d8a0b4457820839c3383d59c2e0c3ed6"
-   size 83541
+  (standards-version 1.0
+   version "1.02"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution contrib
+   priority low
+   category "comm"
+   dump nil
+   description "An obsolete Emacs mailer."
+   filename "rmail-1.02-pkg.tar.gz"
+   md5sum "1d72ef61388abef1dc44633f756b09b4"
+   size 83554
    provides (rmail rmailsum)
    requires (tm apel mail-lib xemacs-base)
    type regular
 ))
 (supercite
-  (version "1.02"
-   filename "supercite-1.02-pkg.tar.gz"
-   md5sum "19327a45b407218b67c0dfeb143c7a18"
-   size 69344
+  (standards-version 1.0
+   version "1.03"
+   author-version "3.55x"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "comm"
+   dump nil
+   description "An Emacs citation tool for News & Mail messages."
+   filename "supercite-1.03-pkg.tar.gz"
+   md5sum "21ee6cbf484b3fac5acf61a2425a83dd"
+   size 69394
    provides (supercite)
    requires (mail-lib xemacs-base)
    type regular
 ))
 (tm
-  (version "1.03"
+  (standards-version 1.0
+   version "1.04"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "comm"
+   dump nil
    description "Emacs MIME support."
-   filename "tm-1.03-pkg.tar.gz"
-   md5sum "1bc0d0c17ca472c793b0eceafa10624b"
-   size 251874
+   filename "tm-1.04-pkg.tar.gz"
+   md5sum "1c56f8dcbd2cf367be4ed6ff1e31351e"
+   size 251912
    provides (tm tm-edit tm-view mime-setup)
    requires (gnus mh-e rmail vm mailcrypt mail-lib apel xemacs-base)
    type regular
 ))
-(vm
-  (version "1.03"
-   filename "vm-1.03-pkg.tar.gz"
-   md5sum "c998cbe419f3d482050632ee7115240f"
-   size 476245
-   provides (vm)
-   requires (mail-lib xemacs-base)
-   type regular
-))
 (w3
-  (version "1.01"
-   filename "w3-1.01-pkg.tar.gz"
-   md5sum "7f896771d25cef4e9e606536bdb13f2e"
-   size 582585
+  (standards-version 1.0
+   version "1.02"
+   author-version "4.0pre13"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution experimental
+   priority high
+   category "comm"
+   dump nil
+   description "A Web browser."
+   filename "w3-1.02-pkg.tar.gz"
+   md5sum "0c7cc3cb5606f72038b1c2c004335c1b"
+   size 583513
    provides (w3 url)
    requires (w3 mail-lib xemacs-base)
    type regular
 ))
 (cookie
-  (version "1.04"
+  (standards-version 1.0
+   version "1.05"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "games"
+   dump nil
    description "Spook and Yow (Zippy quotes)."
-   filename "cookie-1.04-pkg.tar.gz"
-   md5sum "e2c77311b5483e9e700d28f7b2993aca"
-   size 33833
+   filename "cookie-1.05-pkg.tar.gz"
+   md5sum "00bca0b3ada1ec3f893b14fc212d2578"
+   size 33860
    provides (cookie1 yow)
    requires (xemacs-base)
    type regular
 ))
 (games
-  (version "1.01"
-   filename "games-1.01-pkg.tar.gz"
-   md5sum "844d4f68950614f11c078649c231c017"
-   size 29160
+  (standards-version 1.0
+   version "1.02"
+   author-version "1.0"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "games"
+   dump nil
+   description "Tetris, Sokoban, and Snake."
+   filename "games-1.02-pkg.tar.gz"
+   md5sum "c494d0e7ab65a27d01d6ecb9da678f38"
+   size 29242
    provides (gamegrid snake tetris sokoban)
    requires (xemacs-base)
    type regular
 ))
 (mine
-  (version "1.03"
-   filename "mine-1.03-pkg.tar.gz"
-   md5sum "ca06e2e17ac4f5695e66e7004fc7b860"
-   size 67172
+  (standards-version 1.0
+   version "1.04"
+   author-version "1.8"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "games"
+   dump nil
+   description "Minehunt Game."
+   filename "mine-1.04-pkg.tar.gz"
+   md5sum "2954130562ca8ce131000f98f79f0773"
+   size 67463
    provides (xmine)
    requires (xemacs-base)
    type regular
 ))
 (misc-games
-  (version "1.04"
-   filename "misc-games-1.04-pkg.tar.gz"
-   md5sum "07ad46ffdf17ef846c40e81d15fcd832"
-   size 163171
+  (standards-version 1.0
+   version "1.05"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "games"
+   dump nil
+   description "Other amusements and diversions."
+   filename "misc-games-1.05-pkg.tar.gz"
+   md5sum "0d745a9b1f6c0dba0e37d3647b45fd3c"
+   size 163195
    provides (decipher gomoku hanoi life)
    requires (xemacs-base)
    type single
 ))
-(Sun
-  (version "1.03"
-   filename "Sun-1.03-pkg.tar.gz"
-   md5sum "1c121ffcac7a00a653c144d488b43860"
-   size 63758
-   provides (sccs eos-browser eos-common eos-debugger eos-debugger eos-editor eos-init eos-load eos-menubar eos-toolbar sunpro)
-   requires (cc-mode xemacs-base)
-   type regular
-))
 (apel
-  (version "1.02"
-   filename "apel-1.02-pkg.tar.gz"
-   md5sum "57230c9a3ed91126ea97277c87b9e72b"
-   size 34606
+  (standards-version 1.0
+   version "1.03"
+   author-version "3.3"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution mule
+   priority high
+   category "libs"
+   dump nil
+   description "A Portable Emacs Library.  Used by XEmacs MIME support."
+   filename "apel-1.03-pkg.tar.gz"
+   md5sum "2a38de58306f6f8a7a285b00c2849f8d"
+   size 34561
    provides (atype emu-20 emu-e19 emu-x20 emu-xemacs emu file-detect filename install mule-caesar path-util richtext std11-parse std11 tinyrich)
    requires (xemacs-base)
    type regular
 ))
 (edebug
-  (version "1.02"
-   filename "edebug-1.02-pkg.tar.gz"
-   md5sum "5c89f5421ecabb1f026a93b8a4a1db0b"
-   size 117931
+  (standards-version 1.0
+   version "1.03"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "libs"
+   dump nil
+   description "An Emacs Lisp debugger."
+   filename "edebug-1.03-pkg.tar.gz"
+   md5sum "b9f12435b9782b95eb9b7def4d301e80"
+   size 117966
    provides (edebug cl-read cust-print eval-reg cl-specs)
    requires (xemacs-base)
    type regular
 ))
 (efs
-  (version "1.04"
+  (standards-version 1.0
+   version "1.05"
+   author-version "1.15"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority medium
+   category "libs"
+   dump nil
    description "Treat files on remote systems the same as local files."
-   filename "efs-1.04-pkg.tar.gz"
-   md5sum "ba6bce39196f5d63fdc15f21c4cd1294"
-   size 542848
+   filename "efs-1.05-pkg.tar.gz"
+   md5sum "d74dd614e4b84522bacb58820123622d"
+   size 544501
    provides (efs diff dired efs-auto)
    requires (vm xemacs-base)
    type regular
 ))
-(mail-lib
-  (version "1.05"
-   description "Fundamental lisp files for providing email support."
-   filename "mail-lib-1.05-pkg.tar.gz"
-   md5sum "da865a128c4ce310fab6bc2704b58d2a"
-   size 118732
-   provides (browse-url highlight-headers mail-abbrevs mail-extr mail-utils reporter rfc822 rmail-mini rmailout sendmail smtpmail)
-   requires (xemacs-base)
-   type single
-))
 (tooltalk
-  (version "1.03"
-   filename "tooltalk-1.03-pkg.tar.gz"
-   md5sum "88845fc4ace46737ef34ff8acbe0be84"
-   size 9223
+  (standards-version 1.0
+   version "1.04"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution contrib
+   priority low
+   category "libs"
+   dump t
+   description "Support for building with Tooltalk."
+   filename "tooltalk-1.04-pkg.tar.gz"
+   md5sum "b9c04e07001c9994e771ed8f992692b0"
+   size 9226
    provides ()
    requires ()
    type regular
 ))
 (xemacs-base
-  (version "1.08"
+  (standards-version 1.0
+   version "1.09"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution mule
+   priority high
+   category "libs"
+   dump nil
    description "Fundamental XEmacs support, you almost certainly need this."
-   filename "xemacs-base-1.08-pkg.tar.gz"
-   md5sum "5bf009bdb7b0d0478987319d71bcacc4"
-   size 380727
+   filename "xemacs-base-1.09-pkg.tar.gz"
+   md5sum "e2b8169fa6b444f26910131f172e443d"
+   size 381040
    provides (add-log advice annotations assoc case-table chistory comint-xemacs comint compile debug ebuff-menu echistory edmacro ehelp electric enriched env facemenu helper imenu iso-syntax macros novice outline overlay passwd pp regi ring shell skeleton sort thing time-stamp timezone xbm-button xpm-button)
    requires ()
    type regular
 ))
 (xemacs-devel
-  (version "1.05"
-   filename "xemacs-devel-1.05-pkg.tar.gz"
-   md5sum "e12d383c1c30467d8e683504eb00604c"
-   size 71065
+  (standards-version 1.0
+   version "1.06"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority medium
+   category "libs"
+   dump nil
+   description "Emacs Lisp developer support."
+   filename "xemacs-devel-1.06-pkg.tar.gz"
+   md5sum "d0be22936b57c896e6bbe4f6874ba949"
+   size 72163
    provides (docref eldoc elp find-func ielm regexp-opt trace)
    requires (xemacs-base)
    type single
 ))
 (egg-its
-  (version "1.03"
+  (standards-version 1.0
+   version "1.04"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution mule
+   priority high
+   category "mule"
+   dump t
    description "Wnn (4.2 and 6) support.  SJ3 support."
-   filename "egg-its-1.03-pkg.tar.gz"
-   md5sum "6dcae480cb0351da8533e6b95abeb2f5"
-   size 259771
+   filename "egg-its-1.04-pkg.tar.gz"
+   md5sum "4ffa0409545751d4d277da3f06fe90a2"
+   size 260213
    provides ()
    requires (leim mule-base xemacs-base)
    type regular
 ))
 (leim
-  (version "1.02"
-   filename "leim-1.02-pkg.tar.gz"
-   md5sum "5697435f2a2d0849b4eebcc22596fdda"
-   size 1744281
+  (standards-version 1.0
+   version "1.03"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution mule
+   priority medium
+   category "mule"
+   dump nil
+   description "Quail.  All non-English and non-Japanese language support."
+   filename "leim-1.03-pkg.tar.gz"
+   md5sum "17402ccca45ddee1bc7b873c4e692bce"
+   size 1744352
    provides ()
    requires (mule-base xemacs-base)
    type regular
 ))
 (locale
-  (version "1.02"
-   filename "locale-1.02-pkg.tar.gz"
-   md5sum "9fcdf34a9f3ef696fa143398fb92ce1f"
-   size 20633
+  (standards-version 1.0
+   version "1.03"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution mule
+   priority high
+   category "mule"
+   dump nil
+   description "Localized menubars and localized splash screens."
+   filename "locale-1.03-pkg.tar.gz"
+   md5sum "2ef17851ae7feaf2c4dd54cd54736717"
+   size 21336
    provides ()
    requires (mule-base)
    type regular
 ))
-(mule-base
-  (version "1.03"
-   filename "mule-base-1.03-pkg.tar.gz"
-   md5sum "098abbbc88f1702a3a79ec9511475f38"
-   size 499505
-   provides (canna-leim canna char-table china-util cyril-util isearch-ext japan-util ccl can-n-egg mule-help)
-   requires (xemacs-base)
-   type regular
-))
 (skk
-  (version "1.02"
-   filename "skk-1.02-pkg.tar.gz"
-   md5sum "9b836a14af426899f172a3d7ec5bc13a"
-   size 1466604
+  (standards-version 1.0
+   version "1.03"
+   author-version "10.38"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution mule
+   priority medium
+   category "mule"
+   dump t
+   description "Japanese Language Input Method."
+   filename "skk-1.03-pkg.tar.gz"
+   md5sum "8da4b97eb3b4107adae3bf870257cbb9"
+   size 1466864
    provides (skk skk-tut)
    requires (viper mule-base xemacs-base)
    type regular
 ))
 (calendar
-  (version "1.02"
-   filename "calendar-1.02-pkg.tar.gz"
-   md5sum "df5bb1a0d8c53dc94debc1b9f6b625d2"
-   size 168684
+  (standards-version 1.0
+   version "1.03"
+   author-version "20.5b21"
+   date "1998-01-25"
+   build-date "1998-01-25"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "oa"
+   dump nil
+   description "Calendar and diary support."
+   filename "calendar-1.03-pkg.tar.gz"
+   md5sum "dd1477302a9ed29c06a309c947d3fb2e"
+   size 168691
    provides (appt cal-dst cal-french cal-mayan cal-x cal-xemacs calendar diary-ins diary-lib holidays lunar solar)
    requires (xemacs-base)
    type regular
 ))
 (edit-utils
-  (version "1.06"
-   filename "edit-utils-1.06-pkg.tar.gz"
-   md5sum "6b93a01ea3389125c1ea09d035c3eced"
-   size 517449
+  (standards-version 1.0
+   version "1.07"
+   author-version "20.5b21"
+   date "1998-01-25"
+   build-date "1998-01-25"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority high
+   category "oa"
+   dump nil
+   description "Miscellaneous editor extensions, you probably need this."
+   filename "edit-utils-1.07-pkg.tar.gz"
+   md5sum "ebdb25ce0968d7f0d2793c0e7a093dc2"
+   size 518923
    provides (abbrevlist atomic-extents avoid backup-dir balloon-help big-menubar blink-cursor blink-paren bookmark compare-w completion dabbrev desktop detached-minibuf edit-toolbar fast-lock file-part floating-toolbar flow-ctrl foldout func-menu hippie-exp icomplete id-select info-look iswitchb lazy-lock lazy-shot live-icon man mic-paren paren mode-motion+ outl-mouse page-ext blink-paren paren permanent-buffers recent-files redo reportmail rsz-minibuf saveconfsavehist saveplace scroll-in-place toolbar-utils tree-menu uniquify where-was-i-db)
    requires (xemacs-base)
    type single
 ))
 (forms
-  (version "1.04"
-   filename "forms-1.04-pkg.tar.gz"
-   md5sum "9ed253efbb559b54320cd7fda934bf87"
-   size 39809
+  (standards-version 1.0
+   version "1.05"
+   author-version "2.10"
+   date "1998-01-25"
+   build-date "1998-01-25"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution contrib
+   priority low
+   category "oa"
+   dump nil
+   description "Forms editing support (obsolete, use Widget instead)."
+   filename "forms-1.05-pkg.tar.gz"
+   md5sum "b2cb31ec9a5f6b59f28b05c21759b23c"
+   size 39848
+   provides (forms forms-mode)
+   requires ()
+   type regular
+))
+(frame-icon
+  (standards-version 1.0
+   version "1.02"
+   author-version "20.5b21"
+   date "1998-01-25"
+   build-date "1998-01-25"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution contrib
+   priority low
+   category "oa"
+   dump nil
+   description "Set up mode-specific icons for each frame under XEmacs"
+   filename "frame-icon-1.02-pkg.tar.gz"
+   md5sum "d18342bd040c737fe74e6b6588b42e96"
+   size 33248
    provides (forms forms-mode)
    requires ()
    type regular
 ))
 (hm--html-menus
-  (version "1.03"
+  (standards-version 1.0
+   version "1.04"
+   author-version "5.9"
+   date "1998-01-25"
+   build-date "1998-01-25"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "oa"
+   dump nil
    description "HTML editing."
-   filename "hm--html-menus-1.03-pkg.tar.gz"
-   md5sum "cce45f2664aa9cd3c931cfff23c621a5"
-   size 146847
+   filename "hm--html-menus-1.04-pkg.tar.gz"
+   md5sum "50a9d8d0a1543092cf7dfb7f0dce7aeb"
+   size 146988
    provides (adapt hm--date hm--html-configuration hm--html-drag-and-drop hm--html-indentation hm--html-keys hm--html-menu hm--html-mode hm--html-not-standard hm--html html-view tmpl-minor-mode)
    requires (xemacs-base)
    type regular
 ))
 (ispell
-  (version "1.03"
-   filename "ispell-1.03-pkg.tar.gz"
-   md5sum "1119bf349568fb8004b317f1a58fed57"
-   size 55723
+  (standards-version 1.0
+   version "1.04"
+   author-version "2.37"
+   date "1998-01-25"
+   build-date "1998-01-25"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "oa"
+   dump nil
+   description "Spell-checking with GNU ispell."
+   filename "ispell-1.04-pkg.tar.gz"
+   md5sum "56d350f27230d5b408be412e16ad1d36"
+   size 55746
    provides (ispell)
    requires ()
    type regular
 ))
 (pc
-  (version "1.04"
-   filename "pc-1.04-pkg.tar.gz"
-   md5sum "4933e0ac375397076df583a6e93ba304"
-   size 11274
+  (standards-version 1.0
+   version "1.05"
+   author-version "20.5b21"
+   date "1998-01-25"
+   build-date "1998-01-25"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "oa"
+   dump nil
+   description "PC style interface emulation."
+   filename "pc-1.05-pkg.tar.gz"
+   md5sum "935e9b26c800a3b82ece0a4b3eac7343"
+   size 11281
    provides (delbs pc-select pending-del s-region)
    requires (xemacs-base)
    type regular
 ))
 (psgml
-  (version "1.0"
-   filename "psgml-1.0-pkg.tar.gz"
-   md5sum "9d3f8d0909bc2c291955daa6829a9882"
-   size 379154
+  (standards-version 1.0
+   version "1.01"
+   author-version "1.01"
+   date "1998-01-25"
+   build-date "1998-01-25"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority medium
+   category "oa"
+   dump nil
+   description "Validated HTML/SGML editing."
+   filename "psgml-1.01-pkg.tar.gz"
+   md5sum "487f119aea6e8a7b982ab7c6cd143e3b"
+   size 379283
    provides (psgml sgml tempo)
    requires ()
    type regular
 ))
 (sgml
-  (version "1.0"
-   filename "sgml-1.0-pkg.tar.gz"
-   md5sum "e8e744cff0466a77554dfdd477e40cfe"
-   size 26814
+  (standards-version 1.0
+   version "1.01"
+   author-version "20.5b21"
+   date "1998-01-25"
+   build-date "1998-01-25"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution contrib
+   priority low
+   category "oa"
+   dump nil
+   description "SGML/Linuxdoc-SGML editing."
+   filename "sgml-1.01-pkg.tar.gz"
+   md5sum "ff9341e50d595a553a61770b25682e6d"
+   size 26866
    provides (sgml linuxdoc-sgml)
    requires (xemacs-base)
    type regular
 ))
 (slider
-  (version "1.04"
-   filename "slider-1.04-pkg.tar.gz"
-   md5sum "b0af411f9c5a2764152cd0e67b11ba8b"
-   size 11855
+  (standards-version 1.0
+   version "1.05"
+   author-version "0.3"
+   date "1998-01-25"
+   build-date "1998-01-25"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution experimental
+   priority low
+   category "oa"
+   dump nil
+   description "User interface tool."
+   filename "slider-1.05-pkg.tar.gz"
+   md5sum "2cea293cb5aefde724d16c41e0ee269d"
+   size 12085
    provides (slider color-selector)
    requires ()
    type regular
 ))
 (speedbar
-  (version "1.02"
-   filename "speedbar-1.02-pkg.tar.gz"
-   md5sum "c32984d7c232e7049d09f85989e2087c"
-   size 62424
+  (standards-version 1.0
+   version "1.03"
+   author-version "0.5.4x"
+   date "1998-01-25"
+   build-date "1998-01-25"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "oa"
+   dump nil
+   description "??? Document me."
+   filename "speedbar-1.03-pkg.tar.gz"
+   md5sum "06422307016c770a860292f6548c0f3c"
+   size 62468
    provides (speedbar)
    requires (xemacs-base)
    type regular
 ))
 (strokes
-  (version "1.0"
-   filename "strokes-1.0-pkg.tar.gz"
-   md5sum "a15ce2a1dca07b18a64bf332c8946e79"
-   size 43588
+  (standards-version 1.0
+   version "1.01"
+   author-version "20.5b21"
+   date "1998-01-25"
+   build-date "1998-01-25"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority medium
+   category "oa"
+   dump nil
+   description "Mouse enhancement utility."
+   filename "strokes-1.01-pkg.tar.gz"
+   md5sum "7c741c59686b65a74606c037ef1ea5b1"
+   size 43714
    provides (strokes)
    requires (text-modes edit-utils mail-lib xemacs-base)
    type regular
 ))
 (text-modes
-  (version "1.02"
-   filename "text-modes-1.02-pkg.tar.gz"
-   md5sum "cc787c8b9945415148ddcdb2590fea10"
-   size 102015
+  (standards-version 1.0
+   version "1.03"
+   author-version "20.5b21"
+   date "1998-01-25"
+   build-date "1998-01-25"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority high
+   category "oa"
+   dump nil
+   description "Miscellaneous support for editing text files."
+   filename "text-modes-1.03-pkg.tar.gz"
+   md5sum "8573bc737fc11fd11b634dfa7fa1b617"
+   size 103577
    provides (autoinsert crontab-edit filladapt image-mode iso-acc iso-ascii iso-cvt iso-insert iso-swed swedish tabify whitespace-mode winmgr-mode xpm-mode xrdb-mode)
    requires (xemacs-base)
    type regular
 ))
 (time
-  (version "1.02"
-   filename "time-1.02-pkg.tar.gz"
-   md5sum "78751042a5fc579eda833e75fe91b347"
-   size 19839
+  (standards-version 1.0
+   version "1.03"
+   author-version "1.17"
+   date "1998-01-25"
+   build-date "1998-01-25"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority medium
+   category "oa"
+   dump nil
+   description "Display time & date on the modeline."
+   filename "time-1.03-pkg.tar.gz"
+   md5sum "19d6473ad84e913baff82e551f607acc"
+   size 20033
    provides (time)
    requires (xemacs-base)
    type regular
 ))
 (eterm
-  (version "1.02"
-   filename "eterm-1.02-pkg.tar.gz"
-   md5sum "9bc542d4e560e8a00fd555e76079164f"
-   size 101730
+  (standards-version 1.0
+   version "1.03"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority medium
+   category "os"
+   dump nil
+   description "Terminal emulation."
+   filename "eterm-1.03-pkg.tar.gz"
+   md5sum "6b8ef9310dbd121abe6b6896fc5ac10a"
+   size 102075
    provides (eterm)
    requires (xemacs-base)
    type regular
 ))
 (igrep
-  (version "1.0"
-   filename "igrep-1.0-pkg.tar.gz"
-   md5sum "58c6155767fd01765000d829fabbc790"
-   size 13899
+  (standards-version 1.0
+   version "1.01"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "os"
+   dump nil
+   description "Enhanced front-end for Grep."
+   filename "igrep-1.01-pkg.tar.gz"
+   md5sum "35883e177b034c3d58d795852fa68969"
+   size 13957
    provides (igrep)
    requires (efs xemacs-base)
    type regular
 ))
 (ilisp
-  (version "1.02"
-   filename "ilisp-1.02-pkg.tar.gz"
-   md5sum "7fc28390ad9ff212de8da2c3add0dba0"
-   size 213183
+  (standards-version 1.0
+   version "1.03"
+   author-version "5.8"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "os"
+   dump nil
+   description "Front-end for Inferior Lisp."
+   filename "ilisp-1.03-pkg.tar.gz"
+   md5sum "28a131647f17713438f489957944242f"
+   size 223275
    provides (ilisp completer)
    requires (xemacs-base)
    type regular
 ))
 (os-utils
-  (version "1.03"
-   filename "os-utils-1.03-pkg.tar.gz"
-   md5sum "579cd4d025e0b20bbf7887250a0ea599"
-   size 216645
+  (standards-version 1.0
+   version "1.04"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority medium
+   category "os"
+   dump nil
+   description "Miscellaneous O/S utilities."
+   filename "os-utils-1.04-pkg.tar.gz"
+   md5sum "230dd8c50f5287786e7d4a6bcf864ca6"
+   size 217403
    provides (archive-mode background crypt crypt++ inf-lisp jka-compr lpr ps-print tar-mode telnet terminal uncompress)
    requires (xemacs-base)
    type single
 ))
 (view-process
-  (version "1.02"
-   filename "view-process-1.02-pkg.tar.gz"
-   md5sum "e0ee0de2d7116477aee75b82b8d929a5"
-   size 59824
+  (standards-version 1.0
+   version "1.03"
+   author-version "2.4"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "os"
+   dump nil
+   description "A Unix process browsing tool."
+   filename "view-process-1.03-pkg.tar.gz"
+   md5sum "6c33516337b77605d7c474a7c565996e"
+   size 59872
    provides (view-process-mode)
    requires (xemacs-base)
    type regular
 ))
 (ada
-  (version "1.02"
-   filename "ada-1.02-pkg.tar.gz"
-   md5sum "0788c1e082dd1c01a7014b2d6314c4b5"
-   size 54261
+  (standards-version 1.0
+   version "1.03"
+   author-version "2.27"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "prog"
+   dump nil
+   description "Ada language support."
+   filename "ada-1.03-pkg.tar.gz"
+   md5sum "12cf923735f28acd68f6664f8676f7b2"
+   size 54311
    provides (ada-mode ada-stmt)
    requires ()
    type regular
 ))
 (c-support
-  (version "1.03"
+  (standards-version 1.0
+   version "1.04"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution contrib
+   priority low
+   category "prog"
+   dump nil
    description "Basic single-file add-ons for editing C code."
-   filename "c-support-1.03-pkg.tar.gz"
-   md5sum "18815426732ff136a9eedfbcfa5f3a86"
-   size 41780
+   filename "c-support-1.04-pkg.tar.gz"
+   md5sum "2afcb4f1e6d9b2dab60171505e81e885"
+   size 41821
    provides (c-comment-edit cmacexp hideif hideshow)
    requires (cc-mode xemacs-base)
    type regular
 ))
 (cc-mode
-  (version "1.04"
+  (standards-version 1.0
+   version "1.05"
+   author-version "5.19"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority medium
+   category "prog"
+   dump nil
    description "C, C++ and Java language support."
-   filename "cc-mode-1.04-pkg.tar.gz"
-   md5sum "4594ac91bbe114ceea4f06a1196076f6"
-   size 128650
+   filename "cc-mode-1.05-pkg.tar.gz"
+   md5sum "22b97f82faa9240de79eeaf3b505a95b"
+   size 128672
    provides (cc-mode)
    requires (xemacs-base)
    type regular
 ))
 (debug
-  (version "1.0"
-   filename "debug-1.0-pkg.tar.gz"
-   md5sum "b4f7e2d93c10d9b60dd94171d4fe6a7f"
-   size 87115
+  (standards-version 1.0
+   version "1.01"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution contrib
+   priority low
+   category "prog"
+   dump nil
+   description "GUD, gdb, dbx debugging support."
+   filename "debug-1.01-pkg.tar.gz"
+   md5sum "22be059d89ff639e11ffbb2da7c792ce"
+   size 87149
    provides ()
    requires (xemacs-base)
    type regular
 ))
 (ediff
-  (version 1.01
-   filename "ediff-1.01-pkg.tar.gz"
-   md5sum "68431adebf0b9b76b2e347b5cb531378"
-   size 241640
+  (standards-version 1.0
+   version "1.03"
+   author-version "2.70"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority medium
+   category "prog"
+   dump nil
+   description "Interface over GNU patch."
+   filename "ediff-1.03-pkg.tar.gz"
+   md5sum "53981c4c53547b48f12de32ae386725d"
+   size 241873
    provides (ediff)
-   requires (xemacs-base efs pcl-cvs)
+   requires (pcl-cvs efs xemacs-base)
    type regular
 ))
 (emerge
-  (version "1.0"
-   filename "emerge-1.0-pkg.tar.gz"
-   md5sum "d5a58538014f89a0210530605eac1817"
-   size 60851
+  (standards-version 1.0
+   version "1.01"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "prog"
+   dump nil
+   description "Another interface over GNU patch."
+   filename "emerge-1.01-pkg.tar.gz"
+   md5sum "01cb5e705bd1a5400d9a137b1ed6b7c2"
+   size 60912
    provides (emerge)
    requires ()
    type regular
 ))
 (pcl-cvs
-  (version "1.02"
-   filename "pcl-cvs-1.02-pkg.tar.gz"
-   md5sum "c0d535bee1bb2ed97f209d76a0dad15f"
-   size 134504
+  (standards-version 1.0
+   version "1.03"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "prog"
+   dump nil
+   description "CVS frontend."
+   filename "pcl-cvs-1.03-pkg.tar.gz"
+   md5sum "1747e0ae7bdfc69e1bcb498ad9c050fe"
+   size 134547
    provides (pcl-cvs dll elib-node generic-sc)
    requires (xemacs-base)
    type regular
 ))
 (prog-modes
-  (version "1.02"
-   filename "prog-modes-1.02-pkg.tar.gz"
-   md5sum "6f49bfdc7c88ac2182d55c1d4f6c0015"
-   size 535033
+  (standards-version 1.0
+   version "1.03"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority medium
+   category "prog"
+   dump nil
+   description "Support for various programming languages."
+   filename "prog-modes-1.03-pkg.tar.gz"
+   md5sum "338ebcd25b844c448a9c7c2d5bac966b"
+   size 535330
    provides (autoconf-mode cperl-mode eiffel3 f90 fortran ksh-mode m4-mode makefile perl-mode postscript python-mode rexx-mode simula-mode tcl teco verilog-mod)
    requires (mail-lib xemacs-base)
    type regular
 ))
 (scheme
-  (version "1.01"
-   filename "scheme-1.01-pkg.tar.gz"
-   md5sum "404316bd16588b6a8e743e261a14afb1"
-   size 34759
+  (standards-version 1.0
+   version "1.02"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution contrib
+   priority low
+   category "prog"
+   dump nil
+   description "Front-end support for Inferior Scheme."
+   filename "scheme-1.02-pkg.tar.gz"
+   md5sum "070fe92d28b95b548bcb713c2072f701"
+   size 34793
    provides (scheme xscheme cmuscheme)
    requires (xemacs-base)
    type regular
 ))
 (sh-script
-  (version "1.03"
-   filename "sh-script-1.03-pkg.tar.gz"
-   md5sum "1f804e9aa1defc8d5f9d35ffb8f26a34"
-   size 33568
+  (standards-version 1.0
+   version "1.04"
+   author-version "2.0e"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "prog"
+   dump nil
+   description "Support for editing shell scripts."
+   filename "sh-script-1.04-pkg.tar.gz"
+   md5sum "35daef7a3c07cae2ff9011d625140004"
+   size 33618
    provides (sh-script executable)
    requires (xemacs-base)
    type regular
 ))
 (vc-cc
-  (version "1.02"
-   filename "vc-cc-1.02-pkg.tar.gz"
-   md5sum "d0c0c5a9cdae43971d845858de4aa6bc"
-   size 95974
+  (standards-version 1.0
+   version "1.03"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution contrib
+   priority low
+   category "prog"
+   dump t
+   description "Version Control for ClearCase (UnFree) systems."
+   filename "vc-cc-1.03-pkg.tar.gz"
+   md5sum "4c2b00b98f6581f89aa58b77049d5406"
+   size 96065
    provides (vc)
    requires (efs xemacs-base)
    type regular
 ))
 (vc
-  (version "1.02"
-   filename "vc-1.02-pkg.tar.gz"
-   md5sum "c2e1a4c4de6b1e9a43dd6b74028fedf5"
-   size 74142
+  (standards-version 1.0
+   version "1.03"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "prog"
+   dump t
+   description "Version Control for Free systems."
+   filename "vc-1.03-pkg.tar.gz"
+   md5sum "eff043dcb522dfe7bff4a5d11acd4d5f"
+   size 74214
    provides (vc)
    requires (efs xemacs-base)
    type regular
 ))
-(vhdl
-  (version "1.02"
-   filename "vhdl-1.02-pkg.tar.gz"
-   md5sum "3c28c8ab7866519131ee0fe8e5b08f6e"
-   size 54025
-   provides (vhdl-mode)
-   requires ()
-   type regular
-))
 (auctex
-  (version "1.03"
+  (standards-version 1.0
+   version "1.04"
+   author-version "9.7p"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority medium
+   category "wp"
+   dump nil
    description "Basic TeX/LaTeX support."
-   filename "auctex-1.03-pkg.tar.gz"
-   md5sum "1b0403e3b22e3a8fb0f46019e2c245ba"
-   size 289505
+   filename "auctex-1.04-pkg.tar.gz"
+   md5sum "48359901fa551ae9ff3f77b996aa8507"
+   size 289682
    provides (auc-old bib-cite font-latex latex multi-prompt tex-buf tex-info tex-jp tex-site tex)
    requires (xemacs-base)
    type regular
 ))
 (crisp
-  (version "1.02"
-   filename "crisp-1.02-pkg.tar.gz"
-   md5sum "d1f9279563f71f947d758e5722619aef"
-   size 9038
+  (standards-version 1.0
+   version "1.03"
+   author-version "1.31"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "wp"
+   dump nil
+   description "Crisp/Brief emulation."
+   filename "crisp-1.03-pkg.tar.gz"
+   md5sum "45ffef47a1dfa2e3de4efb9958a053dc"
+   size 9051
    provides (crisp scroll-lock)
    requires ()
    type regular
 ))
 (edt
-  (version "1.02"
-   filename "edt-1.02-pkg.tar.gz"
-   md5sum "eee41be05231820696aa27fcca84a38c"
-   size 45981
+  (standards-version 1.0
+   version "1.03"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution contrib
+   priority low
+   category "wp"
+   dump nil
+   description "DEC EDIT/EDT emulation."
+   filename "edt-1.03-pkg.tar.gz"
+   md5sum "da250582becf065c32cfd2c1182d0449"
+   size 46005
    provides (edt)
    requires (xemacs-base)
    type regular
 ))
 (texinfo
-  (version "1.04"
-   filename "texinfo-1.04-pkg.tar.gz"
-   md5sum "6da524a224540b84c7be79cffcc8f966"
-   size 113831
+  (standards-version 1.0
+   version "1.05"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority high
+   category "wp"
+   dump nil
+   description "XEmacs TeXinfo support."
+   filename "texinfo-1.05-pkg.tar.gz"
+   md5sum "8b9573a97dfc7dc9ddc716c741b8c9d4"
+   size 113889
    provides (makeinfo tex-mode texinfmt texinfo texnfo-tex texnfo-upd)
    requires (xemacs-base)
    type regular
@@ -596,20 +1149,39 @@
    type single
 ))
 (tpu
-  (version "1.03"
-   filename "tpu-1.03-pkg.tar.gz"
-   md5sum "c9801b4a173570fce0598182408ce90c"
-   size 57373
+  (standards-version 1.0
+   version "1.04"
+   author-version "20.5b21"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution mule
+   priority high
+   category "wp"
+   dump nil
+   description "DEC EDIT/TPU support."
+   filename "tpu-1.04-pkg.tar.gz"
+   md5sum "6c7b0e97485b7ddf374fe5ceca45d74d"
+   size 57401
    provides (tpu)
    requires ()
    type regular
 ))
 (viper
-  (version "1.03"
+  (standards-version 1.0
+   version "1.04"
+   author-version "3.005"
+   date "1998-01-24"
+   build-date "1998-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "wp"
+   dump nil
    description "VI emulation support."
-   filename "viper-1.03-pkg.tar.gz"
-   md5sum "b1f8a6543aacc5c2d79c76082c739b81"
-   size 260554
+   filename "viper-1.04-pkg.tar.gz"
+   md5sum "ea2bf0b5bd6600bb5e5400d2fd21205f"
+   size 260680
    provides (viper)
    requires (xemacs-base)
    type regular
--- a/lisp/package-info.el	Mon Aug 13 10:17:09 2007 +0200
+++ b/lisp/package-info.el	Mon Aug 13 10:17:54 2007 +0200
@@ -62,16 +62,46 @@
       (when (search-forward key)
 	(replace-match value t)))))

+(defun pi-author-version (author-version)
+  (if (> (length author-version) 0)
+      (format "\"%s\"" author-version)
+    (format "\"%d.%d%s\"" emacs-major-version emacs-minor-version
+	    (if (and (boundp 'xemacs-betaname) xemacs-betaname)
+		(progn
+		  (string-match "[0-9]+" xemacs-betaname)
+		  (concat "b" (match-string 0 xemacs-betaname)))
+	      ""))))
+
+(defun pi-last-mod-date ()
+  (condition-case nil
+      (save-excursion
+	(with-temp-buffer
+	  (insert-file-contents-literally "ChangeLog")
+	  (goto-char (point-min))
+	  (looking-at "[-0-9]+")
+	  (format "\"%s\""
+		  (buffer-substring (match-beginning 0)
+				    (match-end 0)))))
+    ;; Fallback on current date if no valid ChangeLog entry
+    (t (format-time-string "\"%Y-%m-%d\""))))
+
 (defun batch-update-package-info ()
   "Generate a package-info file for use by package-get.el.
 Parameters are:
 version -- Package version number
-filename -- Filename of tarball to generate info for."
+filename -- Filename of tarball to generate info for.
+requires -- Packages necessary for bytecompiling.
+author-version -- The original Author's version #.
+maintainer -- The package maintainer.
+category -- The build category."
   (unless noninteractive
     (error "`batch-update-package-info' is to be used only with -batch"))
   (let ((version (nth 0 command-line-args-left))
 	(filename (nth 1 command-line-args-left))
-	(requires (nth 2 command-line-args-left)))
+	(requires (nth 2 command-line-args-left))
+	(author-version (nth 3 command-line-args-left))
+	(maintainer (nth 4 command-line-args-left))
+	(category (nth 5 command-line-args-left)))
     (unless requires
       (setq requires ""))
     (find-file package-info)
@@ -86,6 +116,11 @@
     (pi-update-key "SIZE" (format "%d"
 				  (nth 7 (file-attributes filename))))
     (pi-update-key "REQUIRES" requires)
+    (pi-update-key "AUTHOR_VERSION" (pi-author-version author-version))
+    (pi-update-key "MAINTAINER" (format "\"%s\"" maintainer))
+    (pi-update-key "CATEGORY" (format "\"%s\"" category))
+    (pi-update-key "BUILD_DATE" (format-time-string "\"%Y-%m-%d\""))
+    (pi-update-key "DATE" (pi-last-mod-date))
     (save-buffers-kill-emacs 0)))

 (provide 'package-info)
--- a/lisp/startup.el	Mon Aug 13 10:17:09 2007 +0200
+++ b/lisp/startup.el	Mon Aug 13 10:17:54 2007 +0200
@@ -763,14 +763,7 @@
 	   (t (find-file-other-window arg)))
 	  (when line
 	    (goto-line line)
-	    (setq line nil))))
-      ;; If 3 or more files visited, and not all visible,
-      ;; show user what they all are.
-      (when (and (not noninteractive)
-		 (> file-count 2)
-		 (not (get-buffer-window first-file-buffer)))
-	(other-window 1)
-	(buffer-menu nil))))))
+	    (setq line nil))))))))

 (defvar startup-presentation-hack-keymap
   (let ((map (make-sparse-keymap)))
--- a/src/ChangeLog	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/ChangeLog	Mon Aug 13 10:17:54 2007 +0200
@@ -1,3 +1,103 @@
+1998-01-23  SL Baur  <steve@altair.xemacs.org>
+
+	* sound.c (Fplay_sound_file): Use NILP for comparison of
+	Lisp_Object.
+
+Wed Jan 21 10:49:47 1998  Andy Piper  <andyp@parallax.co.uk>
+
+	* unexcw.cc: new file for cygwin32 unexec() requires cygwin32
+	b19. Predicated on HAVE_COFF_H.
+
+	* console.c:
+	* device-msw.c:
+	* event-msw.c:
+	* frame-msw.c:
+	* msw-proc.c:
+	* objects-msw.c:
+	Eliminate warnings.
+
+	* redisplay-msw.c (mswindows_update_gc): eliminate warnings and
+	extend hack for bogus bg values.
+
+	* symsinit.h: add msw headers to eliminate warnings.
+
+	* s/cygwin32.h: various updates for unexec() support.
+
+	* lastfile.c: add my_ebss for cygwin32 unexec() support.
+
+	* gmalloc.c: made __malloc_initialized non-static so that
+	it goes into the bss where we expect it.
+
+	* emacs.c: put run_time_remap() in a place where initialized is
+	not always true.
+
+	* Makefile.in.in: add support for compiling .cc files.
+
+	* config.h.in: added HAVE_COFF_H support.
+
+1998-01-23  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* print.c (print_cons): Use XCAR/XCDR.
+	(print_string): Fix up so it Vprint_string_length works under Mule
+	correctly.
+
+	* eval.c (Feval): Increase profile call count.
+
+	* keymap.c: Fixed typo.
+
+1998-01-22  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* symbols.c (Funintern): Reset symbol's obarray property.
+
+1998-01-22  Karl M. Hegbloom  <karlheg@bittersweet.inetarena.com>
+
+	* alloc.c (size_vector): Declare *p as CONST to eliminate warning.
+
+1998-01-22  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* print.c (print_symbol): Recognize Vprint_gensym being a cons;
+	use Vprint_gensym_alist.
+
+	* symbols.c (init_symbols_once_early): Ditto.
+
+	* alloc.c (Fmake_symbol): Reset it.
+
+	* symbols.c (Fintern): Set it.
+
+	* lisp.h (struct Lisp_Symbol): New element `obarray'.
+
+	* print.c (print_prepare): Reset Vprint_gensym_alist.
+	(print_finish): Ditto.
+
+	* lread.c: Recognize #n= and #n#.
+	(readevalloop): Reset read_objects to nil.
+	(Fread): Ditto.
+
+1998-01-23  SL Baur  <steve@altair.xemacs.org>
+
+	* toolbar.c (update_toolbar_button): Eliminate redundant NILP
+	checks.
+	From Martin Buchholz <martin@xemacs.org>
+
+1998-01-21  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* dlopen.c: New file.
+
+1998-01-19  Steven L Baur  <steve@altair.xemacs.org>
+
+	* eval.c (prog1): Don't GCPRO unitialized variable.
+	(prog2): Ditto.
+	From Martin Buchholz <martin@xemacs.org>
+
+1998-01-19  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* sound.c (Fplay_sound_file): Use
+	signal_simple_continuable_error() instead of error().
+
+1998-01-18  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* README: Updated.
+
 1998-01-18  SL Baur  <steve@altair.xemacs.org>

 	* glyphs-x.c (imagick_instantiate): Dynamically allocate pixar
--- a/src/Makefile.in.in	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/Makefile.in.in	Mon Aug 13 10:17:54 2007 +0200
@@ -27,7 +27,7 @@

 ## For performance and consistency, no built-in rules.
 .SUFFIXES:
-.SUFFIXES: .c .o .i .h .dep
+.SUFFIXES: .c .cc .o .i .h .dep

 @SET_MAKE@
 SHELL=/bin/sh
@@ -86,6 +86,7 @@

 #ifdef USE_GNU_MAKE
 vpath %.c @srcdir@
+vpath %.cc @srcdir@
 vpath %.h @srcdir@
 ## now list files that should NOT be searched in the srcdir.
 ## This includes any .c or .h built from something else
@@ -139,6 +140,13 @@
 #endif
 	$(CC) -c $(cflags) $<

+#ifdef SOLARIS2
+%.o : %.cc
+#else
+.cc.o:
+#endif
+	$(CC) -c $(cflags) $<
+
 ## Create preprocessor output (debugging purposes only)
 .c.i:
 	$(CC) -P $(cppflags) $<
--- a/src/README	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/README	Mon Aug 13 10:17:54 2007 +0200
@@ -37,7 +37,7 @@
       (primitive types are int, cons, string, and vector).

    -- References to `XSTRING (obj)->size' get replaced with
-      `string_length (obj)'.  This is currently for cosmetic reasons
+      `XSTRING_LENGTH (obj)'.  This is currently for cosmetic reasons
       but there may be other reasons in the future.  (This change is
       currently incomplete in the source files.)

@@ -58,17 +58,21 @@
       Therefore, it's important that functions do something reasonable
       if an error gets continued.  If you want to signal a non-
       continuable error, the call to Fsignal() gets put inside a
-      `while (1)' loop.  To facilitate this, and also for proper
-      I18N3 message snarfing, most calls to Fsignal() have been
-      replaced by calls to signal_error(), signal_simple_error(),
-      etc.
+      `while (1)' loop.  To facilitate this, and also for proper I18N3
+      message snarfing, most calls to Fsignal() have been replaced by
+      calls to signal_error(), signal_simple_error(), etc.  Look at
+      eval.c for a classification of various error functions.

    -- Constant strings occurring in source files need to get wrapped
       in a call to GETTEXT (or if inside of a call to `build_string',
       change that function to `build_translated_string') if they don't
       occur in certain places where the I18N3 message snarfer will see
       them.  For a complete discussion of this, see the file
-      lib-src/make-msgfile.l.
+      lib-src/make-msgfile.lex.
+
+      NOTE: I18N3 support is not currently working, so the above may
+      or may not apply.  Thus it is not a good idea to add random
+      GETTEXTs, unless you really know what you are doing.

    -- Calls to `fprintf (stderr, ...)' and `printf (...)' get replaced
       with calls to `stderr_out' and `stdout_out'.  This is for I18N3
--- a/src/alloc.c	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/alloc.c	Mon Aug 13 10:17:54 2007 +0200
@@ -1194,7 +1194,7 @@
 static unsigned int
 size_vector (CONST void *lheader)
 {
-  struct Lisp_Vector *p = lheader;
+  CONST struct Lisp_Vector *p = lheader;
   /*
    * -1 because struct Lisp_Vector includes 1 slot
    */
@@ -1783,6 +1783,7 @@
   p->plist = Qnil;
   p->value = Qunbound;
   p->function = Qunbound;
+  p->obarray = Qnil;
   symbol_next (p) = 0;
   XSETSYMBOL (val, p);
   return val;
--- a/src/config.h.in	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/config.h.in	Mon Aug 13 10:17:54 2007 +0200
@@ -171,6 +171,7 @@
 #undef HAVE_LINUX_VERSION_H
 #undef HAVE_INTTYPES_H
 #undef HAVE_SYS_UN_H
+#undef HAVE_COFF_H
 #undef STDC_HEADERS
 #undef TIME_WITH_SYS_TIME
 #undef WORDS_BIGENDIAN
@@ -184,6 +185,9 @@
 /* Use lock files to detect multiple edits of the same file? */
 #undef CLASH_DETECTION

+/* Have shared library support (currently only dlopen() supported?  */
+#undef HAVE_SHLIB
+
 #undef HAVE_LIBKSTAT
 #undef HAVE_LIBINTL
 #undef HAVE_LIBDNET
--- a/src/console.c	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/console.c	Mon Aug 13 10:17:54 2007 +0200
@@ -922,9 +922,9 @@
 */
        (console))
 {
+#ifdef HAVE_TTY
   struct console *c;

-#ifdef HAVE_TTY
   c = decode_console (console);

   if (CONSOLE_TTY_P (c))
@@ -961,9 +961,9 @@
 */
        (console))
 {
+#ifdef HAVE_TTY
   struct console *c;

-#ifdef HAVE_TTY
   c = decode_console (console);

   if (CONSOLE_TTY_P (c))
--- a/src/device-msw.c	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/device-msw.c	Mon Aug 13 10:17:54 2007 +0200
@@ -44,13 +44,9 @@
 static void
 mswindows_init_device (struct device *d, Lisp_Object props)
 {
-  struct console *con = XCONSOLE (DEVICE_CONSOLE (d));
   WNDCLASS wc;
-  mswindows_waitable_info_type info;
   HWND desktop;
   HDC hdc;
-  MSG msg;
-  HANDLE handle;

   DEVICE_INFD (d) = DEVICE_OUTFD (d) = -1;
   init_baud_rate (d);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/dlopen.c	Mon Aug 13 10:17:54 2007 +0200
@@ -0,0 +1,138 @@
+/* Lisp interface to dynamic loading.
+   Copyright (C) 1998  Joshua Rowe.
+   Additional cleanup by Hrvoje Niksic.
+
+This file is part of XEmacs.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+/* Synched up with: Not in FSF. */
+
+/* A shared object may have the following symbols defined:
+      syms_of
+      vars_of
+      complex_vars_of
+   They are called in that order.  Each takes and returns void
+   arguments.
+
+   All of this needs lots and LOTS of work.  Some things to work on:
+
+   1) A good foreign interface.  We probably need to get rid of
+   syms_of and similar junk, and define a more normal interfacing to
+   the outside world, e.g. an init_emacs_module() function.  See below
+   for more discussion about it.  Also, we need a modules/ directory
+   with a few nice sample modules, a sample Makefile, etc. so people
+   can start hacking.
+
+   2) Compatibility concerns.  There are systems without dynamic
+   libraries (Ultrix, to name one).  OK, scrap them, but not all
+   systems out there use the exact dlopen() interface that this file
+   uses.  Bill Perry said he had ready Makefiles for 14 or so systems
+   to do this sort of things portably.  Check it out.  Or, use Gordon
+   Matzigkeit's libtool.
+
+   3) I'm getting coredumps very often -- practically every time I
+   compile without USE_MINIMAL_TAGBITS, and even with it sometimes.  I
+   wasn't able to resolve these.
+
+   4) All of this is sooo simple-minded.  As it gets more complex,
+   we'll have to look at how others have done similar things
+   (e.g. Perl and Zsh 3.1), to avoid botching it up.  */
+
+#include <config.h>
+#include "lisp.h"
+#include "emacsfns.h"
+#include "buffer.h"
+
+#include <stdio.h>
+#include <dlfcn.h>
+#include <errno.h>
+
+
+DEFUN ("dl-open", Fdl_open, 1, 1, "FShared object: ", /*
+Load LIBRARY as a shared object file.
+
+After the LIBRARY is dynamically linked with the executable, the
+following functions are called:
+
+  syms_of(),		containing definitions of symbols and subr's;
+  vars_of(),		containing definitions of variables;
+  complex_vars_of(),	containing complex definitions of variables.
+
+After this point, any lisp symbols defined in the shared object are
+available for use.
+*/
+       (library))
+{
+  /* This function can GC */
+  void *handle;
+  char *file;
+  void (*function)();
+
+  CHECK_STRING (library);
+  library = Fexpand_file_name (library, Qnil);
+
+  file = XSTRING_DATA (library);
+  /* #### Is this right? */
+  GET_C_CHARPTR_EXT_FILENAME_DATA_ALLOCA (file, file);
+
+  handle = dlopen (file, RTLD_LAZY);
+  if (handle == NULL)
+    {
+      signal_error (Qerror,
+		    list3 (build_translated_string ("Cannot load shared library"),
+			   library, build_translated_string (dlerror ())));
+    }
+
+  /* #### This looks unnecessary here, because at this time one
+     initialization function is fully sufficient.  However, I am not
+     removing this support, since we may wish to add mechanisms for
+     static linking, which would have invoke these function via normal
+     paths.
+
+     #### But then this is not sufficient, because one could as well
+     honor specifier_vars_of_foo(), etc.  Maybe we should scrap it
+     after all.
+
+     #### What if one of the first two functions signal an error?
+     Should we take care to execute the other two?  My fingers are
+     getting itchy!  */
+
+  function = dlsym (handle, "syms_of");
+  if (function)
+    {
+      function ();
+    }
+
+  function = dlsym (handle, "vars_of");
+  if (function)
+    {
+      function ();
+    }
+
+  function = dlsym (handle, "complex_vars_of");
+  if (function)
+    {
+      function ();
+    }
+
+  return Qnil;
+}
+
+void syms_of_dlopen ()
+{
+  DEFSUBR (Fdl_open);
+}
--- a/src/emacs.c	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/emacs.c	Mon Aug 13 10:17:54 2007 +0200
@@ -544,11 +544,6 @@
   /* Record (approximately) where the stack begins.  */
   stack_bottom = &stack_bottom_variable;

-#ifdef RUN_TIME_REMAP
-  if (initialized)
-    run_time_remap (argv[0]);
-#endif
-
 #ifdef USG_SHARED_LIBRARIES
   if (bss_end)
     brk ((void *) bss_end);
@@ -831,6 +826,9 @@
       syms_of_dialog ();
 #endif
       syms_of_dired ();
+#ifdef HAVE_SHLIB
+      syms_of_dlopen ();
+#endif
       syms_of_doc ();
       syms_of_editfns ();
       syms_of_elhash ();
@@ -1910,6 +1908,13 @@
 #endif /* _SCO_DS */
       vol_envp = environ;
     }
+#ifdef RUN_TIME_REMAP
+  else
+    /* obviously no-one uses this because where it was before initalized was
+     *always* true */
+    run_time_remap (argv[0]);
+#endif
+
   run_temacs_argc = -1;

   main_1 (vol_argc, vol_argv, vol_envp, restarted);
--- a/src/eval.c	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/eval.c	Mon Aug 13 10:17:54 2007 +0200
@@ -782,7 +782,7 @@
        (args))
 {
   /* This function can GC */
-  Lisp_Object val;
+  Lisp_Object val = Qnil;
   struct gcpro gcpro1, gcpro2;

   GCPRO2 (args, val);
@@ -808,7 +808,7 @@
        (args))
 {
   /* This function can GC */
-  Lisp_Object val;
+  Lisp_Object val = Qnil;
   struct gcpro gcpro1, gcpro2;

   GCPRO2 (args, val);
@@ -2987,6 +2987,9 @@
   if (debug_on_next_call)
     do_debug_on_call (Qt);

+  if (profiling_active)
+    profile_increase_call_count (original_fun);
+
   /* At this point, only original_fun and original_args
      have values that will be used below */
  retry:
--- a/src/event-msw.c	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/event-msw.c	Mon Aug 13 10:17:54 2007 +0200
@@ -81,7 +81,7 @@
 int mswindows_button2_chord_time;

 /* Number of wait handles */
-static mswindows_waitable_count=0;
+static int mswindows_waitable_count=0;

 /* This is the event signaled by the event pump.
    See mswindows_pump_outstanding_events for comments */
@@ -321,6 +321,7 @@
 /*
  * Find a free waitable slot
  */
+#if 0 /* NOTUSED */
 static int
 mswindows_find_free_waitable(void)
 {
@@ -331,6 +332,7 @@
   assert (mswindows_waitable_count < MAX_WAITABLE);
   return mswindows_waitable_count++;
 }
+#endif

 /*
  * Create a new waitable using the type and data passed in by the info structure
--- a/src/frame-msw.c	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/frame-msw.c	Mon Aug 13 10:17:54 2007 +0200
@@ -60,7 +60,6 @@
 mswindows_init_frame_1 (struct frame *f, Lisp_Object props)
 {
   Lisp_Object device = FRAME_DEVICE (f);
-  struct device *d = XDEVICE (device);
   Lisp_Object initially_unmapped;
   Lisp_Object name, height, width, popup, top, left;
   Lisp_Object frame_obj;
@@ -251,7 +250,7 @@
 static void
 mswindows_set_frame_properties (struct frame *f, Lisp_Object plist)
 {
-  int x, y;
+  int x=0, y=0;
   int width = 0, height = 0;
   BOOL width_specified_p = FALSE;
   BOOL height_specified_p = FALSE;
--- a/src/gmalloc.c	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/gmalloc.c	Mon Aug 13 10:17:54 2007 +0200
@@ -432,7 +432,7 @@
 __malloc_size_t _bytes_free;

 /* Are you experienced?  */
-static int __malloc_initialized;
+int __malloc_initialized;

 void (*__after_morecore_hook) __P ((void));
--- a/src/keymap.c	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/keymap.c	Mon Aug 13 10:17:54 2007 +0200
@@ -52,7 +52,7 @@
 #include "events-mod.h"


-/* A keymap contains four slots:
+/* A keymap contains six slots:

    parents	   Ordered list of keymaps to search after
                    this one if no match is found.
--- a/src/lastfile.c	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/lastfile.c	Mon Aug 13 10:17:54 2007 +0200
@@ -39,3 +39,5 @@
 */

 char my_edata[] = "End of Emacs initialized data";
+
+int my_ebss;
--- a/src/lisp.h	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/lisp.h	Mon Aug 13 10:17:54 2007 +0200
@@ -1095,6 +1095,7 @@
   struct Lisp_String *name;
   Lisp_Object value;
   Lisp_Object function;
+  Lisp_Object obarray;
   Lisp_Object plist;
 };
--- a/src/lread.c	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/lread.c	Mon Aug 13 10:17:54 2007 +0200
@@ -119,6 +119,12 @@
 /* Function to use for reading, in `load' and friends.  */
 Lisp_Object Vload_read_function;

+/* The association list of objects read with the #n=object form.
+   Each member of the list has the form (n . object), and is used to
+   look up the object for the corresponding #n# construct.
+   It must be set to nil before all top-level calls to read0.  */
+Lisp_Object read_objects;
+
 /* Nonzero means load should forcibly load all dynamic doc strings.  */
 /* Note that this always happens (with some special behavior) when
    purify_flag is set. */
@@ -1360,6 +1366,7 @@
 #else /* No "defun hack" -- Emacs 19 uses read-time syntax for bytecodes */
 	{
 	  unreadchar (readcharfun, c);
+	  read_objects = Qnil;
 	  if (NILP (Vload_read_function))
 	    val = read0 (readcharfun);
 	  else
@@ -1501,6 +1508,8 @@
   if (EQ (stream, Qt))
     stream = Qread_char;

+  read_objects = Qnil;
+
 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK
   Vcurrent_compiled_function_annotation = Qnil;
 #endif
@@ -1542,6 +1551,8 @@
   lispstream = make_lisp_string_input_stream (string, startval,
 					      endval - startval);

+  read_objects = Qnil;
+
   tem = read0 (lispstream);
   /* Yeah, it's ugly.  Gonna make something of it?
      At least our reader is reentrant ... */
@@ -2413,6 +2424,52 @@
 	      return obj;
 	    }
 #endif
+	  case '0': case '1': case '2': case '3': case '4':
+	  case '5': case '6': case '7': case '8': case '9':
+	    /* Reader forms that can reuse previously read objects.  */
+	    {
+	      int n = 0;
+	      Lisp_Object found;
+
+	      /* Using read_integer() here is impossible, because it
+                 chokes on `='.  Using parse_integer() is too hard.
+                 So we simply read it in, and ignore overflows, which
+                 is safe.  */
+	      while (c >= '0' && c <= '9')
+		{
+		  n *= 10;
+		  n += c - '0';
+		  c = readchar (readcharfun);
+		}
+	      found = assq_no_quit (make_int (n), read_objects);
+	      if (c == '=')
+		{
+		  /* #n=object returns object, but associates it with
+		     n for #n#.  */
+		  Lisp_Object obj;
+		  if (CONSP (found))
+		    return Fsignal (Qinvalid_read_syntax,
+				    list2 (build_translated_string
+					   ("Multiply defined symbol label"),
+					   make_int (n)));
+		  obj = read0 (readcharfun);
+		  read_objects = Fcons (Fcons (make_int (n), obj), read_objects);
+		  return obj;
+		}
+	      else if (c == '#')
+		{
+		  /* #n# returns a previously read object.  */
+		  if (CONSP (found))
+		    return XCDR (found);
+		  else
+		    return Fsignal (Qinvalid_read_syntax,
+				    list2 (build_translated_string
+					   ("Undefined symbol label"),
+					   make_int (n)));
+		}
+	      return Fsignal (Qinvalid_read_syntax,
+			      list1 (build_string ("#")));
+	    }
 	  default:
 	    {
 	      unreadchar (readcharfun, c);
@@ -3201,4 +3258,7 @@
 #ifdef I18N3
   Vfile_domain = Qnil;
 #endif
+
+  read_objects = Qnil;
+  staticpro (&read_objects);
 }
--- a/src/msw-proc.c	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/msw-proc.c	Mon Aug 13 10:17:54 2007 +0200
@@ -62,6 +62,7 @@
 static Lisp_Object mswindows_find_console (HWND hwnd);
 static Lisp_Object mswindows_key_to_emacs_keysym(int mswindows_key, int mods);
 static int mswindows_modifier_state (BYTE* keymap, int has_AltGr);
+#if 0 /* NOTUSED */
 static int mswindows_enqueue_timeout (int milliseconds);
 static void mswindows_dequeue_timeout (int interval_id);

@@ -75,7 +76,9 @@
 typedef struct mswindows_timeout mswindows_timeout;
 static mswindows_timeout timeout_pool[MSW_TIMEOUT_MAX];
 static mswindows_timeout *timeout_head = NULL;
+
 static int timeout_mswindows_id;
+#endif

 /*----------------------------------------------------------------------------*/
 /* Enqueue helpers                                                            */
@@ -247,7 +250,7 @@
 	{
 	  int quit_ch = CONSOLE_QUIT_CHAR (XCONSOLE (mswindows_find_console (hwnd)));
 	  BYTE keymap_orig[256];
-	  MSG msg = { hwnd, message, wParam, lParam, GetMessageTime(), GetMessagePos() };
+	  MSG msg = { hwnd, message, wParam, lParam, GetMessageTime(), (GetMessagePos()) };
 	  memcpy (keymap_orig, keymap, 256);

 	  /* Clear control and alt modifiers out of the keymap */
--- a/src/objects-msw.c	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/objects-msw.c	Mon Aug 13 10:17:54 2007 +0200
@@ -782,11 +782,13 @@
   return(0);
 }

+#if 0
 static void
 mswindows_mark_color_instance (struct Lisp_Color_Instance *c,
 			 void (*markobj) (Lisp_Object))
 {
 }
+#endif

 static void
 mswindows_print_color_instance (struct Lisp_Color_Instance *c,
@@ -910,7 +912,7 @@
   {
     char *c;
     /* Maybe split weight into weight and style */
-    if (c=strchr(weight, ' '))
+    if ((c=strchr(weight, ' ')))
     {
       *c = '\0';
       style = c+1;
@@ -1058,11 +1060,13 @@
   return 1;
 }

+#if 0
 static void
 mswindows_mark_font_instance (struct Lisp_Font_Instance *f,
 			void (*markobj) (Lisp_Object))
 {
 }
+#endif

 static void
 mswindows_print_font_instance (struct Lisp_Font_Instance *f,
--- a/src/print.c	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/print.c	Mon Aug 13 10:17:54 2007 +0200
@@ -83,7 +83,12 @@

 int print_escape_newlines;
 int print_readably;
-int print_gensym;
+
+/* Non-nil means print #: before uninterned symbols.
+   Neither t nor nil means so that and don't clear Vprint_gensym_alist
+   on entry to and exit from print functions.  */
+Lisp_Object Vprint_gensym;
+Lisp_Object Vprint_gensym_alist;

 Lisp_Object Qprint_escape_newlines;
 Lisp_Object Qprint_readably;
@@ -338,6 +343,8 @@
       stdio_stream = stderr;
     }
 #endif
+  if (!CONSP (Vprint_gensym))
+    Vprint_gensym_alist = Qnil;

   return make_print_output_stream (stdio_stream, printcharfun);
 }
@@ -349,6 +356,9 @@
   if (gc_in_progress)
     return;

+  if (!CONSP (Vprint_gensym))
+    Vprint_gensym_alist = Qnil;
+
   Lstream_delete (XLSTREAM (stream));
 }

@@ -893,9 +903,9 @@
 	    write_c_string ("...", printcharfun);
 	    break;
 	  }
-	print_internal (Fcar (obj), printcharfun,
+	print_internal (XCAR (obj), printcharfun,
 			escapeflag);
-	obj = Fcdr (obj);
+	obj = XCDR (obj);
       }
   }
   if (!NILP (obj) && !CONSP (obj))
@@ -917,33 +927,40 @@
 void
 print_string (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
 {
-  Bytecount size = XSTRING_LENGTH (obj);
+  struct Lisp_String *s = XSTRING (obj);
+  /* We distinguish between Bytecounts and Charcounts, to make
+     Vprint_string_length work correctly under Mule.  */
+  Charcount size = string_char_length (s);
+  Charcount max = size;
+  Bytecount bcmax = string_length (s);
   struct gcpro gcpro1, gcpro2;
-  int max = size;
   GCPRO2 (obj, printcharfun);

   if (INTP (Vprint_string_length) &&
       XINT (Vprint_string_length) < max)
-    max = XINT (Vprint_string_length);
+    {
+      max = XINT (Vprint_string_length);
+      bcmax = charcount_to_bytecount (string_data (s), max);
+    }
   if (max < 0)
-    max = 0;
+    {
+      max = 0;
+      bcmax = 0;
+    }

-  /* !!#### This handles MAX incorrectly for Mule. */
   if (!escapeflag)
     {
-      /* This deals with GC-relocation */
-      output_string (printcharfun, 0, obj, 0, max);
+      /* This deals with GC-relocation and Mule. */
+      output_string (printcharfun, 0, obj, 0, bcmax);
       if (max < size)
 	write_c_string (" ...", printcharfun);
     }
   else
     {
-      Bytecount i;
-      struct Lisp_String *s = XSTRING (obj);
-      Bytecount last = 0;
+      Bytecount i, last = 0;

       write_char_internal ("\"", printcharfun);
-      for (i = 0; i < max; i++)
+      for (i = 0; i < bcmax; i++)
 	{
 	  Bufbyte ch = string_byte (s, i);
 	  if (ch == '\"' || ch == '\\'
@@ -969,10 +986,10 @@
 	      last = i + 1;
 	    }
 	}
-      if (max > last)
+      if (bcmax > last)
 	{
 	  output_string (printcharfun, 0, obj, last,
-			 max - last);
+			 bcmax - last);
 	}
       if (max < size)
 	write_c_string (" ...", printcharfun);
@@ -1326,17 +1343,35 @@
     }
   GCPRO2 (obj, printcharfun);

-  if (print_gensym)
+  /* If we print an uninterned symbol as part of a complex object and
+     the flag print-gensym is non-nil, prefix it with #n= to read the
+     object back with the #n# reader syntax later if needed.  */
+  if (!NILP (Vprint_gensym) && NILP (XSYMBOL (obj)->obarray))
     {
-      Lisp_Object tem = oblookup (Vobarray, string_data (name), size);
-      if (!EQ (tem, obj))
-	/* (read) would return a new symbol with the same name.
-	   This isn't quite correct, because that symbol might not
-	   really be uninterned (it might be interned in some other
-	   obarray) but there's no way to win in that case without
-	   implementing a real package system.
-	   */
-	write_c_string ("#:", printcharfun);
+      if (print_depth > 1)
+	{
+	  Lisp_Object tem = Fassq (obj, Vprint_gensym_alist);
+	  if (CONSP (tem))
+	    {
+	      write_char_internal ("#", printcharfun);
+	      print_internal (XCDR (tem), printcharfun, escapeflag);
+	      write_char_internal ("#", printcharfun);
+	      return;
+	    }
+	  else
+	    {
+	      if (CONSP (Vprint_gensym_alist))
+		XSETINT (tem, XINT (XCDR (XCAR (Vprint_gensym_alist))) + 1);
+	      else
+		XSETINT (tem, 1);
+	      Vprint_gensym_alist = Fcons (Fcons (obj, tem), Vprint_gensym_alist);
+
+	      write_char_internal ("#", printcharfun);
+	      print_internal (tem, printcharfun, escapeflag);
+	      write_char_internal ("=", printcharfun);
+	    }
+	}
+      write_c_string ("#:", printcharfun);
     }

   /* Does it look like an integer or a float? */
@@ -1751,23 +1786,34 @@
 */ );
   print_readably = 0;

-  DEFVAR_BOOL ("print-gensym", &print_gensym /*
+  /* #### I think this should default to t.  But we'd better wait
+     until we see that it works out.  */
+  DEFVAR_LISP ("print-gensym", &Vprint_gensym /*
 If non-nil, then uninterned symbols will be printed specially.
 Uninterned symbols are those which are not present in `obarray', that is,
 those which were made with `make-symbol' or by calling `intern' with a
 second argument.

-When print-gensym is true, such symbols will be preceded by "#:", which
-causes the reader to create a new symbol instead of interning and returning
-an existing one.  Beware: the #: syntax creates a new symbol each time it is
-seen, so if you print an object which contains two pointers to the same
-uninterned symbol, `read' will not duplicate that structure.
+When print-gensym is true, such symbols will be preceded by "#:",
+which causes the reader to create a new symbol instead of interning
+and returning an existing one.  Beware: the #: syntax creates a new
+symbol each time it is seen, so if you print an object which contains
+two pointers to the same uninterned symbol, `read' will not duplicate
+that structure.

-Also, since XEmacs has no real notion of packages, there is no way for the
-printer to distinguish between symbols interned in no obarray, and symbols
-interned in an alternate obarray.
+If the value of `print-gensym' is a cons cell, then in addition
+refrain from clearing `print-gensym-alist' on entry to and exit from
+printing functions, so that the use of #...# and #...= can carry over
+for several separately printed objects.
 */ );
-  print_gensym = 0;
+  Vprint_gensym = Qnil;
+
+  DEFVAR_LISP ("print-gensym-alist", &Vprint_gensym_alist /*
+Association list of elements (GENSYM . N) to guide use of #N# and #N=.
+In each element, GENSYM is an uninterned symbol that has been associated
+with #N= for the specified value of N.
+*/ );
+  Vprint_gensym_alist = Qnil;

   DEFVAR_LISP ("print-message-label", &Vprint_message_label /*
 Label for minibuffer messages created with `print'.  This should
--- a/src/redisplay-msw.c	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/redisplay-msw.c	Mon Aug 13 10:17:54 2007 +0200
@@ -220,7 +220,14 @@
       fprintf (stderr, "Help! mswindows_update_gc got a bogus fg value! fg = ");
       debug_print (fg);
       fg = Qnil;
-    }
+      }
+
+  if (!NILP (bg) && !COLOR_INSTANCEP (bg))
+    {
+      fprintf (stderr, "Help! mswindows_update_gc got a bogus fg value! bg = ");
+      debug_print (bg);
+      bg = Qnil;
+      }

   if (!NILP (fg))
     SetTextColor (hdc, COLOR_INSTANCE_MSWINDOWS_COLOR (XCOLOR_INSTANCE (fg)));
@@ -413,7 +420,7 @@
 		   int width, face_index findex)
 {
   struct frame *f = XFRAME (w->frame);
-  struct device *d = XDEVICE (f->device);
+  /* struct device *d = XDEVICE (f->device);*/
   Lisp_Object window = Qnil;
   HDC hdc;
   int clip_end;
@@ -457,7 +464,7 @@
   for (i = 0; i < nruns; i++)
     {
       Lisp_Object font = FACE_CACHEL_FONT (cachel, runs[i].charset);
-      struct Lisp_Font_Instance *fi = XFONT_INSTANCE (font);
+      /* struct Lisp_Font_Instance *fi = XFONT_INSTANCE (font);*/
       int this_width;
       RECT rect = { clip_start, dl->ypos - dl->ascent,
 		    clip_end, dl->ypos + dl->descent - dl->clip };
@@ -695,7 +702,7 @@

 /*****************************************************************************
  #### Display methods
-/*****************************************************************************
+*****************************************************************************/

 /*****************************************************************************
  mswindows_divider_width
--- a/src/s/cygwin32.h	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/s/cygwin32.h	Mon Aug 13 10:17:54 2007 +0200
@@ -67,20 +67,19 @@
 #undef CONST
 #endif

-/* Start and end of text and data.  */
-extern void* _data_start__;
-extern void* _data_end__;
-
 #include <windows.h>
 #endif

+#ifdef HAVE_MS_WINDOWS
 #define HAVE_NTGUI
 #define HAVE_FACES
+#endif

 #ifndef ORDINARY_LINK
 #define ORDINARY_LINK
 #endif

+#define C_SWITCH_SYSTEM -Wno-sign-compare
 #undef MOD_ALT
 #undef MOD_CONTROL
 #undef MOD_SHIFT
@@ -93,7 +92,12 @@
 #define VK_APPS			0x5D
 #define SIGPROF	0
 #define NO_LIM_DATA
-#define HAVE_TEXT_START
+
+#define TEXT_START -1
+#define TEXT_END -1
+#define DATA_END -1
+#define RUN_TIME_REMAP
+#define UNEXEC "unexcw.o"

 #undef MAIL_USE_SYSTEM_LOCK

@@ -123,17 +127,6 @@

 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)

-/* Define CANNOT_DUMP on machines where unexec does not work.
-   Then the function dump-emacs will not be defined
-   and temacs will do (load "loadup") automatically unless told otherwise.  */
-
-#define CANNOT_DUMP	1
-#define	CANNOT_UNEXEC	1
-#define UNEXEC /* unexnt.o */
-
-#define DATA_START 	_data_start__
-#define DATA_END 	_data_end__
-
 /* Define VIRT_ADDR_VARIES if the virtual addresses of
    pure and impure space as loaded can vary, and even their
    relative order cannot be relied on.
@@ -156,7 +149,7 @@
 /* SYSTEM_TYPE should indicate the kind of system you are using.
  It sets the Lisp variable system-type.  */

-#define SYSTEM_TYPE "windows-nt"
+#define SYSTEM_TYPE "cygwin32"

 #define NO_MATHERR

@@ -180,7 +173,7 @@
 /* If your system uses COFF (Common Object File Format) then define the
    preprocessor symbol "COFF". */

-#define COFF
+#define COFF 1

 /* define MAIL_USE_FLOCK if the mailer uses flock
    to interlock access to /usr/spool/mail/$USER.
@@ -189,7 +182,7 @@

 /* If the character used to separate elements of the executable path
    is not ':', #define this to be the appropriate character constant.  */
-#define SEPCHAR ';'
+#define SEPCHAR ':'

 /* ============================================================ */
--- a/src/sound.c	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/sound.c	Mon Aug 13 10:17:54 2007 +0200
@@ -88,13 +88,21 @@
     }

   GCPRO1 (file);
-  file = Fexpand_file_name (file, Qnil);
-  if (NILP (Ffile_readable_p (file)))
+  while (1)
     {
-    if (NILP (Ffile_exists_p (file)))
-      error ("file does not exist.");
-    else
-      error ("file is unreadable.");
+      file = Fexpand_file_name (file, Qnil);
+      if (!NILP(Ffile_readable_p (file)))
+	break;
+      else
+	{
+	  /* #### This is crockish.  It might be a better idea to try
+	     to open the file, and use report_file_error() if it
+	     fails.  --hniksic */
+	  if (NILP (Ffile_exists_p (file)))
+	    signal_simple_continuable_error ("File does not exist", file);
+	  else
+	    signal_simple_continuable_error ("File is unreadable", file);
+	}
     }
   UNGCPRO;

@@ -338,6 +346,13 @@
   struct device *d = decode_device (device);

   XSETDEVICE (device, d);
+
+  /* #### This is utterly disgusting, and is probably a remnant from
+     legacy code that used `ding'+`message' to signal error instead
+     calling `error'.  As a result, there is no way to beep from Lisp
+     directly, without also invoking this aspect.  Maybe we should
+     define a `ring-bell' function that simply beeps on the console,
+     which `ding' should invoke?  --hniksic */
   if (NILP (arg) && !NILP (Vexecuting_macro))
     /* Stop executing a keyboard macro. */
     error ("Keyboard macro terminated by a command ringing the bell");
--- a/src/symbols.c	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/symbols.c	Mon Aug 13 10:17:54 2007 +0200
@@ -102,6 +102,14 @@

   ((markobj) (sym->value));
   ((markobj) (sym->function));
+  /* DON'T mark through ->obarray slot.  Since the slot is not visible
+     from Lisp, it would be wrong not to gc an obarray vector only
+     because there are symbols pointing to it.  This is safe, because
+     we only check the nil-ness of the object.  An implication of this
+     is that, when the obarray vector is gc-ed, its symbols are still
+     considered "interned" for printing purposes -- but it's probably
+     no big deal.  */
+  /*((markobj) (sym->obarray));*/
   XSETSTRING (pname, sym->name);
   ((markobj) (pname));
   if (!symbol_next (sym))
@@ -191,6 +199,7 @@
   if (purify_flag && ! purified (str))
     str = make_pure_pname (XSTRING_DATA (str), len, 0);
   sym = Fmake_symbol (str);
+  XSYMBOL (sym)->obarray = obarray;

   if (SYMBOLP (*ptr))
     symbol_next (XSYMBOL (sym)) = XSYMBOL (*ptr);
@@ -275,7 +284,7 @@
 	    }
 	}
     }
-
+  XSYMBOL (tem)->obarray = Qnil;
   return Qt;
 }

@@ -3156,6 +3165,7 @@
     hash %= OBARRAY_SIZE;
     tem = &XVECTOR_DATA (Vobarray)[hash];
     *tem = Qnil;
+    XSYMBOL (Qnil)->obarray = Vobarray;
   }

   {
--- a/src/symsinit.h	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/symsinit.h	Mon Aug 13 10:17:54 2007 +0200
@@ -101,6 +101,7 @@
 void syms_of_md5 (void);
 void syms_of_menubar_x (void);
 void syms_of_menubar (void);
+void syms_of_menubar_mswindows (void);
 void syms_of_minibuf (void);
 void syms_of_mule (void);
 void syms_of_mule_canna (void);
@@ -152,6 +153,14 @@
 void console_type_create_redisplay_x (void);
 void console_type_create_scrollbar_x (void);
 void console_type_create_toolbar_x (void);
+void console_type_create_mswindows (void);
+void console_type_create_device_mswindows (void);
+void console_type_create_frame_mswindows (void);
+void console_type_create_menubar_mswindows (void);
+void console_type_create_objects_mswindows (void);
+void console_type_create_redisplay_mswindows (void);
+void console_type_create_scrollbar_mswindows (void);
+void console_type_create_toolbar_mswindows (void);

 /* Initialize the specifier types (dump-time only). */

@@ -243,6 +252,7 @@
 void vars_of_md5 (void);
 void vars_of_menubar_x (void);
 void vars_of_menubar (void);
+void vars_of_menubar_mswindows (void);
 void vars_of_minibuf (void);
 void vars_of_mule (void);
 void vars_of_mule_canna (void);
@@ -260,6 +270,7 @@
 void vars_of_redisplay (void);
 void vars_of_scrollbar_x (void);
 void vars_of_scrollbar (void);
+void vars_of_scrollbar_mswindows (void);
 void vars_of_search (void);
 void vars_of_select_mswindows (void);
 void vars_of_sound (void);
--- a/src/toolbar.c	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/toolbar.c	Mon Aug 13 10:17:54 2007 +0200
@@ -446,7 +446,7 @@

       /* We know that we at least have an up_glyph.  Well, no, we
          don't.  The user may have changed the button glyph on us. */
-      if (!NILP (glyphs) && CONSP (glyphs))
+      if (CONSP (glyphs))
 	{
 	  if (!EQ (XCAR (glyphs), tb->up_glyph))
 	    {
@@ -459,7 +459,7 @@
 	tb->up_glyph = Qnil;

       /* We might have a down_glyph. */
-      if (!NILP (glyphs) && CONSP (glyphs))
+      if (CONSP (glyphs))
 	{
 	  if (!EQ (XCAR (glyphs), tb->down_glyph))
 	    {
@@ -472,7 +472,7 @@
 	tb->down_glyph = Qnil;

       /* We might have a disabled_glyph. */
-      if (!NILP (glyphs) && CONSP (glyphs))
+      if (CONSP (glyphs))
 	{
 	  if (!EQ (XCAR (glyphs), tb->disabled_glyph))
 	    {
@@ -485,7 +485,7 @@
 	tb->disabled_glyph = Qnil;

       /* We might have a cap_up_glyph. */
-      if (!NILP (glyphs) && CONSP (glyphs))
+      if (CONSP (glyphs))
 	{
 	  if (!EQ (XCAR (glyphs), tb->cap_up_glyph))
 	    {
@@ -498,7 +498,7 @@
 	tb->cap_up_glyph = Qnil;

       /* We might have a cap_down_glyph. */
-      if (!NILP (glyphs) && CONSP (glyphs))
+      if (CONSP (glyphs))
 	{
 	  if (!EQ (XCAR (glyphs), tb->cap_down_glyph))
 	    {
@@ -511,7 +511,7 @@
 	tb->cap_down_glyph = Qnil;

       /* We might have a cap_disabled_glyph. */
-      if (!NILP (glyphs) && CONSP (glyphs))
+      if (CONSP (glyphs))
 	{
 	  if (!EQ (XCAR (glyphs), tb->cap_disabled_glyph))
 	    {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/unexcw.cc	Mon Aug 13 10:17:54 2007 +0200
@@ -0,0 +1,606 @@
+/* unexec for GNU Emacs on Cygwin32.
+   Copyright (C) 1994, 1998 Free Software Foundation, Inc.
+
+This file is part of XEmacs.
+
+XEmacs is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs; see the file COPYING.  If not, write to the Free
+Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+
+*/
+
+/* Adapted from unexnt.c Andy Piper (andyp@parallax.co.uk) 13-1-98 */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <config.h>
+#include <string.h>
+
+#define PERROR(arg) perror(arg);exit(-1)
+
+#ifndef HAVE_COFF_H
+extern "C" void
+unexec (char *, char *, void *, void *,	void *)
+{
+  PERROR("cannot unexec() coff.h not installed");
+}
+
+extern "C" void run_time_remap (char *)
+{}
+#else
+
+#include <windows.h>
+/*
+ * unfortunately we need this c++ to get at the internals of cygwin
+ */
+class pinfo;
+class per_process
+{
+ public:
+  char *initial_sp;
+
+  /* The offset of these 3 values can never change.  */
+  /* magic_biscuit is the size of this class and should never change.  */
+  int magic_biscuit;
+  int version_major;
+  int version_minor;
+
+  struct _reent **impure_ptr_ptr;
+  char ***envptr;
+
+  /* Used to point to the memory machine we should use -
+     usually points back into the dll, but can be overridden by the user.  */
+  void *(*malloc)(size_t);
+  void (*free)(void *);
+  void *(*realloc)(void *, size_t);
+
+  int *fmode_ptr;
+
+  int (*main)(int, char **, char **);
+  void (**ctors)();
+  void (**dtors)();
+
+  /* For fork */
+  void *data_start;
+  void *data_end;
+  void *bss_start;
+  void *bss_end;
+
+  /* For future expansion of values set by the app.  */
+  void *public_reserved[4];
+
+  /* The rest are *internal* to cygwin.dll.
+     Those that are here because we want the child to inherit the value from
+     the parent (which happens when bss is copied) are marked as such.  */
+
+  /* FIXME: Which of these can go elsewhere?  */
+
+  /* FIXME: Delete, make `self' a global.  */
+  pinfo *self;		/* pointer only valid in self process */
+
+  /* non-zero of ctors have been run.  Inherited from parent.  */
+  int run_ctors_p;
+
+  /* These will be non-zero if the above (malloc,free,realloc) have been
+     overridden.  */
+  /* FIXME: not currently used */
+  int __imp_malloc;
+  int __imp_free;
+  int __imp_realloc;
+
+  /* Heap management.  Inherited from parent.  */
+  void *base;			/* bottom of the heap */
+  void *ptr;			/* current index into heap */
+  int  size;			/* current size of heap */
+
+  /* Mask of what to trace.  Inherited from parent.
+     See sys/strace.h for details.  The value of this is changeable from other
+     tasks via the `cygwin' utility so we want this in the shared data area
+     (and thus the process table since there's one of these per task).
+     However, we also want to turn on stracing as soon as possible and
+     therefore before we know which process table entry to use.  So we put it
+     here, and have a pointer to it in the process table.  */
+  int strace_mask;
+
+  /* Non-zero means the task was forked.  The value is the pid.
+     Inherited from parent.  */
+  int forkee;
+
+  void *hmodule;
+
+  void* /*HANDLE*/ signal_arrived;
+  /* For future expansion, so apps won't have to be relinked if we
+     add an item.  */
+  void *internal_reserved[9];
+
+  /*  struct file_queue *dq;	 !!! this may need to be nuked ? */
+};
+
+extern per_process cygwin_statu; /* pointer into the application's static data */
+
+#include <coff.h>
+
+#define ALLOC_UNIT 0xFFFF
+#define ALLOC_MASK ~((unsigned long)(ALLOC_UNIT))
+#define ALIGN_ALLOC(addr) \
+((((unsigned long)addr) + ALLOC_UNIT) & ALLOC_MASK)
+#define SIZEOF_PER_PROCESS (42 * 4)
+
+/*
+ * Heap related stuff.
+ */
+#define get_reserved_heap_size()	(*heap_size)
+#define get_committed_heap_size()	\
+(int)((unsigned char*)(*heap_index)-(unsigned char*)(*heap_base))
+#define get_heap_start()		(*heap_base)
+#define get_heap_end()			(*heap_index)
+
+extern "C" {
+void** heap_base = &cygwin_statu.base;
+void** heap_index = &cygwin_statu.ptr;
+int*   heap_size = &cygwin_statu.size;
+int*   heap_flag = &cygwin_statu.forkee;
+void*  per_process_data = &cygwin_statu;
+/* To prevent zero-initialized variables from being placed into the bss
+   section, use non-zero values to represent an uninitialized state.  */
+#define UNINIT_PTR ((void *) 0xF0A0F0A0)
+#define UNINIT_LONG (0xF0A0F0A0L)
+
+void* local_heap_base=UNINIT_PTR;
+void* local_heap_index=UNINIT_PTR;
+unsigned long local_heap_size=UNINIT_LONG;
+
+/* Recreate the heap created during dumping.  */
+
+enum {
+  HEAP_UNINITIALIZED = 1,
+  HEAP_UNLOADED,
+  HEAP_LOADED
+};
+
+/* Basically, our "initialized" flag.  */
+int heap_state = HEAP_UNINITIALIZED;
+
+/* So we can find our heap in the file to recreate it.  */
+unsigned long heap_index_in_executable = UNINIT_LONG;
+
+static void get_section_info (int a_out, char* a_name);
+static void copy_executable_and_dump_data_section (int a_out, int a_new);
+static void dump_heap (int a_out, int a_new);
+static void dup_file_area(int a_out, int a_new, long size);
+
+/* Cached info about the .data section in the executable.  */
+void* data_start_va = UNINIT_PTR;
+unsigned long  data_size = UNINIT_LONG;
+
+/* Cached info about the .bss section in the executable.  */
+void* bss_start = UNINIT_PTR;
+unsigned long  bss_size = UNINIT_LONG;
+FILHDR f_hdr;
+PEAOUTHDR f_ohdr;
+SCNHDR f_data, f_bss, f_text, f_idata;
+}
+#define PERROR(arg) perror(arg);exit(-1)
+#define CHECK_AOUT_POS(a) \
+if (lseek(a_out, 0, SEEK_CUR) != a) \
+{ \
+  printf("we are at %lx, should be at %lx\n", \
+	 lseek(a_out, 0, SEEK_CUR), a); \
+  exit(-1); \
+}
+
+/* Dump out .data and .bss sections into a new executable.  */
+extern "C" void
+unexec (char *out_name, char *in_name, void *start_data, void *,	void *)
+{
+  /* ugly nt hack - should be in lisp */
+  char new_name[MAX_PATH], a_name[MAX_PATH];
+  char *ptr;
+
+  /* Make sure that the input and output filenames have the
+     ".exe" extension...patch them up if they don't.  */
+  strcpy (a_name, in_name);
+  ptr = a_name + strlen (a_name) - 4;
+  if (strcmp (ptr, ".exe"))
+    strcat (a_name, ".exe");
+
+  strcpy (new_name, out_name);
+  ptr = new_name + strlen (new_name) - 4;
+  if (strcmp (ptr, ".exe"))
+    strcat (new_name, ".exe");
+  /* save heap info in our data segment so that we can recreate after
+     dumping */
+
+  local_heap_base = *heap_base;
+  local_heap_size = *heap_size;
+  local_heap_index = *heap_index;
+
+  /* We need to round off our heap to NT's allocation unit (64KB).  */
+  /* round_heap (get_allocation_unit ()); */
+
+  int a_new, a_out = -1;
+
+  if (a_name && (a_out = open (a_name, O_RDONLY)) < 0)
+    {
+      PERROR (a_name);
+    }
+  if ((a_new = creat (new_name, 0666)) < 0)
+    {
+      PERROR (new_name);
+    }
+
+  /* Get the interesting section info, like start and size of .bss...  */
+  get_section_info (a_out, a_name);
+
+  /* Set the flag (before dumping).  */
+  heap_state = HEAP_UNLOADED;
+
+  copy_executable_and_dump_data_section (a_out, a_new);
+  dump_heap (a_out, a_new);
+
+  close(a_out);
+  close(a_new);
+}
+
+/* Flip through the executable and cache the info necessary for dumping.  */
+static void get_section_info (int a_out, char* a_name)
+{
+  if (read (a_out, &f_hdr, sizeof (f_hdr)) != sizeof (f_hdr))
+    {
+      PERROR (a_name);
+    }
+
+  if (f_hdr.e_magic != DOSMAGIC)
+    {
+      PERROR("unknown exe header");
+    }
+
+  /* Check the NT header signature ...  */
+  if (f_hdr.nt_signature != NT_SIGNATURE)
+    {
+      PERROR("invalid nt header");
+    }
+
+  /* Flip through the sections for .data and .bss ...  */
+  if (f_hdr.f_opthdr > 0)
+    {
+      if (read (a_out, &f_ohdr, AOUTSZ) != AOUTSZ)
+	{
+	  PERROR (a_name);
+	}
+    }
+  /* Loop through .data & .bss section headers, copying them in */
+  lseek (a_out, sizeof (f_hdr) + f_hdr.f_opthdr, 0);
+
+  if (read (a_out, &f_text, sizeof (f_text)) != sizeof (f_text)
+      &&
+      strcmp (f_text.s_name, ".text"))
+    {
+      PERROR ("no .text section");
+    }
+
+  /* The .bss section.  */
+  if (read (a_out, &f_bss, sizeof (f_bss)) != sizeof (f_bss)
+      &&
+      strcmp (f_bss.s_name, ".bss"))
+    {
+      PERROR ("no .bss section");
+    }
+  extern int my_ebss;
+  bss_start = (void *) ((char*)f_ohdr.ImageBase + f_bss.s_vaddr);
+  bss_size = (unsigned long)((char*)&my_ebss-(char*)bss_start);
+
+  /* must keep bss data that we want to be blank as blank */
+  printf("found bss - keeping %lx of %lx bytes\n", bss_size, f_ohdr.bsize);
+
+  /* The .data section.  */
+  if (read (a_out, &f_data, sizeof (f_data)) != sizeof (f_data)
+      &&
+      strcmp (f_data.s_name, ".data"))
+    {
+      PERROR ("no .data section");
+    }
+
+  /* From lastfile.c  */
+  extern char my_edata[];
+
+  /* The .data section.  */
+  data_start_va = (void *) ((char*)f_ohdr.ImageBase + f_data.s_vaddr);
+
+  /* We want to only write Emacs data back to the executable,
+     not any of the library data (if library data is included,
+     then a dumped Emacs won't run on system versions other
+     than the one Emacs was dumped on).  */
+  data_size = my_edata - data_start_va;
+
+  /* The .idata section.  */
+  if (read (a_out, &f_idata, sizeof (f_idata)) != sizeof (f_idata)
+      &&
+      strcmp (f_idata.s_name, ".idata"))
+    {
+      PERROR ("no .idata section");
+    }
+}
+
+/* The dump routines.  */
+
+static void
+copy_executable_and_dump_data_section (int a_out, int a_new)
+{
+  long size=0;
+  unsigned long new_data_size, new_bss_size, f_data_s_vaddr,
+    file_sz_change, f_data_s_scnptr, bss_padding;
+  int i;
+  SCNHDR section;
+  /* calculate new sizes f_ohdr.dsize is the total initalized data
+     size on disk which is f_data.s_size + f_idata.s_size.
+     f_ohdr.data_start is the base addres of all data and so should
+     not be changed. *.s_vaddr is the virtual address of the start
+     of the section normalzed from f_ohdr.ImageBase. *.s_paddr
+     appears to be the number of bytes in the section actually used
+     (whereas *.s_size is aligned).
+
+     bsize is now 0 since subsumed into .data
+     dsize is dsize + (f_data.s_vaddr - f_bss.s_vaddr)
+     f_data.s_vaddr is f_bss.s_vaddr
+     f_data.s_size is new dsize maybe.
+     what about s_paddr & s_scnptr?  */
+  /* this is the amount the file increases in size */
+  *heap_flag=1;			// kludge to get mem to remap
+  new_bss_size=f_data.s_vaddr - f_bss.s_vaddr;
+  file_sz_change=new_bss_size;
+  new_data_size=f_ohdr.dsize + new_bss_size;
+  f_data_s_scnptr = f_data.s_scnptr;
+  f_data_s_vaddr = f_data.s_vaddr;
+  f_data.s_vaddr = f_bss.s_vaddr;
+  f_data.s_paddr += new_bss_size;
+
+  if (f_data.s_size + f_idata.s_size != f_ohdr.dsize)
+    {
+      printf("section size doesn't tally with dsize %lx != %lx\n",
+	     f_data.s_size + f_idata.s_size, f_ohdr.dsize);
+    }
+  f_data.s_size += new_bss_size;
+  lseek (a_new, 0, SEEK_SET);
+  /* write file header */
+  f_hdr.f_symptr += file_sz_change;
+  f_hdr.f_nscns--;
+  printf("writing file header\n");
+  if (write(a_new, &f_hdr, sizeof(f_hdr)) != sizeof(f_hdr))
+    {
+      PERROR("failed to write file header");
+    }
+  /* write optional header fixing dsize & bsize*/
+  printf("writing optional header\n");
+  printf("new data size is %lx, >= %lx\n", new_data_size,
+	 f_ohdr.dsize + f_ohdr.bsize);
+  if (new_data_size < f_ohdr.dsize + f_ohdr.bsize )
+    {
+      PERROR("new data size is < approx");
+    }
+  f_ohdr.dsize=new_data_size;
+  f_ohdr.bsize=0;
+  if (write(a_new, &f_ohdr, sizeof(f_ohdr)) != sizeof(f_ohdr))
+    {
+      PERROR("failed to write optional header");
+    }
+  /* write text as is */
+  printf("writing text header (unchanged)\n");
+
+  if (write(a_new, &f_text, sizeof(f_text)) != sizeof(f_text))
+    {
+      PERROR("failed to write text header");
+    }
+
+  /* write new data header */
+  printf("writing .data header\n");
+
+  if (write(a_new, &f_data, sizeof(f_data)) != sizeof(f_data))
+    {
+      PERROR("failed to write data header");
+    }
+
+  printf("writing .idata header\n");
+  f_idata.s_scnptr += file_sz_change;
+  if (f_idata.s_lnnoptr != 0) f_idata.s_lnnoptr += file_sz_change;
+  if (f_idata.s_relptr != 0) f_idata.s_relptr += file_sz_change;
+  if (write(a_new, &f_idata, sizeof(f_idata)) != sizeof(f_idata))
+    {
+      PERROR("failed to write idata header");
+    }
+
+  /* copy other section headers adjusting the file offset */
+  for (i=0; i<(f_hdr.f_nscns-3); i++)
+    {
+      if (read (a_out, &section, sizeof (section)) != sizeof (section))
+	{
+	  PERROR ("no .data section");
+	}
+
+      section.s_scnptr += file_sz_change;
+      if (section.s_lnnoptr != 0) section.s_lnnoptr += file_sz_change;
+      if (section.s_relptr != 0) section.s_relptr += file_sz_change;
+
+      if (write(a_new, &section, sizeof(section)) != sizeof(section))
+	{
+	  PERROR("failed to write data header");
+	}
+    }
+
+  /* dump bss to maintain offsets */
+  memset(&f_bss, 0, sizeof(f_bss));
+  if (write(a_new, &f_bss, sizeof(f_bss)) != sizeof(f_bss))
+    {
+      PERROR("failed to write bss header");
+    }
+
+
+  size=lseek(a_new, 0, SEEK_CUR);
+  CHECK_AOUT_POS(size);
+
+  /* copy eveything else until start of data */
+  size = f_data_s_scnptr - lseek (a_out, 0, SEEK_CUR);
+
+  printf ("copying executable up to data section ... %lx bytes\n",
+	  size);
+  dup_file_area(a_out, a_new, size);
+
+  CHECK_AOUT_POS(f_data_s_scnptr);
+
+  /* dump bss + padding between sections */
+  printf ("dumping .bss into executable... %lx bytes\n", bss_size);
+  if (write(a_new, bss_start, bss_size) != (int)bss_size)
+    {
+      PERROR("failed to write bss section");
+    }
+  /* pad, needs to be zero */
+  bss_padding = new_bss_size - bss_size;
+  printf ("padding .bss ... %lx bytes\n", bss_padding);
+  void* empty_space = malloc(bss_padding);
+  memset(empty_space, 0, bss_padding);
+  if (write(a_new, empty_space, bss_padding) != (int)bss_padding)
+    {
+      PERROR("failed to write bss section");
+    }
+  free(empty_space);
+
+  /* Get a pointer to the raw data in our address space.  */
+  printf ("dumping .data section... %lx bytes\n", data_size);
+  if (write(a_new, data_start_va, data_size) != (int)data_size)
+    {
+      PERROR("failed to write data section");
+    }
+
+  lseek(a_out, f_data_s_scnptr + data_size, SEEK_SET);
+
+  size = (((unsigned long)per_process_data-f_ohdr.ImageBase)-f_data_s_vaddr)
+    - data_size;
+  /* write rest of .data to cygwin per process */
+  printf ("copying from .data to cygwin per_process... %lx bytes\n", size);
+  dup_file_area(a_out, a_new, size);
+
+  /* now write out the per process information */
+  printf ("dumping to cygwin per_process... %x bytes at %p\n",
+	  SIZEOF_PER_PROCESS, per_process_data);
+
+  per_process newpp;
+  memset(&newpp, 0, SIZEOF_PER_PROCESS);
+  newpp.base = cygwin_statu.base;
+  newpp.ptr = cygwin_statu.ptr;
+  newpp.size = cygwin_statu.size;
+
+  if (write(a_new, &newpp, SIZEOF_PER_PROCESS)
+      != (int)SIZEOF_PER_PROCESS)
+    {
+      PERROR("failed to write per_process info");
+    }
+  free(empty_space);
+
+  /* dump the rest */
+  size = lseek(a_out, SIZEOF_PER_PROCESS, SEEK_CUR);
+  size = f_idata.s_scnptr - size;
+  dup_file_area(a_out, a_new, size);
+
+  //  lseek(a_out, f_idata.s_scnptr, SEEK_CUR);
+  CHECK_AOUT_POS(f_idata.s_scnptr);
+  /* now dump - idata don't need to do this cygwin ds is in .data! */
+  printf ("dumping .idata section... %lx bytes\n", f_idata.s_size);
+
+  dup_file_area(a_out,a_new,f_idata.s_size);
+
+  /* write rest of file */
+  printf ("writing rest of file\n");
+  size = lseek(a_out, 0, SEEK_END);
+  size = size - (f_idata.s_scnptr + f_idata.s_size); /* length remaining in a_out */
+  lseek(a_out, f_idata.s_scnptr + f_idata.s_size, SEEK_SET);
+
+  dup_file_area(a_out, a_new, size);
+}
+
+/*
+ * copy from aout to anew
+ */
+static void dup_file_area(int a_out, int a_new, long size)
+{
+  char page[BUFSIZ];
+  long n;
+  for (; size > 0; size -= sizeof (page))
+    {
+      n = size > sizeof (page) ? sizeof (page) : size;
+      if (read (a_out, page, n) != n || write (a_new, page, n) != n)
+	{
+	  PERROR ("dump_out()");
+	}
+    }
+}
+
+static void dump_heap (int a_out, int a_new)
+{
+    void *heap_data;
+    unsigned long heap_size;
+
+    printf ("Dumping heap into executable...\n");
+
+    heap_size = get_committed_heap_size ();
+    heap_data = get_heap_start ();
+
+    printf ("heap start in process - %p \n", heap_data);
+    printf ("heap size in bytes %lx\n", heap_size);
+
+    /* nt version rounds heap start - don't see why we should */
+    heap_index_in_executable = lseek(a_new, 0, SEEK_CUR);
+
+    if (write(a_new, heap_data, heap_size) != (int)heap_size)
+      {
+	PERROR("failed to write data section");
+      }
+}
+
+extern "C" void run_time_remap (char *a_name)
+{
+  int a_out=-1;
+
+  if ((*heap_base)!=local_heap_base
+      ||(*heap_index)<local_heap_index
+      ||(*heap_size)<local_heap_size)
+    {
+      PERROR("heap parameters not in bss");
+    }
+
+  if (a_name && (a_out = open (a_name, O_RDONLY)) < 0)
+    {
+      PERROR (a_name);
+    }
+
+  /* load the heap */
+  lseek(a_out, heap_index_in_executable, SEEK_SET);
+
+  if (read (a_out, get_heap_start(),
+	    (int)((unsigned char*)(local_heap_index)
+		  -(unsigned char*)(local_heap_base))) < 0)
+    {
+      PERROR (a_name);
+    }
+  close(a_out);
+
+  /* switch to new heap */
+  heap_state=HEAP_LOADED;
+  *heap_flag=0;
+
+  close(a_out);
+}
+
+#endif /* HAVE_COFF_H */
--- a/version.sh	Mon Aug 13 10:17:09 2007 +0200
+++ b/version.sh	Mon Aug 13 10:17:54 2007 +0200
@@ -1,5 +1,5 @@
 #!/bin/sh
 emacs_major_version=20
 emacs_minor_version=5
-emacs_beta_version=20
-xemacs_codename="Don"
+emacs_beta_version=21
+xemacs_codename="Golden Guernsey"