# This is a patch for xemacs-21.4.5 to update it to xemacs-21.4.6
# 
# To apply this patch:
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'applypatch' program with this patch file as input.
#
# If you do not have 'applypatch', it is part of the 'makepatch' package
# that you can fetch from the Comprehensive Perl Archive Network:
# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz
# In the above URL, 'x' should be 2 or higher.
#
# To apply this patch without the use of 'applypatch':
# STEP 1: Chdir to the source directory.
# If you have a decent Bourne-type shell:
# STEP 2: Run the shell with this file as input.
# If you don't have such a shell, you may need to manually create
# the files as shown below.
# STEP 3: Run the 'patch' program with this file as input.
#
# These are the commands needed to create/delete files/directories:
#
touch './man/lispref/packaging.texi'
chmod 0644 './man/lispref/packaging.texi'
touch './netinstall/init.cc'
chmod 0644 './netinstall/init.cc'
touch './netinstall/uninstall.cc'
chmod 0644 './netinstall/uninstall.cc'
#
# This command terminates the shell and need not be executed manually.
exit
#
#### End of Preamble ####

#### Patch data follows ####
diff --text -u 'xemacs-21.4.5/CHANGES-release' 'xemacs-21.4.6/CHANGES-release'
Index: ././CHANGES-release
--- ././CHANGES-release	Tue Oct 23 17:50:45 2001
+++ ././CHANGES-release	Mon Dec 17 15:27:04 2001
@@ -22,6 +22,52 @@
 For more details, including developers involved and dates, see the
 ChangeLogs, or use CVS diff to view the patches.
 
+to XEmacs 21.4.6 "Common Lisp"
+
+  - Changing coding system marks buffer as modified.
+  - More file/directory dialogs available on Windows.
+  - In replace-regexp, subexpression replacement supported.
+  - Motif bug causes intermittent crashes.  Patch Motif: see PROBLEMS.
+  - Common subexpression optimization caused an illegal pointer
+    reference in regexp replace; fixed.
+  - Autosave files are now saved in current coding system (where file
+    coding supported).  This resolves the "doubled escape" bug common
+    in Japanese mail files, but increases the chance that autosave
+    files will contain garbage (because the buffer contents cannot be
+    saved correctly in the current coding system).
+  - Failure to save certain customizations fixed.
+  - Ability to customize fonts improved, especially the "cannot
+    customize italic" bug
+  - Window loop now properly iterates over multiple devices; some
+    problems with wrong window being selected (eg, with gnuclient)
+    resolved.
+  - Certain infloops in password prompts, etc, fixed.
+  - Make space for symbols defined in modules in Lisp symbol tables
+  - Errors due to failure to conform to pop-up menu API in GTK fixed.
+  - Cygwin URL handling in shell calls fixed.
+  - Inability to select directories fixed.
+  - Initial VC.NET support.
+  - New node on "packaging" for library developers in Lispref.
+  - Fix incorrect ctime to Lisp conversion.
+  - HP-UX LDFLAGS fix.
+  - Many typo fixes and small documentation enhancements.
+  - New section of examples of glyph usage in Lispref.
+  - Make `truncate-partial-width-windows' effect buffer-local.
+  - Suppress bogus focus changes.
+  - Fix custom's handling of font size and family.
+  - Fix comboreloc crash (common on Linux when making first frame).
+  - Default --with-ipv6-cname=no.
+  - From 21.4.5 "Civil Service (Windows)":
+    - Fixed a scrollbar problem when selecting the frame with focus.
+    - Fixed `mswindows-shell-execute' under cygwin.
+    - Added a new function `mswindows-cygwin-to-win32-path' for JDE.
+    - Added support for dialog-based directory selection.
+    - The installer version has been updated to the 21.5 netinstaller.  The
+      21.5 installer now does proper dde file association and adds uninstall
+      capability.
+    - Handle leak fix from Mike Alexander.
+    - New release build script.
+
 to XEmacs 21.4.5 "Civil Service"
 
   - Now installs arch-specific files relative to $execdir, not $prefix.
diff --text -u 'xemacs-21.4.5/ChangeLog' 'xemacs-21.4.6/ChangeLog'
Index: ././ChangeLog
--- ././ChangeLog	Tue Oct 23 20:02:34 2001
+++ ././ChangeLog	Mon Dec 17 18:33:19 2001
@@ -1,3 +1,49 @@
+2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-04  Jan Vroonhof  <jan.vroonhof@ntlworld.com>
+
+	* etc/photos/jan.png: New photo.
+
+2001-11-21  Robert Pluim  <rpluim@bigfoot.com>
+
+	* PROBLEMS (Sun/Solaris): Document fix for Motif related crashes
+
+2001-12-15  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* configure.in (Miscellaneous Flags): test for -z nocombreloc,
+	instead of -z combreloc, to avoid confusing Solaris.
+
+2001-11-24  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* configure.usage: Makefile.in -> Makefile.in.in.
+
+2001-11-21  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* Makefile.in.in: HP-UX needs LDFLAGS.  From Lutz Jaenicke
+	<Lutz.Jaenicke@aet.TU-Cottbus.DE>.
+
+2001-11-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* configure.in: Fix typos in comments.
+	* (Miscellaneous flags): Use -z nocombreloc if supported and !pdump.
+	* (Installation): Suggest pdump instead of -z nocomboreloc.
+	* configure.usage: Document --quick-build.
+
+2001-10-30  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* configure.in: Typo in reference to with_ipv6_cname.
+
+2001-10-30  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* configure.in: Initialize with_ipv6_cname=no.
+	* configure.usage: Document it.
+
 2001-10-23  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.5 "Civil Service" is released.
diff --text -u 'xemacs-21.4.5/Makefile.in.in' 'xemacs-21.4.6/Makefile.in.in'
Index: ././Makefile.in.in
--- ././Makefile.in.in	Fri Apr 13 03:20:32 2001
+++ ././Makefile.in.in	Mon Dec 17 15:27:04 2001
@@ -74,6 +74,7 @@
 LN_S=@LN_S@
 CFLAGS=@CFLAGS@
 CPPFLAGS=@CPPFLAGS@
+LDFLAGS=@LDFLAGS@
 
 ## These help us choose version- and architecture-specific directories
 ## to install files in.
diff --text -u 'xemacs-21.4.5/PROBLEMS' 'xemacs-21.4.6/PROBLEMS'
Index: ././PROBLEMS
--- ././PROBLEMS	Tue Oct 23 17:50:46 2001
+++ ././PROBLEMS	Mon Dec 17 15:27:04 2001
@@ -187,6 +187,33 @@
 
 
 ** SunOS/Solaris
+*** Crashes when using Motif libraries, especially with multiple frames.
+
+Crashes that produce C-backtraces like this:
+
+#0  0xfec9a118 in _libc_kill () from /usr/lib/libc.so.1
+#1  0x77f48 in fatal_error_signal (sig=11)
+    at /codes/rpluim/xemacs-21.4/src/emacs.c:539
+#2  <signal handler called>
+#3  0xfee929f4 in XFindContext () from /usr/openwin/lib/libX11.so.4
+#4  0xfee92930 in XFindContext () from /usr/openwin/lib/libX11.so.4
+#5  0xff297e54 in DisplayDestroy () from /usr/dt/lib/libXm.so.4
+#6  0xfefbece0 in XtCallCallbackList () from /usr/openwin/lib/libXt.so.4
+#7  0xfefc486c in XtPhase2Destroy () from /usr/openwin/lib/libXt.so.4
+#8  0xfefc45d0 in _XtDoPhase2Destroy () from /usr/openwin/lib/libXt.so.4
+#9  0xfefc43b4 in XtDestroyWidget () from /usr/openwin/lib/libXt.so.4
+#10 0x15cf9c in x_delete_device (d=0x523f00)
+
+are caused by buggy Motif libraries.  Installing the following patches
+has been reported to solve the problem on Solaris 2.7:
+
+107081-40 107656-07
+
+For information (although they have not been confirmed to work), the
+equivalent patches for Solaris 2.8 are:
+
+108940-33 108652-25
+
 *** Dumping error when using GNU binutils / GNU ld on a Sun.
 
 Errors similar to the following:
diff --text -u 'xemacs-21.4.5/configure' 'xemacs-21.4.6/configure'
Index: ././configure
--- ././configure	Tue Oct 23 17:50:46 2001
+++ ././configure	Mon Dec 17 18:22:18 2001
@@ -259,7 +259,7 @@
 with_dnet=""
 pdump="no"
 with_dragndrop="no"
-with_ipv6_cname="yes"
+with_ipv6_cname="no"
 
 
 
@@ -4977,8 +4977,9 @@
     c_switch_site="$c_switch_site -threads" ;;
 esac
 
+
 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:4982: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:4983: 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;
@@ -4990,7 +4991,7 @@
 if test "$opsys" = "sol2"; then
   if test "$os_release" -ge 56; then
     echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:4994: checking for \"-z ignore\" linker flag" >&5
+echo "configure:4995: 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 ;;
@@ -4999,9 +5000,19 @@
   fi
 fi
 
+if test "$pdump" != "yes"; then
+  echo $ac_n "checking for \"-z nocombreloc\" linker flag""... $ac_c" 1>&6
+echo "configure:5006: checking for \"-z nocombreloc\" linker flag" >&5
+  case "`ld --help 2>&1`" in
+    *-z\ nocombreloc* ) echo "$ac_t""yes" 1>&6
+      ld_switch_site="-z nocombreloc $ld_switch_site" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-z nocombreloc\" to \$ld_switch_site"; fi ;;
+    *) echo "$ac_t""no" 1>&6 ;;
+  esac
+fi
+
 
 echo "checking "for specified window system"" 1>&6
-echo "configure:5005: checking "for specified window system"" >&5
+echo "configure:5016: checking "for specified window system"" >&5
 
 
 GNOME_CONFIG=no
@@ -5009,7 +5020,7 @@
 
 if test "$with_gnome" != "no"; then
    echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6
-echo "configure:5013: checking for GNOME configuration script" >&5
+echo "configure:5024: checking for GNOME configuration script" >&5
    for possible in gnome-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5040,7 +5051,7 @@
 
 if test "$with_gtk" != "no";then
    echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6
-echo "configure:5044: checking for GTK configuration script" >&5
+echo "configure:5055: checking for GTK configuration script" >&5
    for possible in gtk12-config gtk14-config gtk-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5062,37 +5073,37 @@
 
 if test "${GTK_CONFIG}" != "no"; then
       echo $ac_n "checking gtk version""... $ac_c" 1>&6
-echo "configure:5066: checking gtk version" >&5
+echo "configure:5077: checking gtk version" >&5
       GTK_VERSION=`${GTK_CONFIG} --version`
       echo "$ac_t""${GTK_VERSION}" 1>&6
 
       echo $ac_n "checking gtk libs""... $ac_c" 1>&6
-echo "configure:5071: checking gtk libs" >&5
+echo "configure:5082: checking gtk libs" >&5
       GTK_LIBS=`${GTK_CONFIG} --libs`
       libs_gtk="$libs_gtk ${GTK_LIBS}" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"${GTK_LIBS}\" to \$libs_gtk"; fi
       echo "$ac_t""${GTK_LIBS}" 1>&6
 
       echo $ac_n "checking gtk cflags""... $ac_c" 1>&6
-echo "configure:5077: checking gtk cflags" >&5
+echo "configure:5088: checking gtk cflags" >&5
       GTK_CFLAGS=`${GTK_CONFIG} --cflags`
       c_switch_gtk="$c_switch_gtk ${GTK_CFLAGS}" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"${GTK_CFLAGS}\" to \$c_switch_gtk"; fi
       echo "$ac_t""${GTK_CFLAGS}" 1>&6
 
       
 echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6
-echo "configure:5084: checking for main in -lgdk_imlib" >&5
+echo "configure:5095: checking for main in -lgdk_imlib" >&5
 ac_lib_var=`echo gdk_imlib'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgdk_imlib "
 cat > conftest.$ac_ext <<EOF
-#line 5089 "configure"
+#line 5100 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5114,12 +5125,12 @@
 
       
 echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6
-echo "configure:5118: checking for Imlib_init in -lImlib" >&5
+echo "configure:5129: checking for Imlib_init in -lImlib" >&5
 ac_lib_var=`echo Imlib'_'Imlib_init | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lImlib "
 cat > conftest.$ac_ext <<EOF
-#line 5123 "configure"
+#line 5134 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5130,7 +5141,7 @@
 Imlib_init()
 ; return 0; }
 EOF
-if { (eval echo configure:5134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5153,10 +5164,10 @@
       for ac_func in gdk_imlib_init
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5157: checking for $ac_func" >&5
+echo "configure:5168: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5160 "configure"
+#line 5171 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5179,7 +5190,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5258,15 +5269,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5262: checking for $ac_hdr" >&5
+echo "configure:5273: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5265 "configure"
+#line 5276 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5297,19 +5308,19 @@
 
       
 echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6
-echo "configure:5301: checking for main in -lxml" >&5
+echo "configure:5312: checking for main in -lxml" >&5
 ac_lib_var=`echo xml'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lxml "
 cat > conftest.$ac_ext <<EOF
-#line 5306 "configure"
+#line 5317 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5331,19 +5342,19 @@
 
       
 echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6
-echo "configure:5335: checking for main in -lglade" >&5
+echo "configure:5346: checking for main in -lglade" >&5
 ac_lib_var=`echo glade'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lglade "
 cat > conftest.$ac_ext <<EOF
-#line 5340 "configure"
+#line 5351 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5365,19 +5376,19 @@
 
       
 echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6
-echo "configure:5369: checking for main in -lglade-gnome" >&5
+echo "configure:5380: checking for main in -lglade-gnome" >&5
 ac_lib_var=`echo glade-gnome'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lglade-gnome "
 cat > conftest.$ac_ext <<EOF
-#line 5374 "configure"
+#line 5385 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5398,7 +5409,7 @@
 
 
       cat > conftest.$ac_ext <<EOF
-#line 5402 "configure"
+#line 5413 "configure"
 #include "confdefs.h"
 #include <glade/glade-xml.h>
 EOF
@@ -5457,7 +5468,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:5461: checking for X" >&5
+echo "configure:5472: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -5517,12 +5528,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 5521 "configure"
+#line 5532 "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:5526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5537: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5591,14 +5602,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5595 "configure"
+#line 5606 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:5602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -5707,17 +5718,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:5711: checking whether -R must be followed by a space" >&5
+echo "configure:5722: 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 5714 "configure"
+#line 5725 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -5733,14 +5744,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 5737 "configure"
+#line 5748 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -5776,12 +5787,12 @@
 else
 
 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:5780: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:5791: 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 5785 "configure"
+#line 5796 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5792,7 +5803,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5816,12 +5827,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:5820: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:5831: 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 5825 "configure"
+#line 5836 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5832,7 +5843,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5861,10 +5872,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:5865: checking for gethostbyname" >&5
+echo "configure:5876: checking for gethostbyname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5868 "configure"
+#line 5879 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -5887,7 +5898,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -5908,12 +5919,12 @@
     if test $ac_cv_func_gethostbyname = no; then
       
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:5912: checking for gethostbyname in -lnsl" >&5
+echo "configure:5923: 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 5917 "configure"
+#line 5928 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5924,7 +5935,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:5928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5954,10 +5965,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:5958: checking for connect" >&5
+echo "configure:5969: checking for connect" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5961 "configure"
+#line 5972 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -5980,7 +5991,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -6003,12 +6014,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:6007: checking "$xe_msg_checking"" >&5
+echo "configure:6018: 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 6012 "configure"
+#line 6023 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6019,7 +6030,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:6023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6043,10 +6054,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:6047: checking for remove" >&5
+echo "configure:6058: checking for remove" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6050 "configure"
+#line 6061 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -6069,7 +6080,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -6090,12 +6101,12 @@
     if test $ac_cv_func_remove = no; then
       
 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:6094: checking for remove in -lposix" >&5
+echo "configure:6105: 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 6099 "configure"
+#line 6110 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6106,7 +6117,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:6110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6130,10 +6141,10 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:6134: checking for shmat" >&5
+echo "configure:6145: checking for shmat" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6137 "configure"
+#line 6148 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -6156,7 +6167,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -6177,12 +6188,12 @@
     if test $ac_cv_func_shmat = no; then
       
 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:6181: checking for shmat in -lipc" >&5
+echo "configure:6192: 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 6186 "configure"
+#line 6197 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6193,7 +6204,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:6197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6229,12 +6240,12 @@
 xe_msg_checking="for IceConnectionNumber in -lICE"
 test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6233: checking "$xe_msg_checking"" >&5
+echo "configure:6244: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lICE $X_EXTRA_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6238 "configure"
+#line 6249 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6245,7 +6256,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:6249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6412,7 +6423,7 @@
 
 
     echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:6416: checking for X defines extracted by xmkmf" >&5
+echo "configure:6427: checking for X defines extracted by xmkmf" >&5
   rm -fr conftestdir
   if mkdir conftestdir; then
     cd conftestdir
@@ -6461,15 +6472,15 @@
 
     ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:6465: checking for X11/Intrinsic.h" >&5
+echo "configure:6476: checking for X11/Intrinsic.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6468 "configure"
+#line 6479 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6493,12 +6504,12 @@
 
       
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:6497: checking for XOpenDisplay in -lX11" >&5
+echo "configure:6508: 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 6502 "configure"
+#line 6513 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6509,7 +6520,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6534,12 +6545,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:6538: checking "$xe_msg_checking"" >&5
+echo "configure:6549: 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 6543 "configure"
+#line 6554 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6550,7 +6561,7 @@
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:6554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6577,12 +6588,12 @@
 
     
 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:6581: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:6592: 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 6586 "configure"
+#line 6597 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6593,7 +6604,7 @@
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:6597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6616,12 +6627,12 @@
 
     
 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:6620: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:6631: 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 6625 "configure"
+#line 6636 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6632,7 +6643,7 @@
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6655,14 +6666,14 @@
 
 
   echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:6659: checking the version of X11 being used" >&5
+echo "configure:6670: checking the version of X11 being used" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6661 "configure"
+#line 6672 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
     int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:6666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest foobar; x11_release=$?
 else
@@ -6693,10 +6704,10 @@
   for ac_func in XConvertCase
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6697: checking for $ac_func" >&5
+echo "configure:6708: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6700 "configure"
+#line 6711 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6719,7 +6730,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6751,15 +6762,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6755: checking for $ac_hdr" >&5
+echo "configure:6766: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6758 "configure"
+#line 6769 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6774: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6792,10 +6803,10 @@
     for ac_func in XRegisterIMInstantiateCallback
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6796: checking for $ac_func" >&5
+echo "configure:6807: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6799 "configure"
+#line 6810 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6818,7 +6829,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6846,9 +6857,9 @@
 done
 
   echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6
-echo "configure:6850: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+echo "configure:6861: checking for standard XRegisterIMInstantiateCallback prototype" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6852 "configure"
+#line 6863 "configure"
 #include "confdefs.h"
 
 #define NeedFunctionPrototypes 1
@@ -6860,7 +6871,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6875: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -6881,12 +6892,12 @@
 
     test -z "$with_xmu" && { 
 echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:6885: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:6896: 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 6890 "configure"
+#line 6901 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6897,7 +6908,7 @@
 XmuReadBitmapDataFromFile()
 ; return 0; }
 EOF
-if { (eval echo configure:6901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6936,19 +6947,19 @@
 
       
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:6940: checking for main in -lXbsd" >&5
+echo "configure:6951: 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 6945 "configure"
+#line 6956 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:6952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6985,22 +6996,22 @@
 fi 
 if test "$with_msw" != "no"; then
   echo "checking for MS-Windows" 1>&6
-echo "configure:6989: checking for MS-Windows" >&5
+echo "configure:7000: checking for MS-Windows" >&5
   
 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:6992: checking for main in -lgdi32" >&5
+echo "configure:7003: 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 6997 "configure"
+#line 7008 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7073,12 +7084,12 @@
  fi
     fi
         cat > conftest.$ac_ext <<EOF
-#line 7077 "configure"
+#line 7088 "configure"
 #include "confdefs.h"
 #include <fcntl.h>
     int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
 EOF
-if { (eval echo configure:7082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   need_event_unixoid=yes; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MSG_SELECT
@@ -7142,15 +7153,15 @@
 if test "$with_x11" = "yes"; then
   ac_safe=`echo "X11/extensions/shape.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6
-echo "configure:7146: checking for X11/extensions/shape.h" >&5
+echo "configure:7157: checking for X11/extensions/shape.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7149 "configure"
+#line 7160 "configure"
 #include "confdefs.h"
 #include <X11/extensions/shape.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7154: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7202,7 +7213,7 @@
 esac
 
 echo "checking for WM_COMMAND option" 1>&6
-echo "configure:7206: checking for WM_COMMAND option" >&5;
+echo "configure:7217: checking for WM_COMMAND option" >&5;
 if test "$with_wmcommand" != "no"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_WMCOMMAND
@@ -7217,15 +7228,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:7221: checking for X11/Xauth.h" >&5
+echo "configure:7232: checking for X11/Xauth.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7224 "configure"
+#line 7235 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7248,12 +7259,12 @@
  }
 test -z "$with_xauth" && { 
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:7252: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:7263: 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 7257 "configure"
+#line 7268 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7264,7 +7275,7 @@
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:7268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7309,15 +7320,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:7313: checking for ${dir}tt_c.h" >&5
+echo "configure:7324: checking for ${dir}tt_c.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7316 "configure"
+#line 7327 "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:7321: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7332: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7353,12 +7364,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:7357: checking "$xe_msg_checking"" >&5
+echo "configure:7368: 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 7362 "configure"
+#line 7373 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7369,7 +7380,7 @@
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:7373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7426,15 +7437,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:7430: checking for Dt/Dt.h" >&5
+echo "configure:7441: checking for Dt/Dt.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7433 "configure"
+#line 7444 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7449: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7457,12 +7468,12 @@
  }
 test -z "$with_cde" && { 
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:7461: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:7472: 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 7466 "configure"
+#line 7477 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7473,7 +7484,7 @@
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:7477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7546,7 +7557,7 @@
 
 if test "$with_dragndrop" != "no" ; then
   echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
-echo "configure:7550: checking if drag and drop API is needed" >&5
+echo "configure:7561: checking if drag and drop API is needed" >&5
   if test -n "$dragndrop_proto" ; then
     with_dragndrop=yes
     echo "$ac_t""yes (${dragndrop_proto} )" 1>&6
@@ -7566,18 +7577,18 @@
 fi
 
 echo "checking for LDAP" 1>&6
-echo "configure:7570: checking for LDAP" >&5
+echo "configure:7581: 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:7573: checking for ldap.h" >&5
+echo "configure:7584: checking for ldap.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7576 "configure"
+#line 7587 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7581: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7600,15 +7611,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:7604: checking for lber.h" >&5
+echo "configure:7615: checking for lber.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7607 "configure"
+#line 7618 "configure"
 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7632,12 +7643,12 @@
 if test "$with_ldap" != "no"; then
   
 echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
-echo "configure:7636: checking for ldap_search in -lldap" >&5
+echo "configure:7647: checking for ldap_search in -lldap" >&5
 ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap "
 cat > conftest.$ac_ext <<EOF
-#line 7641 "configure"
+#line 7652 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7648,7 +7659,7 @@
 ldap_search()
 ; return 0; }
 EOF
-if { (eval echo configure:7652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7673,12 +7684,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:7677: checking "$xe_msg_checking"" >&5
+echo "configure:7688: 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 7682 "configure"
+#line 7693 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7689,7 +7700,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7714,12 +7725,12 @@
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber -lkrb" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7718: checking "$xe_msg_checking"" >&5
+echo "configure:7729: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap -llber -lkrb"
 cat > conftest.$ac_ext <<EOF
-#line 7723 "configure"
+#line 7734 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7730,7 +7741,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7755,12 +7766,12 @@
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber -lkrb -ldes" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb -ldes"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7759: checking "$xe_msg_checking"" >&5
+echo "configure:7770: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap -llber -lkrb -ldes"
 cat > conftest.$ac_ext <<EOF
-#line 7764 "configure"
+#line 7775 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7771,7 +7782,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7822,10 +7833,10 @@
   for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7826: checking for $ac_func" >&5
+echo "configure:7837: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7829 "configure"
+#line 7840 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7848,7 +7859,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7879,20 +7890,20 @@
 
 if test "$with_postgresql" != "no"; then
   echo "checking for PostgreSQL" 1>&6
-echo "configure:7883: checking for PostgreSQL" >&5
+echo "configure:7894: checking for PostgreSQL" >&5
 
   for header_dir in "" "pgsql/" "postgresql/"; do
     ac_safe=`echo "${header_dir}libpq-fe.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${header_dir}libpq-fe.h""... $ac_c" 1>&6
-echo "configure:7888: checking for ${header_dir}libpq-fe.h" >&5
+echo "configure:7899: checking for ${header_dir}libpq-fe.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7891 "configure"
+#line 7902 "configure"
 #include "confdefs.h"
 #include <${header_dir}libpq-fe.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7916,12 +7927,12 @@
 
   test -n "$libpq_fe_h_file" && { 
 echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:7920: checking for PQconnectdb in -lpq" >&5
+echo "configure:7931: checking for PQconnectdb in -lpq" >&5
 ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpq "
 cat > conftest.$ac_ext <<EOF
-#line 7925 "configure"
+#line 7936 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7932,7 +7943,7 @@
 PQconnectdb()
 ; return 0; }
 EOF
-if { (eval echo configure:7936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7965,12 +7976,12 @@
 
     
 echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
-echo "configure:7969: checking for PQconnectStart in -lpq" >&5
+echo "configure:7980: checking for PQconnectStart in -lpq" >&5
 ac_lib_var=`echo pq'_'PQconnectStart | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpq "
 cat > conftest.$ac_ext <<EOF
-#line 7974 "configure"
+#line 7985 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7981,7 +7992,7 @@
 PQconnectStart()
 ; return 0; }
 EOF
-if { (eval echo configure:7985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8029,7 +8040,7 @@
 
 if test "$window_system" != "none"; then
   echo "checking for graphics libraries" 1>&6
-echo "configure:8033: checking for graphics libraries" >&5
+echo "configure:8044: checking for graphics libraries" >&5
 
       libpath_xpm=
   incpath_xpm=
@@ -8055,10 +8066,10 @@
     CFLAGS=""$incpath_xpm" $CFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
     LDFLAGS=""$libpath_xpm" $LDFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
     echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:8059: checking for Xpm - no older than 3.4f" >&5
+echo "configure:8070: checking for Xpm - no older than 3.4f" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 8062 "configure"
+#line 8073 "configure"
 #include "confdefs.h"
 #define XPM_NUMBERS
 #include <X11/xpm.h>
@@ -8067,7 +8078,7 @@
       XpmIncludeVersion != XpmLibraryVersion() ? 1 :
       XpmIncludeVersion < 30406 ? 2 : 0 ;}
 EOF
-if { (eval echo configure:8071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest dummy_arg; xpm_status=$?;
       if test "$xpm_status" = "0"; then
@@ -8111,17 +8122,17 @@
     libs_x="-lXpm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXpm\" to \$libs_x"; fi
     CFLAGS=""$incpath_xpm" $CFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
     echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6
-echo "configure:8115: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:8126: checking for \"FOR_MSW\" xpm" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 8118 "configure"
+#line 8129 "configure"
 #include "confdefs.h"
 
 int main() {
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:8125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   xpm_for_msw=no
 else
@@ -8147,15 +8158,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:8151: checking for compface.h" >&5
+echo "configure:8162: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8154 "configure"
+#line 8165 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8178,12 +8189,12 @@
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8182: checking for UnGenFace in -lcompface" >&5
+echo "configure:8193: 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 8187 "configure"
+#line 8198 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8194,7 +8205,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:8198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8246,12 +8257,12 @@
       if test "$with_png $with_tiff" != "no no"; then
     
 echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
-echo "configure:8250: checking for inflate in -lc" >&5
+echo "configure:8261: checking for inflate in -lc" >&5
 ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lc "
 cat > conftest.$ac_ext <<EOF
-#line 8255 "configure"
+#line 8266 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8262,7 +8273,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8281,12 +8292,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:8285: checking for inflate in -lz" >&5
+echo "configure:8296: checking for inflate in -lz" >&5
 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lz "
 cat > conftest.$ac_ext <<EOF
-#line 8290 "configure"
+#line 8301 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8297,7 +8308,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8316,12 +8327,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:8320: checking for inflate in -lgz" >&5
+echo "configure:8331: checking for inflate in -lgz" >&5
 ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgz "
 cat > conftest.$ac_ext <<EOF
-#line 8325 "configure"
+#line 8336 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8332,7 +8343,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8362,15 +8373,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:8366: checking for jpeglib.h" >&5
+echo "configure:8377: checking for jpeglib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8369 "configure"
+#line 8380 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8393,12 +8404,12 @@
  }
   test -z "$with_jpeg" && { 
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:8397: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:8408: 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 8402 "configure"
+#line 8413 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8409,7 +8420,7 @@
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:8413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8445,10 +8456,10 @@
 
     png_problem=""
   test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:8449: checking for pow" >&5
+echo "configure:8460: checking for pow" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8452 "configure"
+#line 8463 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pow(); below.  */
@@ -8471,7 +8482,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_pow=yes"
 else
@@ -8492,15 +8503,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:8496: checking for png.h" >&5
+echo "configure:8507: checking for png.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8499 "configure"
+#line 8510 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8515: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8523,12 +8534,12 @@
  }
   test -z "$with_png" && { 
 echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:8527: checking for png_read_image in -lpng" >&5
+echo "configure:8538: checking for png_read_image in -lpng" >&5
 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpng "
 cat > conftest.$ac_ext <<EOF
-#line 8532 "configure"
+#line 8543 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8539,7 +8550,7 @@
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:8543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8562,10 +8573,10 @@
  }
   if test -z "$with_png"; then
     echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:8566: checking for workable png version information" >&5
+echo "configure:8577: checking for workable png version information" >&5
     xe_check_libs="-lpng -lz"
     cat > conftest.$ac_ext <<EOF
-#line 8569 "configure"
+#line 8580 "configure"
 #include "confdefs.h"
 #include <png.h>
     int main(int c, char **v) {
@@ -8573,7 +8584,7 @@
     if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1;
     return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}
 EOF
-if { (eval echo configure:8577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest dummy_arg; png_status=$?;
       if test "$png_status" = "0"; then
@@ -8616,15 +8627,15 @@
 
     test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:8620: checking for tiffio.h" >&5
+echo "configure:8631: checking for tiffio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8623 "configure"
+#line 8634 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8647,12 +8658,12 @@
  }
   test -z "$with_tiff" && { 
 echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8651: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:8662: checking for TIFFClientOpen in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ltiff "
 cat > conftest.$ac_ext <<EOF
-#line 8656 "configure"
+#line 8667 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8663,7 +8674,7 @@
 TIFFClientOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:8667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8702,15 +8713,15 @@
 if test "$with_gtk" = "yes"; then
     test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:8706: checking for compface.h" >&5
+echo "configure:8717: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8709 "configure"
+#line 8720 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8714: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8733,12 +8744,12 @@
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8737: checking for UnGenFace in -lcompface" >&5
+echo "configure:8748: 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 8742 "configure"
+#line 8753 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8749,7 +8760,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:8753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8788,12 +8799,12 @@
 
 if test "$with_x11" = "yes"; then
   echo "checking for X11 graphics libraries" 1>&6
-echo "configure:8792: checking for X11 graphics libraries" >&5
+echo "configure:8803: checking for X11 graphics libraries" >&5
 fi
 
 if test "$with_x11" = "yes" -a "$with_widgets" = "athena"; then
   echo "checking for the Athena widgets" 1>&6
-echo "configure:8797: checking for the Athena widgets" >&5
+echo "configure:8808: checking for the Athena widgets" >&5
 
     case "$with_athena" in
         "xaw" | "")	athena_variant=Xaw	athena_3d=no  ;;
@@ -8807,12 +8818,12 @@
     if test "$athena_3d" = "no"; then
     
 echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8811: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:8822: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 8816 "configure"
+#line 8827 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8823,7 +8834,7 @@
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:8827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8839,12 +8850,12 @@
   echo "$ac_t""yes" 1>&6
           
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8843: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:8854: checking for threeDClassRec in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 8848 "configure"
+#line 8859 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8855,7 +8866,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8886,12 +8897,12 @@
   else
         
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8890: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:8901: checking for threeDClassRec in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 8895 "configure"
+#line 8906 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8902,7 +8913,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8920,12 +8931,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6
-echo "configure:8924: checking for threeDClassRec in -lXaw" >&5
+echo "configure:8935: checking for threeDClassRec in -lXaw" >&5
 ac_lib_var=`echo Xaw'_'threeDClassRec | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXaw "
 cat > conftest.$ac_ext <<EOF
-#line 8929 "configure"
+#line 8940 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8936,7 +8947,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8967,15 +8978,15 @@
     if test "$athena_3d" = "no"; then
     ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:8971: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:8982: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8974 "configure"
+#line 8985 "configure"
 #include "confdefs.h"
 #include <X11/Xaw/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8979: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8995,15 +9006,15 @@
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "X11/Xaw/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw/XawInit.h""... $ac_c" 1>&6
-echo "configure:8999: checking for X11/Xaw/XawInit.h" >&5
+echo "configure:9010: checking for X11/Xaw/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9002 "configure"
+#line 9013 "configure"
 #include "confdefs.h"
 #include <X11/Xaw/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9018: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9029,15 +9040,15 @@
   else
             ac_safe=`echo "X11/$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/$athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:9033: checking for X11/$athena_variant/XawInit.h" >&5
+echo "configure:9044: checking for X11/$athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9036 "configure"
+#line 9047 "configure"
 #include "confdefs.h"
 #include <X11/$athena_variant/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9054,15 +9065,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "X11/$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/$athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9058: checking for X11/$athena_variant/ThreeD.h" >&5
+echo "configure:9069: checking for X11/$athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9061 "configure"
+#line 9072 "configure"
 #include "confdefs.h"
 #include <X11/$athena_variant/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9090,15 +9101,15 @@
         if test -z "$athena_h_path"; then
       ac_safe=`echo "$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:9094: checking for $athena_variant/XawInit.h" >&5
+echo "configure:9105: checking for $athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9097 "configure"
+#line 9108 "configure"
 #include "confdefs.h"
 #include <$athena_variant/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9102: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9115,15 +9126,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9119: checking for $athena_variant/ThreeD.h" >&5
+echo "configure:9130: checking for $athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9122 "configure"
+#line 9133 "configure"
 #include "confdefs.h"
 #include <$athena_variant/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9138: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9152,15 +9163,15 @@
         if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
       ac_safe=`echo "X11/Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:9156: checking for X11/Xaw3d/XawInit.h" >&5
+echo "configure:9167: checking for X11/Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9159 "configure"
+#line 9170 "configure"
 #include "confdefs.h"
 #include <X11/Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9177,15 +9188,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "X11/Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9181: checking for X11/Xaw3d/ThreeD.h" >&5
+echo "configure:9192: checking for X11/Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9184 "configure"
+#line 9195 "configure"
 #include "confdefs.h"
 #include <X11/Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9217,15 +9228,15 @@
         if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
       ac_safe=`echo "Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:9221: checking for Xaw3d/XawInit.h" >&5
+echo "configure:9232: checking for Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9224 "configure"
+#line 9235 "configure"
 #include "confdefs.h"
 #include <Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9242,15 +9253,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9246: checking for Xaw3d/ThreeD.h" >&5
+echo "configure:9257: checking for Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9249 "configure"
+#line 9260 "configure"
 #include "confdefs.h"
 #include <Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9282,15 +9293,15 @@
             if test -z "$athena_h_path"; then
       ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9286: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:9297: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9289 "configure"
+#line 9300 "configure"
 #include "confdefs.h"
 #include <X11/Xaw/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9329,15 +9340,15 @@
 if test "$with_x11" = "yes"; then
     ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:9333: checking for Xm/Xm.h" >&5
+echo "configure:9344: checking for Xm/Xm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9336 "configure"
+#line 9347 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9354,12 +9365,12 @@
   echo "$ac_t""yes" 1>&6
   
 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:9358: checking for XmStringFree in -lXm" >&5
+echo "configure:9369: 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 9363 "configure"
+#line 9374 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9370,7 +9381,7 @@
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:9374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9399,9 +9410,9 @@
 
   if test "$have_motif" = "yes"; then
         echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:9403: checking for Lesstif" >&5
+echo "configure:9414: checking for Lesstif" >&5
     cat > conftest.$ac_ext <<EOF
-#line 9405 "configure"
+#line 9416 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 #ifdef LESSTIF_VERSION
@@ -9825,7 +9836,7 @@
 
 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
-echo "configure:9829: checking for Mule-related features" >&5
+echo "configure:9840: checking for Mule-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
@@ -9850,15 +9861,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9854: checking for $ac_hdr" >&5
+echo "configure:9865: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9857 "configure"
+#line 9868 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9889,12 +9900,12 @@
 
   
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:9893: checking for strerror in -lintl" >&5
+echo "configure:9904: 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 9898 "configure"
+#line 9909 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9905,7 +9916,7 @@
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:9909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9938,18 +9949,18 @@
 
 
   echo "checking for Mule input methods" 1>&6
-echo "configure:9942: checking for Mule input methods" >&5
+echo "configure:9953: checking for Mule input methods" >&5
         case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6
-echo "configure:9945: checking for XIM" >&5
+echo "configure:9956: checking for XIM" >&5
     
 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:9948: checking for XOpenIM in -lX11" >&5
+echo "configure:9959: checking for XOpenIM in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenIM | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 9953 "configure"
+#line 9964 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9960,7 +9971,7 @@
 XOpenIM()
 ; return 0; }
 EOF
-if { (eval echo configure:9964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9984,12 +9995,12 @@
         if test "$have_motif $have_lesstif" = "yes no"; then
       
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:9988: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:9999: 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 9993 "configure"
+#line 10004 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10000,7 +10011,7 @@
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:10004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10065,15 +10076,15 @@
 
     if test "$with_xfs" = "yes" ; then
     echo "checking for XFontSet" 1>&6
-echo "configure:10069: checking for XFontSet" >&5
+echo "configure:10080: checking for XFontSet" >&5
     
 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:10072: checking for XmbDrawString in -lX11" >&5
+echo "configure:10083: 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 10077 "configure"
+#line 10088 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10084,7 +10095,7 @@
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:10088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10124,15 +10135,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:10128: checking for wnn/jllib.h" >&5
+echo "configure:10139: checking for wnn/jllib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10131 "configure"
+#line 10142 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10155,15 +10166,15 @@
  }
     test -z "$with_wnn" && { ac_safe=`echo "wnn/commonhd.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for wnn/commonhd.h""... $ac_c" 1>&6
-echo "configure:10159: checking for wnn/commonhd.h" >&5
+echo "configure:10170: checking for wnn/commonhd.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10162 "configure"
+#line 10173 "configure"
 #include "confdefs.h"
 #include <wnn/commonhd.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10188,10 +10199,10 @@
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10192: checking for $ac_func" >&5
+echo "configure:10203: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10195 "configure"
+#line 10206 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10214,7 +10225,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10243,12 +10254,12 @@
 
     test "$ac_cv_func_crypt" != "yes" && { 
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:10247: checking for crypt in -lcrypt" >&5
+echo "configure:10258: 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 10252 "configure"
+#line 10263 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10259,7 +10270,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:10263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10294,12 +10305,12 @@
     if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
     
 echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6
-echo "configure:10298: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:10309: 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 10303 "configure"
+#line 10314 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10310,7 +10321,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10328,12 +10339,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6
-echo "configure:10332: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:10343: checking for jl_dic_list_e in -lwnn4" >&5
 ac_lib_var=`echo wnn4'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn4 "
 cat > conftest.$ac_ext <<EOF
-#line 10337 "configure"
+#line 10348 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10344,7 +10355,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10362,12 +10373,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6
-echo "configure:10366: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:10377: checking for jl_dic_list_e in -lwnn6" >&5
 ac_lib_var=`echo wnn6'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn6 "
 cat > conftest.$ac_ext <<EOF
-#line 10371 "configure"
+#line 10382 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10378,7 +10389,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10396,12 +10407,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6
-echo "configure:10400: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:10411: checking for dic_list_e in -lwnn6_fromsrc" >&5
 ac_lib_var=`echo wnn6_fromsrc'_'dic_list_e | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn6_fromsrc "
 cat > conftest.$ac_ext <<EOF
-#line 10405 "configure"
+#line 10416 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10412,7 +10423,7 @@
 dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10460,12 +10471,12 @@
     if test "$with_wnn6" != "no"; then
       
 echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6
-echo "configure:10464: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:10475: checking for jl_fi_dic_list in -l$libwnn" >&5
 ac_lib_var=`echo $libwnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$libwnn "
 cat > conftest.$ac_ext <<EOF
-#line 10469 "configure"
+#line 10480 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10476,7 +10487,7 @@
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:10480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10511,15 +10522,15 @@
   if test "$with_canna" != "no"; then
     ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:10515: checking for canna/jrkanji.h" >&5
+echo "configure:10526: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10518 "configure"
+#line 10529 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10546,15 +10557,15 @@
     c_switch_site="$c_switch_site -I/usr/local/canna/include"
     ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:10550: checking for canna/jrkanji.h" >&5
+echo "configure:10561: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10553 "configure"
+#line 10564 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10582,15 +10593,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:10586: checking for canna/RK.h" >&5
+echo "configure:10597: checking for canna/RK.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10589 "configure"
+#line 10600 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10613,12 +10624,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:10617: checking for RkBgnBun in -lRKC" >&5
+echo "configure:10628: 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 10622 "configure"
+#line 10633 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10629,7 +10640,7 @@
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:10633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10652,12 +10663,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:10656: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:10667: 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 10661 "configure"
+#line 10672 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10668,7 +10679,7 @@
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:10672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10717,12 +10728,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:10721: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:10732: 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 10726 "configure"
+#line 10737 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10733,7 +10744,7 @@
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:10737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10819,10 +10830,10 @@
 for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10823: checking for $ac_func" >&5
+echo "configure:10834: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10826 "configure"
+#line 10837 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10845,7 +10856,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10877,10 +10888,10 @@
 for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10881: checking for $ac_func" >&5
+echo "configure:10892: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10884 "configure"
+#line 10895 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10903,7 +10914,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10932,10 +10943,10 @@
 
 
 echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:10936: checking for openpty" >&5
+echo "configure:10947: checking for openpty" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10939 "configure"
+#line 10950 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char openpty(); below.  */
@@ -10958,7 +10969,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_openpty=yes"
 else
@@ -10977,12 +10988,12 @@
 
   
 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:10981: checking for openpty in -lutil" >&5
+echo "configure:10992: checking for openpty in -lutil" >&5
 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lutil "
 cat > conftest.$ac_ext <<EOF
-#line 10986 "configure"
+#line 10997 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10993,7 +11004,7 @@
 openpty()
 ; return 0; }
 EOF
-if { (eval echo configure:10997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11028,15 +11039,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11032: checking for $ac_hdr" >&5
+echo "configure:11043: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11035 "configure"
+#line 11046 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11051: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11072,15 +11083,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11076: checking for $ac_hdr" >&5
+echo "configure:11087: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11079 "configure"
+#line 11090 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11084: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11113,10 +11124,10 @@
   for ac_func in isastream
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11117: checking for $ac_func" >&5
+echo "configure:11128: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11120 "configure"
+#line 11131 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11139,7 +11150,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11170,15 +11181,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11174: checking for $ac_hdr" >&5
+echo "configure:11185: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11177 "configure"
+#line 11188 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11215,10 +11226,10 @@
 for ac_func in getloadavg
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11219: checking for $ac_func" >&5
+echo "configure:11230: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11222 "configure"
+#line 11233 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11241,7 +11252,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11274,15 +11285,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11278: checking for $ac_hdr" >&5
+echo "configure:11289: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11281 "configure"
+#line 11292 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11286: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11318,12 +11329,12 @@
 
     
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:11322: checking for kstat_open in -lkstat" >&5
+echo "configure:11333: 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 11327 "configure"
+#line 11338 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11334,7 +11345,7 @@
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:11338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11369,15 +11380,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11373: checking for $ac_hdr" >&5
+echo "configure:11384: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11376 "configure"
+#line 11387 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11392: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11409,12 +11420,12 @@
 
     
 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:11413: checking for kvm_read in -lkvm" >&5
+echo "configure:11424: 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 11418 "configure"
+#line 11429 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11425,7 +11436,7 @@
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:11429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11459,16 +11470,16 @@
 fi
 
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:11463: checking whether netdb declares h_errno" >&5
+echo "configure:11474: checking whether netdb declares h_errno" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11465 "configure"
+#line 11476 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:11472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF
@@ -11488,16 +11499,16 @@
 rm -f conftest*
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:11492: checking for sigsetjmp" >&5
+echo "configure:11503: checking for sigsetjmp" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11494 "configure"
+#line 11505 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:11501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11512: \"$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
@@ -11517,11 +11528,11 @@
 rm -f conftest*
 
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:11521: checking whether localtime caches TZ" >&5
+echo "configure:11532: checking whether localtime caches TZ" >&5
 
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 11525 "configure"
+#line 11536 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
@@ -11556,7 +11567,7 @@
   exit (0);
 }
 EOF
-if { (eval echo configure:11560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
@@ -11586,9 +11597,9 @@
 
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:11590: checking whether gettimeofday accepts one or two arguments" >&5
+echo "configure:11601: checking whether gettimeofday accepts one or two arguments" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11592 "configure"
+#line 11603 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -11609,7 +11620,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""two" 1>&6
 else
@@ -11631,19 +11642,19 @@
 
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:11635: checking for inline" >&5
+echo "configure:11646: checking for inline" >&5
 
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 11640 "configure"
+#line 11651 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:11647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -11684,17 +11695,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:11688: checking for working alloca.h" >&5
+echo "configure:11699: checking for working alloca.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11691 "configure"
+#line 11702 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:11698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -11718,10 +11729,10 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:11722: checking for alloca" >&5
+echo "configure:11733: checking for alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11725 "configure"
+#line 11736 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -11749,7 +11760,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:11753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -11788,10 +11799,10 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:11792: checking whether alloca needs Cray hooks" >&5
+echo "configure:11803: checking whether alloca needs Cray hooks" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11795 "configure"
+#line 11806 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -11815,10 +11826,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:11819: checking for $ac_func" >&5
+echo "configure:11830: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11822 "configure"
+#line 11833 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11841,7 +11852,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11871,10 +11882,10 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:11875: checking stack direction for C alloca" >&5
+echo "configure:11886: checking stack direction for C alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11878 "configure"
+#line 11889 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -11893,7 +11904,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:11897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
@@ -11923,15 +11934,15 @@
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:11927: checking for vfork.h" >&5
+echo "configure:11938: checking for vfork.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11930 "configure"
+#line 11941 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11959,10 +11970,10 @@
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:11963: checking for working vfork" >&5
+echo "configure:11974: checking for working vfork" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11966 "configure"
+#line 11977 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -12057,7 +12068,7 @@
   }
 }
 EOF
-if { (eval echo configure:12061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_vfork_works=yes
 else
@@ -12083,10 +12094,10 @@
 
 
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:12087: checking for working strcoll" >&5
+echo "configure:12098: checking for working strcoll" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12090 "configure"
+#line 12101 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -12096,7 +12107,7 @@
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:12100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
@@ -12124,10 +12135,10 @@
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12128: checking for $ac_func" >&5
+echo "configure:12139: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12131 "configure"
+#line 12142 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12150,7 +12161,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -12178,10 +12189,10 @@
 done
 
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:12182: checking whether getpgrp takes no argument" >&5
+echo "configure:12193: checking whether getpgrp takes no argument" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12185 "configure"
+#line 12196 "configure"
 #include "confdefs.h"
 
 /*
@@ -12236,7 +12247,7 @@
 }
 
 EOF
-if { (eval echo configure:12240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_getpgrp_void=yes
 else
@@ -12263,10 +12274,10 @@
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:12267: checking for working mmap" >&5
+echo "configure:12278: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 12270 "configure"
+#line 12281 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -12299,7 +12310,7 @@
   return 1;
 }
 EOF
-if { (eval echo configure:12303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   have_mmap=yes
 else
@@ -12328,9 +12339,9 @@
 if test "$rel_alloc $have_mmap" = "default yes"; then
   if test "$doug_lea_malloc" = "yes"; then
         echo $ac_n "checking for M_MMAP_THRESHOLD""... $ac_c" 1>&6
-echo "configure:12332: checking for M_MMAP_THRESHOLD" >&5
+echo "configure:12343: checking for M_MMAP_THRESHOLD" >&5
     cat > conftest.$ac_ext <<EOF
-#line 12334 "configure"
+#line 12345 "configure"
 #include "confdefs.h"
 #include <malloc.h>
 int main() {
@@ -12342,7 +12353,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   rel_alloc=no; echo "$ac_t""yes" 1>&6;
 else
@@ -12367,15 +12378,15 @@
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:12371: checking for termios.h" >&5
+echo "configure:12382: checking for termios.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12374 "configure"
+#line 12385 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12379: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12418,15 +12429,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:12422: checking for termio.h" >&5
+echo "configure:12433: checking for termio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12425 "configure"
+#line 12436 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12441: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12458,10 +12469,10 @@
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:12462: checking for socket" >&5
+echo "configure:12473: checking for socket" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12465 "configure"
+#line 12476 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -12484,7 +12495,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -12499,15 +12510,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:12503: checking for netinet/in.h" >&5
+echo "configure:12514: checking for netinet/in.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12506 "configure"
+#line 12517 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12524,15 +12535,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:12528: checking for arpa/inet.h" >&5
+echo "configure:12539: checking for arpa/inet.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12531 "configure"
+#line 12542 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12557,9 +12568,9 @@
 }
 
       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:12561: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:12572: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 12563 "configure"
+#line 12574 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12570,7 +12581,7 @@
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:12574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_SOCKADDR_SUN_LEN
@@ -12588,9 +12599,9 @@
 fi
 rm -f conftest*
       echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:12592: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:12603: checking "for ip_mreq struct in netinet/in.h"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 12594 "configure"
+#line 12605 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12600,7 +12611,7 @@
 static struct ip_mreq x;
 ; return 0; }
 EOF
-if { (eval echo configure:12604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MULTICAST
@@ -12631,10 +12642,10 @@
 
 
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:12635: checking for msgget" >&5
+echo "configure:12646: checking for msgget" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12638 "configure"
+#line 12649 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
@@ -12657,7 +12668,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_msgget=yes"
 else
@@ -12672,15 +12683,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:12676: checking for sys/ipc.h" >&5
+echo "configure:12687: checking for sys/ipc.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12679 "configure"
+#line 12690 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12697,15 +12708,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:12701: checking for sys/msg.h" >&5
+echo "configure:12712: checking for sys/msg.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12704 "configure"
+#line 12715 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12743,15 +12754,15 @@
 
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:12747: checking for dirent.h" >&5
+echo "configure:12758: checking for dirent.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12750 "configure"
+#line 12761 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12778,15 +12789,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:12782: checking for sys/dir.h" >&5
+echo "configure:12793: checking for sys/dir.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12785 "configure"
+#line 12796 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12819,15 +12830,15 @@
 
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:12823: checking for nlist.h" >&5
+echo "configure:12834: checking for nlist.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12826 "configure"
+#line 12837 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12831: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12857,22 +12868,22 @@
 
 
 echo "checking "for sound support"" 1>&6
-echo "configure:12861: checking "for sound support"" >&5
+echo "configure:12872: checking "for sound support"" >&5
 test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes
 
 if test "$with_native_sound" != "no"; then
     if test -n "$native_sound_lib"; then
     ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6
-echo "configure:12868: checking for multimedia/audio_device.h" >&5
+echo "configure:12879: checking for multimedia/audio_device.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12871 "configure"
+#line 12882 "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:12876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12920,12 +12931,12 @@
       if test -z "$native_sound_lib"; then
         
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:12924: checking for ALopenport in -laudio" >&5
+echo "configure:12935: 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 12929 "configure"
+#line 12940 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12936,7 +12947,7 @@
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:12940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12967,12 +12978,12 @@
       if test -z "$native_sound_lib"; then
 	
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:12971: checking for AOpenAudio in -lAlib" >&5
+echo "configure:12982: 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 12976 "configure"
+#line 12987 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12983,7 +12994,7 @@
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:12987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13028,15 +13039,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:13032: checking for ${dir}/soundcard.h" >&5
+echo "configure:13043: checking for ${dir}/soundcard.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13035 "configure"
+#line 13046 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13051: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13090,15 +13101,15 @@
 if test "$with_nas_sound" != "no"; then
   ac_safe=`echo "audio/audiolib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for audio/audiolib.h""... $ac_c" 1>&6
-echo "configure:13094: checking for audio/audiolib.h" >&5
+echo "configure:13105: checking for audio/audiolib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13097 "configure"
+#line 13108 "configure"
 #include "confdefs.h"
 #include <audio/audiolib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13102: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13116,12 +13127,12 @@
   
     
 echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6
-echo "configure:13120: checking for AuOpenServer in -laudio" >&5
+echo "configure:13131: checking for AuOpenServer in -laudio" >&5
 ac_lib_var=`echo audio'_'AuOpenServer | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -laudio "
 cat > conftest.$ac_ext <<EOF
-#line 13125 "configure"
+#line 13136 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13132,7 +13143,7 @@
 AuOpenServer()
 ; return 0; }
 EOF
-if { (eval echo configure:13136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13171,7 +13182,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 13175 "configure"
+#line 13186 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
@@ -13202,7 +13213,7 @@
   # Extract the first word of "esd-config", so it can be a program name with args.
 set dummy esd-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:13206: checking for $ac_word" >&5
+echo "configure:13217: checking for $ac_word" >&5
 
 if test -n "$have_esd_config"; then
   ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test.
@@ -13231,10 +13242,10 @@
     c_switch_site="$c_switch_site `esd-config --cflags`" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi
     LIBS="`esd-config --libs` $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"`esd-config --libs`\" to \$LIBS"; fi
     echo $ac_n "checking for esd_play_stream""... $ac_c" 1>&6
-echo "configure:13235: checking for esd_play_stream" >&5
+echo "configure:13246: checking for esd_play_stream" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13238 "configure"
+#line 13249 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char esd_play_stream(); below.  */
@@ -13257,7 +13268,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_esd_play_stream=yes"
 else
@@ -13308,7 +13319,7 @@
 
 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:13312: checking for TTY-related features" >&5
+echo "configure:13323: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
@@ -13324,12 +13335,12 @@
     if test -z "$with_ncurses"; then
     
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:13328: checking for tgetent in -lncurses" >&5
+echo "configure:13339: 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 13333 "configure"
+#line 13344 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13340,7 +13351,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13373,15 +13384,15 @@
 
     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:13377: checking for ncurses/curses.h" >&5
+echo "configure:13388: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13380 "configure"
+#line 13391 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13403,15 +13414,15 @@
 
     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:13407: checking for ncurses/term.h" >&5
+echo "configure:13418: checking for ncurses/term.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13410 "configure"
+#line 13421 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13441,15 +13452,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:13445: checking for ncurses/curses.h" >&5
+echo "configure:13456: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13448 "configure"
+#line 13459 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13453: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13484,12 +13495,12 @@
 	for lib in curses termlib termcap; do
 	  
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:13488: checking for tgetent in -l$lib" >&5
+echo "configure:13499: 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 13493 "configure"
+#line 13504 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13500,7 +13511,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13531,12 +13542,12 @@
       else
 	
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:13535: checking for tgetent in -lcurses" >&5
+echo "configure:13546: 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 13540 "configure"
+#line 13551 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13547,7 +13558,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13565,12 +13576,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:13569: checking for tgetent in -ltermcap" >&5
+echo "configure:13580: 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 13574 "configure"
+#line 13585 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13581,7 +13592,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13629,15 +13640,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:13633: checking for gpm.h" >&5
+echo "configure:13644: checking for gpm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13636 "configure"
+#line 13647 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13641: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13660,12 +13671,12 @@
  }
   test -z "$with_gpm" && { 
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:13664: checking for Gpm_Open in -lgpm" >&5
+echo "configure:13675: 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 13669 "configure"
+#line 13680 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13676,7 +13687,7 @@
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:13680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13726,20 +13737,20 @@
 
 test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
   != "no no no" && echo "checking for database support" 1>&6
-echo "configure:13730: checking for database support" >&5
+echo "configure:13741: checking for database support" >&5
 
 if test "$with_database_gdbm $with_database_dbm" != "no no"; then
   ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6
-echo "configure:13735: checking for ndbm.h" >&5
+echo "configure:13746: checking for ndbm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13738 "configure"
+#line 13749 "configure"
 #include "confdefs.h"
 #include <ndbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -13769,12 +13780,12 @@
 if test "$with_database_gdbm" != "no"; then
   
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:13773: checking for dbm_open in -lgdbm" >&5
+echo "configure:13784: 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 13778 "configure"
+#line 13789 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13785,7 +13796,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:13789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13813,10 +13824,10 @@
 
 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:13817: checking for dbm_open" >&5
+echo "configure:13828: checking for dbm_open" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13820 "configure"
+#line 13831 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -13839,7 +13850,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else
@@ -13858,12 +13869,12 @@
 
     
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:13862: checking for dbm_open in -ldbm" >&5
+echo "configure:13873: 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 13867 "configure"
+#line 13878 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13874,7 +13885,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:13878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13915,10 +13926,10 @@
 
 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:13919: checking for Berkeley db.h" >&5
+echo "configure:13930: checking for Berkeley db.h" >&5
   for header in "db/db.h" "db.h"; do
     cat > conftest.$ac_ext <<EOF
-#line 13922 "configure"
+#line 13933 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13940,7 +13951,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_file="$header"; break
 else
@@ -13956,9 +13967,9 @@
 
   if test "$with_database_berkdb" != "no"; then
     echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:13960: checking for Berkeley DB version" >&5
+echo "configure:13971: checking for Berkeley DB version" >&5
     cat > conftest.$ac_ext <<EOF
-#line 13962 "configure"
+#line 13973 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 1
@@ -13970,7 +13981,7 @@
   egrep "yes" >/dev/null 2>&1; then
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 13974 "configure"
+#line 13985 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 2
@@ -13997,10 +14008,10 @@
 rm -f conftest*
 
     echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:14001: checking for $dbfunc" >&5
+echo "configure:14012: checking for $dbfunc" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14004 "configure"
+#line 14015 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $dbfunc(); below.  */
@@ -14023,7 +14034,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$dbfunc=yes"
 else
@@ -14042,12 +14053,12 @@
 
     
 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:14046: checking for $dbfunc in -ldb" >&5
+echo "configure:14057: checking for $dbfunc in -ldb" >&5
 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldb "
 cat > conftest.$ac_ext <<EOF
-#line 14051 "configure"
+#line 14062 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14058,7 +14069,7 @@
 $dbfunc()
 ; return 0; }
 EOF
-if { (eval echo configure:14062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14122,12 +14133,12 @@
 if test "$with_socks" = "yes"; then
   
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:14126: checking for SOCKSinit in -lsocks" >&5
+echo "configure:14137: 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 14131 "configure"
+#line 14142 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14138,7 +14149,7 @@
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:14142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14193,22 +14204,22 @@
 
 if test "$with_modules" != "no"; then
   echo "checking for module support" 1>&6
-echo "configure:14197: checking for module support" >&5
+echo "configure:14208: checking for module support" >&5
 
     if test "$with_msw" = "yes"; then
     have_dl=yes;
   else
         ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:14204: checking for dlfcn.h" >&5
+echo "configure:14215: checking for dlfcn.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14207 "configure"
+#line 14218 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -14225,16 +14236,16 @@
   echo "$ac_t""yes" 1>&6
   
       echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:14229: checking for dlopen in -lc" >&5
+echo "configure:14240: checking for dlopen in -lc" >&5
       cat > conftest.$ac_ext <<EOF
-#line 14231 "configure"
+#line 14242 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:14238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -14243,18 +14254,18 @@
   rm -rf conftest*
   
       echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:14247: checking for dlopen in -ldl" >&5
+echo "configure:14258: checking for dlopen in -ldl" >&5
       ac_save_LIBS="$LIBS"
       LIBS="-ldl $LIBS"
       cat > conftest.$ac_ext <<EOF
-#line 14251 "configure"
+#line 14262 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:14258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -14283,12 +14294,12 @@
     else
       
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:14287: checking for shl_load in -ldld" >&5
+echo "configure:14298: checking for shl_load in -ldld" >&5
 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldld "
 cat > conftest.$ac_ext <<EOF
-#line 14292 "configure"
+#line 14303 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14299,7 +14310,7 @@
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:14303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14326,12 +14337,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:14330: checking for dld_init in -ldld" >&5
+echo "configure:14341: checking for dld_init in -ldld" >&5
 ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldld "
 cat > conftest.$ac_ext <<EOF
-#line 14335 "configure"
+#line 14346 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14342,7 +14353,7 @@
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:14346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14387,7 +14398,7 @@
 xealias=$internal_configuration
 
 echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:14391: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:14402: checking how to build dynamic libraries for ${xehost}" >&5
 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
 case "$xehost" in
 *-*-linux-gnu*) ;;
@@ -14415,9 +14426,9 @@
   XEGCC=yes
 else
   echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:14419: checking checking whether we are using GNU C" >&5
+echo "configure:14430: checking checking whether we are using GNU C" >&5
   cat > conftest.$ac_ext <<EOF
-#line 14421 "configure"
+#line 14432 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -14439,7 +14450,7 @@
 fi
 
 echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:14443: checking how to produce PIC code" >&5
+echo "configure:14454: checking how to produce PIC code" >&5
 wl=
 
 can_build_shared=yes
@@ -14540,18 +14551,18 @@
 
   # Check to make sure the dll_cflags actually works.
   echo $ac_n "checking if PIC flag ${dll_cflags} really works""... $ac_c" 1>&6
-echo "configure:14544: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:14555: checking if PIC flag ${dll_cflags} really works" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $dll_cflags -DPIC"
   cat > conftest.$ac_ext <<EOF
-#line 14548 "configure"
+#line 14559 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:14555: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
     # On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also
@@ -14582,7 +14593,7 @@
 xldf=
 xcldf=
 echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:14586: checking if C compiler can produce shared libraries" >&5
+echo "configure:14597: checking if C compiler can produce shared libraries" >&5
 if test "$XEGCC" = yes; then
   xcldf="-shared"
   xldf="-shared"
@@ -14633,14 +14644,14 @@
   xe_libs=
   ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
   cat > conftest.$ac_ext <<EOF
-#line 14637 "configure"
+#line 14648 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:14644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cc_produces_so=yes
 else
@@ -14665,7 +14676,7 @@
   if test "$XEGCC" = yes; then
     # Check if gcc -print-prog-name=ld gives a path.
     echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:14669: checking for ld used by GCC" >&5
+echo "configure:14680: checking for ld used by GCC" >&5
     ac_prog=`($CC -print-prog-name=ld) 2>&5`
     case "$ac_prog" in
     # Accept absolute paths.
@@ -14691,7 +14702,7 @@
     esac
   else
     echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:14695: checking for GNU ld" >&5
+echo "configure:14706: checking for GNU ld" >&5
   fi
 
   if test -z "$LTLD"; then
@@ -14729,7 +14740,7 @@
 
 # Check to see if it really is or isn't GNU ld.
 echo $ac_n "checking if the linker is GNU ld""... $ac_c" 1>&6
-echo "configure:14733: checking if the linker is GNU ld" >&5
+echo "configure:14744: checking if the linker is GNU ld" >&5
 # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
   xe_gnu_ld=yes
@@ -14757,7 +14768,7 @@
   # OK - only NOW do we futz about with ld.
   # See if the linker supports building shared libraries.
   echo $ac_n "checking whether the linker supports shared libraries""... $ac_c" 1>&6
-echo "configure:14761: checking whether the linker supports shared libraries" >&5
+echo "configure:14772: checking whether the linker supports shared libraries" >&5
   dll_ld=$CC
   dll_ldflags=$LDFLAGS
   ld_shlibs=yes
@@ -14968,10 +14979,10 @@
     for ac_func in dlerror _dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14972: checking for $ac_func" >&5
+echo "configure:14983: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14975 "configure"
+#line 14986 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -14994,7 +15005,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -15033,11 +15044,11 @@
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 15037 "configure"
+#line 15048 "configure"
 #include "confdefs.h"
 int main(int c,char *v[]){return 0;}
 EOF
-if { (eval echo configure:15041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:15052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -15665,6 +15676,10 @@
 echo "  Compiler:                          $CC $CFLAGS"
 echo "  Relocating allocator for buffers:  $rel_alloc"
 echo "  GNU version of malloc:             ${GNU_MALLOC}${GNU_MALLOC_reason}"
+case "$ld_switch_site" in
+  *nocombreloc*) echo "  Linking with \`-z nocombreloc'.
+    - Consider configuring with --pdump." ;;
+esac
 
 echo "
 Window System:"
@@ -15810,7 +15825,7 @@
 
 echo "
 Other Features:"
-test "with_ipv6_cname" = no && echo "  Inhibiting IPv6 canonicalization at startup."
+test "$with_ipv6_cname" = no && echo "  Inhibiting IPv6 canonicalization at startup."
 test "$with_tooltalk" = yes && echo "  Compiling in support for ToolTalk."
 test "$with_workshop" = yes && echo "  Compiling in support for Sun WorkShop."
 test "$with_socks" = yes && echo "  Compiling in support for SOCKS."
diff --text -u 'xemacs-21.4.5/configure.in' 'xemacs-21.4.6/configure.in'
Index: ././configure.in
--- ././configure.in	Tue Oct 23 17:51:09 2001
+++ ././configure.in	Mon Dec 17 15:27:02 2001
@@ -57,7 +57,7 @@
 dnl here is how XEmacs is different:
 dnl - no cache file
 dnl - non-standard options
-dnl - suport for extra-verbosity
+dnl - support for extra-verbosity
 dnl - ordinary libs are handled separately from X libs (might be a mistake)
 dnl - various random kludges (e.g. -with-dnet=no)
 
@@ -126,7 +126,7 @@
 
 dnl redefine AC_CHECK_LIB in accordance with our own value of ac_link
 dnl Add in extra kludgy check to support with_dnet=no
-dnl Add in extra LDFLAGS arg, which PRECEDE libs
+dnl Add in extra LDFLAGS arg, which PRECEDES libs
 dnl Support --with-dnet=no
 
 dnl AC_CHECK_LIB(LIBRARY, FUNCTION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
@@ -378,8 +378,8 @@
 pdump="no"
 dnl dragndrop is still experimental.  When it is stable, comment out the following line:
 with_dragndrop="no"
-dnl I think this is mandated by IPv6 standards.
-with_ipv6_cname="yes"
+dnl Too annoying, even if mandated by IPv6 (and I'm not even sure of that)
+with_ipv6_cname="no"
 
 dnl ------------------
 dnl Options Processing
@@ -2157,7 +2157,7 @@
 dnl listed in /etc/ld.so.conf on some systems, and including them on
 dnl the link path leads to linking in utterly broken libc's.
 dnl There are many clever ways of approaching this problem,
-dnl but finding out that actually works...
+dnl but finding one that actually works...
 
 dnl if test -z "$LD_RUN_PATH" -a -r "/etc/ld.so.conf"; then
 dnl   for dir in `cat /etc/ld.so.conf`; do
@@ -2495,6 +2495,10 @@
     c_switch_site="$c_switch_site -threads" ;;
 esac
 
+dnl ----------------------------------------------------------------
+dnl Miscellaneous flags
+dnl ----------------------------------------------------------------
+
 AC_MSG_CHECKING(whether the -xildoff compiler flag is required)
 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 ;
@@ -2516,6 +2520,20 @@
   fi
 fi
 
+dnl GNU ld now defaults to combreloc, which screws up unexec, but not pdump.
+dnl Note that it's OK if the GNU style long option causes non-GNU ld to barf
+dnl a usage message, that's often good enough.  Please report it, though.
+dnl #### Should make this Solaris-friendly.
+dnl Link with -z nocombreloc for now.
+if test "$pdump" != "yes"; then
+  AC_MSG_CHECKING(for \"-z nocombreloc\" linker flag)
+  case "`ld --help 2>&1`" in
+    *-z\ nocombreloc* ) AC_MSG_RESULT(yes)
+      XE_PREPEND(-z nocombreloc, ld_switch_site) ;;
+    *) AC_MSG_RESULT(no) ;;
+  esac
+fi
+
 dnl ----------------------
 dnl Choose a window system
 dnl ----------------------
@@ -4840,6 +4858,10 @@
 echo "  Compiler:                          $CC $CFLAGS"
 echo "  Relocating allocator for buffers:  $rel_alloc"
 echo "  GNU version of malloc:             ${GNU_MALLOC}${GNU_MALLOC_reason}"
+case "$ld_switch_site" in
+  *nocombreloc*) echo "  Linking with \`-z nocombreloc'.
+    - Consider configuring with --pdump." ;;
+esac
 
 echo "
 Window System:"
@@ -4985,7 +5007,7 @@
 
 echo "
 Other Features:"
-test "with_ipv6_cname" = no && echo "  Inhibiting IPv6 canonicalization at startup."
+test "$with_ipv6_cname" = no && echo "  Inhibiting IPv6 canonicalization at startup."
 test "$with_tooltalk" = yes && echo "  Compiling in support for ToolTalk."
 test "$with_workshop" = yes && echo "  Compiling in support for Sun WorkShop."
 test "$with_socks" = yes && echo "  Compiling in support for SOCKS."
diff --text -u 'xemacs-21.4.5/configure.usage' 'xemacs-21.4.6/configure.usage'
Index: ././configure.usage
--- ././configure.usage	Tue Oct 23 17:51:10 2001
+++ ././configure.usage	Mon Dec 17 15:27:05 2001
@@ -173,8 +173,8 @@
                         loaded libraries (Dynamic Shared Objects).
 --with-netinstall       Compile in support for installation over the internet.
                         Only functional on the MS Windows platforms.
---with-ipv6-cname=no    Don't try to get IPv6 information when canonicalizing
-                        host names.  This option has no effect unless system
+--with-ipv6-cname=yes   Try IPv6 information first when canonicalizing host
+                        names.  This option has no effect unless system
                         supports getaddrinfo(3) and getnameinfo(3).
 --with-site-lisp=yes    Allow for a site-lisp directory in the XEmacs hierarchy
                         searched before the installation packages.
@@ -205,6 +205,7 @@
                         optionally including autodetection.  Defaults to ON
                         on Windows, OFF on Unix.
 
+
 Internationalization options:
 
 --with-mule             Compile with Mule (MUlti-Lingual Emacs) support,
@@ -247,6 +248,7 @@
 --no-doc-file           Don't rebuild the DOC file unless it's explicitly
                         deleted.  Only use during development. (It speeds
                         up the compile-run-test cycle.)
+--quick-build           Don't GC when dumping.  Implies --no-doc-file.
 --use-union-type        Enable or disable use of a union, instead of an
                         int, for the fundamental Lisp_Object type; this
                         provides stricter type-checking.  Only works with
@@ -267,7 +269,7 @@
 --with-clash-detection  Use lock files to detect multiple edits of the same
                         file.  The default is to do clash detection.
 
-You may also specify any of the `path' variables found in Makefile.in,
+You may also specify any of the `path' variables found in Makefile.in.in,
 including --bindir, --libdir, --docdir, --lispdir, --sitelispdir,
 --datadir, --infodir, --mandir and so on.  Note that we recommend
 against explicitly setting any of these variables.  See the INSTALL
diff --text -u 'xemacs-21.4.5/etc/package-index.LATEST.pgp' 'xemacs-21.4.6/etc/package-index.LATEST.pgp'
Index: ././etc/package-index.LATEST.pgp
--- ././etc/package-index.LATEST.pgp	Fri Apr 13 03:20:51 2001
+++ ././etc/package-index.LATEST.pgp	Mon Dec 17 14:49:04 2001
@@ -1,114 +1,133 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 ;; Package Index file -- Do not edit manually.
 ;;;@@@
 (package-get-update-base-entry (quote
-(lookup
-  (standards-version 1.1
-   version "1.03"
-   author-version "1.0"
-   date "1999-05-05"
-   build-date "1999-07-30"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution mule
-   priority high
-   category "mule"
+(clearcase
+  (standards-version 1.0
+   version "1.00"
+   author-version "21.5b3"
+   date "2001-12-09"
+   build-date "2001-12-10"
+   maintainer "Adrian Aichner <adrian@xemacs.org>"
+   distribution xemacs
+   priority low
+   category "standard"
    dump nil
-   description "Dictionary support"
-   filename "lookup-1.03-pkg.tar.gz"
-   md5sum "d99759b042f8bf401d487e4ea140450d"
-   size 212861
-   provides (lookup)
-   requires (cookie lookup)
+   description "New Clearcase Version Control for XEmacs (UNIX, Windows)."
+   filename "clearcase-1.00-pkg.tar.gz"
+   md5sum "6ae8f1896b97f90a94a6391beeb6f018"
+   size 88185
+   provides (clearcase)
+   requires (dired fsf-compat mail-lib xemacs-base)
    type regular
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
-(os-utils
+(tramp
   (standards-version 1.1
-   version "1.18"
-   author-version "21.1"
-   date "1999-07-20"
-   build-date "1999-07-30"
+   version "1.00"
+   author-version "2.46"
+   date "2001-12-08"
+   build-date "2001-12-08"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
-   priority medium
-   category "os"
+   priority low
+   category "standard"
    dump nil
-   description "Miscellaneous O/S utilities."
-   filename "os-utils-1.18-pkg.tar.gz"
-   md5sum "bafbe5e2628fc678daad46b07ba7fef6"
-   size 179680
-   provides (archive-mode background crypt crypt++ inf-lisp jka-compr lpr mchat tar-mode telnet terminal uncompress)
-   requires (xemacs-base)
-   type single
+   description "Remote shell-based file editing."
+   filename "tramp-1.00-pkg.tar.gz"
+   md5sum "31d4925445293ad091381218fc9e10fa"
+   size 130274
+   provides (tramp tramp-util tramp-vc trampcache)
+   requires (tramp xemacs-base vc fsf-compat efs dired mail-lib gnus)
+   type regular
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
-(ediff
+(dictionary
   (standards-version 1.1
-   version "1.22"
-   author-version "2.72"
-   date "1999-05-27"
-   build-date "1999-07-30"
-   maintainer "Michael Kifer <kifer@cs.sunysb.edu>"
+   version "1.05"
+   author-version "1.7"
+   date "2001-12-15"
+   build-date "2001-12-16"
+   maintainer "Torsten Hilbrich <dictionary@myrkr.in-berlin.de>"
    distribution xemacs
-   priority medium
-   category "prog"
+   priority low
+   category "standard"
    dump nil
-   description "Interface over GNU patch."
-   filename "ediff-1.22-pkg.tar.gz"
-   md5sum "a9ece02fc03ac74ee4501845dec88710"
-   size 282084
-   provides (ediff)
-   requires (pcl-cvs elib dired xemacs-base)
+   description "Interface to RFC2229 dictionary servers."
+   filename "dictionary-1.05-pkg.tar.gz"
+   md5sum "17b8074cee3e85f26f939a26a3848daf"
+   size 37435
+   provides (dictionary connection link)
+   requires (xemacs-base)
    type regular
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
-(hm--html-menus
+(build
   (standards-version 1.0
-   version "1.12"
-   author-version "5.9"
-   date "1999-02-05"
-   build-date "1999-02-05"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   version "1.03"
+   author-version "21.5b3"
+   date "2001-12-02"
+   build-date "2001-12-03"
+   maintainer "Adrian Aichner <adrian@xemacs.org>"
    distribution stable
    priority low
-   category "oa"
+   category "standard"
    dump nil
-   description "HTML editing."
-   filename "hm--html-menus-1.12-pkg.tar.gz"
-   md5sum "fc80ef260cc0682bde6e706cdc8ddae4"
-   size 177442
-   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 (dired xemacs-base)
+   description "Build XEmacs from within (UNIX, Windows)."
+   filename "build-1.03-pkg.tar.gz"
+   md5sum "beaa6b5e8731f13de47c4b5d5ef6fde4"
+   size 31341
+   provides (build)
+   requires (xemacs-base pcl-cvs dired w3 prog-modes)
    type regular
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
-(jde
+(xslt-process
   (standards-version 1.0
-   version "1.14"
-   author-version "2.14"
-   date "1999-02-05"
-   build-date "1999-02-05"
-   maintainer "Andy Piper <andy@xemacs.org>"
-   distribution stable
+   version "1.05"
+   author-version "1.2.1"
+   date "2001-08-25"
+   build-date "2001-08-27"
+   maintainer "Ovidiu Predescu <ovidiu@xemacs.org>"
+   distribution xemacs
    priority medium
-   category "prog"
+   category "standard"
    dump nil
-   description "Java language and development support."
-   filename "jde-1.14-pkg.tar.gz"
-   md5sum "1028c54ef317d8dd4d4c78e5b9c004e6"
-   size 320702
-   provides (jde)
-   requires (cc-mode debug speedbar edit-utils mail-lib xemacs-base)
+   description "XSLT processing support."
+   filename "xslt-process-1.05-pkg.tar.gz"
+   md5sum "f38db5adcbff961d8b542fc5840cab22"
+   size 202235
+   provides (xslt-process)
+   requires (jde cc-mode semantic debug speedbar edit-utils eterm mail-lib xemacs-base elib eieio sh-script)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(eieio
+  (standards-version 1.1
+   version "1.01"
+   author-version "0.16"
+   date "2001-02-20"
+   build-date "2001-02-20"
+   maintainer "Eric Ludlam <zappo@gnu.org>"
+   distribution xemacs
+   priority low
+   category "libs"
+   dump nil
+   description "Enhanced Implementation of Emacs Interpreted Objects"
+   filename "eieio-1.01-pkg.tar.gz"
+   md5sum "936e2330f1ac6e76f437154ad60f5b0f"
+   size 136677
+   provides (eieio chart tree)
+   requires (eieio speedbar xemacs-base )
    type regular
 ))
 ))
@@ -116,21 +135,21 @@
 (package-get-update-base-entry (quote
 (skk
   (standards-version 1.1
-   version "1.14"
-   author-version "10.38"
-   date "1999-05-18"
-   build-date "1999-07-30"
-   maintainer "SL Baur <steve@xemacs.org>"
+   version "1.19"
+   author-version "10.62a"
+   date "2001-06-18"
+   build-date "2001-07-02"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority medium
    category "mule"
    dump nil
-   description "Japanese Language Input Method."
-   filename "skk-1.14-pkg.tar.gz"
-   md5sum "b8c89832f314570cb251147ced107c49"
-   size 1514095
+   description "MULE: Japanese Language Input Method."
+   filename "skk-1.19-pkg.tar.gz"
+   md5sum "1655024ec7091ec05558062e7344a93f"
+   size 1505369
    provides (skk skk-tut)
-   requires (viper mule-base elib xemacs-base)
+   requires (viper mule-base elib xemacs-base apel)
    type regular
 ))
 ))
@@ -138,19 +157,19 @@
 (package-get-update-base-entry (quote
 (egg-its
   (standards-version 1.1
-   version "1.19"
-   author-version "21.1"
-   date "1999-07-26"
-   build-date "1999-07-30"
+   version "1.26"
+   author-version "21.5b1"
+   date "2001-05-07"
+   build-date "2001-05-10"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority high
    category "mule"
    dump nil
-   description "Wnn (4.2 and 6) support.  SJ3 support."
-   filename "egg-its-1.19-pkg.tar.gz"
-   md5sum "121037363bae6925fd4933f861cbdabb"
-   size 261537
+   description "MULE: Wnn (4.2 and 6) support.  SJ3 support."
+   filename "egg-its-1.26-pkg.tar.gz"
+   md5sum "a69b09fedc9aee8422ed7ed35b6649eb"
+   size 260749
    provides (egg-cnpinyin egg-cnzhuyin egg-cwnn-leim egg-jisx0201 egg-jsymbol egg-kwnn-leim egg-leim egg-sj3-client egg-sj3-leim egg-sj3 egg-wnn egg)
    requires (leim mule-base fsf-compat xemacs-base)
    type regular
@@ -160,19 +179,19 @@
 (package-get-update-base-entry (quote
 (edict
   (standards-version 1.1
-   version "1.08"
+   version "1.12"
    author-version "0.9.8"
-   date "1998-07-23"
-   build-date "1999-07-30"
+   date "2000-11-08"
+   build-date "2001-01-15"
    maintainer "Stephen J. Turnbull <turnbull@sk.tsukuba.ac.jp>"
    distribution mule
    priority high
    category "mule"
    dump nil
-   description "Lisp Interface to EDICT, Kanji Dictionary"
-   filename "edict-1.08-pkg.tar.gz"
-   md5sum "f339e93a2cb02d9224e4bf9f313b0b62"
-   size 71621
+   description "MULE: Lisp Interface to EDICT, Kanji Dictionary"
+   filename "edict-1.12-pkg.tar.gz"
+   md5sum "ac774d2ae02fe32de755e758af5dac11"
+   size 71792
    provides (dui-registry dui edict-edit edict-english edict-japanese edict-morphology edict-test edict ts-mode)
    requires (mule-base xemacs-base)
    type regular
@@ -180,21 +199,43 @@
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
+(lookup
+  (standards-version 1.1
+   version "1.08"
+   author-version "1.0"
+   date "2001-01-14"
+   build-date "2001-07-02"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution mule
+   priority high
+   category "mule"
+   dump nil
+   description "MULE: Dictionary support"
+   filename "lookup-1.08-pkg.tar.gz"
+   md5sum "49e7d04e5a9f85f060365433cd45f31d"
+   size 214238
+   provides (lookup)
+   requires (mule-base cookie lookup)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
 (leim
   (standards-version 1.1
-   version "1.13"
+   version "1.17"
    author-version "21.1"
-   date "1999-06-29"
-   build-date "1999-07-30"
+   date "2000-11-08"
+   build-date "2001-01-15"
    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.13-pkg.tar.gz"
-   md5sum "9cd059afefa3aff94fd1802c8db6c39a"
-   size 1702922
+   description "MULE: Quail.  All non-English and non-Japanese language support."
+   filename "leim-1.17-pkg.tar.gz"
+   md5sum "61d39ee096e39219651b01648a37ef2e"
+   size 1708067
    provides ()
    requires (mule-base fsf-compat xemacs-base)
    type regular
@@ -204,19 +245,19 @@
 (package-get-update-base-entry (quote
 (locale
   (standards-version 1.1
-   version "1.14"
+   version "1.18"
    author-version "21.1"
-   date "1999-05-11"
-   build-date "1999-07-30"
+   date "2000-11-08"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority high
    category "mule"
    dump nil
-   description "Localized menubars and localized splash screens."
-   filename "locale-1.14-pkg.tar.gz"
-   md5sum "5a5c7e878596a1009e97a8c4f491826c"
-   size 35744
+   description "MULE: Localized menubars and localized splash screens."
+   filename "locale-1.18-pkg.tar.gz"
+   md5sum "dbc3b123a7f12804fb81643b40fe766a"
+   size 38660
    provides ()
    requires (mule-base)
    type regular
@@ -226,19 +267,19 @@
 (package-get-update-base-entry (quote
 (mule-base
   (standards-version 1.1
-   version "1.32"
-   author-version "21.1"
-   date "1999-06-30"
-   build-date "1999-07-30"
-   maintainer "SL Baur <steve@xemacs.org>"
+   version "1.39"
+   author-version "21.5b1"
+   date "2001-05-23"
+   build-date "2001-06-14"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority high
    category "mule"
    dump nil
-   description "Basic Mule support, required for building with Mule."
-   filename "mule-base-1.32-pkg.tar.gz"
-   md5sum "40950af24540e6cfc6875a9ddc7bab5d"
-   size 453902
+   description "MULE: Basic Mule support, required for building with Mule."
+   filename "mule-base-1.39-pkg.tar.gz"
+   md5sum "5686febbb08c950ead2b4d0b1707c09e"
+   size 443543
    provides (canna-leim canna char-table china-util cyril-util isearch-ext japan-util ccl can-n-egg mule-help)
    requires (fsf-compat xemacs-base apel)
    type regular
@@ -248,19 +289,19 @@
 (package-get-update-base-entry (quote
 (strokes
   (standards-version 1.1
-   version "1.05"
+   version "1.08"
    author-version "21.1"
-   date "1998-01-25"
-   build-date "1999-07-30"
+   date "2000-10-05"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "oa"
    dump nil
    description "Mouse enhancement utility."
-   filename "strokes-1.05-pkg.tar.gz"
-   md5sum "42b991c28dc393a78f9da792f15e53d3"
-   size 43480
+   filename "strokes-1.08-pkg.tar.gz"
+   md5sum "c5ab0860ceb23b40798b11a1fa4c0240"
+   size 43486
    provides (strokes)
    requires (text-modes edit-utils mail-lib xemacs-base)
    type regular
@@ -270,19 +311,19 @@
 (package-get-update-base-entry (quote
 (time
   (standards-version 1.1
-   version "1.08"
+   version "1.11"
    author-version "1.17"
-   date "1998-04-24"
-   build-date "1999-07-30"
+   date "2000-10-05"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "oa"
    dump nil
    description "Display time & date on the modeline."
-   filename "time-1.08-pkg.tar.gz"
-   md5sum "c67d7143de5694ec4a7e17023ceab902"
-   size 19994
+   filename "time-1.11-pkg.tar.gz"
+   md5sum "93ca34fe3275dc3ef5b8fd4c6824551d"
+   size 19983
    provides (time)
    requires (xemacs-base)
    type regular
@@ -292,19 +333,19 @@
 (package-get-update-base-entry (quote
 (text-modes
   (standards-version 1.1
-   version "1.21"
-   author-version "21.1"
-   date "1999-07-06"
-   build-date "1999-07-30"
+   version "1.32"
+   author-version "21.5b1"
+   date "2001-07-18"
+   build-date "2001-07-21"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
-   category "oa"
+   category "standard"
    dump nil
    description "Miscellaneous support for editing text files."
-   filename "text-modes-1.21-pkg.tar.gz"
-   md5sum "d9d9505dfbe52854b3337eddfce093d1"
-   size 207873
+   filename "text-modes-1.32-pkg.tar.gz"
+   md5sum "6af333dc07f90ef72f735ae5a53da5f3"
+   size 225512
    provides (autoinsert crontab-edit filladapt fold-isearch folding image-mode iso-acc iso-ascii iso-cvt iso-insert iso-swed swedish tabify whitespace-mode winmgr-mode xpm-mode xrdb-mode)
    requires (ispell fsf-compat xemacs-base)
    type regular
@@ -314,19 +355,19 @@
 (package-get-update-base-entry (quote
 (slider
   (standards-version 1.1
-   version "1.10"
+   version "1.13"
    author-version "0.3x1"
-   date "1998-08-13"
-   build-date "1999-07-30"
+   date "2000-10-05"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "oa"
    dump nil
    description "User interface tool."
-   filename "slider-1.10-pkg.tar.gz"
-   md5sum "a67e165592a2921ff0978a69befa0d6d"
-   size 12000
+   filename "slider-1.13-pkg.tar.gz"
+   md5sum "3fbc16b2caeef30e87969e19efa40f32"
+   size 12021
    provides (slider color-selector)
    requires ()
    type regular
@@ -336,19 +377,19 @@
 (package-get-update-base-entry (quote
 (sgml
   (standards-version 1.1
-   version "1.05"
+   version "1.08"
    author-version "21.1"
-   date "1998-01-25"
-   build-date "1999-07-30"
+   date "2000-10-05"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "oa"
    dump nil
    description "SGML/Linuxdoc-SGML editing."
-   filename "sgml-1.05-pkg.tar.gz"
-   md5sum "ead5d1671dfebf394be76166c786b0c2"
-   size 26937
+   filename "sgml-1.08-pkg.tar.gz"
+   md5sum "bdadf462489fa1540cc56d1c561aaa54"
+   size 26964
    provides (sgml linuxdoc-sgml)
    requires (xemacs-base)
    type regular
@@ -358,21 +399,21 @@
 (package-get-update-base-entry (quote
 (psgml
   (standards-version 1.1
-   version "1.14"
-   author-version "1.01"
-   date "1999-06-13"
-   build-date "1999-07-30"
+   version "1.23"
+   author-version "1.22"
+   date "2001-02-18"
+   build-date "2001-02-28"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "oa"
    dump nil
    description "Validated HTML/SGML editing."
-   filename "psgml-1.14-pkg.tar.gz"
-   md5sum "44102484c3e5588bab21005cec1a46e1"
-   size 425227
+   filename "psgml-1.23-pkg.tar.gz"
+   md5sum "de5bcf5e4ab559cc239ec060c0db0710"
+   size 650527
    provides (psgml sgml)
-   requires (edit-utils)
+   requires (xemacs-base edit-utils edebug xemacs-devel mail-lib)
    type regular
 ))
 ))
@@ -380,19 +421,19 @@
 (package-get-update-base-entry (quote
 (pc
   (standards-version 1.1
-   version "1.16"
-   author-version "21.1"
-   date "1999-04-13"
-   build-date "1999-07-30"
+   version "1.20"
+   author-version "21.5b1"
+   date "2000-02-12"
+   build-date "2001-05-10"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "oa"
    dump nil
    description "PC style interface emulation."
-   filename "pc-1.16-pkg.tar.gz"
-   md5sum "d721157770274b9fee0b16933764c636"
-   size 16324
+   filename "pc-1.20-pkg.tar.gz"
+   md5sum "ceab8a41e2992aebfa6efe247c6c851c"
+   size 16703
    provides (delbs fusion pc-select pending-del s-region)
    requires (xemacs-base)
    type regular
@@ -402,19 +443,19 @@
 (package-get-update-base-entry (quote
 (ispell
   (standards-version 1.1
-   version "1.16"
+   version "1.23"
    author-version "3.2"
-   date "1999-07-22"
-   build-date "1999-07-30"
+   date "2001-08-02"
+   build-date "2001-08-07"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "oa"
+   category "standard"
    dump nil
    description "Spell-checking with GNU ispell."
-   filename "ispell-1.16-pkg.tar.gz"
-   md5sum "a3140984afc8a9d5aa0d0116625b2d07"
-   size 68157
+   filename "ispell-1.23-pkg.tar.gz"
+   md5sum "d6313eaf9fd77554cd4ee2fc42b898e9"
+   size 72495
    provides (ispell)
    requires ()
    type regular
@@ -422,21 +463,43 @@
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
+(hm--html-menus
+  (standards-version 1.1
+   version "1.16"
+   author-version "5.9"
+   date "2000-10-05"
+   build-date "2001-01-15"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution xemacs
+   priority low
+   category "oa"
+   dump nil
+   description "HTML editing."
+   filename "hm--html-menus-1.16-pkg.tar.gz"
+   md5sum "defc795c8c783b13599927399df7bf18"
+   size 178704
+   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 (dired xemacs-base)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
 (frame-icon
   (standards-version 1.1
-   version "1.07"
+   version "1.09"
    author-version "21.1"
    date "1998-07-14"
-   build-date "1999-07-30"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "oa"
    dump nil
    description "Set up mode-specific icons for each frame under XEmacs"
-   filename "frame-icon-1.07-pkg.tar.gz"
-   md5sum "320909b8d8caa9754c08963878acbb8b"
-   size 33434
+   filename "frame-icon-1.09-pkg.tar.gz"
+   md5sum "91922e43447422f175065428367fb00b"
+   size 33436
    provides (forms forms-mode)
    requires ()
    type regular
@@ -446,19 +509,19 @@
 (package-get-update-base-entry (quote
 (forms
   (standards-version 1.1
-   version "1.11"
+   version "1.13"
    author-version "2.37"
-   date "1999-05-11"
-   build-date "1999-07-30"
+   date "1999-10-07"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "oa"
    dump nil
    description "Forms editing support (obsolete, use Widget instead)."
-   filename "forms-1.11-pkg.tar.gz"
-   md5sum "36604485f4a1031d28968fe2c8534a6d"
-   size 48263
+   filename "forms-1.13-pkg.tar.gz"
+   md5sum "f18fd40a2068b851890ca59d3f1845a7"
+   size 48380
    provides (forms forms-mode)
    requires ()
    type regular
@@ -468,19 +531,19 @@
 (package-get-update-base-entry (quote
 (calendar
   (standards-version 1.1
-   version "1.12"
-   author-version "21.1"
-   date "1999-06-24"
-   build-date "1999-07-30"
+   version "1.17"
+   author-version "21.5b3"
+   date "2001-12-10"
+   build-date "2001-12-10"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "oa"
+   category "standard"
    dump nil
    description "Calendar and diary support."
-   filename "calendar-1.12-pkg.tar.gz"
-   md5sum "d6ad2b3a3477d04ca3b669a67eecc8bc"
-   size 250669
+   filename "calendar-1.17-pkg.tar.gz"
+   md5sum "8821f0209b1ecf2bdb24cddb5b480956"
+   size 252183
    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
@@ -490,19 +553,19 @@
 (package-get-update-base-entry (quote
 (calc
   (standards-version 1.1
-   version "1.11"
+   version "1.17"
    author-version "2.02fX3"
-   date "1998-07-25"
-   build-date "1999-07-30"
+   date "2001-07-30"
+   build-date "2001-07-31"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "oa"
+   category "standard"
    dump nil
    description "Emacs calculator"
-   filename "calc-1.11-pkg.tar.gz"
-   md5sum "7a0cce9d75b5c70f02db67f18eb6a97d"
-   size 1616700
+   filename "calc-1.17-pkg.tar.gz"
+   md5sum "96d9973ad70e2d7b8a8b9682188335ef"
+   size 1614612
    provides (calc)
    requires ()
    type regular
@@ -512,19 +575,19 @@
 (package-get-update-base-entry (quote
 (speedbar
   (standards-version 1.1
-   version "1.13"
-   author-version "0.6.2x"
-   date "1999-07-15"
-   build-date "1999-07-30"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   version "1.21"
+   author-version "0.13"
+   date "2001-07-26"
+   build-date "2001-07-28"
+   maintainer "Eric M. Ludlam <zappo@gnu.org>"
    distribution xemacs
    priority low
-   category "oa"
-   dump nil
-   description "Provides a seperate frame with convenient references."
-   filename "speedbar-1.13-pkg.tar.gz"
-   md5sum "0a2352aa6866888fc8ecdc7ec8d86516"
-   size 64955
+   category "standard"
+   dump nil
+   description "Provides a separate frame with convenient references."
+   filename "speedbar-1.21-pkg.tar.gz"
+   md5sum "0cc730cc05aebd7ab14ad60d5cd53065"
+   size 136610
    provides (speedbar)
    requires (xemacs-base)
    type regular
@@ -534,41 +597,85 @@
 (package-get-update-base-entry (quote
 (edit-utils
   (standards-version 1.1
-   version "1.41"
-   author-version "21.1"
-   date "1999-07-07"
-   build-date "1999-07-30"
+   version "1.73"
+   author-version "21.5b3"
+   date "2001-12-13"
+   build-date "2001-12-13"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
-   category "oa"
+   category "standard"
    dump nil
    description "Miscellaneous editor extensions, you probably need this."
-   filename "edit-utils-1.41-pkg.tar.gz"
-   md5sum "a3d5116811348bde6d56976ce94a991a"
-   size 579673
+   filename "edit-utils-1.73-pkg.tar.gz"
+   md5sum "508d8b321a81bfc69b2ddc3ae3f49174"
+   size 697616
    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)
+   requires (xemacs-base fsf-compat)
    type single
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
+(pcomplete
+  (standards-version 1.1
+   version "1.01"
+   author-version "1.1.6"
+   date "2000-03-06"
+   build-date "2001-01-15"
+   maintainer "John Wiegley <johnw@gnu.org>"
+   distribution xemacs
+   priority medium
+   category "os"
+   dump nil
+   description "Provides programmatic completion."
+   filename "pcomplete-1.01-pkg.tar.gz"
+   md5sum "ee42f90e2a4bb878bd5768ba49ed96ba"
+   size 37289
+   provides (pcomplete)
+   requires (sh-script)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(eshell
+  (standards-version 1.1
+   version "1.01"
+   author-version "2.4.1"
+   date "2000-12-20"
+   build-date "2001-01-15"
+   maintainer "John Wiegley <johnw@gnu.org>"
+   distribution xemacs
+   priority medium
+   category "os"
+   dump nil
+   description "Command shell implemented entirely in Emacs Lisp"
+   filename "eshell-1.01-pkg.tar.gz"
+   md5sum "71d400303baad4de19334b4693b443da"
+   size 231267
+   provides (eshell)
+   requires (xemacs-base eterm)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
 (view-process
   (standards-version 1.1
-   version "1.07"
+   version "1.11"
    author-version "2.4"
-   date "1998-01-24"
-   build-date "1999-07-30"
+   date "2000-10-05"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "os"
    dump nil
    description "A Unix process browsing tool."
-   filename "view-process-1.07-pkg.tar.gz"
-   md5sum "47a82bb6569dd9d9bed03a57c9391538"
-   size 59953
+   filename "view-process-1.11-pkg.tar.gz"
+   md5sum "8273fcfd035804c4b376786629c7b205"
+   size 60260
    provides (view-process-mode)
    requires (xemacs-base)
    type regular
@@ -576,22 +683,44 @@
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
+(ps-print-nomule
+  (standards-version 1.1
+   version "1.05"
+   author-version "3.05x1"
+   date "2000-10-28"
+   build-date "2001-01-15"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution xemacs
+   priority medium
+   category "os"
+   dump nil
+   description "Old, but no-Mule safe ps-print"
+   filename "ps-print-nomule-1.05-pkg.tar.gz"
+   md5sum "c071d71ac89d9a540c0799fb33f40c3a"
+   size 52879
+   provides (ps-print)
+   requires (xemacs-base)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
 (os-utils
-  (standards-version 1.0
-   version "1.15"
-   author-version "21.0"
-   date "1999-03-19"
-   build-date "1999-05-13"
+  (standards-version 1.1
+   version "1.25"
+   author-version "21.1"
+   date "2000-11-09"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority medium
    category "os"
    dump nil
    description "Miscellaneous O/S utilities."
-   filename "os-utils-1.15-pkg.tar.gz"
-   md5sum "92a3d72b0df1fb79fef2aee88a4d4f50"
-   size 228261
-   provides (archive-mode background crypt crypt++ inf-lisp jka-compr lpr mchat ps-print tar-mode telnet terminal uncompress)
+   filename "os-utils-1.25-pkg.tar.gz"
+   md5sum "e71b109e0fb81032fa664768c98b6bcc"
+   size 202651
+   provides (archive-mode background crypt crypt++ inf-lisp jka-compr lpr mchat tar-mode telnet terminal uncompress)
    requires (xemacs-base)
    type single
 ))
@@ -600,21 +729,21 @@
 (package-get-update-base-entry (quote
 (ilisp
   (standards-version 1.1
-   version "1.08"
-   author-version "5.8"
-   date "1998-01-24"
-   build-date "1999-07-30"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   version "1.19"
+   author-version "5.11.1"
+   date "2001-07-05"
+   build-date "2001-07-05"
+   maintainer "ilisp Maintainers <ilisp@cons.org>"
    distribution xemacs
    priority low
-   category "os"
+   category "standard"
    dump nil
    description "Front-end for Inferior Lisp."
-   filename "ilisp-1.08-pkg.tar.gz"
-   md5sum "12041533cb292d9d58a55278c8882c70"
-   size 262171
+   filename "ilisp-1.19-pkg.tar.gz"
+   md5sum "c4379cdfd02c0d578e8877191d3658ff"
+   size 335570
    provides (ilisp completer)
-   requires (xemacs-base)
+   requires (xemacs-base mail-lib fsf-compat eterm)
    type regular
 ))
 ))
@@ -622,19 +751,19 @@
 (package-get-update-base-entry (quote
 (igrep
   (standards-version 1.1
-   version "1.06"
+   version "1.08"
    author-version "2.83"
    date "1998-08-11"
-   build-date "1999-07-30"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "os"
    dump nil
    description "Enhanced front-end for Grep."
-   filename "igrep-1.06-pkg.tar.gz"
-   md5sum "9a61dc2c81e909993e14254f30df3ee7"
-   size 14927
+   filename "igrep-1.08-pkg.tar.gz"
+   md5sum "bc3e4d7a897edb164f93ef49eeff87d3"
+   size 15184
    provides (igrep)
    requires (dired xemacs-base)
    type regular
@@ -644,19 +773,19 @@
 (package-get-update-base-entry (quote
 (eterm
   (standards-version 1.1
-   version "1.09"
+   version "1.13"
    author-version "21.1"
-   date "1999-07-07"
-   build-date "1999-07-30"
+   date "2000-10-05"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "os"
    dump nil
    description "Terminal emulation."
-   filename "eterm-1.09-pkg.tar.gz"
-   md5sum "9cdab77e28dc87a79db4c503c961b37a"
-   size 109066
+   filename "eterm-1.13-pkg.tar.gz"
+   md5sum "ebd64834d12a2a3fc04bbb6f4dd836fa"
+   size 109184
    provides (eterm)
    requires (xemacs-base)
    type regular
@@ -666,19 +795,19 @@
 (package-get-update-base-entry (quote
 (viper
   (standards-version 1.1
-   version "1.17"
-   author-version "3.061"
-   date "1999-05-27"
-   build-date "1999-07-30"
+   version "1.29"
+   author-version "3.09"
+   date "2001-10-13"
+   build-date "2001-11-26"
    maintainer "Michael Kifer <kifer@cs.sunysb.edu>"
    distribution xemacs
    priority low
-   category "wp"
+   category "standard"
    dump nil
    description "VI emulation support."
-   filename "viper-1.17-pkg.tar.gz"
-   md5sum "89285f1297d73552d43602cf1288aefd"
-   size 317943
+   filename "viper-1.29-pkg.tar.gz"
+   md5sum "aa4126c14967ab99fe5584ff8d1d7365"
+   size 327443
    provides (viper)
    requires (xemacs-base)
    type regular
@@ -688,19 +817,19 @@
 (package-get-update-base-entry (quote
 (tpu
   (standards-version 1.1
-   version "1.09"
+   version "1.12"
    author-version "4.2X"
-   date "1998-07-23"
-   build-date "1999-07-30"
+   date "2000-10-05"
+   build-date "2001-01-15"
    maintainer "Kevin Oberman <oberman@es.net>"
    distribution xemacs
    priority medium
    category "wp"
    dump nil
    description "DEC EDIT/TPU support."
-   filename "tpu-1.09-pkg.tar.gz"
-   md5sum "9a467bd306599d97f0f5be0266850d79"
-   size 58814
+   filename "tpu-1.12-pkg.tar.gz"
+   md5sum "8ee6ca98afc9c18a1df013065c430f5e"
+   size 58850
    provides (tpu)
    requires ()
    type regular
@@ -710,19 +839,19 @@
 (package-get-update-base-entry (quote
 (textools
   (standards-version 1.1
-   version "1.09"
+   version "1.12"
    author-version "21.1"
-   date "1998-04-29"
-   build-date "1999-07-30"
+   date "2000-10-05"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "wp"
    dump nil
    description "Miscellaneous TeX support."
-   filename "textools-1.09-pkg.tar.gz"
-   md5sum "d0e16392dfdcd9ec8eab4ebc8da9948e"
-   size 79187
+   filename "textools-1.12-pkg.tar.gz"
+   md5sum "2ce1dc6eb29773d2ab6ce2e04463e54f"
+   size 79212
    provides (bib-mode bibtex refer-to-bibtex)
    requires (xemacs-base)
    type single
@@ -732,19 +861,19 @@
 (package-get-update-base-entry (quote
 (texinfo
   (standards-version 1.1
-   version "1.15"
+   version "1.20"
    author-version "21.1"
-   date "1998-07-20"
-   build-date "1999-07-30"
+   date "2000-03-18"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
    category "wp"
    dump nil
    description "XEmacs TeXinfo support."
-   filename "texinfo-1.15-pkg.tar.gz"
-   md5sum "3c0ba97404953b4383d06f0a88a3a6cd"
-   size 127873
+   filename "texinfo-1.20-pkg.tar.gz"
+   md5sum "25a3261b1700f4b83d229dc1dcf633ae"
+   size 133067
    provides (makeinfo tex-mode texinfmt texinfo texnfo-tex texnfo-upd)
    requires (xemacs-base)
    type regular
@@ -754,19 +883,19 @@
 (package-get-update-base-entry (quote
 (reftex
   (standards-version 1.1
-   version "1.14"
-   author-version "3.43"
-   date "1999-04-06"
-   build-date "1999-07-30"
-   maintainer "Carsten Dominik <dominik@strw.LeidenUniv.nl>"
+   version "1.23"
+   author-version "4.16"
+   date "artin@xema"
+   build-date "2001-06-14"
+   maintainer "Carsten Dominik <dominik@astro.uva.nl>"
    distribution xemacs
    priority medium
    category "wp"
    dump nil
    description "Emacs support for LaTeX cross-references, citations.."
-   filename "reftex-1.14-pkg.tar.gz"
-   md5sum "e56e631f54e895ed95377be6e882bed5"
-   size 215968
+   filename "reftex-1.23-pkg.tar.gz"
+   md5sum "418d13bcf80e929e27be7c68bf718e3c"
+   size 330411
    provides (reftex)
    requires (fsf-compat xemacs-base)
    type regular
@@ -776,19 +905,19 @@
 (package-get-update-base-entry (quote
 (edt
   (standards-version 1.1
-   version "1.08"
-   author-version "21.1"
-   date "1998-04-07"
-   build-date "1999-07-30"
+   version "1.12"
+   author-version "21.5b1"
+   date "2001-07-14"
+   build-date "2001-07-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "wp"
+   category "standard"
    dump nil
    description "DEC EDIT/EDT emulation."
-   filename "edt-1.08-pkg.tar.gz"
-   md5sum "bade43d3b5c90a4b9c969a1f85ef606e"
-   size 46128
+   filename "edt-1.12-pkg.tar.gz"
+   md5sum "0d7649d0f65d9de732918d756f5cf48b"
+   size 62441
    provides (edt)
    requires (xemacs-base)
    type regular
@@ -798,19 +927,19 @@
 (package-get-update-base-entry (quote
 (crisp
   (standards-version 1.1
-   version "1.10"
+   version "1.12"
    author-version "1.34"
    date "1998-08-18"
-   build-date "1999-07-30"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "wp"
    dump nil
    description "Crisp/Brief emulation."
-   filename "crisp-1.10-pkg.tar.gz"
-   md5sum "82fcef8e2a2c6e0d40c68f6142c6a780"
-   size 10065
+   filename "crisp-1.12-pkg.tar.gz"
+   md5sum "30308c6e5fb14f621d53046894c8c180"
+   size 10075
    provides (crisp scroll-lock)
    requires ()
    type regular
@@ -820,19 +949,19 @@
 (package-get-update-base-entry (quote
 (auctex
   (standards-version 1.1
-   version "1.17"
-   author-version "9.7p"
-   date "1998-09-30"
-   build-date "1999-07-30"
+   version "1.28"
+   author-version "10.0g"
+   date "2001-12-13"
+   build-date "2001-12-13"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
-   category "wp"
+   category "standard"
    dump nil
    description "Basic TeX/LaTeX support."
-   filename "auctex-1.17-pkg.tar.gz"
-   md5sum "be1dc85bba341dba02ec13ce06bf9609"
-   size 365053
+   filename "auctex-1.28-pkg.tar.gz"
+   md5sum "a159936d264c746b33776ca9ec078ee8"
+   size 385145
    provides (auc-old bib-cite font-latex latex multi-prompt tex-buf tex-info tex-jp tex-site tex)
    requires (xemacs-base)
    type regular
@@ -842,21 +971,21 @@
 (package-get-update-base-entry (quote
 (vhdl
   (standards-version 1.1
-   version "1.08"
-   author-version "2.74"
-   date "1998-01-24"
-   build-date "1999-07-30"
+   version "1.13"
+   author-version "3.31.20"
+   date "2001-02-16"
+   build-date "2001-02-18"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "prog"
    dump nil
    description "Support for VHDL."
-   filename "vhdl-1.08-pkg.tar.gz"
-   md5sum "8d3422f8b6ba5584dbf89d3ef6759594"
-   size 65948
+   filename "vhdl-1.13-pkg.tar.gz"
+   md5sum "76ef5bea9a7f1c5fb899306089efd0d8"
+   size 272552
    provides (vhdl-mode)
-   requires ()
+   requires (xemacs-base edit-utils c-support speedbar ps-print-nomule os-utils)
    type regular
 ))
 ))
@@ -864,21 +993,21 @@
 (package-get-update-base-entry (quote
 (vc
   (standards-version 1.1
-   version "1.19"
-   author-version "21.1"
-   date "1999-06-07"
-   build-date "1999-07-30"
+   version "1.29"
+   author-version "21.5b3"
+   date "2001-12-03"
+   build-date "2001-12-03"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "prog"
+   category "standard"
    dump nil
    description "Version Control for Free systems."
-   filename "vc-1.19-pkg.tar.gz"
-   md5sum "2794428c1167de3f1db8e9928041b065"
-   size 84689
+   filename "vc-1.29-pkg.tar.gz"
+   md5sum "2c183467360502ae808424ecb179d178"
+   size 91255
    provides (vc)
-   requires (dired xemacs-base)
+   requires (dired xemacs-base vc mail-lib ediff)
    type regular
 ))
 ))
@@ -886,19 +1015,19 @@
 (package-get-update-base-entry (quote
 (vc-cc
   (standards-version 1.1
-   version "1.12"
-   author-version "21.1"
-   date "1998-12-09"
-   build-date "1999-07-30"
+   version "1.18"
+   author-version "21.5b3"
+   date "2001-12-10"
+   build-date "2001-12-10"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "prog"
+   category "standard"
    dump nil
    description "Version Control for ClearCase (UnFree) systems."
-   filename "vc-cc-1.12-pkg.tar.gz"
-   md5sum "db978159bf5d1d194782b79961d003d1"
-   size 96520
+   filename "vc-cc-1.18-pkg.tar.gz"
+   md5sum "6885bb091d1fd108a7ec4353a96016ec"
+   size 94520
    provides (vc)
    requires (dired xemacs-base)
    type regular
@@ -908,19 +1037,19 @@
 (package-get-update-base-entry (quote
 (sh-script
   (standards-version 1.1
-   version "1.10"
+   version "1.13"
    author-version "2.0e"
-   date "1999-05-31"
-   build-date "1999-07-30"
+   date "2000-07-11"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "prog"
    dump nil
    description "Support for editing shell scripts."
-   filename "sh-script-1.10-pkg.tar.gz"
-   md5sum "003e39a5e97acce6f9b751a1fec5e398"
-   size 33987
+   filename "sh-script-1.13-pkg.tar.gz"
+   md5sum "d9fa57da5e44091bf31282886de25687"
+   size 35304
    provides (sh-script executable)
    requires (xemacs-base)
    type regular
@@ -930,19 +1059,19 @@
 (package-get-update-base-entry (quote
 (scheme
   (standards-version 1.1
-   version "1.09"
+   version "1.11"
    author-version "21.1"
    date "1999-06-15"
-   build-date "1999-07-30"
+   build-date "2001-01-15"
    maintainer "Karl M. Hegbloom <karlheg@bittersweet.inetarena.com>"
    distribution xemacs
    priority low
    category "prog"
    dump nil
    description "Front-end support for Inferior Scheme."
-   filename "scheme-1.09-pkg.tar.gz"
-   md5sum "a4542795594e46af3b803d44ed3d7c8d"
-   size 36505
+   filename "scheme-1.11-pkg.tar.gz"
+   md5sum "8994fb43b37a55d4b9ad763af67a45ba"
+   size 36497
    provides (scheme xscheme cmuscheme cmuscheme48)
    requires (xemacs-base)
    type regular
@@ -952,21 +1081,65 @@
 (package-get-update-base-entry (quote
 (prog-modes
   (standards-version 1.1
-   version "1.21"
-   author-version "21.1"
-   date "1999-07-15"
-   build-date "1999-07-30"
+   version "1.44"
+   author-version "21.5b3"
+   date "2001-12-05"
+   build-date "2001-12-10"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
-   category "prog"
+   category "standard"
    dump nil
    description "Support for various programming languages."
-   filename "prog-modes-1.21-pkg.tar.gz"
-   md5sum "e83aff3ead4ab018d07b9b22e9ba301d"
-   size 601321
+   filename "prog-modes-1.44-pkg.tar.gz"
+   md5sum "dbe40bbe4ec194c5ed777b0c5f1548ea"
+   size 720453
    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-devel xemacs-base)
+   requires (mail-lib xemacs-devel xemacs-base cc-mode ps-print-nomule fsf-compat edit-utils ediff emerge efs)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(jde
+  (standards-version 1.1
+   version "1.31"
+   author-version "2.2.8"
+   date "2001-10-14"
+   build-date "2001-11-26"
+   maintainer "Paul Kinnucan <paulk@mathworks.com>"
+   distribution xemacs
+   priority medium
+   category "standard"
+   dump nil
+   description "Java language and development support."
+   filename "jde-1.31-pkg.tar.gz"
+   md5sum "1013e43ea81d2cc354da2bb19f44b205"
+   size 1620042
+   provides (jde)
+   requires (jde cc-mode semantic debug speedbar edit-utils eterm mail-lib xemacs-base xemacs-devel eieio elib sh-script)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(idlwave
+  (standards-version 1.1
+   version "1.23"
+   author-version "4.7"
+   date "2000-12-08"
+   build-date "2001-01-15"
+   maintainer "Carsten Dominik <dominik@astro.uva.nl>"
+   distribution xemacs
+   priority medium
+   category "prog"
+   dump nil
+   description "Editing and Shell mode for the Interactive Data Language"
+   filename "idlwave-1.23-pkg.tar.gz"
+   md5sum "71163a118316b2da6cff6371455dad4c"
+   size 345555
+   provides (idlwave)
+   requires (fsf-compat xemacs-base)
    type regular
 ))
 ))
@@ -974,19 +1147,19 @@
 (package-get-update-base-entry (quote
 (emerge
   (standards-version 1.1
-   version "1.06"
+   version "1.09"
    author-version "21.1"
-   date "1998-04-07"
-   build-date "1999-07-30"
+   date "2000-10-05"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "prog"
    dump nil
    description "Another interface over GNU patch."
-   filename "emerge-1.06-pkg.tar.gz"
-   md5sum "1f4c3003975e8c540742c37cd398dd4b"
-   size 61012
+   filename "emerge-1.09-pkg.tar.gz"
+   md5sum "231c8120d60da2c9ddd856510da2491c"
+   size 61043
    provides (emerge)
    requires ()
    type regular
@@ -994,21 +1167,43 @@
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
+(ediff
+  (standards-version 1.1
+   version "1.33"
+   author-version "2.75"
+   date "2001-09-27"
+   build-date "2001-09-29"
+   maintainer "Michael Kifer <kifer@cs.sunysb.edu>"
+   distribution xemacs
+   priority medium
+   category "standard"
+   dump nil
+   description "Interface over GNU patch."
+   filename "ediff-1.33-pkg.tar.gz"
+   md5sum "8a5b50752086adb44f7d2ec99e10d2eb"
+   size 295809
+   provides (ediff)
+   requires (pcl-cvs elib dired xemacs-base edebug prog-modes)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
 (debug
   (standards-version 1.1
-   version "1.10"
-   author-version "21.1"
-   date "1999-05-12"
-   build-date "1999-07-30"
+   version "1.14"
+   author-version "21.2b42"
+   date "2000-11-07"
+   build-date "2001-01-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "prog"
    dump nil
    description "GUD, gdb, dbx debugging support."
-   filename "debug-1.10-pkg.tar.gz"
-   md5sum "81fab3bf4b08036d122f1e6abb7ffc74"
-   size 103093
+   filename "debug-1.14-pkg.tar.gz"
+   md5sum "20312f80900f1c99f3eeecddf75026ca"
+   size 103296
    provides (dbx gdb-highlight gdb gdbsrc gud history)
    requires (xemacs-base)
    type regular
@@ -1018,19 +1213,19 @@
 (package-get-update-base-entry (quote
 (c-support
   (standards-version 1.1
-   version "1.13"
+   version "1.16"
    author-version "21.1"
-   date "1999-03-02"
-   build-date "1999-07-30"
+   date "2000-10-05"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "prog"
    dump nil
    description "Basic single-file add-ons for editing C code."
-   filename "c-support-1.13-pkg.tar.gz"
-   md5sum "d4568a0fd8c0ea31917ad37e190e443b"
-   size 69931
+   filename "c-support-1.16-pkg.tar.gz"
+   md5sum "047accf51457a041bf920c9563de1bf6"
+   size 70393
    provides (c-comment-edit cmacexp ctypes hideif hideshow)
    requires (cc-mode xemacs-base)
    type regular
@@ -1040,19 +1235,19 @@
 (package-get-update-base-entry (quote
 (ada
   (standards-version 1.1
-   version "1.07"
+   version "1.10"
    author-version "2.27"
-   date "1998-01-24"
-   build-date "1999-07-30"
+   date "2000-10-05"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "prog"
    dump nil
    description "Ada language support."
-   filename "ada-1.07-pkg.tar.gz"
-   md5sum "f12fe7c6ac8ed3bcfeb761ffd9e60661"
-   size 54369
+   filename "ada-1.10-pkg.tar.gz"
+   md5sum "6ba6ca52a345831e8fafa241119db39f"
+   size 54387
    provides (ada-mode ada-stmt)
    requires ()
    type regular
@@ -1062,21 +1257,21 @@
 (package-get-update-base-entry (quote
 (pcl-cvs
   (standards-version 1.1
-   version "1.40"
-   author-version "R-2_0-Beta_2"
-   date "1999-06-16"
-   build-date "1999-07-30"
+   version "1.55"
+   author-version "R-2_9_9"
+   date "2001-06-06"
+   build-date "2001-07-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "prog"
+   category "standard"
    dump nil
    description "CVS frontend."
-   filename "pcl-cvs-1.40-pkg.tar.gz"
-   md5sum "2ad22b28bb14a7bade0b2fad0723d35f"
-   size 163639
+   filename "pcl-cvs-1.55-pkg.tar.gz"
+   md5sum "d4f7b40492290a31139f2233b035d3d7"
+   size 160861
    provides (pcl-cvs generic-sc)
-   requires (xemacs-base elib dired)
+   requires (xemacs-base elib vc dired edebug ediff edit-utils mail-lib prog-modes)
    type regular
 ))
 ))
@@ -1084,21 +1279,43 @@
 (package-get-update-base-entry (quote
 (cc-mode
   (standards-version 1.1
-   version "1.16"
-   author-version "5.25"
-   date "1998-12-30"
-   build-date "1999-07-30"
-   maintainer "Barry Warsaw <bug-cc-mode@gnu.org>"
+   version "1.26"
+   author-version "5.28"
+   date "2001-08-13"
+   build-date "2001-08-14"
+   maintainer "Martin Stjernholm <bug-cc-mode@gnu.org>"
    distribution xemacs
    priority medium
-   category "prog"
+   category "standard"
    dump nil
    description "C, C++ and Java language support."
-   filename "cc-mode-1.16-pkg.tar.gz"
-   md5sum "9f8c53d9abca09982e739344c733c7c3"
-   size 212664
+   filename "cc-mode-1.26-pkg.tar.gz"
+   md5sum "206a11ebe3e1e4639e9e3cbf681d9096"
+   size 262806
    provides (cc-mode)
-   requires (xemacs-base)
+   requires (xemacs-base mail-lib)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(semantic
+  (standards-version 1.1
+   version "1.10"
+   author-version "1.4beta8"
+   date "2001-08-16"
+   build-date "2001-08-16"
+   maintainer "Eric M. Ludlam <zappo@gnu.org>"
+   distribution xemacs
+   priority low
+   category "standard"
+   dump nil
+   description "Semantic bovinator (Yacc/Lex for XEmacs). Includes Senator."
+   filename "semantic-1.10-pkg.tar.gz"
+   md5sum "a3806bbbd6d4cd1ebb11ed969ccc37ec"
+   size 281656
+   provides (semantic senator)
+   requires (eieio xemacs-base xemacs-devel edit-utils speedbar texinfo)
    type regular
 ))
 ))
@@ -1106,19 +1323,19 @@
 (package-get-update-base-entry (quote
 (misc-games
   (standards-version 1.1
-   version "1.12"
+   version "1.15"
    author-version "21.1"
-   date "1999-03-05"
-   build-date "1999-07-30"
+   date "2000-11-18"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "games"
    dump nil
    description "Other amusements and diversions."
-   filename "misc-games-1.12-pkg.tar.gz"
-   md5sum "74c3421bdfdfe77989741389f0e1330a"
-   size 166163
+   filename "misc-games-1.15-pkg.tar.gz"
+   md5sum "a77db688d2d276aaca5840a7c16615f0"
+   size 166336
    provides (decipher gomoku hanoi life morse rot13)
    requires (xemacs-base)
    type single
@@ -1128,19 +1345,19 @@
 (package-get-update-base-entry (quote
 (mine
   (standards-version 1.1
-   version "1.11"
+   version "1.14"
    author-version "1.9"
-   date "1998-05-09"
-   build-date "1999-07-30"
+   date "2000-10-05"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "games"
    dump nil
    description "Minehunt Game."
-   filename "mine-1.11-pkg.tar.gz"
-   md5sum "fad5f9d385ac22c2cf446db18e57300e"
-   size 66703
+   filename "mine-1.14-pkg.tar.gz"
+   md5sum "ebe471b68642906786db139d402002c7"
+   size 66727
    provides (xmine)
    requires (xemacs-base)
    type regular
@@ -1150,19 +1367,19 @@
 (package-get-update-base-entry (quote
 (games
   (standards-version 1.1
-   version "1.10"
+   version "1.13"
    author-version "1.04"
-   date "1998-06-04"
-   build-date "1999-07-30"
+   date "2000-03-23"
+   build-date "2001-01-15"
    maintainer "Glynn Clements <glynn@sensei.co.uk>"
    distribution xemacs
    priority low
    category "games"
    dump nil
    description "Tetris, Sokoban, and Snake."
-   filename "games-1.10-pkg.tar.gz"
-   md5sum "e43de212a7ceb56cbaad7e40eb775dd2"
-   size 32184
+   filename "games-1.13-pkg.tar.gz"
+   md5sum "4138cc59fd6a9316adbb14e7468af593"
+   size 32438
    provides (gamegrid snake tetris sokoban)
    requires (xemacs-base)
    type regular
@@ -1172,19 +1389,19 @@
 (package-get-update-base-entry (quote
 (cookie
   (standards-version 1.1
-   version "1.11"
+   version "1.13"
    author-version "21.1"
    date "1998-04-07"
-   build-date "1999-07-30"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "games"
    dump nil
    description "Spook and Yow (Zippy quotes)."
-   filename "cookie-1.11-pkg.tar.gz"
-   md5sum "291ea47a1e71de661de365aea0addb60"
-   size 34221
+   filename "cookie-1.13-pkg.tar.gz"
+   md5sum "9aeaa055b157c6fa50991758851ec16d"
+   size 34192
    provides (cookie1 yow)
    requires (xemacs-base)
    type regular
@@ -1192,23 +1409,45 @@
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
+(eicq
+  (standards-version 1.1
+   version "1.05"
+   author-version "0.2.14"
+   date "2001-06-06"
+   build-date "2001-07-02"
+   maintainer "Steve Youngs <youngs@xemacs.org>"
+   distribution xemacs
+   priority low
+   category "standard"
+   dump nil
+   description "ICQ Client developed and tested on Linux x86; only supported on that platform"
+   filename "eicq-1.05-pkg.tar.gz"
+   md5sum "09c41ae8e50c418bc73029a05c0694f3"
+   size 299679
+   provides (eicq eicq-toolbar eicq-report)
+   requires (xemacs-base mail-lib eicq gnus fsf-compat cookie)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
 (bbdb
   (standards-version 1.1
-   version "1.08"
-   author-version "2.00.06"
-   date "1999-01-24"
-   build-date "1999-07-30"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   version "1.16"
+   author-version "2.32"
+   date "2001-08-29"
+   build-date "2001-09-01"
+   maintainer "Ronan Waide <waider@waider.ie>"
    distribution xemacs
    priority medium
-   category "comm"
+   category "standard"
    dump nil
    description "The Big Brother Data Base"
-   filename "bbdb-1.08-pkg.tar.gz"
-   md5sum "c95ed737fab5b59e88d9acc33703697b"
-   size 282061
+   filename "bbdb-1.16-pkg.tar.gz"
+   md5sum "076538ab2bf64b6bfbe0ce02edf51eac"
+   size 338066
    provides (bbdb)
-   requires (bbdb edit-utils gnus mh-e rmail supercite vm tm apel mail-lib xemacs-base)
+   requires (bbdb edit-utils gnus mh-e rmail supercite vm tm apel mail-lib xemacs-base w3)
    type regular
 ))
 ))
@@ -1216,19 +1455,19 @@
 (package-get-update-base-entry (quote
 (zenirc
   (standards-version 1.1
-   version "1.06"
+   version "1.11"
    author-version "2.112"
-   date "1998-08-15"
-   build-date "1999-07-30"
+   date "2001-06-16"
+   build-date "2001-07-28"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
-   category "comm"
+   category "standard"
    dump nil
    description "ZENIRC IRC Client."
-   filename "zenirc-1.06-pkg.tar.gz"
-   md5sum "7b701d195193ad6b0bf8e2067e17e372"
-   size 276012
+   filename "zenirc-1.11-pkg.tar.gz"
+   md5sum "ef56684bdf71cae7e15f58c3819a7ee9"
+   size 276478
    provides (zenirc)
    requires (zenirc)
    type regular
@@ -1238,21 +1477,21 @@
 (package-get-update-base-entry (quote
 (mew
   (standards-version 1.1
-   version "1.08"
-   author-version "1.93b38x1"
-   date "1998-12-09"
-   build-date "1999-07-30"
+   version "1.14"
+   author-version "1.94.2"
+   date "2001-02-05"
+   build-date "2001-02-05"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "comm"
    dump nil
    description "Messaging in an Emacs World."
-   filename "mew-1.08-pkg.tar.gz"
-   md5sum "47ff3e8966c6a198cbae3a413139f4b7"
-   size 518502
+   filename "mew-1.14-pkg.tar.gz"
+   md5sum "c46627866de19034116a0c739be8e1eb"
+   size 655083
    provides (mew)
-   requires (mew)
+   requires (mew w3 efs mail-lib xemacs-base fsf-compat)
    type regular
 ))
 ))
@@ -1260,21 +1499,21 @@
 (package-get-update-base-entry (quote
 (tm
   (standards-version 1.1
-   version "1.20"
-   author-version "21.1"
-   date "1999-02-06"
-   build-date "1999-07-30"
+   version "1.29"
+   author-version "21.5b2"
+   date "2001-07-31"
+   build-date "2001-07-31"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "comm"
+   category "standard"
    dump nil
-   description "Emacs MIME support."
-   filename "tm-1.20-pkg.tar.gz"
-   md5sum "d602235f7efdcdd37e7758101e3c162d"
-   size 329547
+   description "Emacs MIME support. Not needed for gnus >= 5.8.0"
+   filename "tm-1.29-pkg.tar.gz"
+   md5sum "ae9c106bafbfb471ceaaaf16b7acb8ac"
+   size 332928
    provides (tm tm-edit tm-view mime-setup)
-   requires (gnus mh-e rmail vm mailcrypt mail-lib apel xemacs-base)
+   requires (gnus mh-e rmail vm mailcrypt mail-lib apel xemacs-base fsf-compat)
    type regular
 ))
 ))
@@ -1282,21 +1521,21 @@
 (package-get-update-base-entry (quote
 (gnus
   (standards-version 1.1
-   version "1.42"
-   author-version "5.6.45x1"
-   date "1999-03-12"
-   build-date "1999-07-30"
+   version "1.57"
+   author-version "5.8.8"
+   date "2001-08-29"
+   build-date "2001-09-01"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
-   category "comm"
+   category "standard"
    dump nil
    description "The Gnus Newsreader and Mailreader."
-   filename "gnus-1.42-pkg.tar.gz"
-   md5sum "f076c9ae4ca6ab468454d8036a178501"
-   size 1872714
+   filename "gnus-1.57-pkg.tar.gz"
+   md5sum "e0d0ffe9792aad3c28af0077b5809c07"
+   size 2350636
    provides (gnus message)
-   requires (gnus tm apel w3 mh-e mailcrypt rmail mail-lib xemacs-base)
+   requires (gnus w3 mh-e mailcrypt rmail eterm mail-lib xemacs-base fsf-compat)
    type regular
 ))
 ))
@@ -1304,19 +1543,19 @@
 (package-get-update-base-entry (quote
 (rmail
   (standards-version 1.1
-   version "1.10"
+   version "1.12"
    author-version "21.1"
    date "1998-06-28"
-   build-date "1999-07-30"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "comm"
    dump nil
    description "An obsolete Emacs mailer."
-   filename "rmail-1.10-pkg.tar.gz"
-   md5sum "4a8b8e1d7b68957ab357d8f86f232fac"
-   size 96442
+   filename "rmail-1.12-pkg.tar.gz"
+   md5sum "ef29f27bfb5b7af89ae57be18b94da6f"
+   size 96401
    provides (rmail rmailsum)
    requires (tm apel mail-lib xemacs-base)
    type regular
@@ -1326,21 +1565,21 @@
 (package-get-update-base-entry (quote
 (mailcrypt
   (standards-version 1.1
-   version "2.01"
-   author-version "3.5.3"
-   date "1999-03-12"
-   build-date "1999-07-30"
+   version "2.09"
+   author-version "3.5.6"
+   date "2001-07-01"
+   build-date "2001-07-02"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "comm"
+   category "standard"
    dump nil
    description "Support for messaging encryption with PGP."
-   filename "mailcrypt-2.01-pkg.tar.gz"
-   md5sum "1225a54298f26e6a06749dfb0665b658"
-   size 134061
+   filename "mailcrypt-2.09-pkg.tar.gz"
+   md5sum "34b06d81b131c89d83b1c9387e23975a"
+   size 141199
    provides (mailcrypt)
-   requires (mail-lib fsf-compat xemacs-base)
+   requires (mail-lib fsf-compat xemacs-base cookie gnus mh-e rmail vm)
    type regular
 ))
 ))
@@ -1348,19 +1587,19 @@
 (package-get-update-base-entry (quote
 (supercite
   (standards-version 1.1
-   version "1.13"
+   version "1.18"
    author-version "3.55x3"
-   date "1999-04-06"
-   build-date "1999-07-30"
+   date "2001-08-06"
+   build-date "2001-08-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "comm"
+   category "standard"
    dump nil
    description "An Emacs citation tool for News & Mail messages."
-   filename "supercite-1.13-pkg.tar.gz"
-   md5sum "7f599f29f111dca3e62c3baeec2b2d91"
-   size 99547
+   filename "supercite-1.18-pkg.tar.gz"
+   md5sum "e19c81599495ff2a010e81f4b175b9fd"
+   size 100848
    provides (supercite)
    requires (mail-lib xemacs-base)
    type regular
@@ -1370,19 +1609,19 @@
 (package-get-update-base-entry (quote
 (mh-e
   (standards-version 1.1
-   version "1.10"
+   version "1.13"
    author-version "21.1"
-   date "1998-07-12"
-   build-date "1999-07-30"
+   date "2000-05-08"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "comm"
    dump nil
    description "Front end support for MH."
-   filename "mh-e-1.10-pkg.tar.gz"
-   md5sum "e04e85a9ff62282a18a06872c840e22f"
-   size 176436
+   filename "mh-e-1.13-pkg.tar.gz"
+   md5sum "213d2484432c141ba2017d437922076b"
+   size 176657
    provides (mh-e)
    requires (mail-lib xemacs-base)
    type regular
@@ -1392,19 +1631,19 @@
 (package-get-update-base-entry (quote
 (gnats
   (standards-version 1.1
-   version "1.09"
+   version "1.12"
    author-version "3.101"
-   date "1998-08-01"
-   build-date "1999-07-30"
+   date "2000-10-05"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
    category "comm"
    dump nil
    description "XEmacs bug reports."
-   filename "gnats-1.09-pkg.tar.gz"
-   md5sum "0893c6cad7179a2be79744bdfc0c6932"
-   size 189250
+   filename "gnats-1.12-pkg.tar.gz"
+   md5sum "8487d89459c7be544547558d39f42945"
+   size 189342
    provides (gnats gnats-admin send-pr)
    requires (mail-lib xemacs-base)
    type regular
@@ -1414,19 +1653,19 @@
 (package-get-update-base-entry (quote
 (footnote
   (standards-version 1.1
-   version "1.11"
+   version "1.13"
    author-version "0.18x"
-   date "1999-03-11"
-   build-date "1999-07-30"
+   date "2000-01-22"
+   build-date "2001-01-15"
    maintainer "SL Baur <steve@xemacs.org>"
    distribution xemacs
    priority low
    category "comm"
    dump nil
    description "Footnoting in mail message editing modes."
-   filename "footnote-1.11-pkg.tar.gz"
-   md5sum "7aa931c602913134e5e716de752439db"
-   size 18364
+   filename "footnote-1.13-pkg.tar.gz"
+   md5sum "23aa290969664f5edb96c79ae322759b"
+   size 21084
    provides (footnote)
    requires (mail-lib xemacs-base)
    type regular
@@ -1436,20 +1675,20 @@
 (package-get-update-base-entry (quote
 (eudc
   (standards-version 1.1
-   version "1.29"
-   author-version "1.29"
-   date "1999-07-21"
-   build-date "1999-07-30"
+   version "1.34"
+   author-version "1.32"
+   date "2001-07-28"
+   build-date "2001-08-20"
    maintainer "Oscar Figueiredo <oscar@xemacs.org>"
    distribution xemacs
    priority low
-   category "comm"
+   category "standard"
    dump nil
    description "Emacs Unified Directory Client (LDAP, PH)."
-   filename "eudc-1.29-pkg.tar.gz"
-   md5sum "23f490bd6771d873c1869fa1ac56a3a8"
-   size 71390
-   provides (eudc eudc-ldap eudc-ph eudc-bbdb)
+   filename "eudc-1.34-pkg.tar.gz"
+   md5sum "31aaecdc3bbf2660999ad8b668eb6d9d"
+   size 78955
+   provides (eudc eudc-vars eudc-hotlist eudc-export eudc-bob eudcb-ldap eudcb-ph eudcb-bbdb)
    requires (fsf-compat xemacs-base bbdb)
    type regular
 ))
@@ -1458,19 +1697,19 @@
 (package-get-update-base-entry (quote
 (net-utils
   (standards-version 1.1
-   version "1.12"
-   author-version "21.1"
-   date "1998-07-01"
-   build-date "1999-07-30"
+   version "1.23"
+   author-version "21.5b3"
+   date "2001-09-28"
+   build-date "2001-09-29"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "comm"
+   category "standard"
    dump nil
    description "Miscellaneous Networking Utilities."
-   filename "net-utils-1.12-pkg.tar.gz"
-   md5sum "49b7e1d0f2f97519eca07d3562f6a00d"
-   size 107202
+   filename "net-utils-1.23-pkg.tar.gz"
+   md5sum "3677407752d20aa6f72be5d497eae0c8"
+   size 119855
    provides (ilisp-browse-cltl2 emacsbug feedmail metamail net-utils rcompile shadowfile webjump webster-www)
    requires (w3 efs mail-lib xemacs-base)
    type single
@@ -1480,19 +1719,19 @@
 (package-get-update-base-entry (quote
 (w3
   (standards-version 1.1
-   version "1.14"
-   author-version "4.0pre39x1"
-   date "1999-03-02"
-   build-date "1999-07-30"
+   version "1.20"
+   author-version "4.0pre46"
+   date "2001-06-18"
+   build-date "2001-07-03"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
-   category "comm"
+   category "standard"
    dump nil
    description "A Web browser."
-   filename "w3-1.14-pkg.tar.gz"
-   md5sum "693692928758ea53e9fa76527893a483"
-   size 680740
+   filename "w3-1.20-pkg.tar.gz"
+   md5sum "d2887a223788fec1deb43ba7489cf603"
+   size 689279
    provides (w3 url)
    requires (w3 mail-lib xemacs-base)
    type regular
@@ -1502,19 +1741,19 @@
 (package-get-update-base-entry (quote
 (vm
   (standards-version 1.1
-   version "1.21"
-   author-version "6.72"
-   date "1999-05-13"
-   build-date "1999-07-30"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   version "7.00"
+   author-version "7.00"
+   date "2001-12-09"
+   build-date "2001-12-09"
+   maintainer "Kyle Jones <kyle_jones@wonderworks.com>"
    distribution xemacs
    priority medium
-   category "comm"
+   category "standard"
    dump nil
    description "An Emacs mailer."
-   filename "vm-1.21-pkg.tar.gz"
-   md5sum "1110173b0759dbed61e9b1690d32d984"
-   size 619207
+   filename "vm-7.00-pkg.tar.gz"
+   md5sum "5cda132d6599eab758ff8623f93bad40"
+   size 699259
    provides (vm)
    requires (mail-lib xemacs-base)
    type regular
@@ -1524,19 +1763,19 @@
 (package-get-update-base-entry (quote
 (sounds-wav
   (standards-version 1.1
-   version "1.08"
+   version "1.10"
    author-version "21.1"
-   date "1999-02-02"
-   build-date "1999-07-30"
+   date "2000-05-23"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
    category "libs"
    dump nil
    description "XEmacs Microsoft sound files."
-   filename "sounds-wav-1.08-pkg.tar.gz"
-   md5sum "8d34b4f2a6cb90f3d86c94d018cc3912"
-   size 149046
+   filename "sounds-wav-1.10-pkg.tar.gz"
+   md5sum "89dff9f3b8e1aaaa19f000035e3aa199"
+   size 149162
    provides ()
    requires ()
    type regular
@@ -1546,19 +1785,19 @@
 (package-get-update-base-entry (quote
 (sounds-au
   (standards-version 1.1
-   version "1.08"
+   version "1.10"
    author-version "21.1"
-   date "1999-02-02"
-   build-date "1999-07-30"
+   date "2000-05-23"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
    category "libs"
    dump nil
    description "XEmacs Sun sound files."
-   filename "sounds-au-1.08-pkg.tar.gz"
-   md5sum "8344fa28ad13a14e67accf72168ac91a"
-   size 126196
+   filename "sounds-au-1.10-pkg.tar.gz"
+   md5sum "256e09c0570a19ae545350681bacaf3e"
+   size 126306
    provides ()
    requires ()
    type regular
@@ -1568,21 +1807,21 @@
 (package-get-update-base-entry (quote
 (xemacs-devel
   (standards-version 1.1
-   version "1.23"
-   author-version "21.1"
-   date "1999-05-28"
-   build-date "1999-07-30"
+   version "1.38"
+   author-version "21.5b3"
+   date "2001-09-08"
+   build-date "2001-09-11"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
-   category "libs"
+   category "standard"
    dump nil
    description "Emacs Lisp developer support."
-   filename "xemacs-devel-1.23-pkg.tar.gz"
-   md5sum "f0f629aed67569b793347ca9713fc836"
-   size 83642
+   filename "xemacs-devel-1.38-pkg.tar.gz"
+   md5sum "ba233ed84cb2f6bb41813297b7adc988"
+   size 156662
    provides (docref eldoc elp find-func hide-copyleft ielm regexp-opt trace)
-   requires (xemacs-base)
+   requires (xemacs-base ispell mail-lib)
    type single
 ))
 ))
@@ -1590,19 +1829,19 @@
 (package-get-update-base-entry (quote
 (tooltalk
   (standards-version 1.1
-   version "1.10"
+   version "1.13"
    author-version "21.1"
-   date "1998-07-25"
-   build-date "1999-07-30"
+   date "2000-10-05"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "libs"
    dump nil
    description "Support for building with Tooltalk."
-   filename "tooltalk-1.10-pkg.tar.gz"
-   md5sum "6e73fe7a0ef9d9511e885999b806f914"
-   size 9279
+   filename "tooltalk-1.13-pkg.tar.gz"
+   md5sum "3f01dab216a3bc318d11f362d22ea89c"
+   size 9301
    provides ()
    requires ()
    type regular
@@ -1612,19 +1851,19 @@
 (package-get-update-base-entry (quote
 (elib
   (standards-version 1.1
-   version "1.05"
+   version "1.08"
    author-version "1.0"
-   date "1998-10-01"
-   build-date "1999-07-30"
+   date "2000-10-05"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
    category "libs"
    dump nil
    description "Portable Emacs Lisp utilities library."
-   filename "elib-1.05-pkg.tar.gz"
-   md5sum "b9f0d18ae78f70a65a341c515aae2095"
-   size 72809
+   filename "elib-1.08-pkg.tar.gz"
+   md5sum "dd8c626d4a2b967febe68bcaa1cd1b96"
+   size 72867
    provides (avltree bintree cookie dll elib-node queue-f queue-m read stack-f stack-m string)
    requires ()
    type single
@@ -1634,19 +1873,19 @@
 (package-get-update-base-entry (quote
 (edebug
   (standards-version 1.1
-   version "1.08"
-   author-version "21.1"
-   date "1998-03-12"
-   build-date "1999-07-30"
+   version "1.14"
+   author-version "21.5b1"
+   date "2001-07-16"
+   build-date "2001-07-21"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "libs"
+   category "standard"
    dump nil
    description "An Emacs Lisp debugger."
-   filename "edebug-1.08-pkg.tar.gz"
-   md5sum "366450f91a308c84471f7cdb98fd907c"
-   size 112428
+   filename "edebug-1.14-pkg.tar.gz"
+   md5sum "8cac8a4c9e7f01bc3199f395fc9d975b"
+   size 112374
    provides (edebug cl-read cust-print eval-reg cl-specs)
    requires (xemacs-base)
    type regular
@@ -1656,19 +1895,19 @@
 (package-get-update-base-entry (quote
 (Sun
   (standards-version 1.1
-   version "1.11"
+   version "1.13"
    author-version "21.1"
    date "1998-07-25"
-   build-date "1999-07-30"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "libs"
    dump nil
    description "Support for Sparcworks."
-   filename "Sun-1.11-pkg.tar.gz"
-   md5sum "8920cd925c5bff8b9d4a353d08c1f7ff"
-   size 63685
+   filename "Sun-1.13-pkg.tar.gz"
+   md5sum "455b7e1c3564563687e36ab53352ba76"
+   size 63836
    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
@@ -1678,19 +1917,19 @@
 (package-get-update-base-entry (quote
 (apel
   (standards-version 1.1
-   version "1.15"
-   author-version "9.20"
-   date "1999-07-26"
-   build-date "1999-07-30"
+   version "1.20"
+   author-version "10.2"
+   date "2000-11-14"
+   build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
    category "libs"
    dump nil
    description "A Portable Emacs Library.  Used by XEmacs MIME support."
-   filename "apel-1.15-pkg.tar.gz"
-   md5sum "503832a7c28fe700afc35dbaf7fdeb01"
-   size 79178
+   filename "apel-1.20-pkg.tar.gz"
+   md5sum "0d3ac6c109783e1cc48cc4608843d6c3"
+   size 107611
    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 (fsf-compat xemacs-base)
    type regular
@@ -1699,44 +1938,44 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (efs
-  (standards-version 1.1
-   version "1.15"
-   author-version "1.18"
-   date "1999-01-03"
-   build-date "1999-07-30"
+  (standards-version 1.0
+   version "1.26"
+   author-version "1.20pre2"
+   date "2001-06-09"
+   build-date "2001-06-14"
    maintainer "Mike Sperber <sperber@informatik.uni-tuebingen.de>"
-   distribution xemacs
+   distribution stable
    priority medium
-   category "libs"
+   category "standard"
    dump nil
    description "Treat files on remote systems the same as local files."
-   filename "efs-1.15-pkg.tar.gz"
-   md5sum "4c88a1915bace153310c681f24deb14d"
-   size 369713
+   filename "efs-1.26-pkg.tar.gz"
+   md5sum "cecc2e953d90dd3fc3938d26fce4f0f7"
+   size 369938
    provides (efs)
-   requires (xemacs-base vm dired)
+   requires (xemacs-base dired)
    type regular
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
 (dired
-  (standards-version 1.1
-   version "1.06"
-   author-version "7.9"
-   date "1998-12-09"
-   build-date "1999-07-30"
+  (standards-version 1.0
+   version "1.11"
+   author-version "7.10"
+   date "2001-06-03"
+   build-date "2001-06-14"
    maintainer "Mike Sperber <sperber@informatik.uni-tuebingen.de>"
-   distribution xemacs
+   distribution stable
    priority medium
-   category "libs"
+   category "standard"
    dump nil
    description "Manage file systems."
-   filename "dired-1.06-pkg.tar.gz"
-   md5sum "9c857aa147bf53d972ad6ac30ce34bd4"
-   size 187691
+   filename "dired-1.11-pkg.tar.gz"
+   md5sum "0b44f0635a1d08189db83e8558cfe8e0"
+   size 193695
    provides (diff dired)
-   requires (xemacs-base)
+   requires (xemacs-base prog-modes)
    type regular
 ))
 ))
@@ -1744,21 +1983,21 @@
 (package-get-update-base-entry (quote
 (mail-lib
   (standards-version 1.1
-   version "1.24"
-   author-version "21.1"
-   date "1999-04-13"
-   build-date "1999-07-30"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   version "1.40"
+   author-version "21.5b3"
+   date "2001-11-27"
+   build-date "2001-11-28"
+   maintainer "Simon Josefsson <simon@josefsson.org>"
    distribution xemacs
    priority medium
-   category "libs"
+   category "standard"
    dump nil
    description "Fundamental lisp files for providing email support."
-   filename "mail-lib-1.24-pkg.tar.gz"
-   md5sum "9428816ccc49d99be80dcbfc34d7917f"
-   size 131977
+   filename "mail-lib-1.40-pkg.tar.gz"
+   md5sum "9bac3da5281026155fd6fadb93efb938"
+   size 177170
    provides (browse-url highlight-headers mail-abbrevs mail-extr mail-utils reporter rfc822 rmail-mini rmailout sendmail smtpmail)
-   requires (xemacs-base)
+   requires (eterm xemacs-base)
    type regular
 ))
 ))
@@ -1766,21 +2005,21 @@
 (package-get-update-base-entry (quote
 (fsf-compat
   (standards-version 1.1
-   version "1.06"
-   author-version "21.1"
-   date "1998-09-12"
-   build-date "1999-07-30"
+   version "1.09"
+   author-version "21.4"
+   date "2001-04-28"
+   build-date "2001-04-28"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
    category "libs"
    dump nil
    description "FSF Emacs compatibility files."
-   filename "fsf-compat-1.06-pkg.tar.gz"
-   md5sum "b167c9b6e4b6ff464d34143782d6c633"
-   size 17356
+   filename "fsf-compat-1.09-pkg.tar.gz"
+   md5sum "b0f33bb047d8c64020b1fa0bf35eb12e"
+   size 21096
    provides (overlay thingatpt timer x-popup-menu)
-   requires ()
+   requires (xemacs-base)
    type single
 ))
 ))
@@ -1788,31 +2027,23 @@
 (package-get-update-base-entry (quote
 (xemacs-base
   (standards-version 1.1
-   version "1.32"
-   author-version "21.1"
-   date "1999-07-22"
-   build-date "1999-07-30"
+   version "1.56"
+   author-version "21.5b3"
+   date "2001-12-10"
+   build-date "2001-12-10"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
-   category "libs"
+   category "standard"
    dump nil
    description "Fundamental XEmacs support, you almost certainly need this."
-   filename "xemacs-base-1.32-pkg.tar.gz"
-   md5sum "ae699a67f9922ad330fc1e5d45d3ff87"
-   size 430787
-   provides (add-log advice annotations assoc case-table chistory comint-xemacs comint compile debug ebuff-menu echistory edmacro ehelp electric enriched env facemenu ffap helper imenu iso-syntax macros novice outline overlay passwd pp regi ring shell skeleton sort thing time-stamp timezone xbm-button xpm-button)
+   filename "xemacs-base-1.56-pkg.tar.gz"
+   md5sum "c619c482b36b55468f4e29d775b2f12f"
+   size 454879
+   provides (add-log advice annotations assoc case-table chistory comint-xemacs comint compile debug ebuff-menu echistory edmacro ehelp electric enriched env facemenu ffap helper imenu iso-syntax macros novice outline overlay passwd pp regi ring shell skeleton sort thing time-stamp timezone xbm-button xpm-button tq)
    requires ()
    type regular
 ))
 ))
 ;;;@@@
 ;; Package Index file ends here
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v0.9.8 (SunOS)
-Comment: For info see http://www.gnupg.org
-
-iEYEARECAAYFAjehBIcACgkQEng2Tdz4C2tvvQCbBYGskNM16GwRfw/DjTS4byZN
-6CIAnRGmsWGM/07NNA6mEyejc3SDD7/3
-=NjSE
------END PGP SIGNATURE-----
diff --text -u 'xemacs-21.4.5/lib-src/ChangeLog' 'xemacs-21.4.6/lib-src/ChangeLog'
Index: ././lib-src/ChangeLog
--- ././lib-src/ChangeLog	Tue Oct 23 20:02:34 2001
+++ ././lib-src/ChangeLog	Mon Dec 17 18:33:19 2001
@@ -1,3 +1,11 @@
+2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.6 "Common Lisp" is released.
+
 2001-10-23  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.5 "Civil Service" is released.
diff --text -u 'xemacs-21.4.5/lisp/ChangeLog' 'xemacs-21.4.6/lisp/ChangeLog'
Index: ././lisp/ChangeLog
--- ././lisp/ChangeLog	Tue Oct 23 20:02:35 2001
+++ ././lisp/ChangeLog	Mon Dec 17 18:33:19 2001
@@ -1,3 +1,78 @@
+2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-11-21  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* package-net.el: Inadvertant synch with Windows branch.  From
+	Andy's log:
+	(package-net-kit-version): new variable.
+	(package-net-generate-bin-ini): use it. Remove unwanted functions.
+
+2001-11-28  Steve Youngs  <youngs@xemacs.org>
+
+	* package-get.el (package-get-locate-index-file): Also search the
+	core etc/ directory for the package index file if it can't be
+	found in ~/.xemacs/.
+
+2001-12-13  William Perry  <wmperry@gnu.org>
+
+	* dialog-gtk.el (popup-builtin-question-dialog):
+	Conform to API in gui.c.
+	
+2001-11-12  Andy Piper  <andy@xemacs.org>
+
+	* cus-edit.el (custom-save-face-internal): make sure we save
+	non-themed faces.
+	(custom-save-variables): ditto variables.
+
+2001-11-20  Stephen J. Turnbull  <stephen@xemacs.og>
+
+	* faces.el (make-face-family):
+	(make-face-size):
+	New face-modifying functions per Jan Vroonhof.
+
+	cus-face.el (custom-set-face-font-family):
+	(custom-set-face-font-size):
+	Use them.
+
+	* font.el (font-window-system-mappings): More precise docstring.
+
+	(font-create-name):
+	(font-create-object):
+	(tty-font-create-object):
+	(tty-font-create-plist):
+	(x-font-create-object):
+	(x-font-create-name):
+	(ns-font-create-name):
+	(mswindows-font-create-object):
+	(mswindows-font-create-name):
+	Add doctrings.
+
+2001-11-14  John Paul Wallington <jpw@shootybangbang.com>
+
+	* gtk-faces.el (gtk-init-device-faces): removed spurious
+	quote before let* expression.
+
+2001-10-29  Andy Piper  <andy@xemacs.org>
+
+	* code-files.el (toggle-buffer-file-coding-system): mark buffer as
+	modified when changing coding system.
+
+	* toolbar-items.el (toolbar-dired): Use interactive "D" spec so
+	that we invoke the GUI directory selector.
+
+2001-10-25  Andy Piper  <andy@xemacs.org>
+
+	* dialog.el (make-dialog-box): use new directory dialog support.
+	* minibuf.el (read-file-name-1): ditto.
+	(read-file-name): ditto.
+	(read-directory-name): ditto.
+
 2001-10-23  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.5 "Civil Service" is released.
diff --text -u 'xemacs-21.4.5/lisp/code-files.el' 'xemacs-21.4.6/lisp/code-files.el'
Index: ././lisp/code-files.el
--- ././lisp/code-files.el	Fri Apr 13 03:21:14 2001
+++ ././lisp/code-files.el	Mon Dec 17 14:49:08 2001
@@ -116,7 +116,8 @@
 	   (coding-system-base buffer-file-coding-system)
 	   (cond ((eq eol-type 'lf) 'crlf)
 		 ((eq eol-type 'crlf) 'lf)
-		 ((eq eol-type 'cr) 'lf))))))
+		 ((eq eol-type 'cr) 'lf))))
+    (set-buffer-modified-p t)))
 
 (define-obsolete-function-alias
   'set-file-coding-system
diff --text -u 'xemacs-21.4.5/lisp/cus-edit.el' 'xemacs-21.4.6/lisp/cus-edit.el'
Index: ././lisp/cus-edit.el
--- ././lisp/cus-edit.el	Tue Oct 23 17:35:20 2001
+++ ././lisp/cus-edit.el	Mon Dec 17 14:49:08 2001
@@ -3391,15 +3391,19 @@
  	(princ "\n"))
        (princ "(custom-set-variables")
        (mapatoms (lambda (symbol)
- 		  (let ((spec (car-safe (get symbol 'theme-value)))
+		  (let ((spec (car-safe (get symbol 'theme-value)))
  			(requests (get symbol 'custom-requests))
  			(now (not (or (get symbol 'standard-value)
  				      (and (not (boundp symbol))
  					   (not (eq (get symbol 'force-value)
 						    'rogue))))))
 			(comment (get symbol 'saved-variable-comment)))
- 		    (when (or (and spec (eq (car spec) 'user)
- 			       (eq (second spec) 'set)) comment)
+ 		    (when (or (and spec
+				   (eq (car spec) 'user)
+				   (eq (second spec) 'set))
+			      comment
+			      ;; support non-themed vars
+			      (and (null spec) (get symbol 'saved-value)))
  		      (princ "\n '(")
  		      (prin1 symbol)
  		      (princ " ")
@@ -3429,10 +3433,14 @@
 	      (and (not (find-face symbol))
 		   (not (eq (get symbol 'force-face) 'rogue)))))))
     (when (or (and (not (memq symbol custom-save-face-ignoring))
-	       ;; Don't print default face here.
-	       theme-spec
-	       (eq (car theme-spec) 'user)
-	       (eq (second theme-spec) 'set)) comment)
+		   ;; Don't print default face here.
+		   (or (and theme-spec
+			    (eq (car theme-spec) 'user)
+			    (eq (second theme-spec) 'set))
+		       ;; cope with non-themed faces
+		       (and (null theme-spec)
+			    (get symbol 'saved-face))))
+	      comment)
       (princ "\n '(")
       (prin1 symbol)
       (princ " ")
diff --text -u 'xemacs-21.4.5/lisp/cus-face.el' 'xemacs-21.4.6/lisp/cus-face.el'
Index: ././lisp/cus-face.el
--- ././lisp/cus-face.el	Tue Oct 23 17:35:21 2001
+++ ././lisp/cus-face.el	Mon Dec 17 14:49:08 2001
@@ -200,14 +200,20 @@
     (and image
 	 (image-instance-file-name image))))
 
+;; This consistently fails to dtrt
+;;(defun custom-set-face-font-size (face size &optional locale tags)
+;;  "Set the font of FACE to SIZE."
+;;  ;; #### should this call have tags in it?
+;;  (let* ((font (apply 'face-font-name face (list locale)))
+;;	 ;; Gag
+;;	 (fontobj (font-create-object font)))
+;;    (set-font-size fontobj size)
+;;    (apply 'font-set-face-font face fontobj locale tags)))
+
+;; From Jan Vroonhof -- see faces.el
 (defun custom-set-face-font-size (face size &optional locale tags)
   "Set the font of FACE to SIZE."
-  ;; #### should this call have tags in it?
-  (let* ((font (apply 'face-font-name face (list locale)))
-	 ;; Gag
-	 (fontobj (font-create-object font)))
-    (set-font-size fontobj size)
-    (apply 'font-set-face-font face fontobj locale tags)))
+  (make-face-size face size locale tags))
 
 (defun custom-face-font-size (face &rest args)
   "Return the size of the font of FACE as a string."
@@ -216,14 +222,20 @@
 	 (fontobj (font-create-object font)))
     (format "%s" (font-size fontobj))))
 
+;; Jan suggests this may not dtrt
+;;(defun custom-set-face-font-family (face family &optional locale tags)
+;;  "Set the font of FACE to FAMILY."
+;;  ;; #### should this call have tags in it?
+;;  (let* ((font (apply 'face-font-name face (list locale)))
+;;	 ;; Gag
+;;	 (fontobj (font-create-object font)))
+;;    (set-font-family fontobj family)
+;;    (apply 'font-set-face-font face fontobj locale tags)))
+
+;; From Jan Vroonhof -- see faces.el
 (defun custom-set-face-font-family (face family &optional locale tags)
   "Set the font of FACE to FAMILY."
-  ;; #### should this call have tags in it?
-  (let* ((font (apply 'face-font-name face (list locale)))
-	 ;; Gag
-	 (fontobj (font-create-object font)))
-    (set-font-family fontobj family)
-    (apply 'font-set-face-font face fontobj locale tags)))
+  (make-face-family face family locale tags))
 
 (defun custom-face-font-family (face &rest args)
   "Return the name of the font family of FACE."
diff --text -u 'xemacs-21.4.5/lisp/dialog-gtk.el' 'xemacs-21.4.6/lisp/dialog-gtk.el'
Index: ././lisp/dialog-gtk.el
--- ././lisp/dialog-gtk.el	Wed Jul 25 16:44:24 2001
+++ ././lisp/dialog-gtk.el	Mon Dec 17 14:49:09 2001
@@ -180,7 +180,9 @@
 	(dialog nil)			; GtkDialog
 	(buttons nil)			; List of GtkButton objects
 	(activep t)
+	(callback nil)
 	(flushrightp nil)
+	(length nil)
 	(errp t))
     (if (not buttons-descr)
 	(error 'syntax-error
@@ -206,28 +208,29 @@
 		    (if (not (vectorp button))
 			(error "Button descriptor is not a vector: %S" button))
 
-		    (if (< (length button) 3)
-			(error "Button descriptor is too small: %S" button))
+		    (setq length (length button))
 
-		    (push (gtk-button-new-with-label (aref button 0)) buttons)
+		    (cond
+		     ((= length 1)	; [ "name" ]
+		      (setq callback nil
+			    activep nil))
+		     ((= length 2)	; [ "name" callback ]
+		      (setq callback (aref button 1)
+			    activep t))
+		     ((and (or (= length 3) (= length 4))
+			   (not (keywordp (aref button 2))))
+		      ;; [ "name" callback active-p ] or
+		      ;; [ "name" callback active-p suffix ]
+		      ;; We ignore the 'suffix' entry, because that is
+		      ;; what the X code does.
+		      (setq callback (aref button 1)
+			    activep (aref button 2)))
+		     (t			; 100% keyword specification
+		      (let ((plist (cdr (mapcar 'identity button))))
+			(setq activep (plist-get plist :active)
+			      callback (plist-get plist :callback)))))
 
-		    ;; Need to detect what flavor of descriptor it is.
-		    (if (not (keywordp (aref button 2)))
-			;; Simple style... just [ name callback activep ]
-			;; We ignore the 'suffix' entry, because that is what
-			;; the X code does.
-			(setq activep (aref button 2))
-		      (let ((ctr 2)
-			    (len (length button)))
-			(if (logand len 1)
-			    (error
-			     "Button descriptor has an odd number of keywords and values: %S"
-			     button))
-			(while (< ctr len)
-			  (if (eq (aref button ctr) :active)
-			      (setq activep (aref button (1+ ctr))
-				    ctr len))
-			  (setq ctr (+ ctr 2)))))
+		    (push (gtk-button-new-with-label (aref button 0)) buttons)
 		    (gtk-widget-set-sensitive (car buttons) (eval activep))
 		    
 		    ;; Apply the callback
@@ -243,7 +246,7 @@
 			     unread-command-events)
 		       (gtk-main-quit)
 		       t)
-		     (cons (aref button 1) dialog))
+		     (cons callback dialog))
 
 		    (gtk-widget-show (car buttons))
 		    (funcall (if flushrightp 'gtk-box-pack-end 'gtk-box-pack-start)
diff --text -u 'xemacs-21.4.5/lisp/dialog.el' 'xemacs-21.4.6/lisp/dialog.el'
Index: ././lisp/dialog.el
--- ././lisp/dialog.el	Wed Jul 25 16:44:24 2001
+++ ././lisp/dialog.el	Mon Dec 17 14:49:09 2001
@@ -262,6 +262,18 @@
 
 ---------------------------------------------------------------------------
 
+For type `directory':
+
+The keywords allowed are
+
+:initial-directory
+  The initial directory to be selected in the dialog box (defaults to the
+  current buffer's `default-directory).
+:title
+  The title of the dialog box (defaults to \"Open\").
+
+---------------------------------------------------------------------------
+
 For type `print':
 
 This invokes the Windows standard Print dialog.
diff --text -u 'xemacs-21.4.5/lisp/faces.el' 'xemacs-21.4.6/lisp/faces.el'
Index: ././lisp/faces.el
--- ././lisp/faces.el	Tue Oct 23 17:35:21 2001
+++ ././lisp/faces.el	Mon Dec 17 14:49:09 2001
@@ -986,6 +986,27 @@
 		  (face-property-instance unfrobbed-face 'font domain))
 	   (set-face-property face 'font (vector frobbed-face) the-locale tags)))))))
 
+;; WE DEMAND FOUNDRY FROBBING!
+
+;; Family frobbing
+;; Thx Jan Vroonhof, Ref xemacs-beta <87oflypbum.fsf@petteflet.ntlworld.com>
+;; Brainlessly derived from make-face-size by Stephen; don't blame Jan.
+;; I'm long since flown to Rio, it does you little good to blame me, either.
+(defun make-face-family (face family &optional locale tags)
+  "Set FACE's family to FAMILY in LOCALE, if possible.
+
+Add/replace settings specified by TAGS only."
+  (frob-face-property face 'font
+		      ;; uses dynamic scope of family
+		      #'(lambda (f d)
+			  ;; keep the dependency on font.el for now
+			  (let ((fo (font-create-object (font-instance-name f)
+							d)))
+			    (set-font-family fo family)
+			    (font-create-name fo d)))
+		      nil locale tags))
+
+;; Style (ie, typographical face) frobbing
 (defun make-face-bold (face &optional locale tags)
   "Make FACE bold in LOCALE, if possible.
 This will attempt to make the font bold for X/MSW locales and will set the
@@ -1158,6 +1179,23 @@
      ([italic] . [default])
      ([bold-italic] . [bold]))))
 
+
+;; Size frobbing
+;; Thx Jan Vroonhof, Ref xemacs-beta <87oflypbum.fsf@petteflet.ntlworld.com>
+;; Jan had a separate helper function 
+(defun make-face-size (face size &optional locale tags)
+  "Adjust FACE to SIZE in LOCALE, if possible.
+
+Add/replace settings specified by TAGS only."
+  (frob-face-property face 'font
+		      ;; uses dynamic scope of size
+		      #'(lambda (f d)
+			  ;; keep the dependency on font.el for now
+			  (let ((fo (font-create-object (font-instance-name f)
+							d)))
+			    (set-font-size fo size)
+			    (font-create-name fo d)))
+		      nil locale tags))
 
 ;; Why do the following two functions lose so badly in so many
 ;; circumstances?
diff --text -u 'xemacs-21.4.5/lisp/font.el' 'xemacs-21.4.6/lisp/font.el'
Index: ././lisp/font.el
--- ././lisp/font.el	Fri Apr 13 03:21:19 2001
+++ ././lisp/font.el	Mon Dec 17 14:49:09 2001
@@ -103,8 +103,10 @@
     (mswindows . (mswindows-font-create-name mswindows-font-create-object))
     (pm        . (x-font-create-name x-font-create-object)) ; Change? FIXME
     (tty       . (tty-font-create-plist tty-font-create-object)))
-  "An assoc list mapping device types to the function used to create
-a font name from a font structure.")
+  "An assoc list mapping device types to a list of translations.
+
+The first function creates a font name from a font descriptor object.
+The second performs the reverse translation.")
 
 (defconst ns-font-weight-mappings
   '((:extra-light . "extralight")
@@ -141,6 +143,8 @@
 (defvar font-maximum-slippage "1pt"
   "How much a font is allowed to vary from the desired size.")
 
+;; Canonical (internal) sizes are in points.
+;; Registry
 (define-font-keywords :family :style :size :registry :encoding)
 
 (define-font-keywords
@@ -299,8 +303,16 @@
       w2))))
 
 (defun font-spatial-to-canonical (spec &optional device)
-  "Convert SPEC (in inches, millimeters, points, or picas) into points."
-  ;; 1 in = 6 pa = 25.4 mm = 72 pt
+  "Convert SPEC (in inches, millimeters, points, picas, or pixels) into points.
+
+Canonical sizes are in points.  If SPEC is null, nil is returned.  If SPEC is
+a number, it is interpreted as the desired point size and returned unchanged.
+Otherwise SPEC must be a string consisting of a number and an optional type.
+The type may be the strings \"px\", \"pix\", or \"pixel\" (pixels), \"pt\" or
+\"point\" (points), \"pa\" or \"pica\" (picas), \"in\" or \"inch\" (inches), \"cm\"
+(centimeters), or \"mm\" (millimeters).
+
+1 in = 2.54 cm = 6 pa = 25.4 mm = 72 pt.  Pixel size is device-dependent."
   (cond
    ((numberp spec)
     spec)
@@ -315,6 +327,8 @@
 	  (mm-width (float (or (device-mm-width device) 293)))
 	  (retval nil))
       (cond
+       ;; the following string-match is broken, there will never be a
+       ;; left operand detected
        ((string-match "^ *\\([-+*/]\\) *" spec) ; math!  whee!
 	(let ((math-func (intern (match-string 1 spec)))
 	      (other (font-spatial-to-canonical
@@ -374,12 +388,14 @@
 	  (plist-get args :encoding)))
 
 (defun font-create-name (fontobj &optional device)
+  "Return a font name constructed from FONTOBJ, appropriate for DEVICE."
   (let* ((type (device-type device))
 	 (func (car (cdr-safe (assq type font-window-system-mappings)))))
     (and func (fboundp func) (funcall func fontobj device))))
 
 ;;;###autoload
 (defun font-create-object (fontname &optional device)
+  "Return a font descriptor object for FONTNAME, appropriate for DEVICE."
   (let* ((type (device-type device))
 	 (func (car (cdr (cdr-safe (assq type font-window-system-mappings))))))
     (and func (fboundp func) (funcall func fontname device))))
@@ -431,9 +447,11 @@
 ;;; The window-system dependent code (TTY-style)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (defun tty-font-create-object (fontname &optional device)
+  "Return a font descriptor object for FONTNAME, appropriate for TTY devices."
   (make-font :size "12pt"))
 
 (defun tty-font-create-plist (fontobj &optional device)
+  "Return a font name constructed from FONTOBJ, appropriate for TTY devices."
   (list
    (cons 'underline (font-underline-p fontobj))
    (cons 'highlight (if (or (font-bold-p fontobj)
@@ -518,6 +536,7 @@
   "A list of font family mappings on X devices.")
 
 (defun x-font-create-object (fontname &optional device)
+  "Return a font descriptor object for FONTNAME, appropriate for X devices."
   (let ((case-fold-search t))
     (if (or (not (stringp fontname))
 	    (not (string-match font-x-font-regexp fontname)))
@@ -621,6 +640,7 @@
   (font-size (font-default-object-for-device (or device (selected-device)))))
 
 (defun x-font-create-name (fontobj &optional device)
+  "Return a font name constructed from FONTOBJ, appropriate for X devices."
   (if (and (not (or (font-family fontobj)
 		    (font-weight fontobj)
 		    (font-size fontobj)
@@ -713,6 +733,7 @@
 	    (sort (font-unique (nconc scaled normal)) 'string-lessp))))))
 
 (defun ns-font-create-name (fontobj &optional device)
+  "Return a font name constructed from FONTOBJ, appropriate for NextSTEP devices."
   (let ((family (or (font-family fontobj)
 		    (ns-font-families-for-device device)))
 	(weight (or (font-weight fontobj) :medium))
@@ -813,6 +834,7 @@
   "A list of font family mappings on mswindows devices.")
 
 (defun mswindows-font-create-object (fontname &optional device)
+  "Return a font descriptor object for FONTNAME, appropriate for MS Windows devices."
   (let ((case-fold-search t)
 	(font (mswindows-font-canonicalize-name fontname)))
     (if (or (not (stringp font))
@@ -851,6 +873,7 @@
 	retval))))
 
 (defun mswindows-font-create-name (fontobj &optional device)
+  "Return a font name constructed from FONTOBJ, appropriate for MS Windows devices."
   (if (and (not (or (font-family fontobj)
 		    (font-weight fontobj)
 		    (font-size fontobj)
diff --text -u 'xemacs-21.4.5/lisp/gtk-faces.el' 'xemacs-21.4.6/lisp/gtk-faces.el'
Index: ././lisp/gtk-faces.el
--- ././lisp/gtk-faces.el	Fri Apr 13 03:21:22 2001
+++ ././lisp/gtk-faces.el	Mon Dec 17 14:49:09 2001
@@ -51,7 +51,7 @@
   (if (not (eq (device-type device) 'gtk))
       nil
     (gtk-init-pointers)
-    '(let* ((style (gtk-style-info device))
+    (let* ((style (gtk-style-info device))
 	   ;;(normal 0)			; GTK_STATE_NORMAL
 	   ;;(active 1)			; GTK_STATE_ACTIVE
 	   (prelight 2)			; GTK_STATE_PRELIGHT
diff --text -u 'xemacs-21.4.5/lisp/minibuf.el' 'xemacs-21.4.6/lisp/minibuf.el'
Index: ././lisp/minibuf.el
--- ././lisp/minibuf.el	Fri Apr 13 03:21:31 2001
+++ ././lisp/minibuf.el	Mon Dec 17 14:49:10 2001
@@ -1665,22 +1665,22 @@
 	 :activate-callback 'read-file-name-activate-callback)
 	(goto-char (point-min) completion-buf)))))
 
-(defun read-file-name-1 (history prompt dir default
-				 must-match initial-contents
-				 completer)
+(defun read-file-name-1 (type history prompt dir default
+			      must-match initial-contents
+			      completer)
   (if (should-use-dialog-box-p)
       (condition-case nil
 	  (let ((file
 		 (apply #'make-dialog-box
-			'file `(:title ,(capitalize-string-as-title
-					 ;; Kludge: Delete ": " off the end.
-					 (replace-in-string prompt ": $" ""))
-				       ,@(and dir (list :initial-directory
-							dir))
-				       :file-must-exist ,must-match
-				       ,@(and initial-contents
-					      (list :initial-filename
-						    initial-contents))))))
+			type `(:title ,(capitalize-string-as-title
+					;; Kludge: Delete ": " off the end.
+					(replace-in-string prompt ": $" ""))
+				      ,@(and dir (list :initial-directory
+						       dir))
+				      :file-must-exist ,must-match
+				      ,@(and initial-contents
+					     (list :initial-filename
+						   initial-contents))))))
 	    ;; hack -- until we implement reading a directory properly,
 	    ;; allow a file as indicating the directory it's in
 	    (if (and (eq completer 'read-directory-name-internal)
@@ -1731,8 +1731,8 @@
 Sixth arg HISTORY specifies the history list to use.  Default is
  `file-name-history'.
 DIR defaults to current buffer's directory default."
-  (read-file-name-1
-   (or history 'file-name-history)
+  (read-file-name-1 
+   'file (or history 'file-name-history)
    prompt dir (or default
 		  (and initial-contents
 		       (abbreviate-file-name (expand-file-name
@@ -1762,9 +1762,9 @@
  `file-name-history'.
 DIR defaults to current buffer's directory default."
   (read-file-name-1
-    (or history 'file-name-history)
-    prompt dir (or default default-directory) must-match initial-contents
-    'read-directory-name-internal))
+   'directory (or history 'file-name-history)
+   prompt dir (or default default-directory) must-match initial-contents
+   'read-directory-name-internal))
 
 
 ;; Environment-variable and ~username completion hack
diff --text -u 'xemacs-21.4.5/lisp/package-get.el' 'xemacs-21.4.6/lisp/package-get.el'
Index: ././lisp/package-get.el
--- ././lisp/package-get.el	Wed Jul 25 16:44:30 2001
+++ ././lisp/package-get.el	Mon Dec 17 14:49:10 2001
@@ -359,7 +359,9 @@
 is non-nil."
   (or (package-get-locate-file package-get-base-filename t no-remote)
       (if (file-exists-p package-get-user-index-filename)
-	  package-get-user-index-filename)))
+	  package-get-user-index-filename)
+      (locate-data-file package-get-base-filename)
+      (error "Can't locate a package index file.")))
 
 (defun package-get-maybe-save-index (filename)
   "Offer to save the current buffer as the local package index file,
diff --text -u 'xemacs-21.4.5/lisp/package-net.el' 'xemacs-21.4.6/lisp/package-net.el'
Index: ././lisp/package-net.el
--- ././lisp/package-net.el	Wed May  9 18:53:52 2001
+++ ././lisp/package-net.el	Mon Dec 17 14:49:10 2001
@@ -55,32 +55,9 @@
 ;;
 ;; 3. For package releases that's all you need to do. For binary
 ;; releases you need to build both cygwin and win32 binaries and put
-;; them in appropriate tarballs:
+;; them in appropriate tarballs: This can be achieved by running
+;; build-msw-release.sh
 ;;
-;; For cygwin, configure, make and install and then do (this is for
-;; 21.1.13):
-;;
-;;   cd <install dir>
-;;   tar cvzf xemacs-i686-pc-cygwin32-21.1.13.tar.gz \
-;;      ./bin/i686-pc-cygwin32 ./lib/xemacs-21.1.13 \
-;;      ./lib/xemacs/lock ./man/man1/xemacs.1 \
-;;      ./man/man1/ctags.1 ./man/man1/gnu*.1'
-;;
-;;  Note that the naming of the package is important. Don't be tempted
-;;  to change the order in any way.
-;;
-;; For win32 build and install the release and then (again for
-;; 21.1.13):
-;;
-;;   cd <install dir>
-;;   tar cvzf xemacs-i386-pc-win32-21.1.13.tar.gz ./XEmacs-21.1.13
-;; 
-;; The binaries should be uploaded to
-;; `ftp://ftp.xemacs.org/pub/xemacs/binaries/cygwin32' and
-;; `ftp://ftp.xemacs.org/pub/xemacs/binaries/win32' respectively. Take
-;; a note of their sizes and set `package-net-cygwin32-binary-size'
-;; and `package-net-win32-binary-size' appropriately in this file and
-;; then follow step 2.
 
 (require 'package-admin)
 (require 'package-get)
@@ -99,12 +76,15 @@
 ;;
 ;; 2. Generating setup.ini should be more automatic.
 
-(defvar package-net-cygwin32-binary-size 7559692
+(defvar package-net-cygwin32-binary-size 0
   "The size in bytes of the cygwin32 binary distribution.")
 
-(defvar package-net-win32-binary-size 7421788
+(defvar package-net-win32-binary-size 0
   "The size in bytes of the win32 binary distribution.")
 
+(defvar package-net-setup-version "1.0"
+  "The version string of setup.")
+
 ;;;###autoload
 (defun package-net-setup-directory ()
   (file-truename (concat data-directory "../../" (if (eq system-type 'cygwin32)
@@ -171,11 +151,8 @@
 	  (write-region (point-min) (point-max) (concat destdir "setup.ini")))
       (kill-buffer buf))))
 
-(defun package-net-generate-bin-ini (&optional destdir version)
-  "Convert the package index to ini file format in DESTDIR.
-DESTDIR defaults to the value of `data-directory'."
-
-  (setq destdir (file-name-as-directory (or destdir data-directory)))
+(defun package-net-generate-bin-ini (&optional version)
+  "Convert the package index to ini file format in the current directory."
   (let ((buf (get-buffer-create "*setup-bin.ini*")))
     (unwind-protect
         (save-excursion
@@ -189,7 +166,7 @@
 			  (+ (* (car (current-time)) 65536) (car (cdr (current-time))))))
 	  (insert (format "setup-version: %s\n\n" (or version "1.0")))
 	  ;; Native version
-	  (insert (format "@ %s\n" "xemacs-i386-pc-win32"))
+	  (insert (format "@ %s\n" "xemacs-i586-pc-win32"))
 	  (insert (format "version: %s\n" emacs-program-version))
 	  (insert "type: native\n")
 	  (insert (format "install: win32/%s %d\n\n"
@@ -207,16 +184,14 @@
 				  emacs-program-version ".tar.gz") 
 			  package-net-cygwin32-binary-size))
 	  (insert "# setup.ini file ends here\n")
-	  (write-region (point-min) (point-max) (concat destdir "setup-bin.ini")))
-      (kill-buffer buf))))
+	  (write-region (point-min) (point-max) "setup-bin.ini")))
+    (kill-buffer buf)))
 
 (defun package-net-batch-generate-bin-ini ()
   "Convert the package index to ini file format."
   (unless noninteractive
     (error "`package-net-batch-generate-bin-ini' is to be used only with -batch"))
-  (let ((dir (car command-line-args-left))
-	(version (car (cdr command-line-args-left))))
-    (package-net-generate-bin-ini dir version)))
+  (package-net-generate-bin-ini package-net-setup-version))
 
 ;;;###autoload
 (defun package-net-update-installed-db (&optional destdir)
diff --text -u 'xemacs-21.4.5/lisp/toolbar-items.el' 'xemacs-21.4.6/lisp/toolbar-items.el'
Index: ././lisp/toolbar-items.el
--- ././lisp/toolbar-items.el	Fri Apr 13 03:21:37 2001
+++ ././lisp/toolbar-items.el	Mon Dec 17 14:49:10 2001
@@ -78,9 +78,9 @@
                 (function :tag "Other"))
   :group 'toolbar)
 
-(defun toolbar-dired ()
-  (interactive)
-  (call-interactively toolbar-dired-function))
+(defun toolbar-dired (dir)
+  (interactive "DDired directory: ")
+  (funcall toolbar-dired-function dir))
 
 (defcustom toolbar-save-function 'save-buffer
   "*Function to call when the save icon is selected."
diff --text -u 'xemacs-21.4.5/lwlib/ChangeLog' 'xemacs-21.4.6/lwlib/ChangeLog'
Index: ././lwlib/ChangeLog
--- ././lwlib/ChangeLog	Tue Oct 23 20:02:36 2001
+++ ././lwlib/ChangeLog	Mon Dec 17 18:33:19 2001
@@ -1,3 +1,11 @@
+2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.6 "Common Lisp" is released.
+
 2001-10-23  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.5 "Civil Service" is released.
diff --text -u 'xemacs-21.4.5/man/ChangeLog' 'xemacs-21.4.6/man/ChangeLog'
Index: ././man/ChangeLog
--- ././man/ChangeLog	Tue Oct 23 20:02:36 2001
+++ ././man/ChangeLog	Mon Dec 17 18:33:19 2001
@@ -1,3 +1,33 @@
+2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.6 "Common Lisp" is released.
+
+man/ChangeLog
+2001-12-15  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* lispref/packaging.texi (The User's View):
+	Correct description of man subdirectory.
+
+	(The Package Release Engineer's View):
+	(package-compile.el):
+	Change hazmat to useful documentation.
+
+	(Issues):
+	Hazmat removal.
+
+2001-11-27  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* lispref/packaging.texi: New file.
+	* lispref/lispref.texi (Top): Add Packaging & subnodes to menus.
+	Include packaging.texi.
+	* lispref/intro.texi (Introduction): Next -> Packaging.
+	* lispref/objects.texi (Lisp Data Types): Previous -> Packaging.
+	* Makefile (lispref-srcs): Depend on lispref/packaging.texi.
+	
 2001-10-23  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.5 "Civil Service" is released.
diff --text -u 'xemacs-21.4.5/man/Makefile' 'xemacs-21.4.6/man/Makefile'
Index: ././man/Makefile
--- ././man/Makefile	Fri Apr 13 03:21:58 2001
+++ ././man/Makefile	Mon Dec 17 14:49:13 2001
@@ -161,6 +161,7 @@
 	lispref/numbers.texi \
 	lispref/objects.texi \
 	lispref/os.texi \
+	lispref/packaging.texi \
 	lispref/positions.texi \
 	lispref/processes.texi \
 	lispref/range-tables.texi \
diff --text -u 'xemacs-21.4.5/man/lispref/glyphs.texi' 'xemacs-21.4.6/man/lispref/glyphs.texi'
Index: ././man/lispref/glyphs.texi
--- ././man/lispref/glyphs.texi	Fri Apr 13 03:22:14 2001
+++ ././man/lispref/glyphs.texi	Mon Dec 17 14:49:14 2001
@@ -36,6 +36,7 @@
 * Redisplay Glyphs::    Glyphs controlling various redisplay functions.
 * Subwindows::          Inserting an externally-controlled subwindow
                           into a buffer.
+* Glyph Examples::      Examples of how to work with glyphs.
 @end menu
 
 @node Glyph Functions
@@ -1380,3 +1381,199 @@
 @defun subwindowp object
 This function returns non-@code{nil} if @var{object} is a subwindow.
 @end defun
+
+@node Glyph Examples
+@section Glyph Examples
+
+For many applications, displaying graphics is a simple process: you
+create a glyph, and then you insert it into a buffer.
+
+The easiest way to create a glyph is to use a file that contains a
+graphical image, such as a JPEG, TIFF, or PNG file:
+
+@lisp
+;; Create a glyph from a JPEG file:
+(setq foo (make-glyph [jpeg :file "/tmp/file1.jpg"]))
+@end lisp
+
+@lisp
+;; Create a glyph from a XPM file:
+(setq foo (make-glyph [xpm :file "/tmp/file2.xpm"]))
+@end lisp
+
+@lisp
+;; Create a glyph from a PNG file:
+(setq foo (make-glyph [png :file "/tmp/file3.png"]))
+@end lisp
+
+@lisp
+;; Create a glyph from a TIFF file:
+(setq foo (make-glyph [tiff :file "/tmp/file4.tiff"]))
+@end lisp
+
+The parameters passed to @code{make-glyph} are called "Image
+Specifiers", and can handle more image types than those shown above.
+You can also put the raw image data into a string (e.g., if you put the
+contents of a JPEG file into a string), and use that to create a glyph.
+@xref{Image Specifiers}, for more information.
+
+@quotation
+@strong{Caution}: In order for XEmacs to read a particular graphics file
+format, support for that format must have been compiled into XEmacs.
+It's possible, although somewhat unlikely, for XEmacs to have been
+compiled without support for any of the various graphics file formats.
+To see what graphics formats your particular version of XEmacs supports,
+use @kbd{M-x describe-installation}.
+
+To programmatically query whether or not a particular file format is
+supported, you can use the @code{featurep} function, with one of:
+@code{gif}, @code{tiff}, @code{jpeg}, @code{xpm}, @code{xbm},
+@code{png}, or @code{xface}.  For an up-to-date list, @ref{Image
+Specifiers}.  Example:
+
+@example
+;; Returns `t' if TIFF is supported:
+(featurep 'tiff)
+@end example
+
+Another example is:
+
+@example
+;; Returns a list of `t' or `nil', depending on whether or not the
+;; corresponding feature is supported:
+(mapcar #'(lambda (format-symbol) (featurep format-symbol))
+        '(gif tiff jpeg xpm png))
+@end example
+
+@end quotation
+
+Once you have a glyph, you can then insert it into a buffer.  Example:
+
+@lisp
+;; Use this function to insert a glyph at the left edge of point in the
+;; current buffer.  Any existing glyph at this location is replaced.
+(defun insert-glyph (gl)
+  "Insert a glyph at the left edge of point."
+  (let ( (prop 'myimage)        ;; myimage is an arbitrary name, chosen 
+                                ;; to (hopefully) not conflict with any
+                                ;; other properties.  Change it if
+                                ;; necessary.
+         extent )
+    ;; First, check to see if one of our extents already exists at
+    ;; point.  For ease-of-programming, we are creating and using our
+    ;; own extents (multiple extents are allowed to exist/overlap at the
+    ;; same point, and it's quite possible for other applications to
+    ;; embed extents in the current buffer without your knowledge).
+    ;; Basically, if an extent, with the property stored in "prop",
+    ;; exists at point, we assume that it is one of ours, and we re-use
+    ;; it (this is why it is important for the property stored in "prop"
+    ;; to be unique, and only used by us).
+    (if (not (setq extent (extent-at (point) (current-buffer) prop)))
+      (progn
+        ;; If an extent does not already exist, create a zero-length
+        ;; extent, and give it our special property.
+        (setq extent (make-extent (point) (point) (current-buffer)))
+        (set-extent-property extent prop t)
+        ))
+    ;; Display the glyph by storing it as the extent's "begin-glyph".
+    (set-extent-property extent 'begin-glyph gl)
+    ))
+
+;; You can then use this function like:
+(insert-glyph (make-glyph [jpeg :file "/tmp/file1.jpg"]))
+;; This will insert the glyph at point.
+
+;; Here's an example of how to insert two glyphs side-by-side, at point
+;; (using the above code):
+(progn
+  (insert-glyph (make-glyph [jpeg :file "/tmp/file1.jpg"]))
+  ;; Create a new extent at point.  We can't simply call "insert-glyph",
+  ;; as "insert-glyph" will simply replace the first glyph with the
+  ;; second.
+  (setq extent (make-extent (point) (point) (current-buffer)))
+  ;; Here, we're only setting the 'myimage property in case we need
+  ;; to later identify/locate/reuse this particular extent.
+  (set-extent-property extent 'myimage t)
+  (set-extent-property extent 'begin-glyph
+                       (make-glyph [jpeg :file "/tmp/file2.jpg"]))
+  )
+
+@end lisp
+
+Here are the gory details:
+
+@itemize @bullet
+
+@item
+Glyphs are displayed by attaching them to extents (see @ref{Extents}),
+either to the beginning or the end of extents.
+
+Note that extents can be used for many things, and not just for
+displaying images (although, in the above example, we are creating our
+own extent for the sole purpose of displaying an image).  Also, note
+that multiple extents are allowed to exist at the same position, and
+they can overlap.
+
+@item
+Glyphs are often displayed inside the text area (alongside text).  This
+is the default.
+
+Although glyphs can also be displayed in the margins, how to do this
+will not be described here.  For more information on this, see
+@ref{Annotation Basics} (look for information on "layout types") and
+@ref{Extent Properties} (look for @code{begin-glyph-layout} and
+@code{end-glyph-layout}).
+
+@item
+The easiest way to insert a glyph into text is to create a zero-length
+extent at the point where you want the glyph to appear.
+
+Note that zero-length extents are attached to the character to the
+right of the extent; deleting this character will also delete the extent.
+
+@item
+It's often a good idea to assign a unique property to the newly-created
+extent, in case you later want to locate it, and replace any existing
+glyph with a different one (or just delete the existing one).  In the
+above example, we are using "myimage" as our (hopefully) unique property
+name.
+
+If you need to locate all of the extents, you'll have to use functions
+like @code{extent-list} or @code{next-extent}, or provide additional
+parameters to the @code{extent-at} function.  Assigning a unique
+property to the extent makes it easy to locate your extents; for
+example, @code{extent-list} can return only those extents with a
+particular property.  @xref{Finding Extents}, and @ref{Mapping Over
+Extents}, for more information.
+
+@item
+Glyphs are displayed by assigning then to the @code{begin-glyph} or
+@code{end-glyph} property of the extent.  For zero-length extents, it
+doesn't really matter if you assign the glyph to the @code{begin-glyph}
+or @code{end-glyph} property, as they are both at the same location;
+however, for non-zero-length extents (extents that cover one or more
+characters of text), it does matter which one you use.
+
+Assigning @code{nil} to the @code{begin-glyph} or @code{end-glyph}
+property will delete any existing glyph.  In this case, you may also
+want to delete the extent, assuming that the extent is used for no other
+purpose.
+
+@item
+If you happen to insert two glyphs, side-by-side, note that the example
+@code{insert-glyph} function will have trouble, if it's again used at
+the same point (it can only locate one of the two extents).
+@xref{Finding Extents}, and @ref{Mapping Over Extents}, for more
+information on locating extents in a buffer.
+
+@item
+Among other things, glyphs provide a way of displaying graphics
+alongside text.  Note, however, that glyphs only provide a way of
+displaying graphics; glyphs are not actually part of the text, and are
+only displayed alongside the text.  If you save the text in the buffer,
+the graphics are not saved.  The low-level glyph code does not provide a
+way of saving graphics with the text.  If you need to save graphics and
+text, you have to write your own code to do this, and this topic is
+outside the scope of this discussion.
+
+@end itemize
diff --text -u 'xemacs-21.4.5/man/lispref/intro.texi' 'xemacs-21.4.6/man/lispref/intro.texi'
Index: ././man/lispref/intro.texi
--- ././man/lispref/intro.texi	Fri Apr 13 03:22:15 2001
+++ ././man/lispref/intro.texi	Mon Dec 17 14:49:14 2001
@@ -400,7 +400,7 @@
 library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
 
-@node Introduction, Lisp Data Types, Copying, Top
+@node Introduction, Packaging, Copying, Top
 @chapter Introduction
 
   Most of the XEmacs text editor is written in the programming
diff --text -u 'xemacs-21.4.5/man/lispref/lispref.texi' 'xemacs-21.4.6/man/lispref/lispref.texi'
Index: ././man/lispref/lispref.texi
--- ././man/lispref/lispref.texi	Fri Apr 13 03:22:16 2001
+++ ././man/lispref/lispref.texi	Mon Dec 17 14:49:14 2001
@@ -130,6 +130,8 @@
 * Copying::                 Conditions for copying and changing XEmacs.
 * Introduction::            Introduction and conventions used.
 
+* Packaging::               Lisp library administrative infrastructure.
+
 * Lisp Data Types::         Data types of objects in XEmacs Lisp.
 * Numbers::                 Numbers and arithmetic functions.
 * Strings and Characters::  Strings, and functions that work on them.
@@ -250,6 +252,34 @@
 * A Sample Function Description::
 * A Sample Variable Description::
 
+Packaging
+
+* Package Overview::       Lisp Libraries and Packages.
+* Package Terminology::    Basic stuff.
+* Building Packages::      Turn packaged source into a tarball.
+* Local.rules File::       Tell the XEmacs Packaging System about your host.
+* Creating Packages::      Tell the XEmacs Packaging System about your package.
+* Issues::
+
+Package Overview
+
+* The User's View::
+* The Library Maintainer's View::
+* The Package Release Engineer's View::
+
+The Library Maintainer's View
+
+* Infrastructure::    Global Makefiles and common rules.
+* Control Files::     Package-specific Makefiles and administrative files.
+* Obtaining::         Obtaining the XEmacs Packaging System and utilities.
+
+Creating Packages
+
+* package-compile.el::
+* package-info.in Fields::
+* Makefile Variables::
+* Makefile Targets::
+
 Lisp Data Types
 
 * Printed Representation::  How Lisp objects are represented as text.
@@ -970,6 +1000,7 @@
 * Redisplay Glyphs::    Glyphs controlling various redisplay functions.
 * Subwindows::          Inserting an externally-controlled subwindow
                           into a buffer.
+* Glyph Examples::      Examples of how to work with glyphs.
 
 Glyph Functions
 
@@ -1153,6 +1184,7 @@
 @end menu
 
 @include intro.texi
+@include packaging.texi
 @include objects.texi
 @include numbers.texi
 @include strings.texi
diff --text -u 'xemacs-21.4.5/man/lispref/objects.texi' 'xemacs-21.4.6/man/lispref/objects.texi'
Index: ././man/lispref/objects.texi
--- ././man/lispref/objects.texi	Fri Apr 13 03:22:18 2001
+++ ././man/lispref/objects.texi	Mon Dec 17 14:49:14 2001
@@ -3,7 +3,7 @@
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
 @c See the file lispref.texi for copying conditions.
 @setfilename ../../info/objects.info
-@node Lisp Data Types, Numbers, Introduction, Top
+@node Lisp Data Types, Numbers, Packaging, Top
 @chapter Lisp Data Types
 @cindex object
 @cindex Lisp object
diff --text -u /dev/null 'xemacs-21.4.6/man/lispref/packaging.texi'
Index: ././man/lispref/packaging.texi
--- ././man/lispref/packaging.texi	Thu Jan  1 09:00:00 1970
+++ ././man/lispref/packaging.texi	Mon Dec 17 14:49:15 2001
@@ -0,0 +1,1245 @@
+@c -*-texinfo-*-
+@c This is part of the XEmacs Lisp Reference Manual.
+@c Copyright (C) 2001 Free Software Foundation, Inc.
+@c See the file lispref.texi for copying conditions.
+
+@setfilename ../../info/packaging.info
+
+@c Macro to make formatting of the XEmacs pms name consistent.
+@c Maybe @sc looks OK in HTML?  If so, condition on Info.
+@iftex
+@macro xpms
+XE@sc{macs} Packaging System
+@end macro
+@end iftex
+@ifnottex
+@macro xpms
+XEmacs Packaging System
+@end macro
+@end ifnottex
+
+@node Packaging, Lisp Data Types, Introduction, Top
+@chapter The @xpms{}
+@cindex package
+@cindex packaging
+
+The XEmacs distribution, starting with version 21, comes only with a
+very basic set of built-in modes and libraries.  Most of the libraries
+that were part of the distribution of earlier versions of XEmacs are now
+available separately.  The user as well as the system administrator can
+choose which packages to install; the actual installation process is
+easy.  This gives an installer the ability to tailor an XEmacs
+installation for local needs with safe removal of unnecessary code.
+
+This chapter describes how to package Lisp libraries for use with the
+@xpms{}.
+
+@emph{Please note carefully} that the term @dfn{package} as used in
+XEmacs refers to an aggregation of Lisp code and/or data distributed as
+a unit.  It does not, as it does in many Lisps, refer to a way of
+creating separate name spaces.  XEmacs has no facility for providing
+separate name spaces.  (If we ever do get separate name spaces, we'll
+probably regret overloading the nomenclature in this way, but it's
+become established.)
+
+@menu
+Introduction:
+* Package Overview::       Lisp Libraries and Packages.
+
+Packaging Lisp Libraries:
+* Package Terminology::    Basic stuff.
+* Building Packages::      Turn packaged source into a tarball.
+* Local.rules File::       Tell the @xpms{} about your host.
+* Creating Packages::      Tell the @xpms{} about your package.
+@c * History::                     History of the @xpms{}
+@c * Installation::                Installing the @xpms{} with your (X)Emacs.
+@c * Configuration::               Configuring the @xpms{} for use.
+@c * Usage::                       An overview of the operation of the @xpms{}.
+@c * Bug Reports::                 Reporting Bugs and Problems
+@c * Frequently Asked Questions::  Questions and answers from the mailing list.
+
+Internals and Package Release Engineering:
+* Issues::                      
+@end menu
+
+@node Package Overview, Package Terminology, , Packaging
+@chapter An overview of the @xpms{}
+
+The @xpms{} is a system for administering the installation, upgrade, and
+removal of Lisp libraries.  For the end user, it provides facilities for
+determining availability of packages and which versions at remote
+sites.  It will download and automatically install a package, ensuring
+that any old files from previous versions of the package are removed
+first.  By providing a standard set of hierarchies for installation, it
+makes configuration of XEmacs simpler.  Furthermore, packages normally
+provide ancillary auto-autoloads and custom-loads libraries, which are
+automatically detected and loaded by XEmacs upon startup.  This means
+that once installed, all facilities of package, including autoloading
+the library upon invocation of a command provided by the library and
+convenient configuration and customization, are automatically available
+to the user.  There is no need to add autoloads or keybindings to in the
+init file, and structured configuration of the package is available
+through the Customize system even before the libraries are loaded.
+
+All of this convenience comes at a cost.  The cost of administration at
+the package level is negligible compared to the benefits, of course.
+However, the requirement that XEmacs find and load auto-autoloads and
+custom-loads libraries comes at a fairly large cost in startup time.  In
+order to reduce this cost, XEmacs imposes fairly strict conditions on
+the structure of an installed package.
+
+Meeting these requirements, as well as simply providing the
+auto-autoloads and the information about availability and so on does
+impose some costs on the library maintainer.  The @xpms{} also provides
+structure and utilities to the library maintainer to make these tasks
+easier.  This manual documents the requirements and the tools that the
+@xpms{} provides to ensure that a package satisfies them.
+
+@menu
+* The User's View::
+* The Library Maintainer's View::
+* The Package Release Engineer's View::
+@end menu
+
+
+@node The User's View, The Library Maintainer's View, , Package Overview
+@section The User's View
+
+@strong{N.B.}  Much of the discussion in this section undoubtedly
+belongs elsewhere, @ref{Packages,,,xemacs}.
+
+From the user's point of view, an XEmacs binary package is simply a
+standard tarball (usually gzipped) containing Lisp sources, compiled
+Lisp, documentation, and possibly data files or supporting executables.
+The tarball is unpacked using standard tools such as GNU tar and gzip.
+The package system does impose certain requirements for automatic
+configuration to work.
+
+Here the main consideration is that the tarball ``expects'' to be
+unpacked from the top of a package hierarchy.  A @dfn{package hierarchy}
+is basically an image of a classic Emacs ``run-in-place'' tree, with
+@file{lisp}, @file{etc}, @file{info}, @file{man}, @file{lib-src}, and
+@file{pkginfo} subdirectories of the top.  The @file{pkginfo}
+subdirectory is for use by the @xpms{} administration tools, and
+currently contains a @file{MANIFEST.@var{package-name}} file for each
+package to ensure that no cruft remains when a package is removed or
+updated.  The @file{lisp}, @file{etc}, and @file{lib-src} subdirectories
+are further subdivided, with a subdirectory for each package.  The
+@file{info} directory obeys the usual conventions.
+@emph{I.e.}, the @file{info} directory is flat
+with a(n) (optional) @file{dir} file and one (set of) info file(s) per
+package.  The @file{man} subdirectory typically contains documentation
+sources, separated by package.  (It does not contain @file{man(1)}
+pages, as Emacs provides very few of them.)
+
+There are several standard package hierarchies, and administrators can
+configure others at build time, while users can configure others at run
+time.  The standard system hierarchies are all subdirectories of an
+@c #### This is possibly incorrect usage of "installation root."
+XEmacs installation root, typically @file{/usr/local/lib/xemacs/}.
+These are the @file{xemacs-packages}, @file{mule-packages},
+@file{infodock-packages}, and @file{site-packages} hierarchies.  Each
+has the structure described above, but the purposes differ.  The
+@file{xemacs-packages} is the normal place for installing ``official''
+packages and many third-party libraries.  Unfortunately, it is not yet
+quite possible to read libraries containing international characters
+with a non-Mule XEmacs, so such libraries are sequestered in the
+@file{mule-packages} hierarchy.  Some packages are compatible only with
+the Infodock development environment, and they will be installed in the
+@file{infodock-packages} hierarchy.  The @file{site-packages} hierarchy
+is for packages not distributed by XEmacs.org, typically locally
+developed.
+
+Packages are in principle supposed to be XEmacs version-independent, but
+if such dependencies are unavoidable, additional standard package
+hierarchies may be installed under version directories, @emph{e.g.}
+@file{/usr/local/lib/xemacs-21.4.6/}.
+
+Users who do not have sufficient privilege to install packages in the
+system hierarchies may install package hierarchies under
+@file{~/.xemacs}.  At present only the @file{xemacs-packages} and
+@file{mule-packages} hierarchies are supported, but it might make sense
+to extend this to support @file{infodock-packages} and
+@file{site-packages} hierarchies in the future.
+
+The package hierarchies are not searched directly for libraries to be
+loaded; this would be very costly.  Instead, the hierarchies are ordered
+according to certain rules, and searched for package lisp directories at
+invocation.  These directories are added to the general
+@code{load-path}.  As usual, it is @code{load-path} that is searched at
+run-time.  This approach is somewhat costly at initialization, but
+results in a very ``clean'' @code{load-path}.
+
+The order of search can be changed at build time by specifying the
+@samp{--package-path} option to @file{configure}, or at run-time by
+specifying the @code{EMACSPACKAGEPATH} environment variable.
+@xref{Packages,,,xemacs}.
+
+@c #### The following description is quite possibly inaccurate.
+@c Please, Michael, write some specs up!
+The default order of search is hierarchically determined.  First, the
+roots are ordered.  The @dfn{early} roots are the user-specific roots,
+typically @file{~/.xemacs}.  The @dfn{late} roots are the system roots,
+typically @file{/usr/local/lib/xemacs-21.4.6} and
+@file{/usr/local/lib/xemacs}, in that order.  All hierarchies for a
+given root are searched for package Lisp directories, which are appended
+to @code{load-path} in the order found.  Then the search proceeds to the
+next root, whose results will be appended to the @code{load-path}
+generated by previous roots.
+
+Second, the hierarchies below each root are searched in the order
+@file{site-packages}, @file{infodock-packages}, @file{mule-packages},
+then @file{xemacs-packages}.
+
+In each hierarchy there should be a @file{lisp} subdirectory, containing
+directories named for the packages.  Each package's Lisp libraries thus
+are contained in a directory of the form
+@var{root}/@var{hierarchy}/lisp/@var{package}/.
+
+With such a complex search algorithm, the possibility of libraries being
+shadowed by another library with the same name is quite real.  There are
+two considerations here.  First, every XEmacs package contains certain
+libraries with constant names.  These are
+
+@table @file
+@item _pkg.el
+Lisp code to inform the package administration system about the package
+
+@item auto-autoloads.el
+Lisp code to set up autoloaded functions and variables that may be
+needed at load time
+
+@item custom-load.el
+definitions of configuration variables for use with the Customize
+system.
+@end table
+
+They are special-cased, because the way they are used prevents shadowing
+from being an issue.
+
+Second, it is possible that multiple copies of some library, or
+different libraries with the same name, are installed in various places
+in the hierarchies.  To detect such shadows, use
+@code{list-load-path-shadows}.
+
+Finally, note that most basic Emacs functionality, including most of the
+Lisp API, is implemented in Lisp libraries.  Because they use internal
+reserved APIs that are subject to change according the needs of the
+developers, these libraries are distributed with the XEmacs binary, and
+are called @dfn{core Lisp libraries}.  Most core Lisp libraries are
+``preloaded'' into the Emacs binary and in normal usage are never
+explicitly loaded.  However, they can be explicitly loaded, and if so
+they are searched on @code{load-path}.
+@c #### Is this correct?  It is not for C-h f, for example.
+Furthermore, functions such as @code{locate-library} will also search on
+the @code{load-path}.  The searching takes place under somewhat
+different rules from those used for packaged Lisp.  It is probably
+easiest to think of the package hierarchy searching algorithm as
+receiving a @code{load-path} initialized to the core Lisp directories.
+
+
+@node The Library Maintainer's View, The Package Release Engineer's View, The User's View, Package Overview
+@section The Library Maintainer's View
+
+From the library maintainer's viewpoint, the advantages to the @xpms{}
+stem from the convenience to the user of installation and upgrade.
+Since an installed package automatically registers its entry points via
+autoload and its configuration variables with the Customize system,
+configuration FAQs are reduced.  When it's easy to upgrade, users learn
+to try @samp{Tools | Packages | Update Installed Packages} before
+posting a FAQ whose answer is ``long since fixed, please upgrade.''
+
+This comes at some cost, as the library maintainer needs to arrange that
+the package be installed in a directory structure that satisfies the
+requirements of the @xpms{}.  Autoload cookies and defcustoms must also
+be added to existing libraries.  The @xpms{} provides infrastructure to
+assure that all of these annoyances need only be dealt with once.  The
+autoload cookies and defcustoms are beyond the scope of this chapter, but
+most maintainers of modern packages are already familiar with these
+mechanisms.
+
+The @xpms{} may be divided into the @dfn{infrastructure} common to all
+packages, and the package-specific @dfn{control files}.  The
+infrastructure supports global builds, installation, and generation of
+the ``sumo'' bundles of packages, as well as generation of individual
+packages.  The package control files describe the structure of the
+package's source tree and provide administrative information.
+
+@menu
+* Infrastructure::    Global Makefiles and common rules.
+* Control Files::     Package-specific Makefiles and administrative files.
+* Obtaining::         Obtaining the @xpms{} and required utilities.
+@end menu
+
+@node Infrastructure, Control Files, , The Library Maintainer's View
+@subsection Infrastructure
+
+In order to get the greatest benefit from the @xpms{}, a library
+maintainer should place the package sources in an appropriate place in
+the XEmacs source package hierarchy, and arrange to have the source
+package imported into the XEmacs CVS repository.
+@c #### the parenthetical remark should go to "issues."
+(We realize that the
+latter requirement can be quite burdensome.  We are working on ways to
+remove this requirement, but for the present it remains necessary.)  The
+library maintainer must also keep sources for any packages his/her
+package requires.  This requirement is somewhat burdensome, but unlikely
+to be relaxed because of the implementation of compilation of macros in
+Emacs Lisp.  Macros cannot be called by compiled Lisp (the macro
+expansion, which is always known at compile time, is inlined), so the
+source of the macro must be loaded before compiling the called function.
+
+The source package hierarchy may be rooted anywhere.  The CVS module is
+called ``packages,'' so we will refer to the top directory of the source
+package hierarchy as ``the @file{packages} directory.''  The
+@file{packages} directory contains two source subdirectories,
+@file{xemacs-packages} and @file{mule-packages} (for convenience in
+segregating the packages which depend on Mule, as they will cause
+load-time errors in a non-Mule XEmacs).  Each subdirectory contains many
+package source directories, whose internal structure is not specified.
+That structure is left up to the convenience of the library maintainers.
+The requirements on the top directory of an individual package source
+tree are given below, @ref{Control Files}.
+
+The @file{packages} directory contains some auxiliary Lisp libraries
+used in the compilation and packaging process.  The content of these
+libraries is of interest primarily to the packaging engineers, @ref{The
+Package Release Engineer's View}.
+
+Finally, the @file{packages}, @file{packages/xemacs-packages}, and
+@file{packages/mule-packages} directories contain @file{Makefile}s and
+include files to control the package creation process.  The
+@file{Makefile}s in @file{packages/xemacs-packages} and
+@file{packages/mule-packages} simply define the default sets of known
+packages and include @file{../iterate.rules}, which implements recursive
+building of all target packages.
+
+The @samp{make} infrastructure in @file{packages} includes
+
+@table @file
+@item Makefile
+controls building of individual packages, local installation, and
+bundling of ``sumo'' tarballs
+
+@item iterate.rules
+controls recursive builds of multiple packages
+
+@item XEmacs.rules
+provides the rules for building and packaging.  Included by all package
+@file{Makefile}s.
+
+@item Local.rules
+provides local configuration, such as installation targets and staging
+directories, as well as a number of kludges (many now obsolete) required
+for building packages on the Windows platform.
+
+@item Local.rules.template
+a template for Local.rules, liberally commented
+
+@item Local.rules.mk
+consistency checking for @file{Local.rules}, included by both the
+top-level @file{Makefile} and by @file{XEmacs.rules}.
+
+@c #### Add to "issues"
+@item package-compile.el
+compile environment (@emph{e.g.}, load-path) setup.  It is very bogus
+that this is here, an alternative mechanism is likely to be provided.
+@end table
+
+Of these, only @file{Local.rules} and @file{package-compile.el} need to
+be modified by the library maintainer.  The changes to Local.rules
+affect only your environment.  This should need to be done only once
+when first preparing the source environment.  The necessary
+modifications to @file{package-compile.el} need to be done for each
+package and are discussed in the next section, @ref{Control Files}.
+
+
+@node Control Files, Obtaining, Infrastructure, The Library Maintainer's View
+@subsection Control Files
+
+Each package source must contain a number of control files in the
+top-level directory.  These files in general can be created and then
+ignored, except for a few variables that need to be updated when new
+versions are released.  In most cases even adding, renaming, and
+removing library source files can be handled by generic rules.
+
+The package control files include
+
+@table @file
+@item Makefile
+Must set a few @file{make} variables used by the administrative
+utilities, and defines a couple of package-building targets to depend on
+appropriate targets defined generically in @file{XEmacs.rules}.  It may
+also provide various variables and rules to transform the source tree
+structure into that expected by the run-time system.
+
+@item package-info.in
+Provides a template for package information to be provided to the
+administrative utilities.  Static variables that are rarely changed
+(such as the package's name) are entered as literals.  Some variables
+are generated by the build process (build dates and MD5 checksums) and
+are automatically filled in.  Finally, some variables that change
+irregularly (dependences and even version numbers) are set as
+@file{make} variables in the @file{Makefile}.
+
+@item ChangeLog
+Not strictly required, but normally a ChangeLog will be added by the
+XEmacs package maintainer if different from the upstream maintainer.
+
+@item package-compile.el
+compile environment (@emph{e.g.}, load-path) setup.  It is very bogus
+that this is here, an alternative mechanism is likely to be provided.
+
+@item _pkg.el
+Generated.  Simply does a @code{package-provide} for the package.
+
+@item _auto-autoloads.el
+Generated.  Read when XEmacs is initialized, and provides autoloads for
+all defuns and other specially-marked forms in the sources.
+
+@item custom-loads.el
+Generated.  Read when XEmacs is initialized, and informs the Customize
+subsystem how to find the defcustom forms needed to create Customization
+forms for the usre configuration variables of the package.
+@end table
+
+
+@node Obtaining, , Control Files, The Library Maintainer's View
+@subsection Obtaining the @xpms{} and Required Utilities
+
+Currently both the infrastructure for creating XEmacs packages and the
+package sources themselves are available only by CVS.  See
+@uref{http://www.xemacs.org/Develop/cvsaccess.html} for more
+intformation.
+
+The @xpms{} currently requires GNU @file{make}, and probably XEmacs, to
+build packages.
+
+
+@node The Package Release Engineer's View, , The Library Maintainer's View, Package Overview
+@subsection The Package Release Engineer's View
+
+The XEmacs Package Release Engineer is responsible for keeping the
+system coherent.  The changes to @file{packages/package-compile.el} and
+@file{packages/xemacs-packages/Makefile} required to make the package
+available to others, and for building SUMO tarballs, @emph{etc}, are
+done by the Package Release Engineer, not individual library
+maintainers.
+
+The Package Release Engineer also maintains assorted infrastructure for
+actually making releases.  These are generally available for inspection
+in the @code{xemacs-builds} module in the CVS repository.
+
+@c #### To be completed.
+
+
+@c #### The following section is lifted verbatim from the XEmacs User's
+@c      Manual, file packages.texi.
+@node Package Terminology, Building Packages, Package Overview, Packaging
+@comment  node-name,  next,  previous,  up
+@heading Package Terminology:
+
+@subsection Libraries and Packages
+@cindex library
+@cindex package
+
+A Lisp @dfn{library} is a single loadable file containing Lisp code.  It
+may be in source or byte-compiled form.  A Lisp @dfn{package} is a set
+of one or more libraries, usually related to each other in some way,
+bundled with administrative information for convenient distribution.
+
+@subsection Package Flavors
+
+There are two main flavors of packages.
+
+@table @strong
+@item Regular Packages
+@cindex regular package
+A regular package is a set of Lisp libraries design to cooperate with
+one another.  A very complex example is Gnus.  One may not in general
+safely remove any of the component libraries.
+
+@item Single-File Packages
+@cindex single-file package
+A single-file package is an collection of thematically related but
+otherwise independent Lisp libraries.  These libraries are bundled
+together for convenience of the maintainers.  Usually individual
+libraries may be deleted at will without any loss of functionality of
+other libraries in the package.  However, we would recommend that you
+follow this rule of thumb: "When in doubt, don't delete".  If it's
+really that big a deal, request that the maintainers split the package
+into smaller aggregations.
+@end table
+
+@subsection Package Distributions
+@cindex package distributions
+@cindex binary packages
+@cindex source packages
+XEmacs Lisp packages are distributed in two ways.  @dfn{Binary packages}
+are used by system administrators and end users.  They are packaged in a
+form convenient for direct installation into an XEmacs package
+hierarchy.  @dfn{Source packages} are for developers and include all
+files necessary for rebuilding byte-compiled lisp and creating tarballs
+for distribution or installation.  This is all of the package author's
+source code plus all of the files necessary to build distribution
+tarballs (Unix Tar format files, gzipped for space savings).
+@c #### This next is an Evile Practice and should be discontinued.
+(Occasionally sources that are not relevant to XEmacs are removed.)
+
+Currently, source packages are only available via CVS.  See
+@url{http://www.xemacs.org/Develop/cvsaccess.html} for details.
+
+The package distributions are also split according to major features
+required in XEmacs to support them.  At present there are @dfn{generic}
+packages, which can be loaded by @emph{any} XEmacs, and @dfn{Mule}
+packages, which @emph{require} Mule support or they will cause errors
+when loaded.  Note that there is no guarantee that a generic package
+will have any useful functionality in a minimally configured XEmacs.  As
+long as any XEmacs can successfully load the package's libraries
+(perhaps given other required Lisp libraries), it will be classified as
+generic.  At the present time only Mule packages need be treated
+specially, and even those only if they contain multibyte characters.
+
+
+@c #### The following section is lifted verbatim from the XEmacs User's
+@c      Manual, file packages.texi.
+@node Building Packages, Local.rules File, Package Terminology, Packaging
+@comment  node-name,  next,  previous,  up
+@cindex building packages
+@cindex package building
+@heading Building Packages:
+Currently, source packages are only available via anonymous CVS.  See
+@url{http://www.xemacs.org/Develop/cvsaccess.html} for details of
+checking out the @file{packages} module.
+
+@subsection Prerequisites for Building Source Packages
+
+@table @code
+@item GNU cp
+@item GNU install 
+(or a BSD compatible install program).
+@item GNU make 
+(3.75 or later preferred).
+@item makeinfo 
+(1.68 from texinfo-3.11 or later required, 1.69 from Texinfo 4 preferred).
+@item GNU tar
+(or equivalent).
+@item GNU gzip
+(or equivalent).
+@item A properly configured @file{Local.rules} file.
+@ref{Local.rules File}.
+@end table
+
+And of course, XEmacs, 21.0 or higher.
+
+@subsection What You Can Do With Source Packages
+
+The packages CVS sources are most useful for creating XEmacs package
+tarballs for installation into your own XEmacs installations or for
+distributing to others.
+
+The supported @file{make} targets are:
+
+@table @code
+@item all
+Bytecompile all files, build and bytecompile byproduct files like
+@file{auto-autoloads.el} and @file{custom-load.el}.  Create info version
+of TeXinfo documentation if present.
+
+@c #### Why do we need this _and_ the binkit target?
+@item bindist
+Does a @code{make all} as well as create a binary package tarball in the
+staging directory.
+
+@item install
+Bytecompile all files, build and bytecompile byproduct files like
+@file{auto-autoloads.el} and @file{custom-load.el}.  Create info version
+of TeXinfo documentation if present.  And install everything into the
+staging directory.
+
+@item srckit
+Usually simply depends on @code{srckit-std}, with no actions.  This does
+a @code{make distclean} and creates a package source tarball in the
+staging directory.  This is generally only of use for package
+maintainers.
+
+@item binkit
+May depend on @code{binkit-sourceonly}, @code{binkit-sourceinfo},
+@code{binkit-sourcedata}, or @code{binkit-sourcedatainfo}, with no
+actions. @code{sourceonly} indicates there is nothing to install in a
+data directory or info directory.  @code{sourceinfo} indicates that
+source and info files are to be installed.  @code{sourcedata} indicates
+that source and etc (data) files are to be installed.
+@code{sourcedatainfo} indicates source, etc (data), and info files are
+to be installed.  A few packages have needs beyond the basic templates
+so this is not yet complete.
+
+@item dist
+Runs the rules @code{srckit} followed by @code{binkit}.  This is
+primarily of use by XEmacs maintainers producing files for distribution.
+
+@item clean
+Remove all built files except @file{auto-autoloads.el} and
+@file{custom-load.el}.
+
+@item distclean
+Remove all created files.
+@end table
+
+@c #### The following section is lifted verbatim from the XEmacs User's
+@c      Manual, file packages.texi.
+@node Local.rules File, Creating Packages, Building Packages, Packaging
+@comment  node-name,  next,  previous,  up
+@cindex local.rules
+@heading The Local.rules File:
+This file in @file{packages} provides the @xpms{} with information about
+the local configuration and environment.  To create @file{Local.rules},
+simply copy @file{Local.rules.template} from that directory to
+@file{Local.rules} and edit it to suit your needs.
+
+These are the variables in @file{Local.rules} that you will need to
+provide values for.  The following variables control which packages will
+be built:
+
+@table @var
+@item XEMACS_PACKAGES
+The default is @samp{xemacs-packages}, which results in the set in
+the @file{xemacs-packages/Makefile} @code{PACKAGES} variable.
+
+Otherwise, it should be a list of package source directories prefixed by
+@samp{xemacs-packages}:
+
+@example
+XEMACS_PACKAGES = xemacs-packages/xemacs-base xemacs-packages/bbdb
+@end example
+
+@item BUILD_WITHOUT_MULE
+The default is the empty value.
+
+Building from CVS defaults to building the Mule
+packages.  Set this to 't' if you don't want/have Mule.
+
+@item MULE_PACKAGES
+The default is @samp{mule-packages}, which results in the set in
+the @file{mule-packages/Makefile} @code{PACKAGES} variable.
+
+Otherwise, it should be a list of package source directories prefixed by
+@samp{mule-packages}:
+
+@example
+MULE_PACKAGES = mule-packages/mule-base mule-packages/skk
+@end example
+
+@item PACKAGE_INDEX
+The default is @file{package-index}.
+
+If you want the package index file to have a different name, change
+this.  This is probably a bad idea unless you are a packages release
+engineer, as it will confuse the package administration tools.
+@end table
+
+The following variables determine where files are installed and how they
+are installed.  Several of the defaults use the variable
+@var{XEMACS_PACKAGES_BASE}.  Never set this variable in
+@file{Local.rules}; it is automatically set in @file{XEmacs.rules}.
+
+@table @asis
+@item @var{XEMACS_STAGING}
+The default is @file{$@{XEMACS_PACKAGES_BASE@}/../xemacs-packages}.
+
+Generic packages will be installed here.  This can be the final
+destination for files or symlinks (if the packages are being installed
+locally), or a clean staging area for building tarballs.
+
+@strong{N.B.}  @samp{make bindist} ignores this variable.  It should be
+handled by the administration utilities, but currently isn't.
+
+@item @var{MULE_STAGING}
+
+The default is @file{$@{XEMACS_PACKAGES_BASE@}/../mule-packages}.
+
+Packages requiring Mule to load correctly will be installed here.  This
+can be the final destination for files or symlinks (if the packages are
+being installed locally), or a clean staging area for building tarballs.
+
+@strong{N.B.}  @samp{make bindist} ignores this variable.  It should be
+handled by the administration utilities, but currently isn't.
+
+@item symlink
+The default is the empty value.
+
+Set this to 't' if you want to simulate ``running in place.''  It is
+currently not possible to ask XEmacs to use any package source tree as
+an automatically configured member of @code{load-path}, and it is
+unlikely that complex trees such as that of the Gnus package will ever
+be able to ``run in place.''  This variable, when set to `t', causes the
+build process to create a symlink farm otherwise identical to an
+installed tree of binary packages.  Thus it is purely a space
+optimization.
+
+Setting this is incompatible with @samp{make bindist}.
+@end table
+
+The following variables determine how packages are made.
+
+@table @var
+@item XEMACS
+The default is @samp{xemacs}.
+
+The path to the XEmacs executable you wish to use to compile the
+packages and execute Lisp build scripts.
+
+@item XEMACS_NATIVE_NT
+The default is the empty value.
+
+Set this to 't' if you are building on WinNT.  It controls hairy shell
+quoting in the @file{Makefile}s.
+
+@item INSTALL
+The default is @samp{install -c}.
+
+The path to your BSD compatible install program.
+
+@item TAR
+The default is @samp{tar}.
+
+The path to your tar program.
+
+@item BZIP2
+The default is the empty value.
+
+If unset, bzipped tarballs will not be built.  If this is set to
+something that resolves to a @samp{bzip2} executable, bzip2 tarballs
+will be built @emph{in addition to} @samp{gzip} tarballs.
+
+@item MAKEINFO
+The default is @samp{makeinfo}.
+
+The path to your @file{makeinfo} program
+@end table
+
+
+@c #### The following section is lifted verbatim from the XEmacs User's
+@c      Manual, file packages.texi.
+@node Creating Packages, Issues, Local.rules File, Packaging
+@comment  node-name,  next,  previous,  up
+@cindex creating packages
+@heading Creating Packages:
+Creating a package from an existing Lisp library is not very difficult.
+
+In addition to the Lisp libraries themselves, you need a
+@file{package-info.in} file and a simple @file{Makefile}.  The rest is
+done by @file{XEmacs.rules}, part of the packaging system
+infrastructure.
+
+@file{package-info.in} contains a single Lisp form like this:
+
+@example
+(NAME                               ; your package's name
+  (standards-version 1.1
+   version VERSION                  ; Makefile
+   author-version AUTHOR_VERSION    ; Makefile
+   date DATE                        ; Makefile
+   build-date BUILD_DATE            ; generated
+   maintainer MAINTAINER            ; Makefile
+   distribution DISTRIBUTION        ; "mule" if MULE is needed,
+                                    ; else "xemacs"
+   priority high
+   category CATEGORY                ; Makefile
+   dump nil
+   description "description"        ; a one-line description string
+   filename FILENAME                ; obsolete
+   md5sum MD5SUM                    ; generated
+   size SIZE                        ; generated
+   provides (FEATURE ...)           ; one for every `provides' form
+   requires (REQUIRES)              ; Makefile
+                                    ; NOT run-time dependencies!  These
+                                    ; are files that provide macros or
+                                    ; defsubsts that must be inlined.
+   type regular
+))
+@end example
+
+You should replace NAME, DISTRIBUTION, DESCRIPTION, and FEATURE ... with
+appropriate values, according to the comments.  Fields marked as
+@samp{obsolete} can be ignored.  Fields marked as @samp{generated} are
+generated by the package construction process, and will be filled in
+automatically.  Fields marked as @samp{Makefile} should be set as
+variables in the @file{Makefile}.
+
+The @samp{provides} can be done automatically, but currently aren't.  It
+would probably be a good idea to set them in the @file{Makefile} (they
+do change, fairly often, but at present they aren't.
+
+The @file{Makefile} is quite stylized.  The idea is similar to an
+@file{Imakefile} or an @code{automake} file: the complexity is hidden in
+generic rules files, in this case the @file{XEmacs.rules} include file
+in the top directory of the packages hierarchy.
+
+An @xpms{} @file{Makefile} has three components.  First, there is a
+variable definition section.  The standard @xpms{} @file{make} variables
+must be defined here for use by the @file{XEmacs.rules} include file.
+Second, the file @file{../../XEmacs.rules} is included.  Finally, the
+@file{make} rules are defined, possibly including additional variable
+definitions for use by the @file{Makefile}.  These always include rules
+for the targets @samp{all}, @samp{binkit}, and @file{srckit}.
+
+Although a number of facilities are available for complex libraries,
+most simple packages' @file{Makefile}s contain a copyright notice, the
+variable definitions mentioned above, and some boilerplate.
+
+@example
+# Makefile for apackage's lisp code
+
+# 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.
+
+VERSION = 0.00
+AUTHOR_VERSION = 0.00
+MAINTAINER = A. M. Aintainer <ama@@not.a.doc>
+PACKAGE = apackage
+PKG_TYPE = regular
+REQUIRES = xemacs-base
+CATEGORY = standard
+
+# All .els should be compiled and packaged.
+ELS = $(wildcard *.el)
+ELCS = $(ELS:.el=.elc)
+
+include ../../XEmacs.rules
+
+all:: $(ELCS) auto-autoloads.elc custom-load.elc
+
+srckit: srckit-std
+
+binkit: binkit-common
+@end example
+
+@menu
+* package-compile.el::
+* package-info.in Fields::
+* Makefile Variables::
+* Makefile Targets::
+@end menu
+
+
+@node package-compile.el, package-info.in Fields, , Creating Packages
+
+The @xpms{} does not automatically become aware of your package simply
+because there is a new subtree.  If any package, including your own,
+requires any of your files, it must be explicitly added to the compile
+environment or loads/requires that search load-path will fail.  The
+changes that need to be made are
+
+@table @strong
+@item an entry in @code{package-directory-map}
+This tells the @xpms{} which distribution (currently
+@samp{xemacs-packages} or @samp{mule-packages}) your package is found
+in.  It then looks in the distribution subdirectory whose name is the
+same as the package's.
+
+@item an entry in the @code{cond} in @code{package-name-to-directory}
+This is optional; it is necessary only if you keep your Lisp code
+somewhere other than the top-level directory of the package's source
+tree, eg, in @file{packages/xemacs-packages/@var{PACKAGE}/lisp}.
+@end table
+
+This only needs to be done once, when the package is first added to the
+@xpms{}.  (Well, when you randomly change the subdirectory layout, too.)
+Your changes to @file{package-compile.el} must be cleared and checked in
+by the XEmacs Package Release Engineer before your package will build
+correctly from a fresh checkout.
+
+This is unfortunate; it works pretty well once set up, but can cause
+confusion when first building a package in the @xpms{} context.  In
+particular, if the @code{package-directory-map} entry for a required
+package
+@c #### including the package itself?
+is not found, the necessary requires will not be executed by
+@file{package-compile.el}.  If required functions are executed (under
+@code{eval-when-compile}), they won't be found and the compile will
+fail.  If required function is actually a macro, the byte compiler will
+not recognize that, compile a function call to the macro.  This will
+cause a run-time error because the byte-code interpreter does not know
+how to execute macros.  (Macros can always be expanded at compile-time,
+and this is more efficient.)
+
+If your package keeps some or all Lisp code somewhere other than the top
+directory, then an entry in @code{package-name-to-directory} is also
+necessary, or requires will fail, leading to the problems just described.
+
+
+@node package-info.in Fields, Makefile Variables, package-compile.el, Creating Packages
+
+The @file{package-info.in} structure is simply Lisp data, to be read by
+a Lisp script, have values substituted for variables, and then written
+out (appropriately quoted) into a loadable Lisp file, to be consed into
+the @file{package-index.el} list at the FTP archives.  That list is
+structured as an alist with package names as keys.  The package data is
+a plist.  Do not rely on this, as it may change.  If you have a good
+reason for relying on it, let the maintainers know and we may
+incorporate it in a future revision of the @xpms{} standard.
+
+There are several kinds of fields, distinguished by how they get their
+values.  There are literals written into @file{package-info.in} by the
+package maintainer.  There are variables substituted in by the build
+process, some computed, and others written as values of @file{make}
+variables in the @file{Makefile} by the package maintainer.  There are a
+few implementation constants, some of which are simply the default value
+for obsolete fields.
+
+The @file{package-info.in} literals provided by the maintainer generally
+should not change over the life of the package.  (The exception is the
+@samp{provides} field, which should be generated, but isn't yet.)
+Values described as ``literal'' below are unquoted literal test.  These
+are normally interpreted as symbols by the package build process.  The
+maintainer literals are
+
+@table @asis
+@item @var{package_name}
+A literal.  The only unnamed ``field,'' the name of the package.
+
+@item distribution
+A literal, either @samp{xemacs} (for generic packages) or @samp{mule}
+(for packages requiring Mule).  @xref{Package Terminology}.
+
+@item description
+A Lisp string containing a one-line text description for use in package
+listings.
+
+@item provides
+A (Lisp) list of features provided by the libraries in the package.  All
+of the features provided by libraries in your package should be elements
+of this list.
+
+@item type
+A literal, either @samp{regular} or @samp{single-file}.  For practical
+purposes, @samp{regular} should be considered an implementation constant.
+@end table
+
+@c #### The following should be rewritten to @xref the make variables
+@c node, and simply associate the field names to the make variables with
+@c one line of description.
+Values which are expected to change regularly as the package is enhanced
+are implemented as @file{make} variables.  You should not change them in
+the @file{package-info.in} file; they are automatically filled in by the
+build process.
+
+The corresponding field name is given in parentheses.  These include
+
+@table @code
+@item VERSION
+(version)
+The version of the XEmacs package, a numeric literal (a decimal
+fixed-point number with two-places of precision).
+
+@item AUTHOR_VERSION
+(author-version)
+The upstream author's version, an unintepreted literal.
+
+@item DATE
+(date)
+Date of release of the upstream version.
+
+@item MAINTAINER
+(maintainer)
+A literal containing the XEmacs package's maintainer and his/her email
+address.
+
+@item CATEGORY
+(category)
+A literal, either @samp{standard} or @samp{mule}.  Probably redundant.
+
+@item REQUIRES
+(requires)
+A list of packages required to correctly build this package.
+
+Note that the usual form in @file{package-info.in} already has the
+parentheses, so the @file{make} variable should be set to a
+space-separated list of package names @emph{not} enclosed in
+parentheses.
+
+The list is of @emph{packages}, not @emph{libraries}, as would
+ordinarily be provided to the Lisp @code{require} function.
+
+@samp{REQUIRES} cannot be correctly computed from the calls to
+@code{require} in the package's library sources.  @samp{REQUIRES} is
+used to ensure that all macro and defstruct definitions used by the
+package are available at build time.  This is not merely a matter of
+efficiency, to get the expansions inlined.  In fact, it is
+@emph{impossible} to call a macro by name in byte-compiled Emacs Lisp
+code.  Thus, if the macro expansion is not inlined, the call will result
+in an error at run-time!  Thus, packages providing libraries that would
+be loaded because of autoload definitions must also be included.
+
+On the other hand, if a package provides no macros to this package, it
+is preferable @emph{not} to include it in @samp{REQUIRES}, because it is
+not uncommon that if the developer doesn't normally use the required
+package, he will never use the functionality in the package being built,
+either.  In that case it would be preferable to not require the
+developer to have source for the dependencies.  That said, of course it
+is safe to put too many packages in @samp{REQUIRES}.
+@end table
+
+Values for the following fields are automatically generated by the build
+process.
+
+@table @asis
+@item build-date
+The date the package tarball was generated.
+
+@item md5sum
+An MD5 checksum for the package tarball, as gzipped.
+
+@item size
+The size of the package tarball, as gzipped.
+@end table
+
+It is not clear that either md5sum or size works correctly if the
+@samp{BZIP2} variable in @file{Local.rules} is set.
+
+The implementation constants are
+
+@table @asis
+@item standards-version
+Currently 1.1.  Defines the format of the @file{package-info.in} file
+and the @file{Makefile}.  A true implementation constant.
+
+@item priority
+An unimplemented and underspecified feature.  Suggestions for
+specification and implementation welcome.
+
+@item dump
+An obsolete feature, superseded by the @file{site-load.el} mechanism.
+The value should always be nil.
+
+@item filename
+An obsolete feature, completely ignored.  Don't even think about doing
+anything useful with it.
+@end table
+
+
+@node Makefile Variables, Makefile Targets, package-info.in Fields, Creating Packages
+
+A number of @file{make} variables are defined by the @xpms{}.  Some are
+required, others are optional.  Of course your @file{Makefile} may
+define other variables for private use, but you should be careful not to
+choose names that conflict with variables defined and used by the
+@xpms{}.
+
+The required variables are described in the table below.
+The corresponding field names for @file{package-info.in}, where
+relevant, are given in parentheses.
+
+@c #### This is the canonical place for this information.  If there is
+@c unnecessary duplication with package-info.in documentation, shorten
+@c that and leave this full-length.
+@table @code
+@item VERSION
+(version)
+The version of the XEmacs package, a numeric literal (a decimal
+fixed-point number with two-places of precision).
+
+@item AUTHOR_VERSION
+(author-version)
+The upstream author's version, an unintepreted literal.
+
+@item DATE
+(date)
+Date of release of the upstream version.
+
+@item MAINTAINER
+(maintainer)
+A literal containing the XEmacs package's maintainer and his/her email
+address.
+
+@item CATEGORY
+(category)
+A literal, either @samp{standard} or @samp{mule}.  Probably redundant.
+
+@item REQUIRES
+(requires)
+A list of packages required to correctly build this package.
+
+Note that the usual form in @file{package-info.in} already has the
+parentheses, so the @file{make} variable should be set to a
+space-separated list of package names @emph{not} enclosed in
+parentheses.
+
+The list is of @emph{packages}, not @emph{libraries}, as would
+ordinarily be provided to the Lisp @code{require} function.
+
+@samp{REQUIRES} cannot be correctly computed from the calls to
+@code{require} in the package's library sources.  @samp{REQUIRES} is
+used to ensure that all macro and defstruct definitions used by the
+package are available at build time.  This is not merely a matter of
+efficiency, to get the expansions inlined.  In fact, it is
+@emph{impossible} to call a macro by name in byte-compiled Emacs Lisp
+code.  Thus, if the macro expansion is not inlined, the call will result
+in an error at run-time!  Thus, packages providing libraries that would
+be loaded because of autoload definitions must also be included.
+
+On the other hand, if a package provides no macros to this package, it
+is preferable @emph{not} to include it in @samp{REQUIRES}, because it is
+not uncommon that if the developer doesn't normally use the required
+package, he will never use the functionality in the package being built,
+either.  In that case it would be preferable to not require the
+developer to have source for the dependencies.  That said, of course it
+is safe to put too many packages in @samp{REQUIRES}.
+
+@item ELCS
+The list of the byte-compiled Lisp files used by the package.  These
+files and their @file{.el} versions will be included in the binary
+package.  This variable determines which libraries will be
+byte-compiled.  These libraries are also deleted by @samp{make clean}.
+
+Note there is no sanity-checking done on this variable.  If you put
+@samp{.el} files in here, they will not be compiled and they @emph{will}
+be deleted by @samp{make clean}.  You would surely be very distressed if
+that happened, so be very careful.  If this variable is left empty, none
+of your Lisp code will be compiled or packaged.  This would be a less
+than amusing surprise, too.
+
+We don't consider this a feature, of course.  Please do submit code to
+do sanity checking to @email{xemacs-patches@@xemacs.org}.
+@end table
+
+Optional, but very commonly used variables include:
+
+@table @code
+item EXTRA_SOURCES
+Other files (such as extra Lisp sources or an upstream @file{Makefile})
+that are normally placed in the installed Lisp directory, but not
+byte-compiled.  These files are @emph{preserved} by the @samp{clean}
+targets.
+
+@item EXTRA_OBJS
+Other files (such as compiled autoload or concatenated @file{.elc}
+libraries) which are normally placed in the installed Lisp directory,
+but do @emph{not} have corresponding source files and @emph{should} be
+deleted by the @samp{clean} targets.  Some of these (such as
+package-specific autoload setups) can and probably should be replaced by
+@xpms{} solutions such as @file{auto-autoloads.el}, but many cannot.
+
+@item PRELOADS
+A specification for loading libraries containing macros before compiling
+the Lisp in the package.  This is spliced directly into the invocation
+of XEmacs for byte-compilation, so it must contain the @samp{-l} flag
+for XEmacs:
+
+@example
+PRELOADS=-l ./apackage-macros.el -l ../bpackage/lisp/bpackage-macros.el
+@end example
+
+@item INFO_FILES
+Any Info file(s) generated by the package.  These must be paths relative
+to the root of the package's source tree.
+
+@item TEXI_FILES
+The Texinfo source file(s).  These must be paths relative
+to the root of the package's source tree.
+
+@item MANUAL
+The name to be used for Info files and man pages.
+
+@item DATA_FILES
+Any data files, such as pixmaps, READMEs, and ChangeLogs.  These must be
+paths relative to the root of the package's source tree.
+
+@item DATA_DEST
+The installation location for data files, relative to the @file{etc/}
+directory of the package hierarchy.  The normal value is simply
+$(PACKAGE).  Leaving it empty (@emph{i.e.}, put it directly under
+@file{etc/}) will probably work, but is subject to name conflicts with
+other packages.
+@end table
+
+Rarely used variables.
+
+@c @table @code
+@c @item
+@c @end table
+
+@node Makefile Targets, , Makefile Variables, Creating Packages
+
+The standard targets that need to be defined in your @file{Makefile}
+follow.  These normally should @emph{not} have an action.  All of the
+work should be done by dependent targets, usually having standard
+definitions in the @xpms{}.
+
+@table @samp
+@item all
+A list of generated files, usually byte-compiled Lisp libraries, to be
+bundled in the package.  The typical dependencies are
+
+@example
+$(ELCS) auto-autoloads.elc custom-load.elc
+@end example
+
+Other targets (such as Info files) may need to be added as dependencies
+for the @code{all} target.
+
+@item srckit
+The target for generating a source package.  Not implemented.  If it
+were, the normal dependency would be @samp{srckit-std}.
+
+@item binkit
+The target for creating a ``master'' installation.  Binary packages are
+actually generated by the @samp{bindist} target.  @xref{Building Packages}.
+@end table
+
+Standard dependencies for @code{srckit} and @code{binkit} are defined in
+@file{XEmacs.rules}.  The most useful of these values are given in the
+following table.
+
+@table @samp
+@item srckit-std
+Build a standard source kit.  Not fully implemented.
+
+@item binkit-sourceonly
+The @samp{binkit} target need only install source and compiled Lisp in
+the staging area.  There is nothing to install in a data directory or
+info directory.
+
+@item binkit-sourceinfo
+Both source and info files are to be installed in the staging area.
+
+@item binkit-sourcedata
+Both source and etc (data) files are to be installed in the staging
+area.
+
+@item binkit-sourcedatainfo
+Source, etc (data), and info files all are present and need to be
+installed in the staging area.
+
+@item binkit-common
+A dependency for all the above.  (In fact in the current implementation
+@samp{binkit-common} does all the work for all of the @samp{binkit}
+targets.)
+@end table
+
+Data files include things like pixmaps for a package-specific toolbar,
+and are normally installed in @file{etc/@var{PACKAGE_NAME}}.  A few
+packages have needs beyond the basic templates.  See @file{XEmacs.rules}
+or a future revision of this manual for details.
+
+
+@node Issues, , Creating Packages, Packaging
+@section Issues
+
+To be completed.
+
diff --text -u 'xemacs-21.4.5/netinstall/ChangeLog' 'xemacs-21.4.6/netinstall/ChangeLog'
Index: ././netinstall/ChangeLog
Prereq:  1.2.2.11 
--- ././netinstall/ChangeLog	Tue Oct 23 20:02:37 2001
+++ ././netinstall/ChangeLog	Mon Dec 17 18:33:19 2001
@@ -1,3 +1,38 @@
+2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-10-27  Andy Piper  <andy@xemacs.org>
+
+	* localdir.cc (dialog_cmd): allow download directory to be
+	created.
+	* log.cc (exit_setup): cygwin -> XEmacs
+	* net.cc (dialog_cmd):
+	 (dialog_proc):
+	 (do_net): sync with cygwin installer.
+	* res.rc:
+	* resource.h (IDS_CREATE_DIR): new.
+	* source.cc (load_dialog):
+	(save_dialog):
+	(dialog_cmd):
+	(dialog_proc):
+	(do_source): sync with cygwin installer.
+	* uninstall.cc (progress): remove log message.
+	* Makefile.in.in: generated setup-bin.ini correctly.
+	
+2001-10-25  Andy Piper  <andy@xemacs.org>
+
+	* Merge 21.5 codeline.
+	
+2001-10-25  Andy Piper  <andy@xemacs.org>
+
+	* setup.mak (OBJS): minor build fixes.
+	(distclean):
+
 2001-10-23  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.5 "Civil Service" is released.
@@ -257,5 +292,5 @@
 
 	* all: port from cygwin setup.
 
-%%% $Id: ChangeLog,v 1.2.2.11 2001/10/23 11:02:37 stephent Exp $
-$Revision: 1.2.2.11 $
+%%% $Id: ChangeLog,v 1.2.2.13 2001/12/17 08:45:59 stephent Exp $
+$Revision: 1.2.2.13 $
diff --text -u 'xemacs-21.4.5/netinstall/Makefile.in.in' 'xemacs-21.4.6/netinstall/Makefile.in.in'
Index: ././netinstall/Makefile.in.in
--- ././netinstall/Makefile.in.in	Wed May  9 18:53:57 2001
+++ ././netinstall/Makefile.in.in	Mon Dec 17 14:49:16 2001
@@ -94,6 +94,9 @@
 PROGS	= setup.exe
 XEMACS=${blddir}/src/${PROGNAME}
 
+CYGWIN_SIZE=0
+WIN32_SIZE=0
+
 CONFIG_H = ../src/config.h
 
 OBJS = \
@@ -111,6 +114,7 @@
 	ini.o \
 	inilex.o \
 	iniparse.o \
+	init.o \
 	install.o \
 	localdir.o \
 	log.o \
@@ -135,6 +139,7 @@
 	splash.o \
 	state.o \
 	tar.o \
+	uninstall.o \
 	version.o
 
 .SUFFIXES:
@@ -151,12 +156,15 @@
 		-L$(MINGW_ZLIB_DIR) -lz -lmingw32
 	@chmod a-x $@
 
-setup-bin.ini: setup.exe
+setup-bin.ini:
 	V=`grep '^\$$Revision.*' $(srcdir)/ChangeLog \
-	| sed -e 's/\$$Revision:* *//' \
-	  -e 's/ *$$.*//'` ;\
-	$(XEMACS) -batch -vanilla -l ${srcdir}/../lisp/package-net.el \
-		-f package-net-batch-generate-bin-ini . $$V
+	| sed -e 's/\$$Revision:* *//' -e 's/ *$$.*//'` ;\
+	$(XEMACS) -batch -vanilla \
+		-eval '(setq package-net-cygwin32-binary-size $(CYGWIN_SIZE) \
+			package-net-win32-binary-size $(WIN32_SIZE) \
+			package-net-setup-version "'$$V'")' \
+		-l ${srcdir}/../lisp/package-net.el \
+		-f package-net-batch-generate-bin-ini
 
 install:
 	@echo; echo "Installing net setup."
@@ -191,7 +199,7 @@
 .PHONY: mostlyclean clean distclean realclean extraclean
 
 mostlyclean:
-	$(RM) *.o *.i core $(PROGS)
+	$(RM) *.o *.i *.ini core $(PROGS)
 
 clean: mostlyclean
 
@@ -227,6 +235,10 @@
  iniparse.h \
  port.h
 install.o: install.cc win32.h \
+ resource.h ini.h dialog.h concat.h geturl.h mkdir.h state.h tar.h \
+ diskfull.h msg.h regedit.h reginfo.h log.h hash.h port.h
+init.o: init.cc win32.h resource.h dialog.h state.h msg.h log.h 
+uninstall.o: uninstall.cc win32.h \
  resource.h ini.h dialog.h concat.h geturl.h mkdir.h state.h tar.h \
  diskfull.h msg.h regedit.h reginfo.h log.h hash.h port.h
 localdir.o: localdir.cc win32.h dialog.h resource.h state.h msg.h \
diff --text -u 'xemacs-21.4.5/netinstall/choose.cc' 'xemacs-21.4.6/netinstall/choose.cc'
Index: ././netinstall/choose.cc
--- ././netinstall/choose.cc	Fri Apr 13 03:22:44 2001
+++ ././netinstall/choose.cc	Mon Dec 17 14:49:16 2001
@@ -623,7 +623,7 @@
   return FALSE;
 }
 
-static char *
+char *
 base (char *s)
 {
   if (!s)
diff --text -u 'xemacs-21.4.5/netinstall/desktop.cc' 'xemacs-21.4.6/netinstall/desktop.cc'
Index: ././netinstall/desktop.cc
--- ././netinstall/desktop.cc	Fri Apr 13 03:22:44 2001
+++ ././netinstall/desktop.cc	Mon Dec 17 14:49:17 2001
@@ -40,6 +40,7 @@
 #include "reginfo.h"
 #include "regedit.h"
 #include "port.h"
+#include "log.h"
 
 extern "C" {
   void make_link_2 (char *exepath, char *args, char *icon, char *lname);
@@ -60,27 +61,31 @@
 
 static char *iconname;
 static char *batname;
+static char *uninstname;
 
 static void
-make_link (char *linkpath, char *title, char *target)
+make_link (char *linkpath, char *title, char *target, char* args)
 {
+#if 0
   char argbuf[_MAX_PATH];
+#endif
   char *fname = concat (linkpath, "/", title, ".lnk", 0);
 
   if (_access (fname, 0) == 0)
     return; /* already exists */
 
-  msg ("make_link %s, %s, %s\n", fname, title, target);
+  msg ("make_link %s, %s, %s, %s\n", fname, title, target, args);
 
   mkdir_p (0, fname);
 
-  char *exepath, *args;
-
+  char *exepath;
+#if 0
   /* If we are running Win9x, build a command line. */
   if (verinfo.dwPlatformId == VER_PLATFORM_WIN32_NT)
     {
+#endif
       exepath = target;
-      args = "";
+#if 0
     }
   else
     {
@@ -91,9 +96,9 @@
       sprintf (argbuf, "%s %s", COMMAND9XARGS, target);
       args = argbuf;
     }
-
+#endif
   msg ("make_link_2 (%s, %s, %s, %s)", exepath, args, iconname, fname);
-  make_link_2 (exepath, args, iconname, fname);
+  make_link_2 (backslash (exepath), args, iconname, fname);
 }
 
 static char* 
@@ -107,7 +112,7 @@
 			      "\\", XEMACS_NATIVE_ARCH_NAME, 0));
 }
 
-static char* 
+char* 
 find_xemacs_exe_name ()
 {
   /* Hack to support older versions. */
@@ -123,7 +128,27 @@
 }
 
 static void
-start_menu (char *title, char *target)
+remove_link (char *linkpath, char* title)
+{
+  if (title)
+    {
+      char *fname = backslash (concat (linkpath, "/", title, ".lnk", 0));
+      msg ("remove_link %s, %s\n", fname, title);
+      if (_access (fname, 0) != 0)
+	return; /* doesn't exist */
+      _unlink (fname);
+    }
+  else 
+    {
+      msg ("remove_link %s\n", linkpath);
+      if (_access (linkpath, 0) != 0)
+	return; /* doesn't exist */
+      _rmdir (linkpath);
+    }
+}
+
+static void
+start_menu (char *title, char *target, int rem, char* args)
 {
   char path[_MAX_PATH];
   LPITEMIDLIST id;
@@ -139,13 +164,16 @@
      msg("Program directory for program link changed to: %s",path);
   }
 // end of Win95 addition
-  strcat (path, "/");
+  strcat (path, "\\");
   strcat (path, XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME);
-  make_link (path, title, target);
+  if (rem == 0)
+    make_link (path, title, target, args);
+  else
+    remove_link (path, title);
 }
 
 static void
-desktop_icon (char *title, char *target)
+desktop_icon (char *title, char *target, int rem)
 {
   char path[_MAX_PATH];
   LPITEMIDLIST id;
@@ -162,59 +190,10 @@
      msg("Desktop directory for deskop link changed to: %s",path);
   }
 // end of Win95 addition
-  make_link (path, title, target);
-}
-
-static int
-uexists (char *path)
-{
-  char *f = concat (root_dir, path, 0);
-  int a = _access (f, 0);
-  free (f);
-  if (a == 0)
-    return 1;
-  return 0;
-}
-
-static void
-make_passwd_group ()
-{
-  if (verinfo.dwPlatformId != VER_PLATFORM_WIN32_NT)
-    {
-      int i;
-
-      LOOP_PACKAGES
-	{
-	  if (!strcmp (package[i].name, "cygwin"))
-	    {
-	      /* mkpasswd and mkgroup are not working on 9x/ME up to 1.1.5-4 */
-	      char *border_version = canonicalize_version ("1.1.5-4");
-	      char *inst_version = canonicalize_version (pi.version);
-
-	      if (strcmp (inst_version, border_version) <= 0)
-		return;
-
-	      break;
-	    }
-	}
-    }
-
-  if (uexists ("/etc/passwd") && uexists ("/etc/group"))
-    return;
-
-  char *fname = concat (root_dir, "/etc/postinstall/passwd-grp.bat", 0);
-  mkdir_p (0, fname);
-
-  FILE *p = fopen (fname, "wb");
-  if (!p)
-    return;
-
-  if (!uexists ("/etc/passwd"))
-    fprintf (p, "bin\\mkpasswd -l > etc\\passwd\n");
-  if (!uexists ("/etc/group"))
-    fprintf (p, "bin\\mkgroup -l > etc\\group\n");
-
-  fclose (p);
+  if (rem == 0)
+    make_link (path, title, target, "");
+  else
+    remove_link (path, title);
 }
 
 static void
@@ -240,46 +219,108 @@
     }
 }
 
+void
+remove_desktop_setup()
+{
+  start_menu ("XEmacs", 0, 1, 0);
+  start_menu ("Uninstall XEmacs", 0, 1, 0);
+  start_menu (0, 0, 1, 0);
+  desktop_icon ("XEmacs", 0, 1);
+
+  if (xemacs_package != 0)
+    {
+#define FROB(exe)	  remove_app_path (exe)
+      FROB (find_xemacs_exe_name ());
+      FROB ("runemacs.exe");
+      FROB ("xemacs.exe");
+#undef FROB
+    }
+}
+
 static void
 do_desktop_setup()
 {
   save_icon ();
 
   if (root_menu && batname) {
-    start_menu ("XEmacs", batname);
+    start_menu ("XEmacs", batname, 0, "");
+    start_menu ("Uninstall XEmacs", uninstname, 0, "-u");
   }
 
   if (root_desktop && batname) {
-    desktop_icon ("XEmacs", batname);
+    desktop_icon ("XEmacs", batname, 0);
   }
 
   // set regkeys for the application
   if (xemacs_package != 0)
     {
       int issystem = (root_scope == IDC_ROOT_SYSTEM ? 1 : 0);
-      if (xemacs_package->type == TY_NATIVE)
+      if (xemacs_package->type == TY_NATIVE
+	  || xemacs_package->type == TY_CYGWIN)
 	{
+	  if (xemacs_package->type == TY_NATIVE)
+	    {
 #define FROB(exe)	  set_app_path ((exe), \
 			find_xemacs_exe_path (), \
 			issystem)
-	  FROB (find_xemacs_exe_name ());
-	  FROB ("runemacs.exe");
-	  FROB ("xemacs.exe");
+	      FROB (find_xemacs_exe_name ());
+	      FROB ("runemacs.exe");
+	      FROB ("xemacs.exe");
 #undef FROB
-	}
-      else if (xemacs_package->type == TY_CYGWIN)
-	{
-	  int junk;
-	  char* root = find_cygwin_root (&junk);
+	    }
+	  else if (xemacs_package->type == TY_CYGWIN)
+	    {
+	      int junk;
+	      char* root = find_cygwin_root (&junk);
 #define FROB(exe)	set_app_path ((exe), \
 			concat (find_xemacs_exe_path (), ";", \
 				root, "\\bin;", \
 				root, "\\usr\\bin", 0), \
 			issystem)
-	  FROB (find_xemacs_exe_name ());
-	  FROB ("runemacs.exe");
-	  FROB ("xemacs.exe");
+	      FROB (find_xemacs_exe_name ());
+	      FROB ("runemacs.exe");
+	      FROB ("xemacs.exe");
 #undef FROB
+	    }
+	  set_install_path (find_xemacs_exe_path(), issystem);
+	}
+      // Register file types
+      if (batname)
+	{
+	  if (reg_java)
+	    {
+	      log (0, "Registering .java files");
+	      setup_explorer ("java", "Java Source file", batname);
+	      setup_explorer ("jav", "Java Source file", batname);
+	    }
+	  if (reg_cpp)
+	    {
+	      log (0, "Registering .cpp files");
+	      setup_explorer ("cpp", "C++ Source file", batname);
+	      setup_explorer ("cc", "C++ Source file", batname);
+	      setup_explorer ("hh", "C++ Header file", batname);
+	    }
+	  if (reg_c)
+	    {
+	      log (0, "Registering .c files");
+	      setup_explorer ("c", "C Source file", batname);
+	      setup_explorer ("h", "C Header file", batname);
+	    }
+	  if (reg_elisp)
+	    {
+	      log (0, "Registering .el files");
+	      setup_explorer ("el", "E-Lisp Source file", batname);
+	    }
+	  if (reg_txt)
+	    {
+	      log (0, "Registering .txt files");
+	      setup_explorer ("txt", "Text file", batname);
+	    }
+	  if (reg_idl)
+	    {
+	      log (0, "Registering .idl files");
+	      setup_explorer ("idl", "OMG IDL file", batname);
+	    }
 	}
     }
 }
@@ -287,6 +328,13 @@
 static int da[] = { IDC_ROOT_DESKTOP, 0 };
 static int ma[] = { IDC_ROOT_MENU, 0 };
 
+static int ct[] = { IDC_C_TYPE, 0 };
+static int javat[] = { IDC_JAVA_TYPE, 0 };
+static int cppt[] = { IDC_CPP_TYPE, 0 };
+static int elispt[] = { IDC_ELISP_TYPE, 0 };
+static int txtt[] = { IDC_TXT_TYPE, 0 };
+static int idlt[] = { IDC_IDL_TYPE, 0 };
+
 static void
 check_if_enable_next (HWND h)
 {
@@ -298,6 +346,12 @@
 {
   rbset (h, da, root_desktop);
   rbset (h, ma, root_menu);
+  rbset (h, ct, reg_c);
+  rbset (h, javat, reg_java);
+  rbset (h, cppt, reg_cpp);
+  rbset (h, elispt, reg_elisp);
+  rbset (h, txtt, reg_txt);
+  rbset (h, idlt, reg_idl);
   check_if_enable_next (h);
 }
 
@@ -346,14 +400,14 @@
      msg ("Program directory for program link changed to: %s",path);
   }
   // end of Win95 addition
-  strcat (path, "/");
+  strcat (path, "\\");
   strcat (path, XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME);
-  char *fname = concat (path, "/", title, ".lnk", 0);
+  char *fname = concat (path, "\\", title, ".lnk", 0);
 
   if (_access (fname, 0) == 0)
     return 0; /* already exists */
   
-  fname = concat (path, "/", title, ".pif", 0); /* check for a pif as well */
+  fname = concat (path, "\\", title, ".pif", 0); /* check for a pif as well */
   
   if (_access (fname, 0) == 0)
     return 0; /* already exists */
@@ -366,6 +420,12 @@
 {
   root_desktop= rbget (h, da);
   root_menu = rbget (h, ma);
+  reg_c = rbget (h, ct);
+  reg_java = rbget (h, javat);
+  reg_cpp = rbget (h, cppt);
+  reg_elisp = rbget (h, elispt);
+  reg_txt = rbget (h, txtt);
+  reg_idl = rbget (h, idlt);
 }
 
 static BOOL
@@ -420,19 +480,33 @@
   verinfo.dwOSVersionInfoSize = sizeof (verinfo);
   GetVersionEx (&verinfo);
   batname = 0;
+  uninstname = 0;
 
   if (xemacs_package != 0 && xemacs_package->type != TY_GENERIC)
     {
       batname = concat (find_xemacs_exe_path (), "\\",
 			find_xemacs_exe_name (), 
 			0);
+      uninstname = concat (find_xemacs_exe_path (), "\\", "setup.exe", 0);
       root_desktop = check_desktop ("XEmacs", batname);
       root_menu = check_startmenu ("XEmacs", batname);
+      reg_c = IDC_C_TYPE;
+      reg_cpp = IDC_CPP_TYPE;
+      reg_java = IDC_JAVA_TYPE;
+      reg_elisp = IDC_ELISP_TYPE;
+      reg_txt = IDC_TXT_TYPE;
+      reg_idl = IDC_IDL_TYPE;
     }
   else
     {
       root_desktop = 0;
       root_menu = 0;
+      reg_c = 0;
+      reg_cpp = 0;
+      reg_java = 0;
+      reg_elisp = 0;
+      reg_txt = 0;
+      reg_idl = 0;
     }
   
   int rv = 0;
diff --text -u 'xemacs-21.4.5/netinstall/dialog.h' 'xemacs-21.4.6/netinstall/dialog.h'
Index: ././netinstall/dialog.h
--- ././netinstall/dialog.h	Fri Apr 13 03:22:45 2001
+++ ././netinstall/dialog.h	Mon Dec 17 14:49:17 2001
@@ -31,11 +31,13 @@
 D(do_download);
 D(do_fromcwd);
 D(do_ini);
+D(do_init);
 D(do_install);
 D(do_local_dir);
 D(do_net);
 D(do_other);
 D(do_postinstall);
+D(do_uninstall);
 D(do_root);
 D(do_site);
 D(do_source);
diff --text -u 'xemacs-21.4.5/netinstall/download.cc' 'xemacs-21.4.6/netinstall/download.cc'
Index: ././netinstall/download.cc
--- ././netinstall/download.cc	Fri Apr 13 03:22:45 2001
+++ ././netinstall/download.cc	Mon Dec 17 14:49:17 2001
@@ -32,8 +32,6 @@
 #include "mkdir.h"
 #include "log.h"
 
-#define pi (package[i].info[package[i].trust])
-
 static int
 download_one (char *name, int expected_size)
 {
diff --text -u 'xemacs-21.4.5/netinstall/geturl.cc' 'xemacs-21.4.6/netinstall/geturl.cc'
Index: ././netinstall/geturl.cc
--- ././netinstall/geturl.cc	Fri Apr 13 03:22:46 2001
+++ ././netinstall/geturl.cc	Mon Dec 17 14:49:17 2001
@@ -72,10 +72,10 @@
 dialog (void *)
 {
   MSG m;
-  HWND gw_dialog = CreateDialog (hinstance, MAKEINTRESOURCE (IDD_DLSTATUS),
+  HWND lgw_dialog = CreateDialog (hinstance, MAKEINTRESOURCE (IDD_DLSTATUS),
 				   0, dialog_proc);
-  ShowWindow (gw_dialog, SW_SHOWNORMAL);
-  UpdateWindow (gw_dialog);
+  ShowWindow (lgw_dialog, SW_SHOWNORMAL);
+  UpdateWindow (lgw_dialog);
   while (GetMessage (&m, 0, 0, 0) > 0) {
     TranslateMessage (&m);
     DispatchMessage (&m);
@@ -197,6 +197,10 @@
       bufs = tmp;
     }
   *rvp = 0;
+
+  if (n)
+    delete n;
+
   return rv;
 }
 
@@ -243,6 +247,9 @@
     }
 
   fclose (f);
+
+  if (n)
+    delete n;
 
   return 0;
 }
diff --text -u 'xemacs-21.4.5/netinstall/ini.h' 'xemacs-21.4.6/netinstall/ini.h'
Index: ././netinstall/ini.h
--- ././netinstall/ini.h	Fri Apr 13 03:22:47 2001
+++ ././netinstall/ini.h	Mon Dec 17 14:49:17 2001
@@ -73,7 +73,8 @@
 Package *new_package (char *name);
 void	ini_init (char *string);
 
-#define pi (package[i].info[package[i].trust])
+#define pinfo(p) ((p).info[(p).trust])
+#define pi pinfo(package[i])
 
 #define LOOP_PACKAGES \
   for (i=0; i<npackages; i++) \
diff --text -u /dev/null 'xemacs-21.4.6/netinstall/init.cc'
Index: ././netinstall/init.cc
--- ././netinstall/init.cc	Thu Jan  1 09:00:00 1970
+++ ././netinstall/init.cc	Mon Dec 17 14:49:17 2001
@@ -0,0 +1,65 @@
+/* Initialisation for netinstall.
+   Copyright (C) 2001 Andy Piper.
+
+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.  */
+
+#include "win32.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include "dialog.h"
+#include "log.h"
+#include "resource.h"
+#include "state.h"
+#include "msg.h"
+#include "regedit.h"
+#include "reginfo.h"
+#include "version.h"
+
+static void
+init_root ()
+{
+  int isnative, issystem;
+  root_dir = find_root_location (&issystem, &isnative);
+  if (root_dir)
+    {
+      if (isnative)
+	install_type = IDC_INSTALL_NATIVE;
+      else
+	install_type = IDC_INSTALL_CYGWIN;
+
+      if (issystem)
+	root_scope = IDC_ROOT_SYSTEM;
+      else
+	root_scope = IDC_ROOT_USER;
+      root_dir_default = 0;
+    }
+}
+
+void
+do_init (HINSTANCE h)
+{
+  char cwd[_MAX_PATH];
+  GetCurrentDirectory (sizeof (cwd), cwd);
+  local_dir = strdup (cwd);
+  log (0, "Current Directory: %s", cwd);
+
+  HANDLE gnu = LoadImage (h, MAKEINTRESOURCE (IDB_GNU), 
+			  IMAGE_BITMAP, 0, 0, 0);
+  init_root();
+}
+
diff --text -u 'xemacs-21.4.5/netinstall/localdir.cc' 'xemacs-21.4.6/netinstall/localdir.cc'
Index: ././netinstall/localdir.cc
--- ././netinstall/localdir.cc	Fri Apr 13 03:22:48 2001
+++ ././netinstall/localdir.cc	Mon Dec 17 14:49:17 2001
@@ -12,6 +12,7 @@
  * Written by Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru>
  * based on work and suggestions of DJ Delorie
  *
+ * Sync'ed with cinstall 2001-10-16
  */
 
 /* The purpose of this file is to ask the user where they want the
@@ -23,7 +24,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <io.h>
 
+#include "mkdir.h"
 #include "dialog.h"
 #include "resource.h"
 #include "state.h"
@@ -102,6 +105,11 @@
 
     case IDOK:
       save_dialog (h);
+      if (_access (local_dir, 0) != 0 && yesno (IDS_CREATE_DIR, local_dir) == IDYES)
+	{
+	  log (0, "Created install directory %s\n", local_dir);
+	  mkdir_p (1, local_dir);
+	}
       if (SetCurrentDirectoryA (local_dir))
 	{
 	  switch (source)
@@ -132,7 +140,6 @@
       NEXT (0);
       break;
     }
-  return FALSE;
 }
 
 static BOOL CALLBACK
diff --text -u 'xemacs-21.4.5/netinstall/log.cc' 'xemacs-21.4.6/netinstall/log.cc'
Index: ././netinstall/log.cc
--- ././netinstall/log.cc	Fri Apr 13 03:22:48 2001
+++ ././netinstall/log.cc	Mon Dec 17 14:49:17 2001
@@ -110,7 +110,7 @@
   if (exit_msg)
     note (exit_msg);
 
-  log (LOG_TIMESTAMP, "Ending cygwin install");
+  log (LOG_TIMESTAMP, "Ending XEmacs install");
 
   if (source == IDC_SOURCE_DOWNLOAD || !root_dir)
     {
diff --text -u 'xemacs-21.4.5/netinstall/main.cc' 'xemacs-21.4.6/netinstall/main.cc'
Index: ././netinstall/main.cc
--- ././netinstall/main.cc	Fri Apr 13 03:22:49 2001
+++ ././netinstall/main.cc	Mon Dec 17 14:49:17 2001
@@ -51,21 +51,29 @@
 	 int cmd_show)
 {
   hinstance = h;
+  int pos = -1;
+  if ((pos = strcspn(command_line, "-")) >= 0
+      &&
+      command_line[pos+1] == 'u')
+    {
+      next_dialog = IDD_UNINSTALL;
+      log (LOG_TIMESTAMP, "Starting XEmacs uninstall");
+      uninstall = 1;
+    }
+  else
+    {
+      next_dialog = IDD_SPLASH;
+      log (LOG_TIMESTAMP, "Starting XEmacs install");
+    }
 
-  next_dialog = IDD_SPLASH;
-
-  log (LOG_TIMESTAMP, "Starting XEmacs install");
-
-  char cwd[_MAX_PATH];
-  GetCurrentDirectory (sizeof (cwd), cwd);
-  local_dir = strdup (cwd);
-  log (0, "Current Directory: %s", cwd);
+  do_init(h);
 
   while (next_dialog)
     {
       switch (next_dialog)
 	{
 	case IDD_SPLASH:	do_splash (h);	break;
+	case IDD_UNINSTALL:	do_uninstall (h);	break;
 	case IDD_SOURCE:	do_source (h);	break;
 	case IDD_LOCAL_DIR:	do_local_dir (h); break;
 	case IDD_ROOT:		do_root (h);	break;
diff --text -u 'xemacs-21.4.5/netinstall/msg.cc' 'xemacs-21.4.6/netinstall/msg.cc'
Index: ././netinstall/msg.cc
Prereq:  1.2 
--- ././netinstall/msg.cc	Fri Apr 13 03:22:49 2001
+++ ././netinstall/msg.cc	Mon Dec 17 14:49:18 2001
@@ -16,7 +16,7 @@
 /* The purpose of this file is to centralize all the message
    functions. */
 
-static char *cvsid = "\n%%% $Id: msg.cc,v 1.2 2001/04/12 18:22:49 michaels Exp $\n";
+static char *cvsid = "\n%%% $Id: msg.cc,v 1.2.2.1 2001/12/17 05:49:18 stephent Exp $\n";
 
 #include "win32.h"
 #include <stdio.h>
diff --text -u 'xemacs-21.4.5/netinstall/net.cc' 'xemacs-21.4.6/netinstall/net.cc'
Index: ././netinstall/net.cc
--- ././netinstall/net.cc	Fri Apr 13 03:22:50 2001
+++ ././netinstall/net.cc	Mon Dec 17 14:49:18 2001
@@ -11,6 +11,7 @@
  *
  * Written by DJ Delorie <dj@cygnus.com>
  *
+ * Sync'ed with cinstall 2001-10-16
  */
 
 /* The purpose of this file is to get the network configuration
@@ -115,7 +116,6 @@
       NEXT (0);
       break;
     }
-  return FALSE;
 }
 
 static BOOL CALLBACK
@@ -125,6 +125,13 @@
     {
     case WM_INITDIALOG:
       load_dialog (h);
+
+      // Check to see if any radio buttons are selected. If not, select a default.
+      if ((!SendMessage(GetDlgItem (h, IDC_NET_IE5), BM_GETCHECK, 0, 0) == BST_CHECKED)
+        && (!SendMessage(GetDlgItem (h, IDC_NET_PROXY), BM_GETCHECK, 0, 0) == BST_CHECKED))
+        {
+          SendMessage(GetDlgItem (h, IDC_NET_DIRECT), BM_CLICK, 0, 0);
+        }
       return FALSE;
     case WM_COMMAND:
       return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd);
@@ -137,6 +144,7 @@
 {
   int rv = 0;
 
+  net_method = IDC_NET_DIRECT;
   rv = DialogBox (h, MAKEINTRESOURCE (IDD_NET), 0, dialog_proc);
   if (rv == -1)
     fatal (IDS_DIALOG_FAILED);
diff --text -u 'xemacs-21.4.5/netinstall/nio-ftp.cc' 'xemacs-21.4.6/netinstall/nio-ftp.cc'
Index: ././netinstall/nio-ftp.cc
--- ././netinstall/nio-ftp.cc	Fri Apr 13 03:22:51 2001
+++ ././netinstall/nio-ftp.cc	Mon Dec 17 14:49:18 2001
@@ -43,7 +43,7 @@
     last_line = s->gets ();
     log (LOG_BABBLE, "ftp > %s", last_line);
   } while (last_line && (!isdigit (last_line[0]) || last_line[3] != ' '));
-  return atoi (last_line ? last_line : "0");
+  return atoi (last_line ?: "0");
 }
 
 NetIO_FTP::NetIO_FTP (char *Purl)
@@ -73,7 +73,7 @@
       code = ftp_line (c);
       if (code == 331)
 	{
-	  c->printf ("PASS xenacs-setup@\r\n");
+	  c->printf ("PASS xemacs-setup@\r\n");
 	  code = ftp_line (c);
 	}
 
diff --text -u 'xemacs-21.4.5/netinstall/nio-ie5.cc' 'xemacs-21.4.6/netinstall/nio-ie5.cc'
Index: ././netinstall/nio-ie5.cc
Prereq:  1.2 
--- ././netinstall/nio-ie5.cc	Fri Apr 13 03:22:51 2001
+++ ././netinstall/nio-ie5.cc	Mon Dec 17 14:49:18 2001
@@ -18,8 +18,6 @@
    must already have installed and configured IE5.  This module is
    called from netio.cc, which is called from geturl.cc */
 
-static char *cvsid = "\n%%% $Id: nio-ie5.cc,v 1.2 2001/04/12 18:22:51 michaels Exp $\n";
-
 #include "win32.h"
 
 #include "resource.h"
diff --text -u 'xemacs-21.4.5/netinstall/regedit.cc' 'xemacs-21.4.6/netinstall/regedit.cc'
Index: ././netinstall/regedit.cc
--- ././netinstall/regedit.cc	Fri Apr 13 03:22:52 2001
+++ ././netinstall/regedit.cc	Mon Dec 17 14:49:18 2001
@@ -180,6 +180,7 @@
 	   path, path);
   RegSetValueEx (key, XEMACS_INFO_XEMACS_PACKAGE_KEY, 
 		 0, REG_SZ, (BYTE *)buf, strlen (buf)+1);
+  RegCloseKey (key);
 }
 
 void
@@ -201,6 +202,117 @@
 
   RegSetValueEx (key, "Path", 
 		 0, REG_SZ, (BYTE *)path, strlen (path)+1);
+  RegCloseKey (key);
+}
+
+void
+set_install_path (char* path, int issystem)
+{
+  char buf[1000];
+  HKEY key;
+  DWORD disposition;
+
+  sprintf (buf, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\XEmacs");
+
+  HKEY kr = issystem ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
+  RegDeleteKey (kr, buf);
+  
+  if (RegCreateKeyEx (kr, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS,
+		      0, &key, &disposition) != ERROR_SUCCESS)
+    fatal ("set_install_path");
+
+  RegSetValueEx (key, "DisplayName", 
+		 0, REG_SZ, (BYTE *)"XEmacs", strlen ("XEmacs")+1);
+
+  sprintf (buf, "%s\\setup.exe -u", path);
+  RegSetValueEx (key, "UninstallString", 
+		 0, REG_SZ, (BYTE *)buf, strlen (buf)+1);
+  RegCloseKey (key);
+}
+
+void
+setup_explorer (char* file_type, char* name, char *exe)
+{
+  char buf[1000];
+  char ftype[32];
+  HKEY key;
+  DWORD disposition;
+
+  sprintf (buf, ".%s", file_type);
+  RegDeleteKey (HKEY_CLASSES_ROOT, buf);
+
+  if (RegCreateKeyEx (HKEY_CLASSES_ROOT, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS,
+		      0, &key, &disposition) != ERROR_SUCCESS)
+    fatal ("setup_explorer");
+
+  // set default key
+  sprintf (ftype, "%sfile", file_type);
+  RegSetValueEx (key, NULL, 
+		 0, REG_SZ, (BYTE *)ftype, strlen (ftype)+1);
+  RegCloseKey (key);
+
+  // create file type entry
+  RegDeleteKey (HKEY_CLASSES_ROOT, ftype);
+  if (RegCreateKeyEx (HKEY_CLASSES_ROOT, ftype, 0, "XEmacs", 
+		      0, KEY_ALL_ACCESS,
+		      0, &key, &disposition) != ERROR_SUCCESS)
+    fatal ("setup_explorer");
+  RegSetValueEx (key, NULL,
+		 0, REG_SZ, (BYTE *)name, strlen (name)+1);
+  RegSetValueEx (key, "AlwaysShowExt",
+		 0, REG_SZ, (BYTE *)"", strlen ("")+1);
+  RegCloseKey (key);
+
+  // make xemacs file the default icon
+  sprintf(buf, "%s\\DefaultIcon", ftype);
+  if (RegCreateKeyEx (HKEY_CLASSES_ROOT, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS,
+		      0, &key, &disposition) != ERROR_SUCCESS)
+    fatal ("setup_explorer");
+
+  sprintf(buf, "%s,1", exe);
+  RegSetValueEx (key, NULL, 
+		 0, REG_SZ, (BYTE *)buf, strlen (buf)+1);
+  RegCloseKey (key);
+
+  // command default key (exe)
+  sprintf(buf, "%s\\shell\\Open\\command", ftype);
+  if (RegCreateKeyEx (HKEY_CLASSES_ROOT, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS,
+		      0, &key, &disposition) != ERROR_SUCCESS)
+    fatal ("setup_explorer");
+
+  sprintf(buf, "\"%s\"", exe);	// Don't need %1 because dde will open the file
+  RegSetValueEx (key, NULL, 
+		 0, REG_SZ, (BYTE *)buf, strlen (buf)+1);
+  RegCloseKey (key);
+
+  // ddeexec
+  sprintf(buf, "%s\\shell\\Open\\ddeexec", ftype);
+  if (RegCreateKeyEx (HKEY_CLASSES_ROOT, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS,
+		      0, &key, &disposition) != ERROR_SUCCESS)
+    fatal ("setup_explorer");
+
+#define DDE_OPEN "Open(\"%1\")"
+  RegSetValueEx (key, NULL, 
+		 0, REG_SZ, (BYTE *)DDE_OPEN, strlen (DDE_OPEN)+1);
+  RegCloseKey (key);
+
+  // ddeexec application
+  sprintf(buf, "%s\\shell\\Open\\ddeexec\\application", ftype);
+  if (RegCreateKeyEx (HKEY_CLASSES_ROOT, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS,
+		      0, &key, &disposition) != ERROR_SUCCESS)
+    fatal ("setup_explorer");
+  RegSetValueEx (key, NULL, 
+		 0, REG_SZ, (BYTE *)"XEmacs", strlen ("XEmacs")+1);
+  RegCloseKey (key);
+
+  // ddeexec topic
+  sprintf(buf, "%s\\shell\\Open\\ddeexec\\topic", ftype);
+  if (RegCreateKeyEx (HKEY_CLASSES_ROOT, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS,
+		      0, &key, &disposition) != ERROR_SUCCESS)
+    fatal ("setup_explorer");
+  RegSetValueEx (key, NULL, 
+		 0, REG_SZ, (BYTE *)"system", strlen ("system")+1);
+  RegCloseKey (key);
 }
 
 static void
@@ -211,7 +323,10 @@
   sprintf (buf, "Software\\%s\\%s",
 	   XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME,
 	   XEMACS_INFO_XEMACS_REGISTRY_NAME);
+  RegDeleteKey (rkey, buf);
 
+  sprintf (buf, "Software\\%s",
+	   XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME);
   RegDeleteKey (rkey, buf);
 }
 
@@ -222,3 +337,23 @@
   remove1 (HKEY_CURRENT_USER);
 }
 
+void
+remove_app_path (char *exe)
+{
+  char buf[1000];
+  sprintf (buf, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\%s",
+	   exe);
+
+  RegDeleteKey (HKEY_LOCAL_MACHINE, buf);
+  RegDeleteKey (HKEY_CURRENT_USER, buf);
+}
+
+void
+remove_uninstall_path ()
+{
+  char buf[1000];
+  sprintf (buf, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\XEmacs");
+
+  RegDeleteKey (HKEY_LOCAL_MACHINE, buf);
+  RegDeleteKey (HKEY_CURRENT_USER, buf);
+}
diff --text -u 'xemacs-21.4.5/netinstall/regedit.h' 'xemacs-21.4.6/netinstall/regedit.h'
Index: ././netinstall/regedit.h
--- ././netinstall/regedit.h	Fri Apr 13 03:22:53 2001
+++ ././netinstall/regedit.h	Mon Dec 17 14:49:18 2001
@@ -23,4 +23,8 @@
 void	create_xemacs_root (char *posix, int issystem, int isnative);
 void	remove_xemacs_root ();
 void	set_app_path (char *exe, char* path, int issystem);
+void 	set_install_path (char* path, int issystem);
+void	setup_explorer (char* file_type, char* name, char *exe);
+void	remove_app_path (char *exe);
+void	remove_uninstall_path ();
 
diff --text -u 'xemacs-21.4.5/netinstall/reginfo.h' 'xemacs-21.4.6/netinstall/reginfo.h'
Index: ././netinstall/reginfo.h
--- ././netinstall/reginfo.h	Wed May  9 18:53:57 2001
+++ ././netinstall/reginfo.h	Mon Dec 17 14:49:18 2001
@@ -2,7 +2,7 @@
 
 Copyright (C) 2000 Andy Piper. */
 
-#define XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME "GNU"
+#define XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME "XEmacs"
 #define XEMACS_INFO_XEMACS_REGISTRY_NAME "XEmacs"
 /* Keys */
 #define XEMACS_INFO_XEMACS_ROOT_KEY "emacs_dir"
diff --text -u 'xemacs-21.4.5/netinstall/res.rc' 'xemacs-21.4.6/netinstall/res.rc'
Index: ././netinstall/res.rc
Prereq:  1.2 
--- ././netinstall/res.rc	Fri Apr 13 03:22:53 2001
+++ ././netinstall/res.rc	Mon Dec 17 14:49:18 2001
@@ -33,20 +33,20 @@
 CAPTION "XEmacs Setup"
 FONT 8, "MS Sans Serif"
 BEGIN
-    DEFPUSHBUTTON   "Next >",IDOK,199,176,45,15,WS_DISABLED
+    PUSHBUTTON      "Next >",IDOK,199,176,45,15, WS_GROUP
     PUSHBUTTON      "Cancel",IDCANCEL,256,176,45,15
+    CONTROL         "Download from the Internet",IDC_SOURCE_DOWNLOAD,"Button",
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,127,102,152,10
+    CONTROL         "Install from the Internet",IDC_SOURCE_NETINST,"Button",
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,127,121,87,10
+    CONTROL         "Install from Local Directory",IDC_SOURCE_CWD,"Button",
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,127,140,104,10
     LTEXT           "",IDC_STATIC,10,10,87,151,SS_SUNKEN | NOT WS_GROUP
     LTEXT           "",IDC_STATIC,10,169,291,1,SS_SUNKEN | NOT WS_GROUP
     LTEXT           "Setup will use the following installation method.",
                     IDC_STATIC,112,11,170,17
     LTEXT           "To exit setup click Cancel at any time.",IDC_STATIC,112,
                     32,166,17
-    CONTROL         "Download from the Internet",IDC_SOURCE_DOWNLOAD,"Button",
-                    BS_AUTORADIOBUTTON,127,102,152,10
-    CONTROL         "Install from the Internet",IDC_SOURCE_NETINST,"Button",
-                    BS_AUTORADIOBUTTON,127,121,87,10
-    CONTROL         "Install from Local Directory",IDC_SOURCE_CWD,"Button",
-                    BS_AUTORADIOBUTTON,127,140,104,10
     GROUPBOX        "Installation method",IDC_STATIC,113,84,188,77
     CONTROL         "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62
 END
@@ -142,26 +142,26 @@
     CONTROL         "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62
 END
 
-IDD_NET DIALOG 0, 0, 311, 201
+IDD_NET DIALOG DISCARDABLE  0, 0, 311, 201
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "XEmacs Setup"
 FONT 8, "MS Sans Serif"
 BEGIN
-    DEFPUSHBUTTON   "Next >",IDOK,199,176,45,15
+    PUSHBUTTON      "Next >",IDOK,199,176,45,15,WS_GROUP
     PUSHBUTTON      "< Back",IDC_BACK,154,176,45,15
     PUSHBUTTON      "Cancel",IDCANCEL,256,176,45,15
     LTEXT           "",IDC_STATIC,10,10,87,151,SS_SUNKEN | NOT WS_GROUP
     LTEXT           "",IDC_STATIC,10,169,291,1,SS_SUNKEN | NOT WS_GROUP
     LTEXT           "Setup will use the following connection method.",
-                    IDC_STATIC,112,11,170,17
+                    IDC_STATIC,112,11,170,17,NOT WS_GROUP
     LTEXT           "To exit setup click Cancel at any time.",IDC_STATIC,112,
-                    32,166,17
+                    32,166,17,NOT WS_GROUP
     CONTROL         "Use IE5 Settings",IDC_NET_IE5,"Button",
-                    BS_AUTORADIOBUTTON,128,93,69,10
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,128,93,69,10
     CONTROL         "Direct Connection",IDC_NET_DIRECT,"Button",
-                    BS_AUTORADIOBUTTON,128,109,73,10
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,128,109,73,10
     CONTROL         "Use HTTP/FTP Proxy:",IDC_NET_PROXY,"Button",
-                    BS_AUTORADIOBUTTON,128,124,88,10
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,128,124,88,10
     EDITTEXT        IDC_PROXY_HOST,128,141,80,12,ES_AUTOHSCROLL | 
                     WS_DISABLED
     LTEXT           "Proxy",IDC_STATIC,10,55,50,15,SS_CENTERIMAGE,
@@ -216,6 +216,30 @@
     CONTROL         "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62
 END
 
+IDD_UNINSTALL DIALOG DISCARDABLE  0, 0, 311, 201
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Uninstall XEmacs"
+FONT 8, "MS Sans Serif"
+BEGIN
+    PUSHBUTTON      "Cancel",IDCANCEL,199,176,45,15
+    DEFPUSHBUTTON   "Uninstall",IDOK,256,176,45,15
+    LTEXT           "",IDC_STATIC,10,10,87,151,SS_SUNKEN | NOT WS_GROUP
+    LTEXT           "",IDC_STATIC,10,169,291,1,SS_SUNKEN | NOT WS_GROUP
+    LTEXT           "Uninstalling Packages",IDC_STATIC,112,10,170,17
+    LTEXT           "(PKG)",IDC_UNINS_PKG,112,26,170,11
+    LTEXT           "(FILE)",IDC_UNINS_FILE,112,41,166,11
+    CONTROL         "Progress1",IDC_UNINS_DISKFULL,"msctls_progress32",
+                    WS_BORDER,123,143,165,10
+    CONTROL         "Progress1",IDC_UNINS_IPROGRESS,"msctls_progress32",
+                    WS_BORDER,125,106,163,10
+    CONTROL         "Progress1",IDC_UNINS_PPROGRESS,"msctls_progress32",
+                    WS_BORDER,125,67,163,10
+    GROUPBOX        "Disk",IDC_STATIC,112,130,186,31
+    GROUPBOX        "Package",IDC_STATIC,112,54,186,31
+    GROUPBOX        "Total",IDC_STATIC,112,93,186,31
+    CONTROL         "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62
+END
+
 IDD_PROXY_AUTH DIALOG DISCARDABLE  0, 0, 215, 95
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "XEmacs Setup"
@@ -250,7 +274,7 @@
     PUSHBUTTON      "Cancel",IDCANCEL,165,75,45,15
 END
 
-IDD_SPLASH DIALOG 0, 0, 311, 201
+IDD_SPLASH DIALOG DISCARDABLE  0, 0, 311, 201
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "XEmacs Setup"
 FONT 8, "MS Sans Serif"
@@ -301,17 +325,29 @@
     DEFPUSHBUTTON   "Finish",IDOK,199,176,45,15
     PUSHBUTTON      "< Back",IDC_BACK,154,176,45,15
     PUSHBUTTON      "Cancel",IDCANCEL,256,176,45,15
-    LTEXT           "",IDC_STATIC,10,10,87,151,SS_SUNKEN | NOT WS_GROUP
-    LTEXT           "",IDC_STATIC,10,169,291,1,SS_SUNKEN | NOT WS_GROUP
     LTEXT           "Setup has now finished. To create desktop shortcuts, please select from the following options.",
                     IDC_STATIC,112,11,170,17
     LTEXT           "To complete setup click Finish.",IDC_STATIC,112,32,166,
                     17
     CONTROL         "Create Desktop Icon",IDC_ROOT_DESKTOP,"Button",
-                    BS_AUTOCHECKBOX,113,76,100,8
+                    BS_AUTOCHECKBOX,113,50,100,8
     CONTROL         "Add to Start Menu",IDC_ROOT_MENU,"Button",
-                    BS_AUTOCHECKBOX,113,97,100,8
+                    BS_AUTOCHECKBOX,113,66,100,8
+    CONTROL         "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62
+    CONTROL         "Text",IDC_TXT_TYPE,"Button",BS_AUTOCHECKBOX,209,101,38,
+                    8
+    CONTROL         "Java",IDC_JAVA_TYPE,"Button",BS_AUTOCHECKBOX,113,100,50,
+                    8
+    CONTROL         "C",IDC_C_TYPE,"Button",BS_AUTOCHECKBOX,113,116,41,8
+    CONTROL         "C++",IDC_CPP_TYPE,"Button",BS_AUTOCHECKBOX,113,133,38,8
+    CONTROL         "E-Lisp",IDC_ELISP_TYPE,"Button",BS_AUTOCHECKBOX,113,148,
+                    38,8
+    LTEXT           "Register XEmacs for these file types:",IDC_STATIC,113,
+                    84,166,13
+    LTEXT           "",IDC_STATIC,10,169,291,1,SS_SUNKEN | NOT WS_GROUP
+    LTEXT           "",IDC_STATIC,10,10,87,151,SS_SUNKEN | NOT WS_GROUP
     CONTROL         "GNU",IDC_STATIC,"Static",SS_BITMAP,19,36,69,62
+    CONTROL         "IDL",IDC_IDL_TYPE,"Button",BS_AUTOCHECKBOX,209,116,38,8
 END
 
 
@@ -433,6 +469,8 @@
     IDD_DESKTOP, DIALOG
     BEGIN
         VERTGUIDE, 113
+        VERTGUIDE, 209
+        HORZGUIDE, 124
     END
 END
 #endif    // APSTUDIO_INVOKED
@@ -449,7 +487,7 @@
 IDB_CHECK_YES           BITMAP  DISCARDABLE     "check-yes.bmp"
 IDB_CHECK_NO            BITMAP  DISCARDABLE     "check-no.bmp"
 IDB_CHECK_NA            BITMAP  DISCARDABLE     "check-na.bmp"
-GNU                 BITMAP  DISCARDABLE     "gnu.bmp"
+GNU                     BITMAP  DISCARDABLE     "gnu.bmp"
 IDB_GNU                 BITMAP  DISCARDABLE     "gnu.bmp"
 
 /////////////////////////////////////////////////////////////////////////////
@@ -478,11 +516,12 @@
     IDS_ERR_OPEN_READ       "Can't open %s for reading: %s"
     IDS_ROOT_ABSOLUTE       "The install directory must be absolute, with both a drive letter and leading slash, like C:\\Cygwin"
     IDS_DOWNLOAD_COMPLETE   "Download Complete"
-    IDS_CVSID               "\n%%% $Id: res.rc,v 1.2 2001/04/12 18:22:53 michaels Exp $\n"
+    IDS_CVSID               "\n%%% $Id: res.rc,v 1.2.2.1 2001/12/17 05:49:18 stephent Exp $\n"
     IDS_NOLOGFILE           "Cannot open log file %s for writing"
     IDS_UNINSTALL_COMPLETE  "Uninstalls complete."
     IDS_WININET             "Unable to find or load the Internet Explorer 5 DLLs"
     IDS_ERR_CHDIR           "Could not change dir to %s"
+    IDS_CREATE_DIR           "The directory %s does not exist, create it?"
     IDS_OLD_SETUP_VERSION   "This setup is version %s, but setup.ini claims version %s is available.\nYou might want to upgrade to get the latest features and bug fixes."
     IDS_DOWNLOAD_FAILED     "Unable to download %s"
     IDS_DOWNLOAD_INCOMPLETE "Download Incomplete.  Try again?"
diff --text -u 'xemacs-21.4.5/netinstall/resource.h' 'xemacs-21.4.6/netinstall/resource.h'
Index: ././netinstall/resource.h
--- ././netinstall/resource.h	Fri Apr 13 03:22:53 2001
+++ ././netinstall/resource.h	Mon Dec 17 14:49:18 2001
@@ -28,6 +28,7 @@
 #define IDS_DOWNLOAD_INCOMPLETE         26
 #define IDS_INSTALL_INCOMPLETE          27
 #define IDS_ROOT_NOCYGWIN               28
+#define IDS_CREATE_DIR   29
 #define IDD_ROOT                        101
 #define IDD_SOURCE                      102
 #define IDD_OTHER_URL                   103
@@ -54,6 +55,7 @@
 #define IDB_CHECK_NO                    124
 #define IDB_CHECK_NA                    125
 #define IDB_GNU                         126
+#define IDD_UNINSTALL                   127
 #define IDC_SOURCE_DOWNLOAD             1000
 #define IDC_SOURCE_NETINST              1001
 #define IDC_SOURCE_CWD                  1002
@@ -94,9 +96,21 @@
 #define IDC_ROOT_DESKTOP                1041
 #define IDC_ROOT_MENU                   1042
 #define IDC_LOCAL_DIR_BROWSE            1043
+#define IDC_TXT_TYPE                    1043
 #define IDC_LOCAL_DIR                   1044
+#define IDC_JAVA_TYPE                   1044
 #define IDC_INSTALL_NATIVE              1045
+#define IDC_C_TYPE                      1045
 #define IDC_INSTALL_CYGWIN              1046
+#define IDC_CPP_TYPE                    1046
+#define IDC_UNINS_PKG                   1047
+#define IDC_ELISP_TYPE                  1047
+#define IDC_UNINS_FILE                  1048
+#define IDC_IDL_TYPE                    1048
+#define IDC_UNINS_DISKFULL              1049
+#define IDC_UNINS_IPROGRESS             1050
+#define IDC_UNINS_PPROGRESS             1051
+#define IDC_UNINS_ACTION                1052
 #define IDC_STATIC                      -1
 
 // Next default values for new objects
diff --text -u 'xemacs-21.4.5/netinstall/root.cc' 'xemacs-21.4.6/netinstall/root.cc'
Index: ././netinstall/root.cc
--- ././netinstall/root.cc	Fri Apr 13 03:22:54 2001
+++ ././netinstall/root.cc	Mon Dec 17 14:49:19 2001
@@ -137,32 +137,6 @@
     }
 }
 
-static void
-read_mount_table ()
-{
-  int isnative, issystem;
-  root_dir = find_root_location (&issystem, &isnative);
-  if (root_dir)
-    {
-      if (isnative)
-	install_type = IDC_INSTALL_NATIVE;
-      else
-	install_type = IDC_INSTALL_CYGWIN;
-
-      if (issystem)
-	root_scope = IDC_ROOT_SYSTEM;
-      else
-	root_scope = IDC_ROOT_USER;
-      root_dir_default = 0;
-    }
-  else
-    {
-      change_default_root (IDC_INSTALL_NATIVE);
-      root_scope = (is_admin()) ? IDC_ROOT_SYSTEM : IDC_ROOT_USER;
-      root_dir_default = 1;
-    }
-}
-
 static int CALLBACK
 browse_cb (HWND h, UINT m, LPARAM lp, LPARAM data)
 {
@@ -317,11 +291,21 @@
   return FALSE;
 }
 
+static void
+set_default_root ()
+{
+  change_default_root (IDC_INSTALL_NATIVE);
+  root_scope = (is_admin()) ? IDC_ROOT_SYSTEM : IDC_ROOT_USER;
+  root_dir_default = 1;
+}
+
 void
 do_root (HINSTANCE h)
 {
   int rv = 0;
-  read_mount_table ();
+  // init will have read a previous root
+  if (!root_dir)
+    set_default_root ();
 
   rv = DialogBox (h, MAKEINTRESOURCE (IDD_ROOT), 0, dialog_proc);
   if (rv == -1)
diff --text -u 'xemacs-21.4.5/netinstall/setup.mak' 'xemacs-21.4.6/netinstall/setup.mak'
Index: ././netinstall/setup.mak
--- ././netinstall/setup.mak	Fri Apr 13 03:22:54 2001
+++ ././netinstall/setup.mak	Mon Dec 17 14:49:19 2001
@@ -26,7 +26,6 @@
 
 TARGETOS=BOTH
 APPVER=4.0
-!include "c:\Program Files\Microsoft Platform SDK\Include\win32.mak"
 
 default: all
 
@@ -55,9 +54,9 @@
 VERBOSECC=0
 !endif
 !if $(VERBOSECC)
-cc=$(cc)
+CCV=$(CC)
 !else
-cc=@$(cc)
+CCV=@$(CC)
 !endif
 
 !if $(DEBUG_XEMACS)
@@ -83,6 +82,7 @@
 	$(OUTDIR)\geturl.obj \
 	$(OUTDIR)\hash.obj \
 	$(OUTDIR)\ini.obj \
+	$(OUTDIR)\init.obj \
 	$(OUTDIR)\inilex.obj \
 	$(OUTDIR)\iniparse.obj \
 	$(OUTDIR)\install.obj \
@@ -101,7 +101,6 @@
 	$(OUTDIR)\nio-http.obj \
 	$(OUTDIR)\other.obj \
 	$(OUTDIR)\postinstall.obj \
-#	$(OUTDIR)\res.obj \
 	$(OUTDIR)\root.obj \
 	$(OUTDIR)\simpsock.obj \
 	$(OUTDIR)\site.obj \
@@ -109,6 +108,7 @@
 	$(OUTDIR)\splash.obj \
 	$(OUTDIR)\state.obj \
 	$(OUTDIR)\tar.obj \
+	$(OUTDIR)\uninstall.obj \
 	$(OUTDIR)\version.obj
 
 #
@@ -126,9 +126,9 @@
 
 # nmake rule
 .cc{$(OUTDIR)}.obj:
-	$(cc) /TP $(cflags) $(cdebug) $(cvarsmt) $(defines) -Fo$@ $<
+	$(CC) /TP $(cflags) $(cdebug) $(cvarsmt) $(defines) -Fo$@ $<
 .c{$(OUTDIR)}.obj:
-	$(cc) $(cflags) $(cdebug) $(cvarsmt) $(defines) -Fo$@ $<
+	$(CC) $(cflags) $(cdebug) $(cvarsmt) $(defines) -Fo$@ $<
 
 #
 # Main target
@@ -169,8 +169,9 @@
 # DO NOT DELETE
 
 $(OUTDIR)/autoload.obj: autoload.c win32.h 
-$(OUTDIR)/inilex.obj: inilex.c win32.h  ini.h iniparse.h \
-	
+$(OUTDIR)/inilex.obj: inilex.c win32.h  ini.h iniparse.h
+$(OUTDIR)/init.obj: win32.h  dialog.h resource.h \
+	state.h ini.h concat.h msg.h log.h find.h reginfo.h
 $(OUTDIR)/iniparse.obj: iniparse.c ini.h iniparse.h port.h
 $(OUTDIR)/inilex.obj: inilex.c win32.h  ini.h iniparse.h
 $(OUTDIR)/mklink2.obj: mklink2.c win32.h 
@@ -237,6 +238,10 @@
 $(OUTDIR)/splash.obj: splash.cc win32.h  dialog.h resource.h msg.h \
 	version.h
 $(OUTDIR)/state.obj: state.cc state.h
+$(OUTDIR)/uninstall.obj: install.cc win32.h  \
+	$(ZLIBDIR)/zlib.h $(ZLIBDIR)/zconf.h \
+	resource.h ini.h dialog.h concat.h geturl.h mkdir.h state.h tar.h \
+	diskfull.h msg.h regedit.h reginfo.h log.h hash.h port.h
 $(OUTDIR)/tar.obj: tar.cc win32.h  \
 	$(ZLIBDIR)/zlib.h $(ZLIBDIR)/zconf.h \
 	tar.h mkdir.h log.h port.h
diff --text -u 'xemacs-21.4.5/netinstall/source.cc' 'xemacs-21.4.6/netinstall/source.cc'
Index: ././netinstall/source.cc
--- ././netinstall/source.cc	Fri Apr 13 03:22:55 2001
+++ ././netinstall/source.cc	Mon Dec 17 14:49:19 2001
@@ -11,6 +11,7 @@
  *
  * Written by DJ Delorie <dj@cygnus.com>
  *
+ * Sync'ed with cinstall 2001-10-16
  */
 
 /* The purpose of this file is to manage the dialog box that lets the
@@ -25,7 +26,7 @@
 #include "msg.h"
 #include "log.h"
 
-static int rb[] = { IDC_SOURCE_DOWNLOAD, IDC_SOURCE_NETINST, IDC_SOURCE_CWD, 0 };
+static int rb[] = { IDC_SOURCE_NETINST, IDC_SOURCE_DOWNLOAD, IDC_SOURCE_CWD, 0 };
 
 static void
 check_if_enable_next (HWND h)
@@ -36,13 +37,14 @@
 static void
 load_dialog (HWND h)
 {
+  int i;
   rbset (h, rb, source);
-  check_if_enable_next (h);
 }
 
 static void
 save_dialog (HWND h)
 {
+  int i;
   source = rbget (h, rb);
 }
 
@@ -56,7 +58,6 @@
     case IDC_SOURCE_NETINST:
     case IDC_SOURCE_CWD:
       save_dialog (h);
-      check_if_enable_next (h);
       break;
 
     case IDOK:
@@ -72,8 +73,10 @@
     case IDCANCEL:
       NEXT (0);
       break;
+
+    default:
+      break;
     }
-  return FALSE;
 }
 
 static BOOL CALLBACK
@@ -83,6 +86,12 @@
     {
     case WM_INITDIALOG:
       load_dialog (h);
+      // Check to see if any radio buttons are selected. If not, select a default.
+      if ((!SendMessage(GetDlgItem (h, IDC_SOURCE_DOWNLOAD), BM_GETCHECK, 0, 0) == BST_CHECKED)
+        && (!SendMessage(GetDlgItem (h, IDC_SOURCE_CWD), BM_GETCHECK, 0, 0) == BST_CHECKED))
+        {
+          SendMessage(GetDlgItem (h, IDC_SOURCE_NETINST), BM_SETCHECK, BST_CHECKED, 0);
+        }
       return FALSE;
     case WM_COMMAND:
       return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd);
@@ -94,6 +103,8 @@
 do_source (HINSTANCE h)
 {
   int rv = 0;
+  /* source = IDC_SOURCE_CWD;*/
+  source = IDC_SOURCE_NETINST;
   rv = DialogBox (h, MAKEINTRESOURCE (IDD_SOURCE), 0, dialog_proc);
   if (rv == -1)
     fatal (IDS_DIALOG_FAILED);
diff --text -u 'xemacs-21.4.5/netinstall/splash.cc' 'xemacs-21.4.6/netinstall/splash.cc'
Index: ././netinstall/splash.cc
--- ././netinstall/splash.cc	Fri Apr 13 03:22:55 2001
+++ ././netinstall/splash.cc	Mon Dec 17 14:49:19 2001
@@ -68,7 +68,6 @@
 do_splash (HINSTANCE h)
 {
   int rv = 0;
-  HANDLE gnu = LoadImage (h, MAKEINTRESOURCE (IDB_GNU), IMAGE_BITMAP, 0, 0, 0);
   rv = DialogBox (h, MAKEINTRESOURCE (IDD_SPLASH), 0, dialog_proc);
   if (rv == -1)
     fatal (IDS_DIALOG_FAILED);
diff --text -u 'xemacs-21.4.5/netinstall/state.h' 'xemacs-21.4.6/netinstall/state.h'
Index: ././netinstall/state.h
--- ././netinstall/state.h	Fri Apr 13 03:22:55 2001
+++ ././netinstall/state.h	Mon Dec 17 14:49:19 2001
@@ -29,6 +29,13 @@
 extern int   root_menu;
 extern int   root_desktop;
 
+extern int   reg_c;
+extern int   reg_cpp;
+extern int   reg_java;
+extern int   reg_elisp;
+extern int   reg_txt;
+extern int   reg_idl;
+	
 extern int	net_method;
 extern char *	net_proxy_host;
 extern int	net_proxy_port;
@@ -42,5 +49,6 @@
 extern char *	other_url;
 
 extern int	trust_level;
+extern int	uninstall;
 
 #define MIRROR_SITE (mirror_site ? mirror_site : other_url)
diff --text -u /dev/null 'xemacs-21.4.6/netinstall/uninstall.cc'
Index: ././netinstall/uninstall.cc
--- ././netinstall/uninstall.cc	Thu Jan  1 09:00:00 1970
+++ ././netinstall/uninstall.cc	Mon Dec 17 14:49:19 2001
@@ -0,0 +1,326 @@
+/*
+ * Copyright (c) 2000, Red Hat, Inc.
+ *
+ *     This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation; either version 2 of the License, or
+ *     (at your option) any later version.
+ *
+ *     A copy of the GNU General Public License can be found at
+ *     http://www.gnu.org/
+ *
+ * Written by DJ Delorie <dj@cygnus.com>
+ *
+ */
+
+/* The purpose of this file is to intall all the packages selected in
+   the install list (in ini.h).  Note that we use a separate thread to
+   maintain the progress dialog, so we avoid the complexity of
+   handling two tasks in one thread.  We also create or update all the
+   files in /etc/setup and create the mount points. */
+
+#include <io.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#ifndef WIN32_NATIVE
+#include <unistd.h>
+#endif
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <zlib.h>
+
+#include "win32.h"
+#include "commctrl.h"
+
+#include "resource.h"
+#include "ini.h"
+#include "dialog.h"
+#include "concat.h"
+#include "geturl.h"
+#include "mkdir.h"
+#include "state.h"
+#include "tar.h"
+#include "diskfull.h"
+#include "msg.h"
+#include "regedit.h"
+#include "reginfo.h"
+#include "log.h"
+#include "hash.h"
+
+#include "port.h"
+
+#define XM_DONE (WM_USER + 101)
+
+static HWND unins_dialog = 0;
+static HWND unins_action = 0;
+static HWND unins_pkgname = 0;
+static HWND unins_filename = 0;
+static HWND unins_pprogress = 0;
+static HWND unins_iprogress = 0;
+static HWND unins_diskfull = 0;
+static HANDLE init_event;
+
+static int package_bytes = 0;
+static int uninstall_started = 0;
+
+extern char * map_filename (char *fn, int type);
+void remove_desktop_setup ();
+static void start_uninstall ();
+extern char* find_xemacs_exe_name();
+
+char *
+base (char *s);
+
+static BOOL
+dialog_cmd (HWND h, int id, HWND hwndctl, UINT code)
+{
+  switch (id)
+    {
+    case IDCANCEL:
+      exit_setup (1);
+    case IDOK:
+      if (uninstall_started == 0) {
+	uninstall_started = 1;
+	start_uninstall();
+      }
+      else
+	exit_setup(0);
+      break;
+    }
+  return FALSE;
+}
+
+static BOOL CALLBACK
+dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam)
+{
+  switch (message)
+    {
+    case WM_INITDIALOG:
+      unins_dialog = h;
+      unins_action = GetDlgItem (h, IDC_UNINS_ACTION);
+      unins_pkgname = GetDlgItem (h, IDC_UNINS_PKG);
+      unins_filename = GetDlgItem (h, IDC_UNINS_FILE);
+      unins_pprogress = GetDlgItem (h, IDC_UNINS_PPROGRESS);
+      unins_iprogress = GetDlgItem (h, IDC_UNINS_IPROGRESS);
+      unins_diskfull = GetDlgItem (h, IDC_UNINS_DISKFULL);
+      SendMessage (unins_pprogress, PBM_SETRANGE, 0, MAKELPARAM (0, 100));
+      SendMessage (unins_iprogress, PBM_SETRANGE, 0, MAKELPARAM (0, 100));
+      SendMessage (unins_diskfull, PBM_SETRANGE, 0, MAKELPARAM (0, 100));
+      SetWindowText (unins_pkgname, "");
+      SetWindowText (unins_filename, "");
+      SendMessage (unins_pprogress, PBM_SETPOS, (WPARAM) 0, 0);
+      SendMessage (unins_iprogress, PBM_SETPOS, (WPARAM) 0, 0);
+      SendMessage (unins_diskfull, PBM_SETPOS, (WPARAM) 0, 0);
+      return FALSE;
+
+    case XM_DONE:
+      {
+	SetWindowText (GetDlgItem (h, IDOK), "Ok");
+	LONG style = GetWindowLong (GetDlgItem (h, IDCANCEL),
+				    GWL_STYLE);
+	SetWindowLong (GetDlgItem (h, IDCANCEL),
+		       GWL_STYLE, style & WS_DISABLED);
+      }
+      return FALSE;
+      
+    case WM_COMMAND:
+      return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd);
+    }
+  return DefWindowProc (h, message, wParam, lParam);
+}
+
+static DWORD WINAPI uninstall_all (void *);
+
+static void
+start_uninstall ()
+{
+  DWORD tid;
+  HANDLE thread;
+  init_event = CreateEvent (0, 0, 0, 0);
+  thread = CreateThread (0, 0, uninstall_all, 0, 0, &tid);
+  WaitForSingleObject (init_event, 10000);
+  CloseHandle (init_event);
+}
+
+static void
+progress (int bytes, int num)
+{
+  int perc;
+  if (package_bytes > 100)
+    {
+      perc = (bytes * 100) / package_bytes;
+      SendMessage (unins_pprogress, PBM_SETPOS, (WPARAM) perc, 0);
+    }
+
+  if (npackages > 0)
+    {
+      perc = (num * 100) / npackages;
+      SendMessage (unins_iprogress, PBM_SETPOS, (WPARAM) perc, 0);
+    }
+}
+
+static int num_installs, num_uninstalls;
+
+static void
+uninstall_one (char *name, int type, int num)
+{
+  hash dirs;
+  char line[_MAX_PATH];
+  char* fname = (type == TY_GENERIC ? 
+		 concat (root_dir, XEMACS_PACKAGE_DIR, "pkginfo/MANIFEST.",
+			 name,  0) :
+		 concat (root_dir, XEMACS_SETUP_DIR, "MANIFEST.", name,  0));
+
+  FILE* lst = fopen (fname, "rb");
+  int pos = 0;
+
+  if (lst)
+    {
+      fseek (lst, 0, SEEK_END);
+      package_bytes = ftell (lst);
+      fseek (lst, 0, SEEK_SET);
+  
+      SetWindowText (unins_pkgname, name);
+      SetWindowText (unins_action, "Uninstalling...");
+      log (0, "uninstalling %s", name);
+
+      while (fgets (line, sizeof (line), lst))
+	{
+	  progress (pos, num);
+	  pos += strlen(line);
+	  if (line[strlen(line)-1] == '\n')
+	    line[strlen(line)-1] = 0;
+
+	  dirs.add_subdirs (line);
+
+	  char *d = map_filename (line, type);
+	  DWORD dw = GetFileAttributes (d);
+	  if (dw != 0xffffffff && !(dw & FILE_ATTRIBUTE_DIRECTORY))
+	    {
+	      log (LOG_BABBLE, "unlink %s", d);
+	      DeleteFile (d);
+	    }
+	}
+      fclose (lst);
+      remove (fname);
+
+      dirs.reverse_sort ();
+      char *subdir = 0;
+      while ((subdir = dirs.enumerate (subdir)) != 0)
+	{
+	  char *d = map_filename (subdir, type);
+	  if (RemoveDirectory (d))
+	    log (LOG_BABBLE, "rmdir %s", d);
+	}
+      num_uninstalls ++;
+    }
+}
+
+void
+do_uninstall (HINSTANCE h)
+{
+  num_installs = 0, num_uninstalls = 0;
+
+  next_dialog = 0;		// we're done after this
+
+  if (!root_dir)
+    fatal ("no installation found");
+
+  int rv = DialogBox (h, MAKEINTRESOURCE (IDD_UNINSTALL), 0, dialog_proc);
+  if (rv == -1)
+    fatal (IDS_DIALOG_FAILED);
+}
+
+static void
+read_installed_db ()
+{
+  if (!root_dir)
+    return;
+
+  char line[1000], pkg[1000], inst[1000], src[1000];
+  int instsz, srcsz;
+
+  FILE *db = fopen (concat (root_dir, XEMACS_SETUP_DIR, "installed.db", 0), "rt");
+  if (!db)
+    return;
+
+  while (fgets (line, 1000, db))
+    {
+      src[0] = 0;
+      srcsz = 0;
+      sscanf (line, "%s %s %d %s %d", pkg, inst, &instsz, src, &srcsz);
+
+      log (0, "read %s", pkg);
+      Package* np = new_package(strdup(pkg));
+      pinfo(*np).install = inst;
+      pinfo(*np).install_size = instsz;
+      // pick up versoin
+      char *v, *d;
+      for (v=base (inst); *v; v++)
+	if (*v == '-' && isdigit(v[1]))
+	  {
+	    v++;
+	    break;
+	  }
+      if (!v)
+	v = inst;
+      for (d=v; *d; d++)
+	if (strncmp (d, ".tar", 4) == 0
+	    || strncmp (d, "-pkg", 4) == 0)
+	  {
+	    *d = 0;
+	    break;
+	  }
+      if (v[0])
+	pinfo(*np).version = strdup (v);
+      else
+	pinfo(*np).version = "0";
+      // Crude but effective
+      if (pkg != 0)
+	if (strncmp ("xemacs-i686", pkg, 11) == 0
+	    || (strncmp ("xemacs-i586", pkg, 11) == 0))
+	  {
+	    np->type = install_type;
+	    xemacs_package = np;
+	  }
+    }
+  fclose (db);
+}
+
+static DWORD WINAPI
+uninstall_all (void *)
+{
+  int i;
+  SetEvent (init_event);
+
+  int df = diskfull (root_dir);
+  SendMessage (unins_diskfull, PBM_SETPOS, (WPARAM) df, 0);
+
+  read_installed_db();
+
+  log (0, "There are %d packages\n", npackages);
+  for (i=0; i<npackages; i++)
+    {
+      log (0, "uninstalling %s\n", package[i].name);
+      uninstall_one (package[i].name, package[i].type, i);
+    }
+
+  PostMessage (unins_dialog, XM_DONE, 0, 0);
+
+  remove (concat (root_dir, XEMACS_SETUP_DIR, "installed.db.old", 0));
+  remove (concat (root_dir, XEMACS_SETUP_DIR, "installed.db", 0));
+
+  remove_desktop_setup();
+  remove_xemacs_root();
+  remove_uninstall_path();
+
+  if (num_installs == 0)
+    {
+      //      exit_msg = IDS_UNINSTALL_COMPLETE;
+      return FALSE;
+    }
+
+  return FALSE;
+}
diff --text -u 'xemacs-21.4.5/nt/ChangeLog' 'xemacs-21.4.6/nt/ChangeLog'
Index: ././nt/ChangeLog
--- ././nt/ChangeLog	Tue Oct 23 20:02:37 2001
+++ ././nt/ChangeLog	Mon Dec 17 18:33:19 2001
@@ -1,3 +1,11 @@
+2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.6 "Common Lisp" is released.
+
 2001-10-23  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.5 "Civil Service" is released.
diff --text -u 'xemacs-21.4.5/src/ChangeLog' 'xemacs-21.4.6/src/ChangeLog'
Index: ././src/ChangeLog
--- ././src/ChangeLog	Tue Oct 23 20:02:38 2001
+++ ././src/ChangeLog	Mon Dec 17 18:33:19 2001
@@ -1,3 +1,90 @@
+2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-16  Torsten Duwe  <duwe@caldera.de>
+
+	* search.c (Freplace_match): Add missing sub-expression functionality.
+
+	* buffer.c (decode_buffer): Add a check for pointer type to
+	decode_buffer, before gcc's CSE optimization reorders a
+	dereference in front of the allow_string test.
+
+2001-11-16  Darryl Okahata  <darrylo@xemacs.org>
+
+	* window.c (window_loop): Fix bug that sometimes prevented
+	window_loop() from iterating across multiple devices.  Also, at
+	Ben's request, changed infloop-detecting code to abort() instead
+	of silently terminating window_loop().
+
+2001-11-21  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	Based on analysis and patch by Simon Josefson <jas@extundo.com>.
+	* editfns.c (make_time): New function.
+	(Fencode_time): Use it instead of wasteful_word_to_lisp.
+	* lisp.h (make_time): Prototype and comment it.
+	* dired.c (wasteful_word_to_lisp): Deprecate.
+	(Ffile_attributes): Use make_time() instead of wasteful_word_to_lisp().
+
+2001-10-31  Kyle Jones  <kyle_jones@wonderworks.com>
+
+	* fileio.c (auto_save_1): Use current coding system, not
+	escape-quoted.
+
+2001-11-13  Ben Wing  <ben@xemacs.org>
+
+	* window.c:
+	* window.c (window_truncation_on):
+	* window.c (syms_of_window):
+	truncate-partial-width-windows should respect the buffer being
+	displayed, like other redisplay vars.
+
+2001-11-13  Hirokazu FUKUI  <hfukui@sannet.ne.jp>
+
+	* event-stream.c (Fread_key_sequence): save current buffer.
+
+2001-10-29  Andrew Begel  <abegel@eecs.berkeley.edu>
+
+	* ntheap.c (_heap_init): Don't redefine in VS.NET (MSC >= 1300).
+
+2001-10-29  Andrew Begel  <abegel@eecs.berkeley.edu>
+
+	* alloc.c (lcrecord_stats): Add space for types defined in modules.
+
+2001-10-26  Mike Alexander  <mta@arbortext.com>
+
+	* event-msw.c (slurper_free_shared_data_maybe): Free the pipe handle.
+
+2001-10-25  Andy Piper  <andy@xemacs.org>
+
+	* ChangeLog:
+	* dialog-msw.c (handle_directory_proc): new function.
+	 (handle_directory_dialog_box): new fucntion.
+	 (handle_file_dialog_box): use new directory dialog support.
+	 (mswindows_make_dialog_box_internal): ditto.
+	* event-msw.c (mswindows_wnd_proc): minor fix to scrollbar event
+	handling.
+	(mswindows_find_frame): make global.
+	* fileio.c (Fexpand_file_name): build fix.
+	* general-slots.h: add Qdirectory.
+	* scrollbar-msw.c (mswindows_handle_scrollbar_event): fix focus
+	handling.
+	* syswindows.h (LOCAL_TO_WIN32_FILE_FORMAT): fix problem with
+	cygwin not leaving win32 paths unchanged.
+	* win32.c (Fmswindows_cygwin_to_win32_path): new function. Use the
+	cygwin runtime to do path conversion.
+	(Fmswindows_shell_execute): fix cygwin handling of URLs.
+	(syms_of_win32): add new function.
+	* window.c (window_loop): build fix.
+
+2001-10-15  Andy Piper  <andy@xemacs.org>
+
+	(Fmswindows_shell_execute): fix handling of URL's under cygwin.
+
 2001-10-23  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.5 "Civil Service" is released.
@@ -216,8 +303,8 @@
 
 2001-04-24  Jerry James <james@xemacs.org>
 
-        * faces.h: pass parameters to Fadd_spec_to_specifier in the
-        correct order.
+	* faces.h: pass parameters to Fadd_spec_to_specifier in the
+	correct order.
 
 2001-06-01  Ben Wing  <ben@xemacs.org>
 
diff --text -u 'xemacs-21.4.5/src/alloc.c' 'xemacs-21.4.6/src/alloc.c'
Index: ././src/alloc.c
--- ././src/alloc.c	Tue Oct 23 17:35:29 2001
+++ ././src/alloc.c	Mon Dec 17 14:49:22 2001
@@ -2473,7 +2473,8 @@
   int instances_freed;
   int bytes_freed;
   int instances_on_free_list;
-} lcrecord_stats [countof (lrecord_implementations_table)];
+} lcrecord_stats [countof (lrecord_implementations_table)
+		  + MODULE_DEFINABLE_TYPE_COUNT];
 
 static void
 tick_lcrecord_stats (const struct lrecord_header *h, int free_p)
diff --text -u 'xemacs-21.4.5/src/buffer.c' 'xemacs-21.4.6/src/buffer.c'
Index: ././src/buffer.c
--- ././src/buffer.c	Tue Oct 23 17:35:30 2001
+++ ././src/buffer.c	Mon Dec 17 14:49:23 2001
@@ -356,7 +356,7 @@
 struct buffer *
 decode_buffer (Lisp_Object buffer, int allow_string)
 {
-  if (NILP (buffer))
+  if (NILP (buffer) || (!POINTER_TYPE_P( XTYPE(buffer))))
     return current_buffer;
 
   if (allow_string && STRINGP (buffer))
diff --text -u 'xemacs-21.4.5/src/dialog-msw.c' 'xemacs-21.4.6/src/dialog-msw.c'
Index: ././src/dialog-msw.c
--- ././src/dialog-msw.c	Wed Jul 25 16:45:23 2001
+++ ././src/dialog-msw.c	Mon Dec 17 14:49:23 2001
@@ -332,14 +332,132 @@
   { FRERR_BUFFERLENGTHZERO, "FRERR_BUFFERLENGTHZERO" },
 };
 
+struct param_data {
+  char* fname;
+  char* unknown_fname;
+  int validate;
+};
+
+static int
+CALLBACK handle_directory_proc (HWND hwnd, UINT msg,
+				LPARAM lParam, LPARAM lpData)
+{
+  TCHAR szDir[MAX_PATH];
+  struct param_data* pd = (struct param_data*)lpData;
+  
+  switch(msg) {
+  case BFFM_INITIALIZED:
+    // WParam is TRUE since you are passing a path.
+    // It would be FALSE if you were passing a pidl.
+    SendMessage(hwnd, BFFM_SETSELECTION, TRUE, (LPARAM)pd->fname);
+    break;
+
+  case BFFM_SELCHANGED:
+    // Set the status window to the currently selected path.
+    if (SHGetPathFromIDList((LPITEMIDLIST) lParam, szDir)) {
+      SendMessage(hwnd, BFFM_SETSTATUSTEXT, 0, (LPARAM)szDir);
+    }
+    break;
+
+  case BFFM_VALIDATEFAILED:
+    if (pd->validate)
+      return TRUE;
+    else
+      pd->unknown_fname = xstrdup((char*)lParam);
+    break;
+
+  default:
+    break;
+  }
+  return 0;
+}
+
+static Lisp_Object
+handle_directory_dialog_box (struct frame *f, Lisp_Object keys)
+{
+  Lisp_Object ret = Qnil;
+  BROWSEINFO bi;
+  LPITEMIDLIST pidl;
+  LPMALLOC pMalloc;
+  struct param_data pd;
+
+  xzero(pd);
+  xzero(bi);
+
+  bi.lParam = (LPARAM)&pd;
+  bi.hwndOwner = FRAME_MSWINDOWS_HANDLE (f);
+  bi.pszDisplayName = 0;
+  bi.pidlRoot = 0;
+  bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT | BIF_EDITBOX;
+  bi.lpfn = handle_directory_proc;
+
+  LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (build_string (""), Qnil),
+			     (char*)pd.fname);
+
+  {
+    EXTERNAL_PROPERTY_LIST_LOOP_3 (key, value, keys)
+      {
+	if (EQ (key, Q_title))
+	  {
+	    CHECK_STRING (value);
+	    LISP_STRING_TO_EXTERNAL (value, bi.lpszTitle, Qmswindows_tstr);
+	  }
+	else if (EQ (key, Q_initial_directory))
+	  LOCAL_FILE_FORMAT_TO_TSTR (Fexpand_file_name (value, Qnil),
+				     pd.fname);
+	else if (EQ (key, Q_initial_filename))
+	  ;			/* do nothing */
+	else if (EQ (key, Q_file_must_exist))
+	  {
+	    if (!NILP (value)) {
+	      pd.validate = TRUE;
+	      bi.ulFlags |= BIF_VALIDATE;
+	    }
+	    else
+	      bi.ulFlags &= ~BIF_VALIDATE;
+	  }
+	else
+	  syntax_error ("Unrecognized directory dialog keyword", key);
+      }
+  }
+
+  if (SHGetMalloc(&pMalloc) == NOERROR)
+    {
+      pidl = SHBrowseForFolder(&bi);
+      if (pidl) {
+	TCHAR* szDir = alloca (MAX_PATH);
+	
+	if (SHGetPathFromIDList(pidl, szDir)) {
+	  ret = tstr_to_local_file_format (szDir);
+	}
+	
+	pMalloc->lpVtbl->Free(pMalloc, pidl);
+	pMalloc->lpVtbl->Release(pMalloc);
+	return ret;
+      } 
+      else if (pd.unknown_fname != 0) {
+	ret = tstr_to_local_file_format (pd.unknown_fname);
+	xfree(pd.unknown_fname);
+      }
+      
+    }
+  else
+    signal_type_error (Qdialog_box_error,
+		       "Unable to create folder browser",
+		       make_int (0));
+  return ret;
+}
+
 static Lisp_Object
 handle_file_dialog_box (struct frame *f, Lisp_Object keys)
 {
   OPENFILENAME ofn;
+  
   char fnbuf[8000];
 
   xzero (ofn);
   ofn.lStructSize = sizeof (ofn);
+  ofn.Flags = OFN_EXPLORER;
   ofn.hwndOwner = FRAME_MSWINDOWS_HANDLE (f);
   ofn.lpstrFile = fnbuf;
   ofn.nMaxFile = sizeof (fnbuf) / XETCHAR_SIZE;
@@ -675,6 +793,8 @@
 {
   if (EQ (type, Qfile))
     return handle_file_dialog_box (f, keys);
+  else if (EQ (type, Qdirectory))
+    return handle_directory_dialog_box (f, keys);
   else if (EQ (type, Qquestion))
     return handle_question_dialog_box (f, keys);
   else if (EQ (type, Qprint))
diff --text -u 'xemacs-21.4.5/src/dired.c' 'xemacs-21.4.6/src/dired.c'
Index: ././src/dired.c
--- ././src/dired.c	Fri Apr 13 03:23:34 2001
+++ ././src/dired.c	Mon Dec 17 14:49:23 2001
@@ -740,6 +740,9 @@
     return Qnil;
 }
 
+#if 0
+/* ... never used ... should use list2 directly anyway ... */
+/* NOTE: This function can never return a negative value. */
 Lisp_Object
 wasteful_word_to_lisp (unsigned int item)
 {
@@ -749,6 +752,7 @@
   XCDR (cons) = Fcons (XCDR (cons), Qnil);
   return cons;
 }
+#endif
 
 DEFUN ("file-attributes", Ffile_attributes, 1, 1, 0, /*
 Return a list of attributes of file FILENAME.
@@ -835,9 +839,9 @@
   values[1] = make_int (s.st_nlink);
   values[2] = make_int (s.st_uid);
   values[3] = make_int (s.st_gid);
-  values[4] = wasteful_word_to_lisp (s.st_atime);
-  values[5] = wasteful_word_to_lisp (s.st_mtime);
-  values[6] = wasteful_word_to_lisp (s.st_ctime);
+  values[4] = make_time (s.st_atime);
+  values[5] = make_time (s.st_mtime);
+  values[6] = make_time (s.st_ctime);
   values[7] = make_int ((EMACS_INT) s.st_size);
   /* If the size is out of range, give back -1.  */
   /* #### Fix when Emacs gets bignums! */
diff --text -u 'xemacs-21.4.5/src/editfns.c' 'xemacs-21.4.6/src/editfns.c'
Index: ././src/editfns.c
--- ././src/editfns.c	Tue Oct 23 17:35:31 2001
+++ ././src/editfns.c	Mon Dec 17 14:49:24 2001
@@ -1176,6 +1176,15 @@
 
 static void set_time_zone_rule (char *tzstring);
 
+/* from GNU Emacs 21, per Simon Josefsson, modified by stephen
+   The slight inefficiency is justified since negative times are weird. */
+Lisp_Object
+make_time (time_t time)
+{
+  return list2 (make_int (time < 0 ? time / 0x10000 : time >> 16),
+		make_int (time & 0xFFFF));
+}
+
 DEFUN ("encode-time", Fencode_time, 6, MANY, 0, /*
   Convert SECOND, MINUTE, HOUR, DAY, MONTH, YEAR and ZONE to internal time.
 This is the reverse operation of `decode-time', which see.
@@ -1249,7 +1258,7 @@
   if (the_time == (time_t) -1)
     error ("Specified time is not representable");
 
-  return wasteful_word_to_lisp (the_time);
+  return make_time (the_time);
 }
 
 DEFUN ("current-time-string", Fcurrent_time_string, 0, 1, 0, /*
diff --text -u 'xemacs-21.4.5/src/event-msw.c' 'xemacs-21.4.6/src/event-msw.c'
Index: ././src/event-msw.c
--- ././src/event-msw.c	Tue Oct 23 17:35:32 2001
+++ ././src/event-msw.c	Mon Dec 17 14:49:24 2001
@@ -93,7 +93,7 @@
 /* Timer ID used for button2 emulation */
 #define BUTTON_2_TIMER_ID 1
 
-static Lisp_Object mswindows_find_frame (HWND hwnd);
+Lisp_Object mswindows_find_frame (HWND hwnd);
 static Lisp_Object mswindows_find_console (HWND hwnd);
 static Lisp_Object mswindows_key_to_emacs_keysym (int mswindows_key, int mods,
 						  int extendedp);
@@ -232,6 +232,7 @@
       CloseHandle (s->hev_thread);
       CloseHandle (s->hev_caller);
       CloseHandle (s->hev_unsleep);
+      CloseHandle (s->hpipe);
       s->inuse_p = 0;
     }
 }
@@ -2827,7 +2828,8 @@
 					       MAKEPOINTS (lParam)))
 	  {
 	    GCPRO2 (emacs_event, fobj);
-	    mswindows_pump_outstanding_events ();	/* Can GC */
+	    if (UNBOUNDP(mswindows_pump_outstanding_events ()))	/* Can GC */
+	      SendMessage (hwnd, WM_CANCELMODE, 0, 0);
 	    UNGCPRO;
 	  }
 	else
@@ -3276,7 +3278,7 @@
 /*
  * Find the frame that matches the supplied mswindows window handle
  */
-static Lisp_Object
+Lisp_Object
 mswindows_find_frame (HWND hwnd)
 {
   LONG l = GetWindowLong (hwnd, XWL_FRAMEOBJ);
diff --text -u 'xemacs-21.4.5/src/event-stream.c' 'xemacs-21.4.6/src/event-stream.c'
Index: ././src/event-stream.c
--- ././src/event-stream.c	Wed Jul 25 16:45:27 2001
+++ ././src/event-stream.c	Mon Dec 17 14:49:25 2001
@@ -4303,6 +4303,7 @@
   struct gcpro gcpro1;
   GCPRO1 (event);
 
+  record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
   if (!NILP (prompt))
     CHECK_STRING (prompt);
   /* else prompt = Fkeymap_prompt (current_buffer->keymap); may GC */
diff --text -u 'xemacs-21.4.5/src/fileio.c' 'xemacs-21.4.6/src/fileio.c'
Index: ././src/fileio.c
--- ././src/fileio.c	Tue Oct 23 17:35:33 2001
+++ ././src/fileio.c	Mon Dec 17 14:49:25 2001
@@ -952,7 +952,7 @@
 	      if (IS_DIRECTORY_SEP (nm[1]))
 		{
 		  if (strcmp ((char *) nm, (char *) XSTRING_DATA (name)) != 0)
-		    name = build_string ((CBufbyte *) nm);
+		    name = build_string ((Bufbyte *) nm);
 		}
 	      /* drive must be set, so this is okay */
 	      else if (strcmp ((char *) nm - 2,
@@ -3858,8 +3858,8 @@
   return
     /* !!#### need to deal with this 'escape-quoted everywhere */
     Fwrite_region_internal (Qnil, Qnil, a, Qnil, Qlambda, Qnil,
-#ifdef MULE
-			    Qescape_quoted
+#ifdef FILE_CODING
+			    current_buffer->buffer_file_coding_system
 #else
 			    Qnil
 #endif
diff --text -u 'xemacs-21.4.5/src/general-slots.h' 'xemacs-21.4.6/src/general-slots.h'
Index: ././src/general-slots.h
--- ././src/general-slots.h	Wed Jul 25 16:45:29 2001
+++ ././src/general-slots.h	Mon Dec 17 14:49:26 2001
@@ -92,6 +92,7 @@
 SYMBOL (Qdevice);
 SYMBOL_KEYWORD (Q_device);
 SYMBOL (Qdialog);
+SYMBOL (Qdirectory);
 SYMBOL (Qdimension);
 SYMBOL (Qdisplay);
 SYMBOL (Qdoc_string);
diff --text -u 'xemacs-21.4.5/src/lisp.h' 'xemacs-21.4.6/src/lisp.h'
Index: ././src/lisp.h
--- ././src/lisp.h	Tue Oct 23 17:35:34 2001
+++ ././src/lisp.h	Mon Dec 17 14:49:26 2001
@@ -2395,6 +2395,9 @@
   arith_grtr_or_equal };
 Lisp_Object arithcompare (Lisp_Object, Lisp_Object, enum arith_comparison);
 
+/* Do NOT use word_to_lisp or wasteful_word_to_lisp to decode time_t's
+   unless you KNOW arg is non-negative.  They cannot return negative
+   values!  Use make_time.  */
 Lisp_Object word_to_lisp (unsigned int);
 unsigned int lisp_to_word (Lisp_Object);
 
@@ -2433,6 +2436,7 @@
 void buffer_insert1 (struct buffer *, Lisp_Object);
 Lisp_Object make_string_from_buffer (struct buffer *, Bufpos, Charcount);
 Lisp_Object make_string_from_buffer_no_extents (struct buffer *, Bufpos, Charcount);
+Lisp_Object make_time (time_t);
 Lisp_Object save_excursion_save (void);
 Lisp_Object save_restriction_save (void);
 Lisp_Object save_excursion_restore (Lisp_Object);
diff --text -u 'xemacs-21.4.5/src/ntheap.c' 'xemacs-21.4.6/src/ntheap.c'
Index: ././src/ntheap.c
--- ././src/ntheap.c	Fri Apr 13 03:24:08 2001
+++ ././src/ntheap.c	Mon Dec 17 14:49:26 2001
@@ -291,12 +291,14 @@
     sbrk (need_to_alloc);
 }
 
-#if (_MSC_VER >= 1000)
+#if ((_MSC_VER >= 1000) && (_MSC_VER < 1300))
 
 /* MSVC 4.2 invokes these functions from mainCRTStartup to initialize
    a heap via HeapCreate.  They are normally defined by the runtime,
    but we override them here so that the unnecessary HeapCreate call
    is not performed.  */
+
+/* MSVC 7.0 does not allow you to redefine _heap_init or _heap_term. */
 
 int __cdecl
 _heap_init (void)
diff --text -u 'xemacs-21.4.5/src/scrollbar-msw.c' 'xemacs-21.4.6/src/scrollbar-msw.c'
Index: ././src/scrollbar-msw.c
--- ././src/scrollbar-msw.c	Tue Oct 23 17:35:38 2001
+++ ././src/scrollbar-msw.c	Mon Dec 17 14:49:26 2001
@@ -41,6 +41,7 @@
 #define VERTICAL_SCROLLBAR_DRAG_HACK
 
 static int vertical_drag_in_progress = 0;
+extern Lisp_Object mswindows_find_frame (HWND hwnd);
 
 static void
 mswindows_create_scrollbar_instance (struct frame *f, int vertical,
@@ -203,23 +204,36 @@
   }
 
   sb = (struct scrollbar_instance *)GetWindowLong (hwnd, GWL_USERDATA);
-  win = real_window ((sb==NULL) ? GetFocus() : sb->mirror, 1);
-  /* "0 as the second parameter" refers to the call to real_window above.
-     This comment was taken from Ben's 21.5 code that differs somewhat
-     from this, I don't think the 21.4 code ever had a 0 there.
-     #### we're still hitting an abort here with 0 as the second
-     parameter, although only occasionally.  It seems that sometimes we
-     receive events for scrollbars that don't exist anymore.  I assume
-     it must happen like this: The user does something that causes a
-     scrollbar to disappear (e.g. Alt-TAB, causing recomputation of
-     everything in the new frame) and then immediately uses the mouse
-     wheel, generating scrollbar events.  Both events get posted before
-     we have a chance to process them, and in processing the first, the
-     scrollbar mentioned in the second disappears. */
-  if (NILP (win))
-    return;
-  frame = XWINDOW (win)->frame;
-  f = XFRAME (frame);
+  if (sb != NULL) 
+    {
+      win = real_window (sb->mirror, 1);
+      /* "0 as the second parameter" refers to the call to real_window
+     above.  This comment was taken from Ben's 21.5 code that differs
+     somewhat from this, I don't think the 21.4 code ever had a 0
+     there.  #### we're still hitting an abort here with 0 as the
+     second parameter, although only occasionally.  It seems that
+     sometimes we receive events for scrollbars that don't exist
+     anymore.  I assume it must happen like this: The user does
+     something that causes a scrollbar to disappear (e.g. Alt-TAB,
+     causing recomputation of everything in the new frame) and then
+     immediately uses the mouse wheel, generating scrollbar events.
+     Both events get posted before we have a chance to process them,
+     and in processing the first, the scrollbar mentioned in the
+     second disappears. */
+      if (NILP (win))
+	return;
+      frame = XWINDOW (win)->frame;
+      f = XFRAME (frame);
+    }
+  else 
+    {
+      /* I'm not sure if this is right, but its much better than
+	 passing an HNWD to real_window() - which is what the previous
+	 code did -- andyp */
+      frame = mswindows_find_frame (GetFocus());
+      f = XFRAME (frame);
+      win = FRAME_SELECTED_WINDOW (f);
+    }
 
   /* SB_LINEDOWN == SB_CHARLEFT etc. This is the way they will
      always be - any Windows is binary compatible backward with
diff --text -u 'xemacs-21.4.5/src/search.c' 'xemacs-21.4.6/src/search.c'
Index: ././src/search.c
--- ././src/search.c	Wed Jul 25 16:45:36 2001
+++ ././src/search.c	Mon Dec 17 14:49:27 2001
@@ -2269,7 +2269,7 @@
   Lisp_Object buffer;
   int_dynarr *ul_action_dynarr = 0;
   int_dynarr *ul_pos_dynarr = 0;
-  int sub;
+  int sub = 0;
   int speccount;
 
   CHECK_STRING (replacement);
@@ -2290,9 +2290,7 @@
     }
   else
     {
-      if (NILP (strbuffer))
-	sub = 0;
-      else
+      if (!NILP (strbuffer))
 	{
 	  CHECK_INT (strbuffer);
 	  sub = XINT (strbuffer);
@@ -2334,7 +2332,7 @@
     {
       /* Decide how to casify by examining the matched text. */
 
-      last = search_regs.end[0];
+      last = search_regs.end[sub];
       prevc = '\n';
       case_action = all_caps;
 
@@ -2345,7 +2343,7 @@
       some_nonuppercase_initial = 0;
       some_uppercase = 0;
 
-      for (pos = search_regs.start[0]; pos < last; pos++)
+      for (pos = search_regs.start[sub]; pos < last; pos++)
 	{
 	  if (NILP (string))
 	    c = BUF_FETCH_CHAR (buf, pos);
@@ -2561,8 +2559,8 @@
       return concat3 (before, replacement, after);
     }
 
-  mc_count = begin_multiple_change (buf, search_regs.start[0],
-				    search_regs.end[0]);
+  mc_count = begin_multiple_change (buf, search_regs.start[sub],
+				    search_regs.end[sub]);
 
   /* begin_multiple_change() records an unwind-protect, so we need to
      record this value now. */
@@ -2572,7 +2570,7 @@
      delete the original text.  This means that markers at the
      beginning or end of the original will float to the corresponding
      position in the replacement.  */
-  BUF_SET_PT (buf, search_regs.start[0]);
+  BUF_SET_PT (buf, search_regs.start[sub]);
   if (!NILP (literal))
     Finsert (1, &replacement);
   else
@@ -2583,11 +2581,21 @@
       GCPRO1 (replacement);
       for (strpos = 0; strpos < stlen; strpos++)
 	{
-	  Charcount offset = BUF_PT (buf) - search_regs.start[0];
+	  /* on the first iteration assert(offset==0),
+	     exactly complementing BUF_SET_PT() above.
+	     During the loop, it keeps track of the amount inserted.
+	   */
+	  Charcount offset = BUF_PT (buf) - search_regs.start[sub];
 
 	  c = string_char (XSTRING (replacement), strpos);
 	  if (c == '\\' && strpos < stlen - 1)
 	    {
+	      /* XXX FIXME: replacing just a substring non-literally
+		 using backslash refs to the match looks dangerous.  But
+		 <15366.18513.698042.156573@ns.caldera.de> from Torsten Duwe
+		 <duwe@caldera.de> claims Finsert_buffer_substring already
+		 handles this correctly.
+	      */
 	      c = string_char (XSTRING (replacement), ++strpos);
 	      if (c == '&')
 		Finsert_buffer_substring
@@ -2630,9 +2638,9 @@
       UNGCPRO;
     }
 
-  inslen = BUF_PT (buf) - (search_regs.start[0]);
-  buffer_delete_range (buf, search_regs.start[0] + inslen, search_regs.end[0] +
-		       inslen, 0);
+  inslen = BUF_PT (buf) - (search_regs.start[sub]);
+  buffer_delete_range (buf, search_regs.start[sub] + inslen,
+		       search_regs.end[sub] +  inslen, 0);
 
   if (case_action == all_caps)
     Fupcase_region (make_int (BUF_PT (buf) - inslen),
diff --text -u 'xemacs-21.4.5/src/syswindows.h' 'xemacs-21.4.6/src/syswindows.h'
Index: ././src/syswindows.h
--- ././src/syswindows.h	Wed Jul 25 16:45:40 2001
+++ ././src/syswindows.h	Mon Dec 17 14:49:27 2001
@@ -74,6 +74,7 @@
 #define Status int
 #endif
 #include <mmsystem.h>
+#include <shlobj.h>
 #include <shellapi.h>
 #include <ddeml.h>
 #endif
@@ -106,6 +107,17 @@
 #define PHYSICALOFFSETY 113
 #endif
 
+/* shlobj.h defines. */
+#ifndef BIF_EDITBOX
+#define BIF_EDITBOX 0x10
+#endif
+#ifndef BIF_VALIDATE
+#define BIF_VALIDATE 0x20
+#endif
+#ifndef BFFM_VALIDATEFAILED
+#define BFFM_VALIDATEFAILED 3
+#endif
+
 /* windows.h defines. */
 #if defined (CYGWIN) && (CYGWIN_VERSION_DLL_MAJOR < 20)
 typedef NMHDR *LPNMHDR;
@@ -238,10 +250,15 @@
 #define LOCAL_TO_WIN32_FILE_FORMAT(path, pathout)			\
 do {									\
   Lisp_Object ltwff1 = (path);						\
-  int ltwff2 =								\
-    cygwin_posix_to_win32_path_list_buf_size (XSTRING_DATA (ltwff1));	\
-  pathout = (Bufbyte *) alloca (ltwff2);				\
-  cygwin_posix_to_win32_path_list (XSTRING_DATA (ltwff1), pathout);	\
+  Bufbyte* ltwffp = XSTRING_DATA (ltwff1);				\
+  if (isalpha (ltwffp[0]) && (IS_DEVICE_SEP (ltwffp[1])))			\
+    pathout = ltwffp;							\
+  else {									\
+    int ltwff2 =								\
+      cygwin_posix_to_win32_path_list_buf_size (ltwffp);	\
+    pathout = (Bufbyte *) alloca (ltwff2);				\
+    cygwin_posix_to_win32_path_list (ltwffp, pathout);	\
+  }									\
 } while (0)
 #else
 #define LOCAL_TO_WIN32_FILE_FORMAT(path, pathout)	\
diff --text -u 'xemacs-21.4.5/src/win32.c' 'xemacs-21.4.6/src/win32.c'
Index: ././src/win32.c
--- ././src/win32.c	Tue Oct 23 17:35:39 2001
+++ ././src/win32.c	Mon Dec 17 14:49:27 2001
@@ -154,8 +154,11 @@
   /* Encode filename and current directory.  */
   Lisp_Object current_dir = Ffile_name_directory (document);
   char* path = NULL;
+#ifdef CYGWIN
+  char* fname1, *fname2;
+  int pos, sz;
+#endif
   char* doc = NULL;
-  Extbyte* f=0;
   int ret;
   struct gcpro gcpro1, gcpro2;
 
@@ -169,25 +172,31 @@
   /* Use mule and cygwin-safe APIs top get at file data. */
   if (STRINGP (current_dir))
     {
-      TO_EXTERNAL_FORMAT (LISP_STRING, current_dir,
-			  C_STRING_ALLOCA, f,
-			  Qfile_name);
-#ifdef CYGWIN
-      CYGWIN_WIN32_PATH (f, path);
-#else
-      path = f;
-#endif
+      LOCAL_TO_WIN32_FILE_FORMAT (current_dir, path);
     }
 
   if (STRINGP (document))
     {
-      TO_EXTERNAL_FORMAT (LISP_STRING, document,
-			  C_STRING_ALLOCA, f,
-			  Qfile_name);
+      doc = XSTRING_DATA (document);
 #ifdef CYGWIN
-      CYGWIN_WIN32_PATH (f, doc);
-#else
-      doc = f;
+      if ((fname1 = strchr (doc, ':')) != NULL 
+	  && *++fname1 == '/' && *++fname1 == '/')
+	{
+	  fname1++;
+	  pos = fname1 - doc;
+	  if (!(isalpha (fname1[0]) && (IS_DEVICE_SEP (fname1[1]))))
+	    {
+	      sz = cygwin_posix_to_win32_path_list_buf_size (fname1);
+	      fname2 = alloca (sz + pos);
+	      strncpy (fname2, doc, pos);
+	      doc = fname2;
+	      fname2 += pos;
+	      cygwin_posix_to_win32_path_list (fname1, fname2);
+	    }
+	}
+      else {
+	LOCAL_TO_WIN32_FILE_FORMAT (document, doc);
+      }
 #endif
     }
 
@@ -218,6 +227,29 @@
   return Qnil;
 }
 
+#ifdef CYGWIN
+DEFUN ("mswindows-cygwin-to-win32-path", Fmswindows_cygwin_to_win32_path, 1, 1, 0, /*
+Get the cygwin environment to convert the Unix PATH to win32 format.
+No expansion is performed, all conversion is done by the cygwin runtime.
+*/
+       (path))
+{
+  Extbyte* f;
+  Bufbyte* p;
+  CHECK_STRING (path);
+
+  /* There appears to be a bug in the cygwin conversion routines in
+     that they are not idempotent. */
+  p = XSTRING_DATA (path);
+  if (isalpha (p[0]) && (IS_DEVICE_SEP (p[1])))
+    return path;
+
+  /* Use mule and cygwin-safe APIs top get at file data. */
+  LOCAL_TO_WIN32_FILE_FORMAT (path, f);
+  return build_ext_string (f, Qnative);
+}
+#endif
+
 
 /*--------------------------------------------------------------------*/
 /*                               Async timers                         */
@@ -357,6 +389,9 @@
 syms_of_win32 (void)
 {
   DEFSUBR (Fmswindows_shell_execute);
+#ifdef CYGWIN
+  DEFSUBR (Fmswindows_cygwin_to_win32_path);
+#endif
 }
 
 void
diff --text -u 'xemacs-21.4.5/src/window.c' 'xemacs-21.4.6/src/window.c'
Index: ././src/window.c
--- ././src/window.c	Tue Oct 23 17:35:39 2001
+++ ././src/window.c	Mon Dec 17 14:49:27 2001
@@ -123,6 +123,8 @@
 /* List of freed window configurations with 1 - 10 windows. */
 static Lisp_Object Vwindow_configuration_free_list[10];
 
+Lisp_Object Qtruncate_partial_width_windows;
+
 #define SET_LAST_MODIFIED(w, cache_too)		\
 do {						\
   (w)->last_modified[CURRENT_DISP] = Qzero;	\
@@ -724,7 +726,8 @@
 
   /* If truncate_partial_width_windows is true and the window is not
      the full width of the frame it is truncated. */
-  if (truncate_partial_width_windows
+  if (!NILP (symbol_value_in_buffer (Qtruncate_partial_width_windows,
+				     w->buffer))
       && !(window_is_leftmost (w) && window_is_rightmost (w)))
     return 1;
 
@@ -2614,7 +2617,7 @@
 	 We can't just wait until we hit the first window again,
 	 because it might be deleted.  */
 
-      last_window = Fprevious_window (w, mini ? Qt : Qnil, frame_arg, Qt);
+      last_window = Fprevious_window (w, mini ? Qt : Qnil, frame_arg, device);
 
       best_window = Qnil;
       for (;;)
@@ -2629,7 +2632,17 @@
 	  /* Given the outstanding quality of the rest of this code,
 	     I feel no shame about putting this piece of shit in. */
 	  if (++lose_lose >= 500)
-	    return Qnil;
+	    {
+	      /* Call to abort() added by Darryl Okahata (16 Nov. 2001),
+	         at Ben's request, to catch any remaining bugs.
+
+		 If you find that XEmacs is aborting here, and you
+		 need to be up and running ASAP, it should be safe to
+		 comment out the following abort(), as long as you
+		 leave the "break;" alone.  */
+	      abort();
+	      break;	/* <--- KEEP THIS HERE!  Do not delete!  */
+	    }
 
 	  /* Note that we do not pay attention here to whether
 	     the frame is visible, since Fnext_window skips non-visible frames
@@ -2689,7 +2702,7 @@
 
               case UNDEDICATE_BUFFER:
                 {
-                  if ((XBUFFER (p->buffer) == XBUFFER (obj)) && (p->dedicated))
+                  if ((XBUFFER (p->buffer) == XBUFFER (obj)))
                     p->dedicated = Qnil;
                   break;
                 }
@@ -6097,6 +6110,8 @@
   /* Qother in general.c */
 #endif
 
+  DEFSYMBOL (Qtruncate_partial_width_windows);
+  
   DEFSUBR (Fselected_window);
   DEFSUBR (Flast_nonminibuf_window);
   DEFSUBR (Fminibuffer_window);
diff --text -u 'xemacs-21.4.5/tests/ChangeLog' 'xemacs-21.4.6/tests/ChangeLog'
Index: ././tests/ChangeLog
--- ././tests/ChangeLog	Tue Oct 23 20:02:41 2001
+++ ././tests/ChangeLog	Mon Dec 17 18:33:19 2001
@@ -1,3 +1,11 @@
+2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.6 "Common Lisp" is released.
+
+2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.6 "Common Lisp" is released.
+
 2001-10-23  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.5 "Civil Service" is released.
diff --text -u 'xemacs-21.4.5/version.sh' 'xemacs-21.4.6/version.sh'
Index: ././version.sh
--- ././version.sh	Tue Oct 23 20:02:33 2001
+++ ././version.sh	Mon Dec 17 18:33:19 2001
@@ -2,8 +2,8 @@
 emacs_is_beta=
 emacs_major_version=21
 emacs_minor_version=4
-emacs_beta_version=5
-xemacs_codename="Civil Service"
+emacs_beta_version=6
+xemacs_codename="Common Lisp"
 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=8
#### End of Patch data ####

#### ApplyPatch data follows ####
# Data version        : 1.0
# Date generated      : Mon Dec 17 18:33:21 2001
# Generated by        : makepatch 2.00_03
# Recurse directories : Yes
# Excluded files      : (\A|/)MANIFEST\Z
#                       (\A|/)\.precious\Z
# p './CHANGES-release' 6023 1008570424 0100644
# p './ChangeLog' 144702 1008581599 0100644
# p './Makefile.in.in' 25003 1008570424 0100644
# p './PROBLEMS' 76882 1008570424 0100644
# p './configure' 456822 1008580938 0100755
# p './configure.in' 171748 1008570422 0100644
# p './configure.usage' 15320 1008570425 0100644
# p './etc/package-index.LATEST.pgp' 46330 1008568144 0100644
# p './lib-src/ChangeLog' 39773 1008581599 0100644
# p './lisp/ChangeLog' 344412 1008581599 0100644
# p './lisp/code-files.el' 22320 1008568148 0100644
# p './lisp/cus-edit.el' 125169 1008568148 0100644
# p './lisp/cus-face.el' 11580 1008568148 0100644
# p './lisp/dialog-gtk.el' 8865 1008568149 0100644
# p './lisp/dialog.el' 24910 1008568149 0100644
# p './lisp/faces.el' 77456 1008568149 0100644
# p './lisp/font.el' 47992 1008568149 0100644
# p './lisp/gtk-faces.el' 11565 1008568149 0100644
# p './lisp/minibuf.el' 92764 1008568150 0100644
# p './lisp/package-get.el' 42395 1008568150 0100644
# p './lisp/package-net.el' 10732 1008568150 0100644
# p './lisp/toolbar-items.el' 20366 1008568150 0100644
# p './lwlib/ChangeLog' 22837 1008581599 0100644
# p './man/ChangeLog' 83465 1008581599 0100644
# p './man/Makefile' 7845 1008568153 0100644
# p './man/lispref/glyphs.texi' 60972 1008568154 0100644
# p './man/lispref/intro.texi' 37894 1008568154 0100644
# p './man/lispref/lispref.texi' 53226 1008568154 0100644
# p './man/lispref/objects.texi' 80743 1008568154 0100644
# c './man/lispref/packaging.texi' 0 1008568155 0100644
# p './netinstall/ChangeLog' 6758 1008581599 0100644
# p './netinstall/Makefile.in.in' 7099 1008568156 0100644
# p './netinstall/choose.cc' 19996 1008568156 0100644
# p './netinstall/desktop.cc' 11112 1008568157 0100644
# p './netinstall/dialog.h' 1895 1008568157 0100644
# p './netinstall/download.cc' 2431 1008568157 0100644
# p './netinstall/geturl.cc' 5654 1008568157 0100644
# p './netinstall/ini.h' 2415 1008568157 0100644
# c './netinstall/init.cc' 0 1008568157 0100644
# p './netinstall/localdir.cc' 3185 1008568157 0100644
# p './netinstall/log.cc' 2526 1008568157 0100644
# p './netinstall/main.cc' 2439 1008568157 0100644
# p './netinstall/msg.cc' 1498 1008568158 0100644
# p './netinstall/net.cc' 3078 1008568158 0100644
# p './netinstall/nio-ftp.cc' 2704 1008568158 0100644
# p './netinstall/nio-ie5.cc' 3749 1008568158 0100644
# p './netinstall/regedit.cc' 4986 1008568158 0100644
# p './netinstall/regedit.h' 830 1008568158 0100644
# p './netinstall/reginfo.h' 1481 1008568158 0100644
# p './netinstall/res.rc' 20642 1008568158 0100644
# p './netinstall/resource.h' 4827 1008568158 0100644
# p './netinstall/root.cc' 7408 1008568159 0100644
# p './netinstall/setup.mak' 7369 1008568159 0100644
# p './netinstall/source.cc' 2191 1008568159 0100644
# p './netinstall/splash.cc' 1646 1008568159 0100644
# p './netinstall/state.h' 1243 1008568159 0100644
# c './netinstall/uninstall.cc' 0 1008568159 0100644
# p './nt/ChangeLog' 39814 1008581599 0100644
# p './src/ChangeLog' 322062 1008581599 0100644
# p './src/alloc.c' 119374 1008568162 0100644
# p './src/buffer.c' 103189 1008568163 0100644
# p './src/dialog-msw.c' 22334 1008568163 0100644
# p './src/dired.c' 27703 1008568163 0100644
# p './src/editfns.c' 79914 1008568164 0100644
# p './src/event-msw.c' 119356 1008568164 0100644
# p './src/event-stream.c' 164130 1008568165 0100644
# p './src/fileio.c' 133826 1008568165 0100644
# p './src/general-slots.h' 5823 1008568166 0100644
# p './src/lisp.h' 117947 1008568166 0100644
# p './src/ntheap.c' 10350 1008568166 0100644
# p './src/scrollbar-msw.c' 14752 1008568166 0100644
# p './src/search.c' 90245 1008568167 0100644
# p './src/syswindows.h' 8548 1008568167 0100644
# p './src/win32.c' 10840 1008568167 0100644
# p './src/window.c' 197270 1008568167 0100644
# p './tests/ChangeLog' 11558 1008581599 0100644
# p './version.sh' 198 1008581599 0100644
#### End of ApplyPatch data ####

#### End of Patch kit [created: Mon Dec 17 18:33:21 2001] ####
#### Patch checksum: 12389 432855 30982 ####
#### Checksum: 12423 434097 4892 ####