Mercurial > hg > xemacs-beta

--- a/CHANGES-beta	Mon Aug 13 10:23:05 2007 +0200
+++ b/CHANGES-beta	Mon Aug 13 10:23:51 2007 +0200
@@ -1,4 +1,16 @@
 							-*- indented-text -*-
+to 20.5 beta29 "Loashan"
+-- Add autodetection of DLL support
+-- bug fixes from Kyle Jones
+-- miscellaneous bug fixes
+-- `make all' really remakes everything
+-- Installation file changes format:
+   XEmacs version is printed
+   Previous versions are now deleted by default
+-- --with-dlmalloc configure option added
+-- fix multicast support courtesy of Didier Verna
+-- LDAP fixes courtesy of Oscar Figueiredo
+
 to 20.5 beta28 "LaMancha"
 -- eudc/LDAP stuffs courtesy of Oscar Figueiredo
 -- file-coding separation from Mule courtesy of Andy Piper
--- a/ChangeLog	Mon Aug 13 10:23:05 2007 +0200
+++ b/ChangeLog	Mon Aug 13 10:23:51 2007 +0200
@@ -1,3 +1,21 @@
+1998-02-28  SL Baur  <steve@altair.xemacs.org>
+
+	* Makefile.in (top_distclean): Remove Installation.el.
+	(xemacs): New target.  Formerly it was `all:'.
+	(all): New default, dist: is now superfluous.
+
+1998-02-27  SL Baur  <steve@altair.xemacs.org>
+
+	* configure.in (GNU_MALLOC): add --with-dlmalloc to allow
+	selective use of Doug Lea malloc in Linux C Library and GNU C Library.
+	(Installation): Add XEmacs version and generate `Installation.el'.
+
+1998-02-26  SL Baur  <steve@altair.xemacs.org>
+
+	* configure.in (with_ldap: Fix -lldap autodection.
+	Suggested by Oscar Figueiredo <Oscar.Figueiredo@di.epfl.ch>
+	(Installation): Only keep the last configuration.
+
 1998-02-25  SL Baur  <steve@altair.xemacs.org>

 	* XEmacs 20.5-beta28 is released.
--- a/Makefile.in	Mon Aug 13 10:23:05 2007 +0200
+++ b/Makefile.in	Mon Aug 13 10:23:51 2007 +0200
@@ -233,7 +233,9 @@
 GENERATED_HEADERS = src/paths.h src/Emacs.ad.h src/puresize-adjust.h src/config.h lwlib/config.h src/sheap-adjust.h
 GENERATED_LISP = lisp/finder-inf.el

-all:	${GENERATED_HEADERS} ${MAKE_SUBDIR} ${GENERATED_LISP}
+all: xemacs all-elc info
+
+xemacs:	${GENERATED_HEADERS} ${MAKE_SUBDIR} ${GENERATED_LISP}

 ## For performance and consistency, no built-in rules
 .SUFFIXES:
@@ -569,7 +571,7 @@
 	  $(RM) $$d/Makefile $$d/Makefile.in ; \
 	done ; \
 	$(RM) core .sbinit Makefile lock/*; \
-	$(RM) lisp/finder-inf.el*
+	$(RM) lisp/finder-inf.el* Installation.el Installation.elc

 distclean: FRC.distclean
 	for d in $(SUBDIR); do (cd $$d && $(RECURSIVE_MAKE) $@); done
--- a/configure	Mon Aug 13 10:23:05 2007 +0200
+++ b/configure	Mon Aug 13 10:23:51 2007 +0200
@@ -244,6 +244,7 @@
 with_minimal_tagbits='no'
 rel_alloc='default'
 with_system_malloc='default'
+with_dlmalloc='default'
 native_sound_lib=''
 use_assertions="yes"
 with_gif=""
@@ -384,6 +385,7 @@
 	;;

 		rel_alloc | \
+	with_dlmalloc | \
 	with_debug_malloc  | use_debug_malloc | \
 	with_system_malloc | use_system_malloc )
 	  case "$val" in
@@ -639,7 +641,7 @@

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

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

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


 echo "checking "the configuration name"" 1>&6
-echo "configure:834: checking "the configuration name"" >&5
+echo "configure:836: checking "the configuration name"" >&5
 internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'`
 if canonical=`$srcdir/config.sub "$internal_configuration"` ; then : ; else
   exit $?
@@ -1277,19 +1279,6 @@
  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
@@ -1301,7 +1290,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:1305: checking for $ac_word" >&5
+echo "configure:1294: checking for $ac_word" >&5

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

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

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

 cat > conftest.$ac_ext <<EOF
-#line 1388 "configure"
+#line 1377 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1381: \"$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
@@ -1408,19 +1397,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:1412: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1401: 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:1417: checking whether we are using GNU C" >&5
+echo "configure:1406: 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:1424: \"$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:1413: \"$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
@@ -1434,7 +1423,7 @@
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1438: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1427: checking whether ${CC-cc} accepts -g" >&5

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

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

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

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

 cat > conftest.$ac_ext <<EOF
-#line 1550 "configure"
+#line 1539 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1543: \"$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
@@ -1570,19 +1559,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:1574: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1563: 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:1579: checking whether we are using GNU C" >&5
+echo "configure:1568: 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:1586: \"$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:1575: \"$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
@@ -1596,7 +1585,7 @@
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1600: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1589: checking whether ${CC-cc} accepts -g" >&5

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

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

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

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

 cat > conftest.$ac_ext <<EOF
-#line 1712 "configure"
+#line 1701 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1705: \"$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
@@ -1732,19 +1721,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:1736: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1725: 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:1741: checking whether we are using GNU C" >&5
+echo "configure:1730: 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:1748: \"$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:1737: \"$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
@@ -1758,7 +1747,7 @@
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1762: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1751: checking whether ${CC-cc} accepts -g" >&5

 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -1791,7 +1780,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:1795: checking how to run the C preprocessor" >&5
+echo "configure:1784: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1804,13 +1793,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1808 "configure"
+#line 1797 "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:1814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1821,13 +1810,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1825 "configure"
+#line 1814 "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:1831: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1850,9 +1839,9 @@


 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1854: checking for AIX" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1856 "configure"
+echo "configure:1843: checking for AIX" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1845 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -1879,9 +1868,9 @@


 echo $ac_n "checking for GNU libc""... $ac_c" 1>&6
-echo "configure:1883: checking for GNU libc" >&5
-cat > conftest.$ac_ext <<EOF
-#line 1885 "configure"
+echo "configure:1872: checking for GNU libc" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1874 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
@@ -1893,7 +1882,7 @@

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


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

 int main() {
@@ -1927,7 +1916,7 @@

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

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

 if test "$add_runtime_path" = "yes"; then
       echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:2305: checking "for runtime libraries flag"" >&5
+echo "configure:2294: 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 2310 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:2317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+#line 2299 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:2306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   dash_r="$try_dash_r"
 else
@@ -2393,13 +2382,17 @@


 GNU_MALLOC=yes
-doug_lea_malloc=yes
+if test "$with_dlmalloc" != "no"; then
+	doug_lea_malloc=yes
+else
+	doug_lea_malloc=no
+fi
 after_morecore_hook_exists=yes
 echo $ac_n "checking for malloc_get_state""... $ac_c" 1>&6
-echo "configure:2400: checking for malloc_get_state" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2403 "configure"
+echo "configure:2393: checking for malloc_get_state" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2396 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_get_state(); below.  */
@@ -2422,7 +2415,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:2426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_malloc_get_state=yes"
 else
@@ -2442,10 +2435,10 @@
 fi

 echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
-echo "configure:2446: checking for malloc_set_state" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2449 "configure"
+echo "configure:2439: checking for malloc_set_state" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2442 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_set_state(); below.  */
@@ -2468,7 +2461,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:2472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_malloc_set_state=yes"
 else
@@ -2488,16 +2481,16 @@
 fi

 echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
-echo "configure:2492: checking whether __after_morecore_hook exists" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2494 "configure"
+echo "configure:2485: checking whether __after_morecore_hook exists" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2487 "configure"
 #include "confdefs.h"
 extern void (* __after_morecore_hook)();
 int main() {
 __after_morecore_hook = 0
 ; return 0; }
 EOF
-if { (eval echo configure:2501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -2562,7 +2555,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:2566: checking for $ac_word" >&5
+echo "configure:2559: checking for $ac_word" >&5

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

   IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
@@ -2666,7 +2659,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:2670: checking for $ac_word" >&5
+echo "configure:2663: checking for $ac_word" >&5

 if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -2697,15 +2690,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2701: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2704 "configure"
+echo "configure:2694: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2697 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2738,15 +2731,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2742: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2745 "configure"
+echo "configure:2735: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2738 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2779,15 +2772,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2783: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2786 "configure"
+echo "configure:2776: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2779 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2817,10 +2810,10 @@
 done

 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:2821: checking for sys/wait.h that is POSIX.1 compatible" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2824 "configure"
+echo "configure:2814: checking for sys/wait.h that is POSIX.1 compatible" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2817 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -2836,7 +2829,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:2840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -2860,10 +2853,10 @@
 fi

 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2864: checking for ANSI C header files" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2867 "configure"
+echo "configure:2857: checking for ANSI C header files" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2860 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2871,7 +2864,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2888,7 +2881,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 2892 "configure"
+#line 2885 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2906,7 +2899,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 2910 "configure"
+#line 2903 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2924,7 +2917,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 2928 "configure"
+#line 2921 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2935,7 +2928,7 @@
 exit (0); }

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

 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2964: checking whether time.h and sys/time.h may both be included" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 2967 "configure"
+echo "configure:2957: checking whether time.h and sys/time.h may both be included" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2960 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -2972,7 +2965,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:2976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -2996,10 +2989,10 @@
 fi

 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:3000: checking for sys_siglist declaration in signal.h or unistd.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3003 "configure"
+echo "configure:2993: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2996 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3011,7 +3004,7 @@
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:3015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -3036,9 +3029,9 @@


 echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6
-echo "configure:3040: checking for struct utimbuf" >&5
-cat > conftest.$ac_ext <<EOF
-#line 3042 "configure"
+echo "configure:3033: checking for struct utimbuf" >&5
+cat > conftest.$ac_ext <<EOF
+#line 3035 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -3057,7 +3050,7 @@
 static struct utimbuf x; x.actime = x.modtime;
 ; return 0; }
 EOF
-if { (eval echo configure:3061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3054: \"$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
@@ -3077,10 +3070,10 @@
 rm -f conftest*

 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3081: checking return type of signal handlers" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3084 "configure"
+echo "configure:3074: checking return type of signal handlers" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3077 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3097,7 +3090,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -3119,10 +3112,10 @@


 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3123: checking for size_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3126 "configure"
+echo "configure:3116: checking for size_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3119 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3153,10 +3146,10 @@
 fi

 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3157: checking for pid_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3160 "configure"
+echo "configure:3150: checking for pid_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3153 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3187,10 +3180,10 @@
 fi

 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3191: checking for uid_t in sys/types.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3194 "configure"
+echo "configure:3184: checking for uid_t in sys/types.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3187 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -3226,10 +3219,10 @@
 fi

 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:3230: checking for mode_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3233 "configure"
+echo "configure:3223: checking for mode_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3226 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3260,10 +3253,10 @@
 fi

 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3264: checking for off_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3267 "configure"
+echo "configure:3257: checking for off_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3260 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3295,9 +3288,9 @@


 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:3299: checking for struct timeval" >&5
-cat > conftest.$ac_ext <<EOF
-#line 3301 "configure"
+echo "configure:3292: checking for struct timeval" >&5
+cat > conftest.$ac_ext <<EOF
+#line 3294 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -3313,7 +3306,7 @@
 static struct timeval x; x.tv_sec = x.tv_usec;
 ; return 0; }
 EOF
-if { (eval echo configure:3317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
   HAVE_TIMEVAL=yes
@@ -3335,10 +3328,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:3339: checking whether struct tm is in sys/time.h or time.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3342 "configure"
+echo "configure:3332: checking whether struct tm is in sys/time.h or time.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3335 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -3346,7 +3339,7 @@
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:3350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -3370,10 +3363,10 @@
 fi

 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:3374: checking for tm_zone in struct tm" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3377 "configure"
+echo "configure:3367: checking for tm_zone in struct tm" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3370 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -3381,7 +3374,7 @@
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:3385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_zone=yes
 else
@@ -3404,10 +3397,10 @@

 else
   echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:3408: checking for tzname" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3411 "configure"
+echo "configure:3401: checking for tzname" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3404 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -3417,7 +3410,7 @@
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:3421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_var_tzname=yes
 else
@@ -3443,10 +3436,10 @@


 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3447: checking for working const" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3450 "configure"
+echo "configure:3440: checking for working const" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3443 "configure"
 #include "confdefs.h"

 int main() {
@@ -3495,7 +3488,7 @@

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


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

 cat > conftestmake <<\EOF
@@ -3545,12 +3538,12 @@


 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3549: checking whether byte ordering is bigendian" >&5
+echo "configure:3542: 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 3554 "configure"
+#line 3547 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3561,11 +3554,11 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3558: \"$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 3569 "configure"
+#line 3562 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3576,7 +3569,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -3593,7 +3586,7 @@
 rm -f conftest*
 if test $ac_cv_c_bigendian = unknown; then
 cat > conftest.$ac_ext <<EOF
-#line 3597 "configure"
+#line 3590 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -3606,7 +3599,7 @@
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:3610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_c_bigendian=no
 else
@@ -3632,10 +3625,10 @@


 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:3636: checking size of short" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3639 "configure"
+echo "configure:3629: checking size of short" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3632 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -3646,7 +3639,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:3650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -3673,10 +3666,10 @@
   exit 1
 fi
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:3677: checking size of int" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3680 "configure"
+echo "configure:3670: checking size of int" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3673 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -3687,7 +3680,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:3691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -3708,10 +3701,10 @@


 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:3712: checking size of long" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3715 "configure"
+echo "configure:3705: checking size of long" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3708 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -3722,7 +3715,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:3726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -3743,10 +3736,10 @@


 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:3747: checking size of long long" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3750 "configure"
+echo "configure:3740: checking size of long long" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3743 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -3757,7 +3750,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:3761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3754: \"$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
@@ -3778,10 +3771,10 @@


 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:3782: checking size of void *" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3785 "configure"
+echo "configure:3775: checking size of void *" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3778 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -3792,7 +3785,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:3796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:3789: \"$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
@@ -3814,7 +3807,7 @@


 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:3818: checking for long file names" >&5
+echo "configure:3811: 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:
@@ -3861,12 +3854,12 @@


 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:3865: checking for sin in -lm" >&5
+echo "configure:3858: 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 3870 "configure"
+#line 3863 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3877,7 +3870,7 @@
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:3881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3874: \"$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
@@ -3919,14 +3912,14 @@


 cat > conftest.$ac_ext <<EOF
-#line 3923 "configure"
+#line 3916 "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:3930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3923: \"$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
@@ -3943,7 +3936,7 @@
 rm -f conftest*

 echo "checking type of mail spool file locking" 1>&6
-echo "configure:3947: checking type of mail spool file locking" >&5
+echo "configure:3940: 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
@@ -3967,12 +3960,12 @@


 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:3971: checking for kstat_open in -lkstat" >&5
+echo "configure:3964: 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 3976 "configure"
+#line 3969 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3983,7 +3976,7 @@
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:3987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3980: \"$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
@@ -4017,12 +4010,12 @@


 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:4021: checking for kvm_read in -lkvm" >&5
+echo "configure:4014: 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 4026 "configure"
+#line 4019 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4033,7 +4026,7 @@
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:4037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4030: \"$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
@@ -4067,12 +4060,12 @@


 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:4071: checking for cma_open in -lpthreads" >&5
+echo "configure:4064: 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 4076 "configure"
+#line 4069 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4083,7 +4076,7 @@
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:4087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4080: \"$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
@@ -4119,7 +4112,7 @@
 fi

 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:4123: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:4116: 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;
@@ -4130,7 +4123,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:4134: checking for \"-z ignore\" linker flag" >&5
+echo "configure:4127: 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 ;;
@@ -4140,7 +4133,7 @@


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

 if test "$with_x11" != "no"; then
     test "$x_includes $x_libraries" != "NONE NONE" && \
@@ -4170,7 +4163,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:4174: checking for X" >&5
+echo "configure:4167: checking for X" >&5

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

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

 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:4315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4308: \"$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.
@@ -4420,17 +4413,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:4424: checking whether -R must be followed by a space" >&5
+echo "configure:4417: 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 4427 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:4434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+#line 4420 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:4427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -4446,14 +4439,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 4450 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:4457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+#line 4443 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:4450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -4489,12 +4482,12 @@
 else

 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:4493: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:4486: 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 4498 "configure"
+#line 4491 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4505,7 +4498,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:4509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4502: \"$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
@@ -4529,12 +4522,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:4533: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:4526: 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 4538 "configure"
+#line 4531 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4545,7 +4538,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:4549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4542: \"$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
@@ -4574,10 +4567,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:4578: checking for gethostbyname" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4581 "configure"
+echo "configure:4571: checking for gethostbyname" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4574 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -4600,7 +4593,7 @@

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

 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4625: checking for gethostbyname in -lnsl" >&5
+echo "configure:4618: 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 4630 "configure"
+#line 4623 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4637,7 +4630,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:4641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4634: \"$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
@@ -4667,10 +4660,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:4671: checking for connect" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4674 "configure"
+echo "configure:4664: checking for connect" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4667 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -4693,7 +4686,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:4697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -4716,12 +4709,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:4720: checking "$xe_msg_checking"" >&5
+echo "configure:4713: 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 4725 "configure"
+#line 4718 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4732,7 +4725,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:4736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4729: \"$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
@@ -4756,10 +4749,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:4760: checking for remove" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4763 "configure"
+echo "configure:4753: checking for remove" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4756 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -4782,7 +4775,7 @@

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

 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:4807: checking for remove in -lposix" >&5
+echo "configure:4800: 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 4812 "configure"
+#line 4805 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4819,7 +4812,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:4823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4816: \"$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
@@ -4843,10 +4836,10 @@

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

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

 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:4894: checking for shmat in -lipc" >&5
+echo "configure:4887: 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 4899 "configure"
+#line 4892 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4906,7 +4899,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:4910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4903: \"$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
@@ -4940,12 +4933,12 @@
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.

 echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:4944: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:4937: 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 4949 "configure"
+#line 4942 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4956,7 +4949,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:4960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4953: \"$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
@@ -4993,22 +4986,22 @@

 if test "$window_system" = "none" && test -z "$with_tty"; then
   echo "checking for MS-Windows" 1>&6
-echo "configure:4997: checking for MS-Windows" >&5
+echo "configure:4990: checking for MS-Windows" >&5

 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:5000: checking for main in -lgdi32" >&5
+echo "configure:4993: 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 5005 "configure"
+#line 4998 "configure"
 #include "confdefs.h"

 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5005: \"$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
@@ -5154,7 +5147,7 @@
   fi

     echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:5158: checking for X defines extracted by xmkmf" >&5
+echo "configure:5151: checking for X defines extracted by xmkmf" >&5
   rm -fr conftestdir
   if mkdir conftestdir; then
     cd conftestdir
@@ -5186,15 +5179,15 @@

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


 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:5222: checking for XOpenDisplay in -lX11" >&5
+echo "configure:5215: 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 5227 "configure"
+#line 5220 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5234,7 +5227,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:5238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5231: \"$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
@@ -5259,12 +5252,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:5263: checking "$xe_msg_checking"" >&5
+echo "configure:5256: 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 5268 "configure"
+#line 5261 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5275,7 +5268,7 @@
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:5279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5272: \"$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
@@ -5302,12 +5295,12 @@


 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:5306: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:5299: 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 5311 "configure"
+#line 5304 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5318,7 +5311,7 @@
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:5322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5315: \"$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
@@ -5341,12 +5334,12 @@


 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:5345: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:5338: 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 5350 "configure"
+#line 5343 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5357,7 +5350,7 @@
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:5361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5354: \"$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
@@ -5380,14 +5373,14 @@


   echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:5384: checking the version of X11 being used" >&5
+echo "configure:5377: checking the version of X11 being used" >&5
   cat > conftest.$ac_ext <<EOF
-#line 5386 "configure"
+#line 5379 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
     main(int c, char* v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:5391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:5384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ./conftest foobar; x11_release=$?
 else
@@ -5411,15 +5404,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5415: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5418 "configure"
+echo "configure:5408: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5411 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5450,7 +5443,7 @@


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

     test -z "$with_xmu" && {
 echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:5474: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:5467: 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 5479 "configure"
+#line 5472 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5486,7 +5479,7 @@
 XmuReadBitmapDataFromFile()
 ; return 0; }
 EOF
-if { (eval echo configure:5490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5483: \"$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
@@ -5525,19 +5518,19 @@


 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:5529: checking for main in -lXbsd" >&5
+echo "configure:5522: 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 5534 "configure"
+#line 5527 "configure"
 #include "confdefs.h"

 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5534: \"$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
@@ -5596,7 +5589,7 @@
 esac

 echo "checking for session-management option" 1>&6
-echo "configure:5600: checking for session-management option" >&5;
+echo "configure:5593: checking for session-management option" >&5;
 if test "$with_session" != "no"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_SESSION
@@ -5611,15 +5604,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:5615: checking for X11/Xauth.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5618 "configure"
+echo "configure:5608: checking for X11/Xauth.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5611 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5642,12 +5635,12 @@
  }
 test -z "$with_xauth" && {
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:5646: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:5639: 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 5651 "configure"
+#line 5644 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5658,7 +5651,7 @@
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:5662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5655: \"$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
@@ -5722,15 +5715,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:5726: checking for ${dir}tt_c.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5729 "configure"
+echo "configure:5719: checking for ${dir}tt_c.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5722 "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:5734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5759,12 +5752,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:5763: checking "$xe_msg_checking"" >&5
+echo "configure:5756: 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 5768 "configure"
+#line 5761 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5775,7 +5768,7 @@
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:5779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5772: \"$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
@@ -5824,15 +5817,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:5828: checking for Dt/Dt.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5831 "configure"
+echo "configure:5821: checking for Dt/Dt.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5824 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5855,12 +5848,12 @@
  }
 test -z "$with_cde" && {
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:5859: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:5852: 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 5864 "configure"
+#line 5857 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5871,7 +5864,7 @@
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:5875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5868: \"$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
@@ -5908,18 +5901,18 @@
 fi

 echo "checking for LDAP" 1>&6
-echo "configure:5912: checking for LDAP" >&5
+echo "configure:5905: checking for LDAP" >&5
 test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ldap.h""... $ac_c" 1>&6
-echo "configure:5915: checking for ldap.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5918 "configure"
+echo "configure:5908: checking for ldap.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5911 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5923: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5942,15 +5935,15 @@
  }
 test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for lber.h""... $ac_c" 1>&6
-echo "configure:5946: checking for lber.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5949 "configure"
+echo "configure:5939: checking for lber.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5942 "configure"
 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5954: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5975,12 +5968,12 @@
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:5979: checking "$xe_msg_checking"" >&5
+echo "configure:5972: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lldap -llber"
 cat > conftest.$ac_ext <<EOF
-#line 5984 "configure"
+#line 5977 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5991,7 +5984,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:5995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5988: \"$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 +6007,12 @@
  }
 test \( -z "$with_ldap" -o "$with_ldap" = "yes" \) -a  "$with_umich_ldap" = "no" && {
 echo $ac_n "checking for ldap_set_option in -lldap10""... $ac_c" 1>&6
-echo "configure:6018: checking for ldap_set_option in -lldap10" >&5
+echo "configure:6011: checking for ldap_set_option in -lldap10" >&5
 ac_lib_var=`echo ldap10'_'ldap_set_option | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lldap10 "
 cat > conftest.$ac_ext <<EOF
-#line 6023 "configure"
+#line 6016 "configure"
 #include "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 +6023,7 @@
 ldap_set_option()
 ; 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:6027: \"$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
@@ -6095,19 +6088,32 @@
   extra_objs="$extra_objs eldap.o" &&  if test "$extra_verbose" = "yes"; then
    echo "    xemacs will be linked with \"eldap.o\""
  fi
+elif test "$with_ldap" = "yes" ; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_LDAP
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_LDAP 1
+EOF
+}
+
+  LIBS="-lldap $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lldap\" to \$LIBS"; fi
+  extra_objs="$extra_objs eldap.o" &&  if test "$extra_verbose" = "yes"; then
+   echo "    xemacs will be linked with \"eldap.o\""
+ fi
 fi


 if test "$with_x11" = "yes"; then

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

     echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:6108: checking for Xpm - no older than 3.4f" >&5
+echo "configure:6114: checking for Xpm - no older than 3.4f" >&5
   xe_check_libs=-lXpm
   test -z "$with_xpm" && { cat > conftest.$ac_ext <<EOF
-#line 6111 "configure"
+#line 6117 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
   int main(int c, char **v) {
@@ -6117,7 +6123,7 @@
 		  0 ;
   }
 EOF
-if { (eval echo configure:6121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:6127: \"$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;
@@ -6155,15 +6161,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:6159: checking for compface.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6162 "configure"
+echo "configure:6165: checking for compface.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6168 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6186,12 +6192,12 @@
  }
   test -z "$with_xface" && {
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:6190: checking for UnGenFace in -lcompface" >&5
+echo "configure:6196: 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 6195 "configure"
+#line 6201 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6202,7 +6208,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:6206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6212: \"$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
@@ -6253,15 +6259,15 @@

     test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:6257: checking for jpeglib.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6260 "configure"
+echo "configure:6263: checking for jpeglib.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6266 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6284,12 +6290,12 @@
  }
   test -z "$with_jpeg" && {
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:6288: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:6294: checking for jpeg_destroy_decompress in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ljpeg "
 cat > conftest.$ac_ext <<EOF
-#line 6293 "configure"
+#line 6299 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6300,7 +6306,7 @@
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:6304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6310: \"$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
@@ -6336,15 +6342,15 @@

     test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:6340: checking for png.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6343 "configure"
+echo "configure:6346: checking for png.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6349 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6366,10 +6372,10 @@
 fi
  }
   test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:6370: checking for pow" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6373 "configure"
+echo "configure:6376: checking for pow" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6379 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pow(); below.  */
@@ -6392,7 +6398,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:6396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_pow=yes"
 else
@@ -6417,12 +6423,12 @@
 xe_msg_checking="for png_read_image in -lpng"
 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:6421: checking "$xe_msg_checking"" >&5
+echo "configure:6427: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`

 xe_check_libs=" -lpng $extra_libs"
 cat > conftest.$ac_ext <<EOF
-#line 6426 "configure"
+#line 6432 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6433,7 +6439,7 @@
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:6437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6443: \"$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
@@ -6475,12 +6481,12 @@
 xe_msg_checking="for TIFFReadScanline in -ltiff"
 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:6479: checking "$xe_msg_checking"" >&5
+echo "configure:6485: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo tiff'_'TIFFReadScanline | sed 'y%./+-%__p_%'`

 xe_check_libs=" -ltiff $extra_libs"
 cat > conftest.$ac_ext <<EOF
-#line 6484 "configure"
+#line 6490 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6491,7 +6497,7 @@
 TIFFReadScanline()
 ; return 0; }
 EOF
-if { (eval echo configure:6495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6501: \"$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
@@ -6529,12 +6535,12 @@


 echo $ac_n "checking for XawScrollbarSetThumb in -lXaw""... $ac_c" 1>&6
-echo "configure:6533: checking for XawScrollbarSetThumb in -lXaw" >&5
+echo "configure:6539: 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 6538 "configure"
+#line 6544 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6545,7 +6551,7 @@
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:6549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6555: \"$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
@@ -6569,15 +6575,15 @@

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

 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:6598: checking for XmStringFree in -lXm" >&5
+echo "configure:6604: 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 6603 "configure"
+#line 6609 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6610,7 +6616,7 @@
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:6614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6620: \"$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
@@ -6901,7 +6907,7 @@

 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
-echo "configure:6905: checking for Mule-related features" >&5
+echo "configure:6911: checking for Mule-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
@@ -6926,15 +6932,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6930: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6933 "configure"
+echo "configure:6936: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6939 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6965,12 +6971,12 @@


 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:6969: checking for strerror in -lintl" >&5
+echo "configure:6975: 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 6974 "configure"
+#line 6980 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6981,7 +6987,7 @@
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:6985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6991: \"$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
@@ -7014,19 +7020,19 @@


   echo "checking for Mule input methods" 1>&6
-echo "configure:7018: checking for Mule input methods" >&5
+echo "configure:7024: 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:7022: checking for XIM" >&5
+echo "configure:7028: checking for XIM" >&5

 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:7025: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:7031: 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 7030 "configure"
+#line 7036 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7037,7 +7043,7 @@
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:7041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7047: \"$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
@@ -7102,15 +7108,15 @@

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

 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:7109: checking for XmbDrawString in -lX11" >&5
+echo "configure:7115: 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 7114 "configure"
+#line 7120 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7121,7 +7127,7 @@
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:7125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7131: \"$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
@@ -7161,15 +7167,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:7165: checking for wnn/jllib.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7168 "configure"
+echo "configure:7171: checking for wnn/jllib.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7174 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7194,10 +7200,10 @@
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7198: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7201 "configure"
+echo "configure:7204: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7207 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7220,7 +7226,7 @@

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

     test "$ac_cv_func_crypt" != "yes" && {
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:7253: checking for crypt in -lcrypt" >&5
+echo "configure:7259: 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 7258 "configure"
+#line 7264 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7265,7 +7271,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:7269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7275: \"$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
@@ -7299,12 +7305,12 @@
   fi
     test -z "$with_wnn" && {
 echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6
-echo "configure:7303: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:7309: 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 7308 "configure"
+#line 7314 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7315,7 +7321,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:7319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7325: \"$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
@@ -7352,12 +7358,12 @@
  fi

 echo $ac_n "checking for jl_fi_dic_list in -lwnn""... $ac_c" 1>&6
-echo "configure:7356: checking for jl_fi_dic_list in -lwnn" >&5
+echo "configure:7362: 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 7361 "configure"
+#line 7367 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7368,7 +7374,7 @@
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:7372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7378: \"$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
@@ -7400,15 +7406,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:7404: checking for canna/RK.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7407 "configure"
+echo "configure:7410: checking for canna/RK.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7413 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7431,12 +7437,12 @@
  }
   test -z "$with_canna" && {
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:7435: checking for RkBgnBun in -lRKC" >&5
+echo "configure:7441: 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 7440 "configure"
+#line 7446 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7447,7 +7453,7 @@
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:7451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7457: \"$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
@@ -7470,12 +7476,12 @@
  }
   test -z "$with_canna" && {
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:7474: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:7480: 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 7479 "configure"
+#line 7485 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7486,7 +7492,7 @@
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:7490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7496: \"$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
@@ -7535,12 +7541,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:7539: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:7545: 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 7544 "configure"
+#line 7550 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7551,7 +7557,7 @@
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:7555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7561: \"$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
@@ -7624,10 +7630,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:7628: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7631 "configure"
+echo "configure:7634: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7637 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7650,7 +7656,7 @@

 ; return 0; }
 EOF
-if { (eval echo configure:7654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7687,10 +7693,10 @@
     for ac_func in realpath
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7691: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7694 "configure"
+echo "configure:7697: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7700 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7713,7 +7719,7 @@

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

 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:7750: checking whether netdb declares h_errno" >&5
-cat > conftest.$ac_ext <<EOF
-#line 7752 "configure"
+echo "configure:7756: checking whether netdb declares h_errno" >&5
+cat > conftest.$ac_ext <<EOF
+#line 7758 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:7759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7765: \"$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
@@ -7775,16 +7781,16 @@
 rm -f conftest*

 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:7779: checking for sigsetjmp" >&5
-cat > conftest.$ac_ext <<EOF
-#line 7781 "configure"
+echo "configure:7785: checking for sigsetjmp" >&5
+cat > conftest.$ac_ext <<EOF
+#line 7787 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:7788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7794: \"$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
@@ -7804,11 +7810,11 @@
 rm -f conftest*

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

 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 7812 "configure"
+#line 7818 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
@@ -7843,7 +7849,7 @@
   exit (0);
 }
 EOF
-if { (eval echo configure:7847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
@@ -7872,9 +7878,9 @@

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

 #ifdef TIME_WITH_SYS_TIME
@@ -7896,7 +7902,7 @@

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


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

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

 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:7934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -7980,17 +7986,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:7984: checking for working alloca.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7987 "configure"
+echo "configure:7990: checking for working alloca.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7993 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:7994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -8014,10 +8020,10 @@
 fi

 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:8018: checking for alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8021 "configure"
+echo "configure:8024: checking for alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8027 "configure"
 #include "confdefs.h"

 #ifdef __GNUC__
@@ -8040,7 +8046,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:8044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -8079,10 +8085,10 @@


 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:8083: checking whether alloca needs Cray hooks" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8086 "configure"
+echo "configure:8089: checking whether alloca needs Cray hooks" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8092 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -8106,10 +8112,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:8110: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8113 "configure"
+echo "configure:8116: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8119 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8132,7 +8138,7 @@

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

 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:8166: checking stack direction for C alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8169 "configure"
+echo "configure:8172: checking stack direction for C alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8175 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -8184,7 +8190,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:8188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
@@ -8212,15 +8218,15 @@

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

 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:8252: checking for working vfork" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8255 "configure"
+echo "configure:8258: checking for working vfork" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8261 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -8346,7 +8352,7 @@
   }
 }
 EOF
-if { (eval echo configure:8350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_func_vfork_works=yes
 else
@@ -8371,10 +8377,10 @@


 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:8375: checking for working strcoll" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8378 "configure"
+echo "configure:8381: checking for working strcoll" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8384 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -8384,7 +8390,7 @@
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:8388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
@@ -8411,10 +8417,10 @@
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8415: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8418 "configure"
+echo "configure:8421: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8424 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8437,7 +8443,7 @@

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

 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:8469: checking whether getpgrp takes no argument" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8472 "configure"
+echo "configure:8475: checking whether getpgrp takes no argument" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8478 "configure"
 #include "confdefs.h"

 /*
@@ -8523,7 +8529,7 @@
 }

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


 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:8553: checking for working mmap" >&5
+echo "configure:8559: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 8556 "configure"
+#line 8562 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -8585,7 +8591,7 @@
   return 1;
 }
 EOF
-if { (eval echo configure:8589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   have_mmap=yes
 else
@@ -8619,15 +8625,15 @@

 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:8623: checking for termios.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8626 "configure"
+echo "configure:8629: checking for termios.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8632 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8637: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8670,15 +8676,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:8674: checking for termio.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8677 "configure"
+echo "configure:8680: checking for termio.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8683 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8688: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8710,10 +8716,10 @@


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

 ; return 0; }
 EOF
-if { (eval echo configure:8740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -8751,15 +8757,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:8755: checking for netinet/in.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8758 "configure"
+echo "configure:8761: checking for netinet/in.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8764 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8769: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8776,15 +8782,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:8780: checking for arpa/inet.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8783 "configure"
+echo "configure:8786: checking for arpa/inet.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8789 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8794: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8809,9 +8815,9 @@
 }

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

 #include <sys/types.h>
@@ -8822,7 +8828,7 @@
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:8826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8832: \"$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
@@ -8840,9 +8846,9 @@
 fi
 rm -f conftest*
       echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:8844: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:8850: checking "for ip_mreq struct in netinet/in.h"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 8846 "configure"
+#line 8852 "configure"
 #include "confdefs.h"

 #include <netinet/in.h>
@@ -8851,7 +8857,7 @@
 static struct ip_mreq x;
 ; return 0; }
 EOF
-if { (eval echo configure:8855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MULTICAST
@@ -8882,10 +8888,10 @@


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

 ; return 0; }
 EOF
-if { (eval echo configure:8912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_msgget=yes"
 else
@@ -8923,15 +8929,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:8927: checking for sys/ipc.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8930 "configure"
+echo "configure:8933: checking for sys/ipc.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8936 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8941: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8948,15 +8954,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:8952: checking for sys/msg.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8955 "configure"
+echo "configure:8958: checking for sys/msg.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8961 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8994,15 +9000,15 @@

 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:8998: checking for dirent.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9001 "configure"
+echo "configure:9004: checking for dirent.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9007 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9029,15 +9035,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:9033: checking for sys/dir.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9036 "configure"
+echo "configure:9039: checking for sys/dir.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9042 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9070,15 +9076,15 @@

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


 echo "checking "for sound support"" 1>&6
-echo "configure:9112: checking "for sound support"" >&5
+echo "configure:9118: checking "for sound support"" >&5
 case "$with_sound" in
   native | both ) with_native_sound=yes;;
   nas    | no   ) with_native_sound=no;;
@@ -9119,15 +9125,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:9123: checking for multimedia/audio_device.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9126 "configure"
+echo "configure:9129: checking for multimedia/audio_device.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9132 "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:9131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9137: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9175,12 +9181,12 @@
       if test -z "$native_sound_lib"; then

 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:9179: checking for ALopenport in -laudio" >&5
+echo "configure:9185: 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 9184 "configure"
+#line 9190 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9191,7 +9197,7 @@
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:9195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9201: \"$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
@@ -9222,12 +9228,12 @@
       if test -z "$native_sound_lib"; then

 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:9226: checking for AOpenAudio in -lAlib" >&5
+echo "configure:9232: 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 9231 "configure"
+#line 9237 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9238,7 +9244,7 @@
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:9242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9248: \"$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
@@ -9276,15 +9282,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:9280: checking for ${dir}/soundcard.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9283 "configure"
+echo "configure:9286: checking for ${dir}/soundcard.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9289 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9354,7 +9360,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 9358 "configure"
+#line 9364 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
@@ -9381,7 +9387,7 @@

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

 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:9401: checking for tgetent in -lncurses" >&5
+echo "configure:9407: 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 9406 "configure"
+#line 9412 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9413,7 +9419,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:9417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9423: \"$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
@@ -9446,15 +9452,15 @@

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

     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:9480: checking for ncurses/term.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9483 "configure"
+echo "configure:9486: checking for ncurses/term.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9489 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9514,15 +9520,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:9518: checking for ncurses/curses.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9521 "configure"
+echo "configure:9524: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9527 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9557,12 +9563,12 @@
 	for lib in curses termlib termcap; do

 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:9561: checking for tgetent in -l$lib" >&5
+echo "configure:9567: 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 9566 "configure"
+#line 9572 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9573,7 +9579,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:9577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9583: \"$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
@@ -9604,12 +9610,12 @@
       else

 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:9608: checking for tgetent in -lcurses" >&5
+echo "configure:9614: 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 9613 "configure"
+#line 9619 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9620,7 +9626,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:9624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9630: \"$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
@@ -9638,12 +9644,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:9642: checking for tgetent in -ltermcap" >&5
+echo "configure:9648: 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 9647 "configure"
+#line 9653 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9654,7 +9660,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:9658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9664: \"$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
@@ -9702,15 +9708,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:9706: checking for gpm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9709 "configure"
+echo "configure:9712: checking for gpm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9715 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9714: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9733,12 +9739,12 @@
  }
   test -z "$with_gpm" && {
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:9737: checking for Gpm_Open in -lgpm" >&5
+echo "configure:9743: 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 9742 "configure"
+#line 9748 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9749,7 +9755,7 @@
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:9753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9759: \"$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
@@ -9798,17 +9804,17 @@


 echo "checking for database support" 1>&6
-echo "configure:9802: checking for database support" >&5
+echo "configure:9808: 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:9807: checking for dbm_open in -lgdbm" >&5
+echo "configure:9813: 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 9812 "configure"
+#line 9818 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9819,7 +9825,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:9823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9829: \"$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
@@ -9841,10 +9847,10 @@

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

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

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

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

 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:9954: checking for dbm_open in -ldbm" >&5
+echo "configure:9960: 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 9959 "configure"
+#line 9965 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9966,7 +9972,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:9970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9976: \"$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
@@ -10003,10 +10009,10 @@

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

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

 echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6
-echo "configure:10054: checking for dbopen in -ldb" >&5
+echo "configure:10060: 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 10059 "configure"
+#line 10065 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10066,7 +10072,7 @@
 dbopen()
 ; return 0; }
 EOF
-if { (eval echo configure:10070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10076: \"$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
@@ -10090,7 +10096,7 @@
   if test "$with_database_berkdb" = "yes"; then
     for path in "db/db.h" "db.h"; do
 cat > conftest.$ac_ext <<EOF
-#line 10094 "configure"
+#line 10100 "configure"
 #include "confdefs.h"
 #ifdef HAVE_INTTYPES_H
 #define __BIT_TYPES_DEFINED__
@@ -10108,7 +10114,7 @@

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

 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:10164: checking for SOCKSinit in -lsocks" >&5
+echo "configure:10170: 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 10169 "configure"
+#line 10175 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10176,7 +10182,7 @@
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:10180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10186: \"$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
@@ -10229,6 +10235,94 @@
   LIBS="-Bstatic -lut -Bdynamic $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-Bstatic -lut -Bdynamic\" to \$LIBS"; fi
 fi

+test -z "$with_shlib" && { ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
+echo "configure:10241: checking for dlfcn.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10244 "configure"
+#include "confdefs.h"
+#include <dlfcn.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+with_shlib=no
+fi
+ }
+test -z "$with_shlib" && {
+echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+echo "configure:10272: checking for dlopen in -ldl" >&5
+ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -ldl "
+cat > conftest.$ac_ext <<EOF
+#line 10277 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char dlopen();
+
+int main() {
+dlopen()
+; return 0; }
+EOF
+if { (eval echo configure:10288: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+with_shlib=no
+fi
+
+ }
+test -z "$with_shlib" && with_shlib=yes
+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
+  LIBS="-ldl $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-ldl\" to \$LIBS"; fi
+fi
+
+
+


 T=""
@@ -10628,12 +10722,15 @@
 fi
 echo ""
 echo "$0 $quoted_arguments"
-) >> Installation
+) > Installation
+
+xemacs_betaname=""
+test ! -z "${emacs_beta_version}" && xemacs_betaname="-b${emacs_beta_version}"

 (
 echo "

-Configured for \`$canonical'.
+XEmacs ${emacs_major_version}.${emacs_minor_version}${xemacs_betaname} \"$xemacs_codename\" configured for \`$canonical'.

   Where should the build process find the source code?    $srcdir
   What installation prefix should install use?		  $prefix
@@ -10735,6 +10832,7 @@
   athena   ) echo "  Using Athena dialog boxes."    ;;
   athena3d ) echo "  Using Athena-3d dialog boxes." ;;
 esac
+test "$with_shlib" = "yes" && echo "  Compiling in DLL support."
 test "$with_clash_detection" = yes && \
   echo "  Clash detection will use \"$lockdir\" for locking files."
 echo "  movemail will use \"$mail_locking\" for locking mail spool files."
@@ -10760,9 +10858,12 @@
 fi
 echo ""
 ) | tee -a Installation
-echo "The above configure report is appended to \"Installation\" file."
 echo ""

+echo '(setq Installation-string "' > Installation.el
+sed 's/"/\\"/g' Installation >> Installation.el
+echo '")' >> Installation.el
+


 # Remove any trailing slashes in these variables.
--- a/configure.in	Mon Aug 13 10:23:05 2007 +0200
+++ b/configure.in	Mon Aug 13 10:23:51 2007 +0200
@@ -354,6 +354,7 @@
 with_minimal_tagbits='no'
 rel_alloc='default'
 with_system_malloc='default'
+with_dlmalloc='default'
 native_sound_lib=''
 dnl use-assertions should be 'yes' by default.  Too many people in this
 dnl world have core dumps turned off by default or \"cannot find where the
@@ -533,6 +534,7 @@

 	dnl Options that take "yes", "no", or "default" values
 	rel_alloc | \
+	with_dlmalloc | \
 	with_debug_malloc  | use_debug_malloc | \
 	with_system_malloc | use_system_malloc )
 	  case "$val" in
@@ -1453,10 +1455,11 @@
   XE_ADD_OBJS(filelock.o)
 fi

-if test "$with_shlib" = "yes"; then
-  AC_DEFINE(HAVE_SHLIB)
-  XE_ADD_OBJS(dlopen.o)
-fi
+dnl Autodetected below
+dnl if test "$with_shlib" = "yes"; then
+dnl   AC_DEFINE(HAVE_SHLIB)
+dnl   XE_ADD_OBJS(dlopen.o)
+dnl fi

 dnl Choose a compiler from (in order)
 dnl --compiler, env var CC, with_gcc=no && ${NON_GNU_CC:-cc}, AC_PROG_CC
@@ -1922,7 +1925,11 @@
 dnl Do the opsystem or machine files prohibit the use of the GNU malloc?
 dnl Assume not, until told otherwise.
 GNU_MALLOC=yes
-doug_lea_malloc=yes
+if test "$with_dlmalloc" != "no"; then
+	doug_lea_malloc=yes
+else
+	doug_lea_malloc=no
+fi
 after_morecore_hook_exists=yes
 AC_CHECK_FUNC(malloc_get_state, ,doug_lea_malloc=no)
 AC_CHECK_FUNC(malloc_set_state, ,doug_lea_malloc=no)
@@ -2421,10 +2428,10 @@
   AC_DEFINE(HAVE_NS_LDAP)
   XE_PREPEND(-lldap10, LIBS)
   XE_ADD_OBJS(eldap.o)
-dnl else
-dnl   AC_DEFINE(HAVE_LDAP)
-dnl   XE_PREPEND(-lldap, LIBS)
-dnl   XE_ADD_OBJS(eldap.o)
+elif test "$with_ldap" = "yes" ; then
+  AC_DEFINE(HAVE_LDAP)
+  XE_PREPEND(-lldap, LIBS)
+  XE_ADD_OBJS(eldap.o)
 fi

 dnl ----------------------
@@ -3215,6 +3222,23 @@
   XE_PREPEND(-Bstatic -lut -Bdynamic, LIBS)
 fi

+dnl autodetect dll support
+test -z "$with_shlib" && { AC_CHECK_HEADER(dlfcn.h, ,with_shlib=no) }
+test -z "$with_shlib" && { AC_CHECK_LIB(dl, dlopen,[:],with_shlib=no) }
+test -z "$with_shlib" && with_shlib=yes
+if test "$with_shlib" = "yes"; then
+  AC_DEFINE(HAVE_SHLIB)
+  XE_ADD_OBJS(dlopen.o)
+  XE_PREPEND(-ldl, LIBS)
+fi
+
+dnl Process support (hardcoded)
+dnl every system that supports this runs configure, the others don't
+
+dnl We're not ready for this yet.
+dnl AC_DEFINE(HAVE_UNIX_PROCESSES)
+dnl XE_ADD_OBJS(process-unix.o)
+
 dnl --------------------------------
 dnl Compute SUBST-itutable variables
 dnl --------------------------------
@@ -3413,13 +3437,16 @@
 fi
 echo ""
 echo "$0 $quoted_arguments"
-) >> Installation
+) > Installation
+
+xemacs_betaname=""
+test ! -z "${emacs_beta_version}" && xemacs_betaname="-b${emacs_beta_version}"

 dnl Start stdout redirection to '| tee -a Installation'
 (
 echo "

-Configured for \`$canonical'.
+XEmacs ${emacs_major_version}.${emacs_minor_version}${xemacs_betaname} \"$xemacs_codename\" configured for \`$canonical'.

   Where should the build process find the source code?    $srcdir
   What installation prefix should install use?		  $prefix
@@ -3521,6 +3548,7 @@
   athena   ) echo "  Using Athena dialog boxes."    ;;
   athena3d ) echo "  Using Athena-3d dialog boxes." ;;
 esac
+test "$with_shlib" = "yes" && echo "  Compiling in DLL support."
 test "$with_clash_detection" = yes && \
   echo "  Clash detection will use \"$lockdir\" for locking files."
 echo "  movemail will use \"$mail_locking\" for locking mail spool files."
@@ -3546,9 +3574,14 @@
 fi
 echo ""
 ) | tee -a Installation
-echo "The above configure report is appended to \"Installation\" file."
+dnl echo "The above configure report is appended to \"Installation\" file."
 echo ""

+dnl Generate Installation.el
+echo '(setq Installation-string "' > Installation.el
+sed 's/"/\\"/g' Installation >> Installation.el
+echo '")' >> Installation.el
+
 dnl -----------------------------------
 dnl Now generate config.h and Makefiles
 dnl -----------------------------------
--- a/configure.usage	Mon Aug 13 10:23:05 2007 +0200
+++ b/configure.usage	Mon Aug 13 10:23:51 2007 +0200
@@ -194,6 +194,9 @@
 --puresize=VALUE	Override default amount of space for pure Lisp code.
 --rel-alloc		Use the relocating allocator (default for this option
   			is system-dependent).
+--with-dlmalloc		Control usage of Doug Lea malloc on systems that have
+			it in the standard C library (default is to use it if
+			it is available).
 --with-clash-detection	Use lock files to detect multiple edits of the same file.
 			The default is to not do clash detection.
 --lockdir=DIR		The directory to put clash detection files in, such as
--- a/lib-src/ChangeLog	Mon Aug 13 10:23:05 2007 +0200
+++ b/lib-src/ChangeLog	Mon Aug 13 10:23:51 2007 +0200
@@ -1,3 +1,8 @@
+1998-02-27  SL Baur  <steve@altair.xemacs.org>
+
+	* update-elc.sh (ignore_pattern): Add Installation.el, remove old
+	stuff from 20.4.
+
 Tue Feb 17 12:50:37 1998  Andy Piper  <andyp@parallax.co.uk>

 	* lib-src/Makefile.in.in: make sure clean removes msw executables
--- a/lib-src/update-elc.sh	Mon Aug 13 10:23:05 2007 +0200
+++ b/lib-src/update-elc.sh	Mon Aug 13 10:23:51 2007 +0200
@@ -157,7 +157,6 @@
 # Other special-case filenames that don't get byte-compiled
 ignore_pattern="$ignore_pattern"'
 \!/,!d
-\!/edebug/edebug-test.el$!d
 \!/paths.el$!d
 \!/loadup.el$!d
 \!/loadup-el.el$!d
@@ -168,21 +167,7 @@
 \!/site-load.el$!d
 \!/site-init.el$!d
 \!/version.el$!d
-\!/language/devanagari.el$!d
-\!/language/indian.el$!d
-\!/language/lao-util.el$!d
-\!/language/lao.el$!d
-\!/language/tibetan.el$!d
-\!/language/tibet-util.el$!d
-\!/language/vietnamese.el$!d
-\!/leim/quail/devanagari.el$!d
-\!/leim/quail/ethiopic.el$!d
-\!/leim/quail/japanese.el$!d
-\!/leim/quail/lao.el$!d
-\!/leim/quail/lrt.el$!d
-\!/leim/quail/thai.el$!d
-\!/leim/quail/tibetan.el$!d
-\!/leim/quail/viqr.el$!d
+\!/Installation.el$!d
 '

 echo "Compiling files without .elc..."
--- a/lisp/ChangeLog	Mon Aug 13 10:23:05 2007 +0200
+++ b/lisp/ChangeLog	Mon Aug 13 10:23:51 2007 +0200
@@ -1,3 +1,27 @@
+1998-02-27  SL Baur  <steve@altair.xemacs.org>
+
+	* help.el (describe-installation): New function.
+
+	* x-menubar.el (default-menubar): Add describe-installation to
+	Help menu.
+
+	* packages.el (packages-unbytecompiled-lisp): Installation.el
+	should not be bytecompiled.
+
+	* dumped-lisp.el (preloaded-file-list): Dump Installation with
+	XEmacs.
+
+	* x-menubar.el (default-menubar): Use correct guard for VM menu
+	entry.
+
+	* coding.el: Add coding systems for iso-8859-[12] for No-Mule + file
+	coding.
+	From Andy Piper <andyp@parallax.co.uk>
+
+1998-02-26  Oscar Figueiredo  <Oscar.Figueiredo@di.epfl.ch>
+
+	* ldap.el: Do not require ldap-internal at compile time.
+
 Tue Feb 17 12:50:37 1998  Andy Piper  <andyp@parallax.co.uk>

 	* code-files.el: new file. a virtual copy of mule-files.el
--- a/lisp/coding.el	Mon Aug 13 10:23:05 2007 +0200
+++ b/lisp/coding.el	Mon Aug 13 10:23:51 2007 +0200
@@ -195,6 +195,12 @@
  "Automatic conversion."
  '(mnemonic "Auto"))

+;; these are so that gnus and friends work when not mule
+(or (featurep 'mule)
+    (progn
+      (copy-coding-system 'undecided 'iso-8859-1)
+      (copy-coding-system 'undecided 'iso-8859-2)))
+
 ;; compatibility for old XEmacsen (don't use it)
 (copy-coding-system 'undecided 'automatic-conversion)
--- a/lisp/dumped-lisp.el	Mon Aug 13 10:23:05 2007 +0200
+++ b/lisp/dumped-lisp.el	Mon Aug 13 10:23:51 2007 +0200
@@ -6,6 +6,7 @@
 	"replace" 		; match-string used in version.el.
 	; Ignore compiled-by-mistake version.elc
 	"version.el"
+	#-infodock "../Installation.el"
 	"cl"
 	"cl-extra"
 	"cl-seq"
@@ -28,7 +29,7 @@
 	"events"
 	"text-props"
 	"process" ;; This is bad. network-streams may not be defined.
-	;; #+multicast "multicast" ;; #+network-streams implicitely true
+	#+multicast "multicast" ;; #+network-streams implicitely true
 	"frame"			; move up here cause some stuff needs it here
 	"map-ynp"
 	"simple"
--- a/lisp/help.el	Mon Aug 13 10:23:05 2007 +0200
+++ b/lisp/help.el	Mon Aug 13 10:23:51 2007 +0200
@@ -695,6 +695,15 @@
 ;; run describe-prefix-bindings.
 (setq prefix-help-command 'describe-prefix-bindings)

+(defun describe-installation ()
+  "Display a buffer showing information about this XEmacs was compiled."
+  (interactive)
+  (if (and (boundp 'Installation-string)
+	   (stringp Installation-string))
+      (with-displaying-help-buffer "Installation"
+	(princ Installation-string))
+    (error "No Installation information available.")))
+
 (defun view-emacs-news ()
   "Display info on recent changes to XEmacs."
   (interactive)
--- a/lisp/ldap.el	Mon Aug 13 10:23:05 2007 +0200
+++ b/lisp/ldap.el	Mon Aug 13 10:23:51 2007 +0200
@@ -5,7 +5,7 @@
 ;; Author: Oscar Figueiredo <Oscar.Figueiredo@di.epfl.ch>
 ;; Maintainer: Oscar Figueiredo <Oscar.Figueiredo@di.epfl.ch>
 ;; Created: Jan 1998
-;; Version: $Revision: 1.1 $
+;; Version: $Revision: 1.2 $
 ;; Keywords: help comm

 ;; This file is part of XEmacs
@@ -35,7 +35,8 @@

 ;;; Code:

-(require 'ldap-internal)
+(eval-when '(load eval)
+  (require 'ldap-internal))

 (defvar ldap-host-parameters-alist nil
   "An alist describing per host options to use for LDAP transactions
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/multicast.el	Mon Aug 13 10:23:51 2007 +0200
@@ -0,0 +1,81 @@
+;;; multicast.el --- lisp frontend for multicast connections in XEmacs
+
+;; Copyright (C) 1997-1998 Didier Verna.
+
+;; Author:          Didier Verna <verna@inf.enst.fr>
+;; Maintainer:      Didier Verna <verna@inf.enst.fr>
+;; Created:         Thu Dec  4 16:37:39 1997
+;; Last Revision:   Mon Jan 19 19:10:50 1998
+;; Current Version: 0.4
+;; Keywords:        dumped comm processes
+
+;; 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 of the License, 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 this program; if not, write to the Free Software
+;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+
+;;; Commentary:
+
+;; This file just contains a lisp frontend to the internal function
+;; open-multicast-group-internal written in C and belonging to process.c
+;; Well, nothing much to say about it ... read the doc string.
+
+
+;;; Change Log:
+
+;; Rev. of Mon Jan 19 19:04:44 1998 : packaging cleanup
+;; Rev. of Thu Dec 11 13:54:26 1997 : updated the docstring
+;; Rev. of Mon Dec  8 15:28:47 1997 : Improved the doc string
+;; Rev. of Thu Dec  4 16:38:09 1997 : Initial Version.
+
+
+;;; Code:
+
+(defun open-multicast-group (name buffer address)
+  "Open a multicast connection on the specified address.
+Returns a subprocess-object to represent the connection.
+Input and output work as for subprocesses; `delete-process' closes it.
+Args are NAME BUFFER ADDRESS.
+NAME is a name for the process. It is modified if necessary to make it unique.
+BUFFER is the buffer (or buffer-name) to associate with the process.
+ Process output goes at the end of that buffer, unless you specify an output
+ stream or filter function to handle the output.
+ BUFFER may be also nil, meaning that this process is not associated with any
+ buffer
+ADDRESS specifies a standard multicast address \"dest/port/ttl\":
+ dest is an internet address between 224.0.0.0 and 239.255.255.255
+ port is a communication port like in traditional unicast
+ ttl is the time-to-live (15 for site, 63 for region and 127 for world).
+
+WARNING: it is *strongly* recommended to avoid using groups beginning with
+         224 or 239. Such groups are considered 'admin' groups, and may
+         behave in a surprising way ..."
+  (let (dest port ttl)
+    ;; We check only the general form of the multicast address.
+    ;; The rest will be handled by the internal function.
+    (string-match "^\\([0-9\\.]+\\)/\\([0-9]+\\)/\\([0-9]+\\)$" address)
+    (and (not (and (= (match-beginning 0) 0)
+		   (= (match-end 0) (length address))))
+	 (error "malformed multicast address: %s" address))
+    (and (not (setq dest (match-string 1 address)))
+	 (error "invalid destination specification."))
+    (and (= 0 (setq port (string-to-int (match-string 2 address))))
+	 (error "invalid port specification."))
+    (and (= 0 (setq ttl (string-to-int (match-string 3 address))))
+	 (error "invalid ttl specification."))
+    (open-multicast-group-internal name buffer dest port ttl)
+    ))
+
+;;; multicast.el ends here
--- a/lisp/package-get-base.el	Mon Aug 13 10:23:05 2007 +0200
+++ b/lisp/package-get-base.el	Mon Aug 13 10:23:51 2007 +0200
@@ -1,10 +1,29 @@
 (setq package-get-base
-'((footnote
+'((eudc
+  (standards-version 1.0
+   version "1.0"
+   author-version "0.2"
+   date "1998-02-25"
+   build-date "1998-02-27"
+   maintainer "Oscar Figueiredo <Oscar.Figueiredo@epfl.ch>"
+   distribution stable
+   priority low
+   category "comm"
+   dump nil
+   description "Emacs Unified Directory Client."
+   filename "eudc-1.0-pkg.tar.gz"
+   md5sum "c9a7556ad99205b4dab655781f8b2895"
+   size 25863
+   provides (eudc eudc-ldap eudc-ph)
+   requires (xemacs-base)
+   type regular
+))
+(footnote
   (standards-version 1.0
    version "1.02"
    author-version "0.18"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "SL Baur <steve@xemacs.org>"
    distribution stable
    priority low
@@ -12,8 +31,8 @@
    dump nil
    description "Footnoting in mail message editing modes."
    filename "footnote-1.02-pkg.tar.gz"
-   md5sum "9c4e614eab727d58d1cb850b4334a533"
-   size 18018
+   md5sum "460a7309abcb52bc6fce3c80cfcdf1d9"
+   size 18045
    provides (footnote)
    requires (mail-lib xemacs-base)
    type regular
@@ -23,7 +42,7 @@
    version "1.02"
    author-version "3.101"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority high
@@ -31,27 +50,27 @@
    dump nil
    description "XEmacs bug reports."
    filename "gnats-1.02-pkg.tar.gz"
-   md5sum "89cd5144aa36dede739d845b65b3fd2a"
-   size 126343
+   md5sum "0cd0ab1a2c7dfc61b043948bc98f43d9"
+   size 126338
    provides (gnats gnats-admin send-pr)
    requires (mail-lib xemacs-base)
    type regular
 ))
 (gnus
   (standards-version 1.0
-   version "1.03"
-   author-version "0.22q"
-   date "1998-01-24"
-   build-date "1998-01-25"
+   version "1.07"
+   author-version "0.30q"
+   date "1998-02-23"
+   build-date "1998-02-27"
    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.03-pkg.tar.gz"
-   md5sum "89614e38ec293f82996246140dae1a05"
-   size 1664505
+   filename "gnus-1.07-pkg.tar.gz"
+   md5sum "c71f02248d3676f4e03298a0c5db9a3b"
+   size 1640176
    provides (gnus message)
    requires (gnus w3 mh-e mailcrypt rmail mail-lib xemacs-base)
    type regular
@@ -61,7 +80,7 @@
    version "1.03"
    author-version "3.4"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
@@ -69,8 +88,8 @@
    dump nil
    description "Support for messaging encryption with PGP."
    filename "mailcrypt-1.03-pkg.tar.gz"
-   md5sum "39f5b5f57f557dc760ef49be5275e97f"
-   size 66815
+   md5sum "78c26e92be2b302d462045527c5d46ed"
+   size 66823
    provides (mailcrypt)
    requires (gnus vm mail-lib xemacs-base)
    type regular
@@ -78,9 +97,9 @@
 (mh-e
   (standards-version 1.0
    version "1.04"
-   author-version "20.5b21"
+   author-version "20.5b29"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution contrib
    priority low
@@ -88,8 +107,8 @@
    dump nil
    description "Front end support for MH."
    filename "mh-e-1.04-pkg.tar.gz"
-   md5sum "f412f2a82ac7005c788880119d1f75d5"
-   size 128979
+   md5sum "5ecad7b26355ed5adcf2b1ecee9a9c95"
+   size 128977
    provides (mh-e)
    requires (mail-lib xemacs-base)
    type regular
@@ -97,9 +116,9 @@
 (net-utils
   (standards-version 1.0
    version "1.02"
-   author-version "20.5b21"
+   author-version "20.5b29"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
@@ -107,8 +126,8 @@
    dump nil
    description "Miscellaneous Networking Utilities."
    filename "net-utils-1.02-pkg.tar.gz"
-   md5sum "c2391219560bd5edf83e25eacf773236"
-   size 48538
+   md5sum "48d2bd98d8b26f2ad4c451982807d960"
+   size 48559
    provides (ilisp-browse-cltl2 emacsbug feedmail metamail rcompile shadowfile webjump webster-www)
    requires (w3 efs mail-lib xemacs-base)
    type single
@@ -118,7 +137,7 @@
    version "1.02"
    author-version "2.6"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
@@ -126,8 +145,8 @@
    dump nil
    description "LDAP support."
    filename "ph-1.02-pkg.tar.gz"
-   md5sum "db0d1c059d645624c2cf38a006a9d837"
-   size 27560
+   md5sum "753a88169b747db3a449f60255d38cf2"
+   size 27548
    provides (ph)
    requires (xemacs-base)
    type regular
@@ -135,9 +154,9 @@
 (rmail
   (standards-version 1.0
    version "1.02"
-   author-version "20.5b21"
+   author-version "20.5b29"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution contrib
    priority low
@@ -145,27 +164,27 @@
    dump nil
    description "An obsolete Emacs mailer."
    filename "rmail-1.02-pkg.tar.gz"
-   md5sum "1d72ef61388abef1dc44633f756b09b4"
-   size 83554
+   md5sum "d385c1d48a41899ec5436669c422699f"
+   size 83574
    provides (rmail rmailsum)
    requires (tm apel mail-lib xemacs-base)
    type regular
 ))
 (supercite
   (standards-version 1.0
-   version "1.03"
+   version "1.05"
    author-version "3.55x"
-   date "1998-01-24"
-   build-date "1998-01-24"
+   date "1998-02-11"
+   build-date "1998-02-27"
    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
+   filename "supercite-1.05-pkg.tar.gz"
+   md5sum "34e772eff70739d2d25f282b71264428"
+   size 90161
    provides (supercite)
    requires (mail-lib xemacs-base)
    type regular
@@ -173,9 +192,9 @@
 (tm
   (standards-version 1.0
    version "1.04"
-   author-version "20.5b21"
-   date "1998-01-24"
-   build-date "1998-01-24"
+   author-version "20.5b29"
+   date "1998-01-25"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
@@ -183,46 +202,65 @@
    dump nil
    description "Emacs MIME support."
    filename "tm-1.04-pkg.tar.gz"
-   md5sum "1c56f8dcbd2cf367be4ed6ff1e31351e"
-   size 251912
+   md5sum "f52c4e83a3c2b9a33ffec67668cd2dff"
+   size 252091
    provides (tm tm-edit tm-view mime-setup)
    requires (gnus mh-e rmail vm mailcrypt mail-lib apel xemacs-base)
    type regular
 ))
+(vm
+  (standards-version 1.0
+   version "1.06"
+   author-version "6.41"
+   date "1998-02-17"
+   build-date "1998-02-27"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority medium
+   category "comm"
+   dump t
+   description "An Emacs mailer."
+   filename "vm-1.06-pkg.tar.gz"
+   md5sum "7a9e4f7943fa74752bd677ac1d26fc6f"
+   size 506117
+   provides (vm)
+   requires (mail-lib xemacs-base)
+   type regular
+))
 (w3
   (standards-version 1.0
-   version "1.02"
-   author-version "4.0pre13"
-   date "1998-01-24"
-   build-date "1998-01-24"
+   version "1.03"
+   author-version "4.0pre14"
+   date "1998-01-20"
+   build-date "1998-02-27"
    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
+   filename "w3-1.03-pkg.tar.gz"
+   md5sum "1870ae4bc79d5c38827fd6fdce0fa16d"
+   size 584854
    provides (w3 url)
    requires (w3 mail-lib xemacs-base)
    type regular
 ))
 (cookie
   (standards-version 1.0
-   version "1.05"
-   author-version "20.5b21"
-   date "1998-01-24"
-   build-date "1998-01-24"
+   version "1.06"
+   author-version "20.5b29"
+   date "1998-02-01"
+   build-date "1998-02-27"
    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.05-pkg.tar.gz"
-   md5sum "00bca0b3ada1ec3f893b14fc212d2578"
-   size 33860
+   filename "cookie-1.06-pkg.tar.gz"
+   md5sum "528a9773c0e84394d3cc04fdc2f5304e"
+   size 34107
    provides (cookie1 yow)
    requires (xemacs-base)
    type regular
@@ -232,7 +270,7 @@
    version "1.02"
    author-version "1.0"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
@@ -240,8 +278,8 @@
    dump nil
    description "Tetris, Sokoban, and Snake."
    filename "games-1.02-pkg.tar.gz"
-   md5sum "c494d0e7ab65a27d01d6ecb9da678f38"
-   size 29242
+   md5sum "d9c68af0f2e98e80b5dade3508d4d1bf"
+   size 29267
    provides (gamegrid snake tetris sokoban)
    requires (xemacs-base)
    type regular
@@ -251,7 +289,7 @@
    version "1.04"
    author-version "1.8"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
@@ -259,8 +297,8 @@
    dump nil
    description "Minehunt Game."
    filename "mine-1.04-pkg.tar.gz"
-   md5sum "2954130562ca8ce131000f98f79f0773"
-   size 67463
+   md5sum "59b117b2d0b581f67f09db288d82263d"
+   size 67519
    provides (xmine)
    requires (xemacs-base)
    type regular
@@ -268,9 +306,9 @@
 (misc-games
   (standards-version 1.0
    version "1.05"
-   author-version "20.5b21"
+   author-version "20.5b29"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
@@ -278,18 +316,37 @@
    dump nil
    description "Other amusements and diversions."
    filename "misc-games-1.05-pkg.tar.gz"
-   md5sum "0d745a9b1f6c0dba0e37d3647b45fd3c"
-   size 163195
+   md5sum "cafe2c566a63f7b049ead69e27326cd1"
+   size 163192
    provides (decipher gomoku hanoi life)
    requires (xemacs-base)
    type single
 ))
+(Sun
+  (standards-version 1.0
+   version "1.04"
+   author-version "20.5b29"
+   date "1998-01-24"
+   build-date "1998-02-27"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution sun
+   priority low
+   category "libs"
+   dump t
+   description "Support for Sparcworks."
+   filename "Sun-1.04-pkg.tar.gz"
+   md5sum "1e5d0b8e3dfd7f05a409015dd3a3f0fc"
+   size 63715
+   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
   (standards-version 1.0
    version "1.03"
    author-version "3.3"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority high
@@ -297,18 +354,37 @@
    dump nil
    description "A Portable Emacs Library.  Used by XEmacs MIME support."
    filename "apel-1.03-pkg.tar.gz"
-   md5sum "2a38de58306f6f8a7a285b00c2849f8d"
-   size 34561
+   md5sum "8122f0fd87cc0fd5d2c15fbd9d9ee10d"
+   size 34609
    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
 ))
+(dired
+  (standards-version 1.0
+   version "1.0"
+   author-version "7.9"
+   date "1998-02-17"
+   build-date "1998-02-27"
+   maintainer "Mike Sperber <sperber@informatik.uni-tuebingen.de>"
+   distribution stable
+   priority medium
+   category "libs"
+   dump nil
+   description "Manage file systems."
+   filename "dired-1.0-pkg.tar.gz"
+   md5sum "e81b83bc45d46ea06e82b8118ab0fbc7"
+   size 187313
+   provides (diff dired)
+   requires (xemacs-base)
+   type regular
+))
 (edebug
   (standards-version 1.0
    version "1.03"
-   author-version "20.5b21"
+   author-version "20.5b29"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
@@ -316,37 +392,56 @@
    dump nil
    description "An Emacs Lisp debugger."
    filename "edebug-1.03-pkg.tar.gz"
-   md5sum "b9f12435b9782b95eb9b7def4d301e80"
-   size 117966
+   md5sum "767100572c7dd771f59277a808515a3e"
+   size 117962
    provides (edebug cl-read cust-print eval-reg cl-specs)
    requires (xemacs-base)
    type regular
 ))
 (efs
   (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>"
+   version "1.07"
+   author-version "1.16"
+   date "1998-02-17"
+   build-date "1998-02-27"
+   maintainer "Mike Sperber <sperber@informatik.uni-tuebingen.de>"
    distribution stable
    priority medium
    category "libs"
    dump nil
    description "Treat files on remote systems the same as local files."
-   filename "efs-1.05-pkg.tar.gz"
-   md5sum "d74dd614e4b84522bacb58820123622d"
-   size 544501
-   provides (efs diff dired efs-auto)
-   requires (vm xemacs-base)
+   filename "efs-1.07-pkg.tar.gz"
+   md5sum "07a76f9a45d62d1087fc8a79049bb665"
+   size 370308
+   provides (efs)
+   requires (xemacs-base vm dired)
    type regular
 ))
+(mail-lib
+  (standards-version 1.0
+   version "1.07"
+   author-version "20.5b29"
+   date "1998-02-24"
+   build-date "1998-02-27"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority medium
+   category "libs"
+   dump nil
+   description "Fundamental lisp files for providing email support."
+   filename "mail-lib-1.07-pkg.tar.gz"
+   md5sum "58f719dd3b9e4e6f20f9c38ca2776b79"
+   size 118919
+   provides (browse-url highlight-headers mail-abbrevs mail-extr mail-utils reporter rfc822 rmail-mini rmailout sendmail smtpmail)
+   requires (xemacs-base)
+   type single
+))
 (tooltalk
   (standards-version 1.0
    version "1.04"
-   author-version "20.5b21"
+   author-version "20.5b29"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution contrib
    priority low
@@ -354,46 +449,46 @@
    dump t
    description "Support for building with Tooltalk."
    filename "tooltalk-1.04-pkg.tar.gz"
-   md5sum "b9c04e07001c9994e771ed8f992692b0"
-   size 9226
+   md5sum "56c6ff17e4144bf7e8086ee62a9551c5"
+   size 9235
    provides ()
    requires ()
    type regular
 ))
 (xemacs-base
   (standards-version 1.0
-   version "1.09"
-   author-version "20.5b21"
-   date "1998-01-24"
-   build-date "1998-01-24"
+   version "1.14"
+   author-version "20.5b29"
+   date "1998-02-24"
+   build-date "1998-02-27"
    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.09-pkg.tar.gz"
-   md5sum "e2b8169fa6b444f26910131f172e443d"
-   size 381040
+   filename "xemacs-base-1.14-pkg.tar.gz"
+   md5sum "e4e4a823e051772b8be30e448cceef63"
+   size 384138
    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
   (standards-version 1.0
-   version "1.06"
-   author-version "20.5b21"
-   date "1998-01-24"
-   build-date "1998-01-24"
+   version "1.08"
+   author-version "20.5b29"
+   date "1998-02-08"
+   build-date "1998-02-27"
    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
+   filename "xemacs-devel-1.08-pkg.tar.gz"
+   md5sum "6d02c982ca2e7d269802d9d023aecb6b"
+   size 72861
    provides (docref eldoc elp find-func ielm regexp-opt trace)
    requires (xemacs-base)
    type single
@@ -401,9 +496,9 @@
 (egg-its
   (standards-version 1.0
    version "1.04"
-   author-version "20.5b21"
+   author-version "20.5b29"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority high
@@ -411,27 +506,27 @@
    dump t
    description "Wnn (4.2 and 6) support.  SJ3 support."
    filename "egg-its-1.04-pkg.tar.gz"
-   md5sum "4ffa0409545751d4d277da3f06fe90a2"
-   size 260213
+   md5sum "5d531d513111576d4e0367abf7c2aa3c"
+   size 260075
    provides ()
    requires (leim mule-base xemacs-base)
    type regular
 ))
 (leim
   (standards-version 1.0
-   version "1.03"
-   author-version "20.5b21"
-   date "1998-01-24"
-   build-date "1998-01-24"
+   version "1.05"
+   author-version "20.5b29"
+   date "1998-02-06"
+   build-date "1998-02-27"
    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
+   filename "leim-1.05-pkg.tar.gz"
+   md5sum "3c846cdbe34e946f0ca0fd371f149b84"
+   size 1743902
    provides ()
    requires (mule-base xemacs-base)
    type regular
@@ -439,9 +534,9 @@
 (locale
   (standards-version 1.0
    version "1.03"
-   author-version "20.5b21"
+   author-version "20.5b29"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority high
@@ -449,18 +544,37 @@
    dump nil
    description "Localized menubars and localized splash screens."
    filename "locale-1.03-pkg.tar.gz"
-   md5sum "2ef17851ae7feaf2c4dd54cd54736717"
-   size 21336
+   md5sum "6f8be0c05128d96ac787c4a741379fb6"
+   size 21363
    provides ()
    requires (mule-base)
    type regular
 ))
+(mule-base
+  (standards-version 1.0
+   version "1.09"
+   author-version "20.5b29"
+   date "1998-02-25"
+   build-date "1998-02-27"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution mule
+   priority high
+   category "mule"
+   dump t
+   description "Basic Mule support, required for building with Mule."
+   filename "mule-base-1.09-pkg.tar.gz"
+   md5sum "dc13aa6e6f958c2dd6c5d6079a061d0b"
+   size 487022
+   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
   (standards-version 1.0
    version "1.03"
    author-version "10.38"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority medium
@@ -468,18 +582,37 @@
    dump t
    description "Japanese Language Input Method."
    filename "skk-1.03-pkg.tar.gz"
-   md5sum "8da4b97eb3b4107adae3bf870257cbb9"
-   size 1466864
+   md5sum "f5a459223e78f146959a4c44795b7830"
+   size 1466964
    provides (skk skk-tut)
    requires (viper mule-base xemacs-base)
    type regular
 ))
+(speedbar
+  (standards-version 1.0
+   version "1.01"
+   author-version "2.02f"
+   date "1998-02-27"
+   build-date "1998-02-27"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "oa"
+   dump nil
+   description "Emacs calculator"
+   filename "calc-1.01-pkg.tar.gz"
+   md5sum "efd4978d775c86b49ca7660537c35a65"
+   size 1158290
+   provides (calc)
+   requires ()
+   type regular
+))
 (calendar
   (standards-version 1.0
    version "1.03"
-   author-version "20.5b21"
+   author-version "20.5b29"
    date "1998-01-25"
-   build-date "1998-01-25"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
@@ -487,28 +620,28 @@
    dump nil
    description "Calendar and diary support."
    filename "calendar-1.03-pkg.tar.gz"
-   md5sum "dd1477302a9ed29c06a309c947d3fb2e"
-   size 168691
+   md5sum "c1688fe7c3228dd369a096d7c47cb51c"
+   size 168688
    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
   (standards-version 1.0
-   version "1.07"
-   author-version "20.5b21"
-   date "1998-01-25"
-   build-date "1998-01-25"
+   version "1.12"
+   author-version "20.5b29"
+   date "1998-02-21"
+   build-date "1998-02-27"
    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)
+   filename "edit-utils-1.12-pkg.tar.gz"
+   md5sum "153dff6f67b6e6e09613b6f81017988a"
+   size 549827
+   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 popper mode-motion+ outl-mouse page-ext blink-paren paren permanent-buffers recent-files redo reportmail rsz-minibuf saveconfsavehist saveplace scroll-in-place tempo toolbar-utils tree-menu uniquify where-was-i-db)
    requires (xemacs-base)
    type single
 ))
@@ -517,7 +650,7 @@
    version "1.05"
    author-version "2.10"
    date "1998-01-25"
-   build-date "1998-01-25"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution contrib
    priority low
@@ -525,8 +658,8 @@
    dump nil
    description "Forms editing support (obsolete, use Widget instead)."
    filename "forms-1.05-pkg.tar.gz"
-   md5sum "b2cb31ec9a5f6b59f28b05c21759b23c"
-   size 39848
+   md5sum "fbf0d97c78f304cf4cb8212490c58a25"
+   size 39853
    provides (forms forms-mode)
    requires ()
    type regular
@@ -534,9 +667,9 @@
 (frame-icon
   (standards-version 1.0
    version "1.02"
-   author-version "20.5b21"
-   date "1998-01-25"
-   build-date "1998-01-25"
+   author-version "20.5b29"
+   date "1998-02-26"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution contrib
    priority low
@@ -544,94 +677,94 @@
    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
+   md5sum "5878c2f4fed7546265bf93b381f9aa83"
+   size 33563
    provides (forms forms-mode)
    requires ()
    type regular
 ))
 (hm--html-menus
   (standards-version 1.0
-   version "1.04"
+   version "1.05"
    author-version "5.9"
    date "1998-01-25"
-   build-date "1998-01-25"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
    category "oa"
    dump nil
    description "HTML editing."
-   filename "hm--html-menus-1.04-pkg.tar.gz"
-   md5sum "50a9d8d0a1543092cf7dfb7f0dce7aeb"
-   size 146988
+   filename "hm--html-menus-1.05-pkg.tar.gz"
+   md5sum "544597bdddd4b2e138bf6f26a8ecb2b8"
+   size 134645
    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
   (standards-version 1.0
-   version "1.04"
-   author-version "2.37"
-   date "1998-01-25"
-   build-date "1998-01-25"
+   version "1.06"
+   author-version "3.0beta"
+   date "1998-02-25"
+   build-date "1998-02-27"
    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
+   filename "ispell-1.06-pkg.tar.gz"
+   md5sum "7b04d028581c0c7c3b9c7812dbaf70ca"
+   size 65123
    provides (ispell)
    requires ()
    type regular
 ))
 (pc
   (standards-version 1.0
-   version "1.05"
-   author-version "20.5b21"
-   date "1998-01-25"
-   build-date "1998-01-25"
+   version "1.07"
+   author-version "20.5b29"
+   date "1998-02-25"
+   build-date "1998-02-27"
    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
+   filename "pc-1.07-pkg.tar.gz"
+   md5sum "c5e92917cbe06e156f8ba08c36cae217"
+   size 12155
    provides (delbs pc-select pending-del s-region)
    requires (xemacs-base)
    type regular
 ))
 (psgml
   (standards-version 1.0
-   version "1.01"
+   version "1.04"
    author-version "1.01"
-   date "1998-01-25"
-   build-date "1998-01-25"
+   date "1998-02-06"
+   build-date "1998-02-27"
    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 ()
+   filename "psgml-1.04-pkg.tar.gz"
+   md5sum "546cca7db9afd44630151c7f45e0d5e6"
+   size 402845
+   provides (psgml sgml)
+   requires (edit-utils)
    type regular
 ))
 (sgml
   (standards-version 1.0
    version "1.01"
-   author-version "20.5b21"
+   author-version "20.5b29"
    date "1998-01-25"
-   build-date "1998-01-25"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution contrib
    priority low
@@ -639,8 +772,8 @@
    dump nil
    description "SGML/Linuxdoc-SGML editing."
    filename "sgml-1.01-pkg.tar.gz"
-   md5sum "ff9341e50d595a553a61770b25682e6d"
-   size 26866
+   md5sum "a9377edae67887eec79458909e143f4a"
+   size 26872
    provides (sgml linuxdoc-sgml)
    requires (xemacs-base)
    type regular
@@ -650,7 +783,7 @@
    version "1.05"
    author-version "0.3"
    date "1998-01-25"
-   build-date "1998-01-25"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution experimental
    priority low
@@ -658,27 +791,27 @@
    dump nil
    description "User interface tool."
    filename "slider-1.05-pkg.tar.gz"
-   md5sum "2cea293cb5aefde724d16c41e0ee269d"
-   size 12085
+   md5sum "10632105a03c6c186168b7e9746c6074"
+   size 12123
    provides (slider color-selector)
    requires ()
    type regular
 ))
 (speedbar
   (standards-version 1.0
-   version "1.03"
-   author-version "0.5.4x"
-   date "1998-01-25"
-   build-date "1998-01-25"
+   version "1.05"
+   author-version "0.6.2"
+   date "1998-02-07"
+   build-date "1998-02-27"
    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
+   filename "speedbar-1.05-pkg.tar.gz"
+   md5sum "122c2b1676a2d9cd0cb5dbdb2c787514"
+   size 95006
    provides (speedbar)
    requires (xemacs-base)
    type regular
@@ -686,9 +819,9 @@
 (strokes
   (standards-version 1.0
    version "1.01"
-   author-version "20.5b21"
+   author-version "20.5b29"
    date "1998-01-25"
-   build-date "1998-01-25"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority medium
@@ -696,27 +829,27 @@
    dump nil
    description "Mouse enhancement utility."
    filename "strokes-1.01-pkg.tar.gz"
-   md5sum "7c741c59686b65a74606c037ef1ea5b1"
-   size 43714
+   md5sum "38979b99949b221fe85c0845a922aa9e"
+   size 43723
    provides (strokes)
    requires (text-modes edit-utils mail-lib xemacs-base)
    type regular
 ))
 (text-modes
   (standards-version 1.0
-   version "1.03"
-   author-version "20.5b21"
-   date "1998-01-25"
-   build-date "1998-01-25"
+   version "1.05"
+   author-version "20.5b29"
+   date "1998-02-26"
+   build-date "1998-02-27"
    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
+   filename "text-modes-1.05-pkg.tar.gz"
+   md5sum "bf46fbc87327b7512932aa4374bcf1f9"
+   size 106135
    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
@@ -726,7 +859,7 @@
    version "1.03"
    author-version "1.17"
    date "1998-01-25"
-   build-date "1998-01-25"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority medium
@@ -734,8 +867,8 @@
    dump nil
    description "Display time & date on the modeline."
    filename "time-1.03-pkg.tar.gz"
-   md5sum "19d6473ad84e913baff82e551f607acc"
-   size 20033
+   md5sum "47dcbd05b3b7b6982f2f1a42475de338"
+   size 20091
    provides (time)
    requires (xemacs-base)
    type regular
@@ -743,9 +876,9 @@
 (eterm
   (standards-version 1.0
    version "1.03"
-   author-version "20.5b21"
+   author-version "20.5b29"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority medium
@@ -753,8 +886,8 @@
    dump nil
    description "Terminal emulation."
    filename "eterm-1.03-pkg.tar.gz"
-   md5sum "6b8ef9310dbd121abe6b6896fc5ac10a"
-   size 102075
+   md5sum "4314f3f85e2ac035c356d99df910231c"
+   size 102100
    provides (eterm)
    requires (xemacs-base)
    type regular
@@ -762,9 +895,9 @@
 (igrep
   (standards-version 1.0
    version "1.01"
-   author-version "20.5b21"
+   author-version "20.5b29"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
@@ -772,10 +905,10 @@
    dump nil
    description "Enhanced front-end for Grep."
    filename "igrep-1.01-pkg.tar.gz"
-   md5sum "35883e177b034c3d58d795852fa68969"
-   size 13957
+   md5sum "d1e1224ed2547cb28d17064e46dcad48"
+   size 13961
    provides (igrep)
-   requires (efs xemacs-base)
+   requires (dired xemacs-base)
    type regular
 ))
 (ilisp
@@ -783,7 +916,7 @@
    version "1.03"
    author-version "5.8"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
@@ -791,28 +924,28 @@
    dump nil
    description "Front-end for Inferior Lisp."
    filename "ilisp-1.03-pkg.tar.gz"
-   md5sum "28a131647f17713438f489957944242f"
-   size 223275
+   md5sum "62c1e14eaca07d6ed5c00cba517c3b26"
+   size 223412
    provides (ilisp completer)
    requires (xemacs-base)
    type regular
 ))
 (os-utils
   (standards-version 1.0
-   version "1.04"
-   author-version "20.5b21"
-   date "1998-01-24"
-   build-date "1998-01-24"
+   version "1.06"
+   author-version "20.5b29"
+   date "1998-02-21"
+   build-date "1998-02-27"
    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)
+   filename "os-utils-1.06-pkg.tar.gz"
+   md5sum "c2b8aec12884057993b11b19868cd1d8"
+   size 224310
+   provides (archive-mode background crypt crypt++ inf-lisp jka-compr lpr mchat ps-print tar-mode telnet terminal uncompress)
    requires (xemacs-base)
    type single
 ))
@@ -821,7 +954,7 @@
    version "1.03"
    author-version "2.4"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
@@ -829,8 +962,8 @@
    dump nil
    description "A Unix process browsing tool."
    filename "view-process-1.03-pkg.tar.gz"
-   md5sum "6c33516337b77605d7c474a7c565996e"
-   size 59872
+   md5sum "9e9567a768184a0aeea90bbdadf15f08"
+   size 59864
    provides (view-process-mode)
    requires (xemacs-base)
    type regular
@@ -840,7 +973,7 @@
    version "1.03"
    author-version "2.27"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
@@ -848,46 +981,46 @@
    dump nil
    description "Ada language support."
    filename "ada-1.03-pkg.tar.gz"
-   md5sum "12cf923735f28acd68f6664f8676f7b2"
-   size 54311
+   md5sum "4626ea66734003692b32b86fa7fa4fe8"
+   size 54305
    provides (ada-mode ada-stmt)
    requires ()
    type regular
 ))
 (c-support
   (standards-version 1.0
-   version "1.04"
-   author-version "20.5b21"
-   date "1998-01-24"
-   build-date "1998-01-24"
+   version "1.05"
+   author-version "20.5b29"
+   date "1998-02-26"
+   build-date "1998-02-27"
    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.04-pkg.tar.gz"
-   md5sum "2afcb4f1e6d9b2dab60171505e81e885"
-   size 41821
+   filename "c-support-1.05-pkg.tar.gz"
+   md5sum "9f82872d426d4364543bc9e36b59074d"
+   size 41785
    provides (c-comment-edit cmacexp hideif hideshow)
    requires (cc-mode xemacs-base)
    type regular
 ))
 (cc-mode
   (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>"
+   version "1.07"
+   author-version "5.20"
+   date "1998-02-11"
+   build-date "1998-02-27"
+   maintainer "Barry Warsaw <cc-mode-help@python.org>"
    distribution stable
    priority medium
    category "prog"
    dump nil
    description "C, C++ and Java language support."
-   filename "cc-mode-1.05-pkg.tar.gz"
-   md5sum "22b97f82faa9240de79eeaf3b505a95b"
-   size 128672
+   filename "cc-mode-1.07-pkg.tar.gz"
+   md5sum "1077a5b4040a05a0847e5d5ab6e6d3ad"
+   size 147539
    provides (cc-mode)
    requires (xemacs-base)
    type regular
@@ -895,9 +1028,9 @@
 (debug
   (standards-version 1.0
    version "1.01"
-   author-version "20.5b21"
+   author-version "20.5b29"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution contrib
    priority low
@@ -905,37 +1038,37 @@
    dump nil
    description "GUD, gdb, dbx debugging support."
    filename "debug-1.01-pkg.tar.gz"
-   md5sum "22be059d89ff639e11ffbb2da7c792ce"
-   size 87149
+   md5sum "dab66c6b6fc130a9bf4a6e6794014971"
+   size 87152
    provides ()
    requires (xemacs-base)
    type regular
 ))
 (ediff
   (standards-version 1.0
-   version "1.03"
+   version "1.05"
    author-version "2.70"
-   date "1998-01-24"
-   build-date "1998-01-24"
+   date "1998-02-25"
+   build-date "1998-02-27"
    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
+   filename "ediff-1.05-pkg.tar.gz"
+   md5sum "51b558d3af30e129d82ca5a62a2eefaa"
+   size 244330
    provides (ediff)
-   requires (pcl-cvs efs xemacs-base)
+   requires (pcl-cvs dired xemacs-base)
    type regular
 ))
 (emerge
   (standards-version 1.0
    version "1.01"
-   author-version "20.5b21"
+   author-version "20.5b29"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
@@ -943,8 +1076,8 @@
    dump nil
    description "Another interface over GNU patch."
    filename "emerge-1.01-pkg.tar.gz"
-   md5sum "01cb5e705bd1a5400d9a137b1ed6b7c2"
-   size 60912
+   md5sum "59f3d69e46bf05f1f1f8cd26e6caac43"
+   size 60905
    provides (emerge)
    requires ()
    type regular
@@ -952,9 +1085,9 @@
 (pcl-cvs
   (standards-version 1.0
    version "1.03"
-   author-version "20.5b21"
+   author-version "20.5b29"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
@@ -962,27 +1095,27 @@
    dump nil
    description "CVS frontend."
    filename "pcl-cvs-1.03-pkg.tar.gz"
-   md5sum "1747e0ae7bdfc69e1bcb498ad9c050fe"
-   size 134547
+   md5sum "e077c161d2013314bb98d94fc50efa7f"
+   size 134541
    provides (pcl-cvs dll elib-node generic-sc)
    requires (xemacs-base)
    type regular
 ))
 (prog-modes
   (standards-version 1.0
-   version "1.03"
-   author-version "20.5b21"
-   date "1998-01-24"
-   build-date "1998-01-24"
+   version "1.04"
+   author-version "20.5b29"
+   date "1998-02-08"
+   build-date "1998-02-27"
    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
+   filename "prog-modes-1.04-pkg.tar.gz"
+   md5sum "82d3259204008efa69d7eab20db7a80b"
+   size 535354
    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
@@ -990,9 +1123,9 @@
 (scheme
   (standards-version 1.0
    version "1.02"
-   author-version "20.5b21"
+   author-version "20.5b29"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution contrib
    priority low
@@ -1000,8 +1133,8 @@
    dump nil
    description "Front-end support for Inferior Scheme."
    filename "scheme-1.02-pkg.tar.gz"
-   md5sum "070fe92d28b95b548bcb713c2072f701"
-   size 34793
+   md5sum "b23c568e5939392f054119f9c6eee981"
+   size 34801
    provides (scheme xscheme cmuscheme)
    requires (xemacs-base)
    type regular
@@ -1011,7 +1144,7 @@
    version "1.04"
    author-version "2.0e"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
@@ -1019,8 +1152,8 @@
    dump nil
    description "Support for editing shell scripts."
    filename "sh-script-1.04-pkg.tar.gz"
-   md5sum "35daef7a3c07cae2ff9011d625140004"
-   size 33618
+   md5sum "d3840b34d0b92b57257b4170d8fa33a5"
+   size 33617
    provides (sh-script executable)
    requires (xemacs-base)
    type regular
@@ -1028,9 +1161,9 @@
 (vc-cc
   (standards-version 1.0
    version "1.03"
-   author-version "20.5b21"
+   author-version "20.5b29"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution contrib
    priority low
@@ -1038,46 +1171,65 @@
    dump t
    description "Version Control for ClearCase (UnFree) systems."
    filename "vc-cc-1.03-pkg.tar.gz"
-   md5sum "4c2b00b98f6581f89aa58b77049d5406"
-   size 96065
+   md5sum "b9d346ff0e29fdb75bf0309c5b25d869"
+   size 96057
    provides (vc)
-   requires (efs xemacs-base)
+   requires (dired xemacs-base)
    type regular
 ))
 (vc
   (standards-version 1.0
-   version "1.03"
-   author-version "20.5b21"
-   date "1998-01-24"
-   build-date "1998-01-24"
+   version "1.04"
+   author-version "20.5b29"
+   date "1998-01-21"
+   build-date "1998-02-27"
    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
+   filename "vc-1.04-pkg.tar.gz"
+   md5sum "9b5b0b2a4d1242aadab2e6e36b4ceed9"
+   size 74394
    provides (vc)
-   requires (efs xemacs-base)
+   requires (dired xemacs-base)
+   type regular
+))
+(vhdl
+  (standards-version 1.0
+   version "1.03"
+   author-version "2.74"
+   date "1998-01-24"
+   build-date "1998-02-27"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stable
+   priority low
+   category "prog"
+   dump nil
+   description "Support for VHDL."
+   filename "vhdl-1.03-pkg.tar.gz"
+   md5sum "0edc086261a9e0526704e99400d100e2"
+   size 54064
+   provides (vhdl-mode)
+   requires ()
    type regular
 ))
 (auctex
   (standards-version 1.0
-   version "1.04"
+   version "1.06"
    author-version "9.7p"
-   date "1998-01-24"
-   build-date "1998-01-24"
+   date "1998-02-25"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority medium
    category "wp"
    dump nil
    description "Basic TeX/LaTeX support."
-   filename "auctex-1.04-pkg.tar.gz"
-   md5sum "48359901fa551ae9ff3f77b996aa8507"
-   size 289682
+   filename "auctex-1.06-pkg.tar.gz"
+   md5sum "e6ed0053066ca0c49251d1f85dc31fc1"
+   size 304695
    provides (auc-old bib-cite font-latex latex multi-prompt tex-buf tex-info tex-jp tex-site tex)
    requires (xemacs-base)
    type regular
@@ -1087,7 +1239,7 @@
    version "1.03"
    author-version "1.31"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
@@ -1095,8 +1247,8 @@
    dump nil
    description "Crisp/Brief emulation."
    filename "crisp-1.03-pkg.tar.gz"
-   md5sum "45ffef47a1dfa2e3de4efb9958a053dc"
-   size 9051
+   md5sum "7d1e952213bd159dd11957daff005083"
+   size 9054
    provides (crisp scroll-lock)
    requires ()
    type regular
@@ -1104,9 +1256,9 @@
 (edt
   (standards-version 1.0
    version "1.03"
-   author-version "20.5b21"
+   author-version "20.5b29"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution contrib
    priority low
@@ -1114,18 +1266,37 @@
    dump nil
    description "DEC EDIT/EDT emulation."
    filename "edt-1.03-pkg.tar.gz"
-   md5sum "da250582becf065c32cfd2c1182d0449"
-   size 46005
+   md5sum "93715876897a4f0bfcf66eed73010c2c"
+   size 46019
    provides (edt)
    requires (xemacs-base)
    type regular
 ))
+(textools
+  (standards-version 1.0
+   version "1.01"
+   author-version "3.18.0.2"
+   date "1998-02-25"
+   build-date "1998-02-27"
+   maintainer "Carsten Dominik <dominik@strw.LeidenUniv.nl>"
+   distribution stable
+   priority medium
+   category "wp"
+   dump nil
+   description "Emacs support for LaTeX cross-references, citations.."
+   filename "reftex-1.01-pkg.tar.gz"
+   md5sum "60b322908ea0e4dda2d177d7080b1596"
+   size 140425
+   provides (reftex)
+   requires (xemacs-base)
+   type regular
+))
 (texinfo
   (standards-version 1.0
    version "1.05"
-   author-version "20.5b21"
+   author-version "20.5b29"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority high
@@ -1133,27 +1304,37 @@
    dump nil
    description "XEmacs TeXinfo support."
    filename "texinfo-1.05-pkg.tar.gz"
-   md5sum "8b9573a97dfc7dc9ddc716c741b8c9d4"
-   size 113889
+   md5sum "44295e8366210af70df831c579c71c62"
+   size 113863
    provides (makeinfo tex-mode texinfmt texinfo texnfo-tex texnfo-upd)
    requires (xemacs-base)
    type regular
 ))
 (textools
-  (version "1.0"
-   filename "textools-1.0-pkg.tar.gz"
-   md5sum "c75f9e6b009a6f9892cd0aa68f8df17b"
-   size 187454
-   provides (bib-mode bibtex refer-to-bibtex reftex)
+  (standards-version 1.0
+   version "1.04"
+   author-version "20.5b29"
+   date "1998-02-17"
+   build-date "1998-02-27"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution stabl
+   priority medium
+   category "wp"
+   dump nil
+   description "Miscellaneous TeX support."
+   filename "textools-1.04-pkg.tar.gz"
+   md5sum "b18c912373db3b8ae4ad9c472c33128b"
+   size 78953
+   provides (bib-mode bibtex refer-to-bibtex)
    requires (xemacs-base)
    type single
 ))
 (tpu
   (standards-version 1.0
    version "1.04"
-   author-version "20.5b21"
+   author-version "20.5b29"
    date "1998-01-24"
-   build-date "1998-01-24"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority high
@@ -1161,27 +1342,27 @@
    dump nil
    description "DEC EDIT/TPU support."
    filename "tpu-1.04-pkg.tar.gz"
-   md5sum "6c7b0e97485b7ddf374fe5ceca45d74d"
-   size 57401
+   md5sum "08968507b0879b85c2d56e49bc69b379"
+   size 57407
    provides (tpu)
    requires ()
    type regular
 ))
 (viper
   (standards-version 1.0
-   version "1.04"
+   version "1.05"
    author-version "3.005"
-   date "1998-01-24"
-   build-date "1998-01-24"
+   date "1998-02-25"
+   build-date "1998-02-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution stable
    priority low
    category "wp"
    dump nil
    description "VI emulation support."
-   filename "viper-1.04-pkg.tar.gz"
-   md5sum "ea2bf0b5bd6600bb5e5400d2fd21205f"
-   size 260680
+   filename "viper-1.05-pkg.tar.gz"
+   md5sum "9fdea665cb1021fd8ce70ef17ba1a19d"
+   size 261076
    provides (viper)
    requires (xemacs-base)
    type regular
--- a/lisp/packages.el	Mon Aug 13 10:23:05 2007 +0200
+++ b/lisp/packages.el	Mon Aug 13 10:23:51 2007 +0200
@@ -111,7 +111,8 @@
   '("paths.el"
     "dumped-lisp.el"
     "dumped-pkg-lisp.el"
-    "version.el")
+    "version.el"
+    "Installation.el")
   "Lisp packages that should not be byte compiled.")
--- a/lisp/x-menubar.el	Mon Aug 13 10:23:05 2007 +0200
+++ b/lisp/x-menubar.el	Mon Aug 13 10:23:51 2007 +0200
@@ -171,7 +171,7 @@

      ("Apps"
       ["Read Mail (VM)..." vm
-       :active (fboundp 'vm-easy-menu-define)]
+       :active (fboundp 'vm)]
       ["Read Mail (MH)..." (mh-rmail t)
        :active (fboundp 'mh-rmail)]
       ["Send mail..." mail
@@ -788,6 +788,7 @@
      ("Help"
       ["About XEmacs..." about-xemacs]
       ("Basics"
+       #-infodock ["Installation" describe-installation]
        ;; Tutorials.
        ,(if (featurep 'mule)
 	    ;; Mule tutorials.
--- a/src/ChangeLog	Mon Aug 13 10:23:05 2007 +0200
+++ b/src/ChangeLog	Mon Aug 13 10:23:51 2007 +0200
@@ -1,5 +1,85 @@
+1998-03-01  SL Baur  <steve@altair.xemacs.org>
+
+	* config.h.in: Add HAVE_UNIX_PROCESSES for 20.6.
+
+	* alloc.c (init_alloc_once_early): Document movement of mmap
+	enabling code to emacs.c.
+
+	* Makefile.in.in: Update FILE_CODING dependencies.
+
+1998-03-01  Kyle Jones  <kyle_jones@wonderworks.com>
+
+	* file-coding.c (setup_eol_coding_systems): Don't try
+	  to copy the mnemonic property of the coding system
+	  unless it is a string.
+
+	  (allocate_coding_system): Initialize coding system
+	  struct member 'mnemonic' to Qnil.  Leaving its value
+	  set to 0 causes a crash.
+
+1998-03-01  SL Baur  <steve@altair.xemacs.org>
+
+	* file-coding.c (DEFINE_SUB_CODESYS): Undo previous patch.
+
+1998-03-01  Kyle Jones  <kyle_jones@wonderworks.com>
+
+	* callint.c: Read coding system names for the 'z' and
+	  'Z' interactive specs if FILE_CODING or MULE is defined.
+	  Previously, coding system names were read only if MULE was
+	  defined.
+
+	* file-coding.h: Removed charset-based category types
+	  from enumerated coding_category_type if not building
+	  with MULE.
+
+	* file-coding.c (syms_of_mule_coding): Don't define
+	  symbols for charset-based coding systems unless
+	  building with MULE.
+
+1998-02-28  SL Baur  <steve@altair.xemacs.org>
+
+	* alloc.c (garbage_collect_1): Guard call to selected_frame so it
+	cannot be called during GC.
+	- Update current count of staticpro'ed objects.
+
+1998-02-28  Kyle Jones  <kyle_jones@wonderworks.com>
+
+	* menubar.c (Fmenu_find_real_submenu): Document the
+	  "use struct as array" hack.  Convert struct pointer to
+	  array to avoid compiler warnings.
+
+1998-02-26  SL Baur  <steve@altair.xemacs.org>
+
+	* buffer.c (complex_vars_of_buffer): Fix DOC string for
+	buffer-file-coding-system.
+
+1998-02-26  Damon Lipparelli  <lipp@primus.com>
+
+	* symsinit.h: syms_of_ldap() is actually syms_of_eldap().
+
+	* eldap.c: removed duplicates.
+
+1998-02-26  SL Baur  <steve@altair.xemacs.org>
+
+	* file-coding.c (setup_eol_coding_systems): Disable SUB_CODESYS
+	feature -- it causes stack corruption in Mule.
+
+1998-02-27  Kirill M. Katsnelson  <kkm@kis.ru>
+
+	* events.c (character_to_event): The code which guesses TTY
+	backspace character is conditionalized on HAVE_TTY
+
+1998-02-26  SL Baur  <steve@altair.xemacs.org>
+
+	* console.c (complex_vars_of_console): Guard tty_erase_char with
+	HAVE_TTY.
+	* conslots.h: Ditto.
+
 1998-02-25  SL Baur  <steve@altair.xemacs.org>

+	* events.c (character_to_event): Correct operations on tty_erase_char.
+	From Martin Buchholz <martin@xemacs.org>
+
 	* file-coding.c (setup_eol_coding_systems): Unix/Binary sub
 	coding-system display should default to the empty string.
 	- Use '(t)' for Mac/Text mode.
--- a/src/Makefile.in.in	Mon Aug 13 10:23:05 2007 +0200
+++ b/src/Makefile.in.in	Mon Aug 13 10:23:51 2007 +0200
@@ -756,6 +756,35 @@
 ## This has been hand-maintained since (at least) some time in 1996
 ## Note:  We deliberately do not include a dependency on lisp.h

+#ifdef FILE_CODING
+callproc.o: file-coding.h
+console-tty.o: file-coding.h
+event-Xt.o: file-coding.h
+event-stream.o: file-coding.h
+file-coding.o: buffer.h
+file-coding.o: elhash.h
+file-coding.o: file-coding.h
+file-coding.o: insdel.h
+file-coding.o: lstream.h
+#ifdef MULE
+file-coding.o: mule-ccl.h
+#endif
+fileio.o: file-coding.h
+glyphs-x.o: file-coding.h
+inline.o: file-coding.h
+lread.o: file-coding.h
+md5.o: file-coding.h
+#ifdef HAVE_CANNA
+mule-canna.o: file-coding.h
+#endif
+#ifdef MULE
+mule-ccl.o: file-coding.h
+#endif
+process.o: file-coding.h
+redisplay-x.o: file-coding.h
+redisplay.o: file-coding.h
+#endif
+
 #ifdef MULE
 EmacsFrame.o: mule-charset.h
 abbrev.o: mule-charset.h
@@ -764,14 +793,12 @@
 bytecode.o: mule-charset.h
 callint.o: mule-charset.h
 callproc.o: mule-charset.h
-callproc.o: mule-coding.h
 casefiddle.o: mule-charset.h
 casetab.o: mule-charset.h
 chartab.o: mule-charset.h
 cmdloop.o: mule-charset.h
 cmds.o: mule-charset.h
 console-tty.o: mule-charset.h
-console-tty.o: mule-coding.h
 console.o: mule-charset.h
 data.o: mule-charset.h
 device-tty.o: mule-charset.h
@@ -786,12 +813,10 @@
 eval.o: mule-charset.h
 event-Xt.o: mule-charset.h
 event-stream.o: mule-charset.h
-event-stream.o: mule-coding.h
 events.o: mule-charset.h
 extents.o: mule-charset.h
 faces.o: mule-charset.h
 fileio.o: mule-charset.h
-fileio.o: mule-coding.h
 filelock.o: mule-charset.h
 fns.o: mule-charset.h
 font-lock.o: mule-charset.h
@@ -802,13 +827,9 @@
 gui-x.o: mule-charset.h
 indent.o: mule-charset.h
 inline.o: mule-charset.h
-inline.o: mule-coding.h
-input-method-xlib.o: mule-charset.h
-input-method-xlib.o: mule-coding.h
 insdel.o: mule-charset.h
 keymap.o: mule-charset.h
 lread.o: mule-charset.h
-lread.o: mule-coding.h
 lstream.o: mule-charset.h
 macros.o: mule-charset.h
 marker.o: mule-charset.h
@@ -829,7 +850,6 @@
 mule-ccl.o: config.h
 mule-ccl.o: dynarr.h
 mule-ccl.o: mule-charset.h
-mule-ccl.o: mule-coding.h
 mule-charset.o: blocktype.h
 mule-charset.o: buffer.h
 mule-charset.o: bufslots.h
@@ -839,6 +859,7 @@
 mule-charset.o: elhash.h
 mule-charset.o: lstream.h
 mule-charset.o: mule-charset.h
+#if 0
 mule-coding.o: blocktype.h
 mule-coding.o: buffer.h
 mule-coding.o: bufslots.h
@@ -849,6 +870,7 @@
 mule-coding.o: lstream.h
 mule-coding.o: mule-charset.h
 mule-coding.o: mule-coding.h
+#endif
 #if 0
 mule-mcpath.o: blocktype.h
 mule-mcpath.o: buffer.h
@@ -878,15 +900,12 @@
 objects.o: mule-charset.h
 print.o: mule-charset.h
 process.o: mule-charset.h
-process.o: mule-coding.h
 redisplay-output.o: mule-charset.h
 redisplay-tty.o: mule-charset.h
 redisplay-x.o: mule-charset.h
-redisplay-x.o: mule-coding.h
 redisplay-msw.o: mule-charset.h
 redisplay-msw.o: mule-ccl.h
 redisplay.o: mule-charset.h
-redisplay.o: mule-coding.h
 regex.o: mule-charset.h
 scrollbar.o: mule-charset.h
 search.o: mule-charset.h
--- a/src/alloc.c	Mon Aug 13 10:23:05 2007 +0200
+++ b/src/alloc.c	Mon Aug 13 10:23:51 2007 +0200
@@ -3034,6 +3034,7 @@
 struct gcpro *gcprolist;

 /* 415 used Mly 29-Jun-93 */
+/* 1327 used slb 28-Feb-98 */
 #define NSTATICS 1500
 /* Not "static" because of linker lossage on some systems */
 Lisp_Object *staticvec[NSTATICS]
@@ -4317,7 +4318,7 @@
   char stack_top_variable;
   extern char *stack_bottom;
   int i;
-  struct frame *f = selected_frame ();
+  struct frame *f;
   int speccount = specpdl_depth ();
   Lisp_Object pre_gc_cursor = Qnil;
   struct gcpro gcpro1;
@@ -4333,6 +4334,10 @@
   if (preparing_for_armageddon)
     return;

+  /* This function cannot be called inside GC so we move to after the */
+  /* above tests */
+  f = selected_frame ();
+
   GCPRO1 (pre_gc_cursor);

   /* Very important to prevent GC during any of the following
@@ -4946,7 +4951,9 @@
 #ifdef DOUG_LEA_MALLOC
   mallopt (M_TRIM_THRESHOLD, 128*1024); /* trim threshold */
   mallopt (M_MMAP_THRESHOLD, 64*1024); /* mmap threshold */
-  /*  mallopt (M_MMAP_MAX, 64); /* max. number of mmap'ed areas */
+#if 0 /* Moved to emacs.c */
+  mallopt (M_MMAP_MAX, 64); /* max. number of mmap'ed areas */
+#endif
 #endif
   init_string_alloc ();
   init_string_chars_alloc ();
--- a/src/buffer.c	Mon Aug 13 10:23:05 2007 +0200
+++ b/src/buffer.c	Mon Aug 13 10:23:51 2007 +0200
@@ -2531,7 +2531,8 @@
 particular operation, you should bind the variable
 `coding-system-for-read' rather than changing the other two
 variables just mentioned, which are intended to be used for
-global environment specification.  */ );
+global environment specification.
+*/ );
 #endif

   DEFVAR_BUFFER_LOCAL ("auto-fill-function", auto_fill_function /*
--- a/src/callint.c	Mon Aug 13 10:23:05 2007 +0200
+++ b/src/callint.c	Mon Aug 13 10:23:51 2007 +0200
@@ -74,7 +74,7 @@
 Lisp_Object Qread_string;
 Lisp_Object Qevents_to_keys;

-#ifdef MULE
+#if defined(MULE) || defined(FILE_CODING)
 Lisp_Object Qread_coding_system;
 Lisp_Object Qread_non_nil_coding_system;
 #endif
@@ -854,7 +854,7 @@
 	    }
 	  case 'Z':		/* Coding-system symbol or nil if no prefix */
 	    {
-#ifdef MULE
+#if defined(MULE) || defined(FILE_CODING)
 	      if (NILP (prefix))
 		{
 		  args[argnum] = Qnil;
@@ -872,7 +872,7 @@
 	    }
 	  case 'z':		/* Coding-system symbol */
 	    {
-#ifdef MULE
+#if defined(MULE) || defined(FILE_CODING)
 	      args[argnum] = call1 (Qread_coding_system, PROMPT ());
 	      arg_from_tty = 1;
 #else
@@ -974,7 +974,7 @@
   defsymbol (&Qread_command, "read-command");
   defsymbol (&Qread_number, "read-number");
   defsymbol (&Qread_expression, "read-expression");
-#ifdef MULE
+#if defined(MULE) || defined(FILE_CODING)
   defsymbol (&Qread_coding_system, "read-coding-system");
   defsymbol (&Qread_non_nil_coding_system, "read-non-nil-coding-system");
 #endif
--- a/src/config.h.in	Mon Aug 13 10:23:05 2007 +0200
+++ b/src/config.h.in	Mon Aug 13 10:23:51 2007 +0200
@@ -82,6 +82,9 @@
 /* If at first you don't succeed, try, try again. */
 /* #define LOSING_BYTECODE */

+/* Undefine on systems which don't have processes */
+#undef HAVE_UNIX_PROCESSES
+
 /* Does XEmacs support floating-point numbers? */
 #undef LISP_FLOAT_TYPE
--- a/src/conslots.h	Mon Aug 13 10:23:05 2007 +0200
+++ b/src/conslots.h	Mon Aug 13 10:23:51 2007 +0200
@@ -81,8 +81,10 @@
     /* Last anonymous kbd macro defined.  */
     MARKED_SLOT (last_kbd_macro);

+#ifdef HAVE_TTY
     /* ERASE character from stty settings.  */
     MARKED_SLOT (tty_erase_char);
+#endif

     /* Minibufferless frames on this console use this frame's minibuffer.  */
     MARKED_SLOT (default_minibuffer_frame);
--- a/src/console.c	Mon Aug 13 10:23:05 2007 +0200
+++ b/src/console.c	Mon Aug 13 10:23:51 2007 +0200
@@ -1291,7 +1291,9 @@
     console_local_flags.default_minibuffer_frame = always_local_resettable;
     console_local_flags.overriding_terminal_local_map =
       always_local_resettable;
+#ifdef HAVE_TTY
     console_local_flags.tty_erase_char = always_local_resettable;
+#endif

     console_local_flags.function_key_map = make_int (1);

@@ -1328,6 +1330,7 @@
 \[#<keypress-event f1> #<keypress-event x>].
 */ );

+#ifdef HAVE_TTY
   /* ### Should this somehow go to TTY data?  How do we make it
      accessible from Lisp, then?  */
   DEFVAR_CONSOLE_LOCAL ("tty-erase-char", tty_erase_char /*
@@ -1335,9 +1338,10 @@
 When this value cannot be determined or would be meaningless (on non-TTY
 consoles, for example), it is set to nil.
 */ );
+#endif

   /* While this should be CONST it can't be because some things
-     (i.e. edebug) do maninpulate it. */
+     (i.e. edebug) do manipulate it. */
   DEFVAR_CONSOLE_LOCAL ("defining-kbd-macro", defining_kbd_macro /*
 Non-nil while a console macro is being defined.  Don't set this!
 */ );
--- a/src/eldap.c	Mon Aug 13 10:23:05 2007 +0200
+++ b/src/eldap.c	Mon Aug 13 10:23:51 2007 +0200
@@ -59,7 +59,6 @@
 /* Search scope limits */
 static Lisp_Object Qbase, Qonelevel, Qsubtree;
 /* Authentication methods */
-static Lisp_Object Qsimple;
 #ifdef LDAP_AUTH_KRBV41
 static Lisp_Object Qkrbv41;
 #endif
@@ -67,7 +66,7 @@
 static Lisp_Object Qkrbv42;
 #endif
 /* Deref policy */
-static Lisp_Object Qnever, Qalways, Qsearch, Qfind;
+static Lisp_Object Qnever, Qalways, Qfind;

 DEFUN ("ldap-search-internal", Fldap_search_internal, 1, 1, 0, /*
 Perform a search on a LDAP server.
@@ -430,7 +429,6 @@
   defsymbol (&Qbase, "base");
   defsymbol (&Qonelevel, "onelevel");
   defsymbol (&Qsubtree, "subtree");
-  defsymbol (&Qsimple, "simple");
 #ifdef LDAP_AUTH_KRBV41
   defsymbol (&Qkrbv41, "krbv41");
 #endif
@@ -439,7 +437,6 @@
 #endif
   defsymbol (&Qnever, "never");
   defsymbol (&Qalways, "always");
-  defsymbol (&Qsearch, "search");
   defsymbol (&Qfind, "find");
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/eldap.h	Mon Aug 13 10:23:51 2007 +0200
@@ -0,0 +1,39 @@
+/* Definitions for the LDAP client interface for XEmacs.
+   Copyright (C) ***FIXME***
+
+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.  */
+
+/* Synched up with: Not in FSF. */
+
+/* Author: Oscar Figueiredo */
+
+
+#ifndef _XEMACS_ELDAP_H_
+#define _XEMACS_ELDAP_H_
+
+#ifdef HAVE_LDAP
+
+#ifdef emacs
+
+Lisp_Object Fldap_search_internal (Lisp_Object search_plist);
+
+#endif /* emacs */
+
+#endif /* HAVE_LDAP */
+
+#endif /* _XEMACS_ELDAP_H_ */
--- a/src/events.c	Mon Aug 13 10:23:05 2007 +0200
+++ b/src/events.c	Mon Aug 13 10:23:51 2007 +0200
@@ -1000,17 +1000,23 @@
 	case 'J': k = QKlinefeed; m &= ~MOD_CONTROL; break;
 	case 'M': k = QKreturn;	  m &= ~MOD_CONTROL; break;
 	case '[': k = QKescape;	  m &= ~MOD_CONTROL; break;
+#ifdef HAVE_TTY
 	default:
-	  if (c - '@' == XCHAR(con->tty_erase_char)) {
+	  if (CHARP (con->tty_erase_char) &&
+	      c - '@' == XCHAR (con->tty_erase_char)) {
 	    k = QKbackspace;
 	    m &= ~MOD_CONTROL;
 	  }
 	  break;
+#endif
 	}
       if (c >= 'A' && c <= 'Z') c -= 'A'-'a';
     }
-  else if (c == XCHAR(con->tty_erase_char))
+#ifdef HAVE_TTY
+  else if (CHARP (con->tty_erase_char) &&
+	   c == XCHAR(con->tty_erase_char))
     k = QKbackspace;
+#endif
   else if (c == 127)
     k = QKdelete;
   else if (c == ' ')
--- a/src/file-coding.c	Mon Aug 13 10:23:05 2007 +0200
+++ b/src/file-coding.c	Mon Aug 13 10:23:51 2007 +0200
@@ -360,9 +360,8 @@
   Lisp_Object codesys_obj = Qnil;
   int len = string_length (XSYMBOL (CODING_SYSTEM_NAME (codesys))->name);
   char *codesys_name = (char *) alloca (len + 7);
-
-  int mlen = XSTRING_LENGTH(CODING_SYSTEM_MNEMONIC (codesys));
-  char *codesys_mnemonic = (char *) alloca (mlen + 7);
+  int mlen = -1;
+  char *codesys_mnemonic;

   Lisp_Object codesys_name_sym, sub_codesys_obj;

@@ -373,16 +372,24 @@
   memcpy (codesys_name,
 	  string_data (XSYMBOL (CODING_SYSTEM_NAME (codesys))->name), len);

-  memcpy (codesys_mnemonic,
-	  XSTRING_DATA (CODING_SYSTEM_MNEMONIC (codesys)), mlen);
+  if (STRINGP (CODING_SYSTEM_MNEMONIC (codesys)))
+    {
+      mlen = XSTRING_LENGTH(CODING_SYSTEM_MNEMONIC (codesys));
+      codesys_mnemonic = (char *) alloca (mlen + 7);
+      memcpy (codesys_mnemonic,
+	      XSTRING_DATA (CODING_SYSTEM_MNEMONIC (codesys)), mlen);
+    }

 #define DEFINE_SUB_CODESYS(op_sys, op_sys_abbr, Type) do {	\
     strcpy (codesys_name + len, "-" op_sys);	\
-    strcpy (codesys_mnemonic + mlen, op_sys_abbr);	\
+    if (mlen != -1) \
+      strcpy (codesys_mnemonic + mlen, op_sys_abbr);	\
     codesys_name_sym = intern (codesys_name);	\
     sub_codesys_obj = Fcopy_coding_system (codesys_obj, codesys_name_sym); \
     XCODING_SYSTEM_EOL_TYPE (sub_codesys_obj) = Type; \
-    XCODING_SYSTEM_MNEMONIC(sub_codesys_obj) = build_string(codesys_mnemonic); \
+    if (mlen != -1) \
+      XCODING_SYSTEM_MNEMONIC(sub_codesys_obj) = \
+	build_string(codesys_mnemonic); \
     CODING_SYSTEM_##Type (codesys) = sub_codesys_obj; \
 } while (0)

@@ -516,6 +523,7 @@
   CODING_SYSTEM_EOL_CR   (codesys) = Qnil;
   CODING_SYSTEM_EOL_LF   (codesys) = Qnil;
   CODING_SYSTEM_TYPE     (codesys) = type;
+  CODING_SYSTEM_MNEMONIC (codesys) = Qnil;
 #ifdef MULE
   if (type == CODESYS_ISO2022)
     {
@@ -4718,7 +4726,6 @@
 	     "shift-jis");
   defsymbol (&coding_category_symbol[CODING_CATEGORY_BIG5],
 	     "big5");
-#endif /* MULE */
   defsymbol (&coding_category_symbol[CODING_CATEGORY_ISO_7],
 	     "iso-7");
   defsymbol (&coding_category_symbol[CODING_CATEGORY_ISO_8_DESIGNATE],
@@ -4729,6 +4736,7 @@
 	     "iso-8-2");
   defsymbol (&coding_category_symbol[CODING_CATEGORY_ISO_LOCK_SHIFT],
 	     "iso-lock-shift");
+#endif /* MULE */
   defsymbol (&coding_category_symbol[CODING_CATEGORY_NO_CONVERSION],
 	     "no-conversion");
 }
--- a/src/file-coding.h	Mon Aug 13 10:23:05 2007 +0200
+++ b/src/file-coding.h	Mon Aug 13 10:23:51 2007 +0200
@@ -372,6 +372,7 @@
 /* For detecting the encoding of text */
 enum coding_category_type
 {
+#ifdef MULE
   CODING_CATEGORY_SHIFT_JIS,
   CODING_CATEGORY_ISO_7, /* ISO2022 system using only seven-bit bytes,
 			    no locking shift */
@@ -386,6 +387,7 @@
 			      two-dimension characters in the upper half. */
   CODING_CATEGORY_ISO_LOCK_SHIFT, /* ISO2022 system using locking shift */
   CODING_CATEGORY_BIG5,
+#endif /* MULE */
   CODING_CATEGORY_NO_CONVERSION
 };
--- a/src/menubar.c	Mon Aug 13 10:23:05 2007 +0200
+++ b/src/menubar.c	Mon Aug 13 10:23:51 2007 +0200
@@ -151,11 +151,22 @@
        (desc, path))
 {
   Lisp_Object path_entry, submenu_desc, submenu;
+  Lisp_Object *gui_item_array;
   struct gcpro gcpro1;
   struct gui_item gui_item;

   gui_item_init (&gui_item);
-  GCPRO1 (gui_item);
+
+  /*
+   * gui_item is a struct containing a bunch of Lisp_Object
+   * members.  We need to GC-protect all the member slots.
+   * Rather than build a long chain of individual gcpro structs
+   * that protect the slots individually, we protect all the
+   * member slots by pretending the struct is an array.  ANSI C
+   * requires tihs hack to work, ugly though it is.
+   */
+  gui_item_array = (Lisp_Object *) &gui_item;
+  GCPRO1 (gui_item_array[0]);
   gcpro1.nvars = GUI_ITEM_GCPRO_COUNT;

   EXTERNAL_LIST_LOOP (path_entry, path)
--- a/src/symsinit.h	Mon Aug 13 10:23:05 2007 +0200
+++ b/src/symsinit.h	Mon Aug 13 10:23:51 2007 +0200
@@ -284,7 +284,7 @@
 void vars_of_undo (void);
 void vars_of_window (void);
 void vars_of_xselect (void);
-void vars_of_ldap (void);
+void vars_of_eldap (void);

 /* Initialize specifier variables (dump-time only). */
--- a/version.sh	Mon Aug 13 10:23:05 2007 +0200
+++ b/version.sh	Mon Aug 13 10:23:51 2007 +0200
@@ -1,5 +1,5 @@
 #!/bin/sh
 emacs_major_version=20
 emacs_minor_version=5
-emacs_beta_version=28
-xemacs_codename="LaMancha"
+emacs_beta_version=29
+xemacs_codename="Loashan"