Index: CHANGES-beta
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/CHANGES-beta,v
retrieving revision 1.211
retrieving revision 1.213
diff -u -r1.211 -r1.213
--- CHANGES-beta	24 Apr 2003 23:41:31 -0000	1.211
+++ CHANGES-beta	10 May 2003 08:53:26 -0000	1.213
@@ -1,3 +1,51 @@
+to 21.5.13 "cauliflower"
+
+Remember that bug that made return behave as linefeed in a TTY?  It's
+gone!  Thanks go out to Jerry James and Steve Turnbull for squashing
+this year old bug.  Of course, that wasn't the only bug fixed this
+time around.
+
+Here are the highlights:
+
+Build
+
+-- Don't look for Motif if it's already been found - Buchholz.
+-- Darwin, Cygwin, BerkDB autoconf fixes - Turnbull.
+-- Make DEFUNed functions be tags - Buchholz.
+-- Allow compiling with Motif 1 and linking with Motif 2 - Buchholz.
+-- Update regexp tests - Turnbull.
+-- Don't autodetect ESD (Enlightened Sound Daemon) - Turnbull.
+
+
+Documentation
+
+-- New section in PROBLEMS auxilary programs for Windows - Turnbull.
+-- FAQ updates
+	Q6.4.3 New aux programs for Windows - Turnbull.
+-- Document failed match preserves data - Turnbull.
+
+
+Internals
+
+-- Don't use the u_int8_t etc typedefs on FreeBSD in database.c - Pluim.
+-- Better support for externally defined lrecord types - Begel.
+-- Only call `xm_update_progress' if Motif is defined - Youngs.
+-- Define __STDC__ for BerkeleyDB - Buchholz.
+-- Fix bug where XEmacs couldn't find its .dmp file - Buchholz.
+-- Move `filemodestring' from lisp.h to sysfile.h - Golubev.
+-- Clean ups against the possibility of sys/stat.h defining stat - Turnbull.
+-- Search/match updates - Turnbull.
+
+
+Lisp API
+
+-- Fix bug preventing installing new packages - Youngs.
+-- Put exit message on separate line in `command-error' - Turnbull.
+-- Temporarily turn off PGP verification of package-index - Youngs.
+-- Remove keymapings for 'function-key-error' - James.
+-- Fix bug that mapped RET to LFD in TTYs - James.
+
+
 to 21.5.12 "carrot"
 
 Lots of updates, fixes, and features from Ben Wing (he never stops).
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.360
retrieving revision 1.369
diff -u -r1.360 -r1.369
--- ChangeLog	24 Apr 2003 23:41:31 -0000	1.360
+++ ChangeLog	10 May 2003 08:53:26 -0000	1.369
@@ -1,3 +1,74 @@
+2003-05-10  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.13 "cauliflower" is released.
+
+2003-05-10  Steve Youngs  <youngs@xemacs.org>
+
+	* Revert this patch:
+	2003-05-01  Andrew Begel  <abegel@CS.Berkeley.EDU>
+
+	        * configure.in: Move module detection to after src/ is added to
+	        MAKE_SUBDIR. On MacOS X, building modules requires xemacs to
+	        already be built.
+	        * aclocal.m4 (XE_SHLIB_STUFF): Properly define ellcc flags for
+	        MacOS X.
+	It was stopping certain libs from making their way into the
+	Makefiles. 
+
+	* configure: Regenerate.
+
+2003-05-09  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* configure.in: Revert Steve Youngs's patch, and set default for
+	ESD in the Defaults section.  Improve comments.
+
+	* configure: Regenerate.
+
+2003-05-07  Steve Youngs  <youngs@xemacs.org>
+
+	* configure.in: Default ESD sound to off.
+
+	* configure.usage (--with-sound): Document ESD defaulting to off.
+
+	* configure: Regenerate.
+
+2003-05-05  Steve Youngs  <youngs@xemacs.org>
+
+	* CHANGES.beta: Update.
+
+2003-05-04  Steve Youngs  <youngs@xemacs.org>
+
+	* configure: Regenerate.
+
+2003-05-04  Martin Buchholz  <martin@xemacs.org>
+
+	* configure.in: Don't look for Motif if it's already present in
+	$x_includes and $x_libraries.
+
+2003-05-01  Andrew Begel  <abegel@CS.Berkeley.EDU>
+
+	* configure.in: Move module detection to after src/ is added to
+	MAKE_SUBDIR. On MacOS X, building modules requires xemacs to
+	already be built.
+	* aclocal.m4 (XE_SHLIB_STUFF): Properly define ellcc flags for
+	MacOS X.
+
+2003-05-02  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* configure.in (darwin): Collect random kludges in one place.
+	(cygwin): Check for intptr_t in <sys/types.h>.
+	(Berkeley db): Handle 4.1 functions decorated with version info.
+
+2003-04-28  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* PROBLEMS (Windows): New: auxiliary programs for Windows.
+
+2003-03-04  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* Makefile.in.in (TAGS tags): Make DEFUNed functions be tags.
+	Patch by Martin Buchholz <martin@xemacs.org>.
+	<15410.44105.753590.169241@gargle.gargle.HOWL>
+
 2003-04-24  Steve Youngs  <youngs@xemacs.org>
 
 	* XEmacs 21.5.12 "carrot" is released.
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/Makefile.in.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.in.in	9 Mar 2003 17:23:54 -0000	1.15
+++ Makefile.in.in	2 May 2003 06:00:41 -0000	1.16
@@ -613,7 +613,9 @@
 	  echo "Using etags from `which etags`."
 	PATH=`$(pwd)`/lib-src:$$PATH ; export PATH; cd ${srcdir} && \
 	find src lwlib lib-src modules ${PRUNE_VC} -name '*.[ch]' -print | \
-	  xargs etags -a -r '/[ 	]*DEF\(VAR\|INE\)_[A-Z_]+[ 	]*([ 	]*"\([^"]+\)"/\2/'; \
+	  xargs etags -a \
+		-r '/[ 	]*DEF\(VAR\|INE\)_[A-Z_]+[ 	]*([ 	]*"\([^"]+\)"/\2/' \
+	        -r '/^DEFUN[	]*([	]*"\([^"]+\)"[	]*,[ 	]*\([A-Za-z0-9_]+\)/\2/'; \
 	find ${tagslisp} ${PRUNE_VC} -name '*.el' ! -name 'auto-autoloads.el' -print | \
 	  xargs etags -a -l none -r "/^(def\\(var\\|un\\|alias\\|const\\|macro\\|subst\\|struct\\|face\\|group\\|custom\\|ine-\\(function\\|compiler-macro\\|[a-z-]+alias\\)\\)[ 	]+'?\\([^ 	]+\\)/\\3/"
 
Index: PROBLEMS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/PROBLEMS,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- PROBLEMS	27 Mar 2003 12:57:37 -0000	1.66
+++ PROBLEMS	2 May 2003 06:00:41 -0000	1.67
@@ -740,6 +740,19 @@
 
 ** Windows
 
+*** XEmacs complains "No such file or directory, diff"
+
+or "ispell" or other commands that seem related to whatever you just
+tried to do.
+
+There are a large number of common (in the sense that "everyone has
+these, really") Unix utilities that are not provided with XEmacs.  The
+GNU Project's implementations are available for Windows in the the
+Cygwin distribution (http://www.cygwin.com/), which also provides a
+complete Unix emulation environment (and thus makes ports of Unix
+utilities nearly trivial).  Another implementation is that from MinGW
+(http://www.mingw.org/msys.shtml).
+
 *** Weird crashes in pdump load or shortly after pdump load.
 
 This can happen with incremental linking.  Check if you have set
Index: aclocal.m4
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/aclocal.m4,v
retrieving revision 1.5
retrieving revision 1.7
diff -u -r1.5 -r1.7
Index: configure
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v
retrieving revision 1.194
retrieving revision 1.200
diff -u -r1.194 -r1.200
--- configure	24 Apr 2003 05:26:40 -0000	1.194
+++ configure	10 May 2003 02:57:05 -0000	1.200
@@ -256,6 +256,9 @@
 rel_alloc='default'
 with_system_malloc='default'
 with_dlmalloc='default'
+with_native_sound=''
+with_nas_sound=''
+with_esd_sound='no'
 native_sound_lib=''
 with_gtk='no'
 with_gnome='no'
@@ -865,7 +868,7 @@
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:869: checking whether ln -s works" >&5
+echo "configure:872: checking whether ln -s works" >&5
 
 rm -f conftestdata
 if ln -s X conftestdata 2>/dev/null
@@ -1151,7 +1154,7 @@
 
 
 echo $ac_n "checking "host system type"""... $ac_c" 1>&6
-echo "configure:1155: checking "host system type"" >&5
+echo "configure:1158: checking "host system type"" >&5
 internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'`
 canonical=`${CONFIG_SHELL-/bin/sh} $srcdir/config.sub "$internal_configuration"`
 configuration=`echo "$configuration" | sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'`
@@ -1283,7 +1286,7 @@
 
     *-*-darwin*)
     opsys=darwin
-    RANLIB="ranlib -c"     ;;
+    ;;
 
     i586-dg-dgux*R4*   | i586-dg-dgux5.4.4* ) machine=aviion opsys=dgux5-4r4 ;;
   m88k-dg-dgux5.4R3* | m88k-dg-dgux5.4.3* ) opsys=dgux5-4r3 ;;
@@ -1586,7 +1589,7 @@
 
 if test -z "$pdump"; then
   case "$opsys" in
-    linux* )  pdump=yes ;;        darwin )  pdump=yes ;;        *)        pdump=no ;;
+    linux* )  pdump=yes ;;              darwin )  pdump=yes ;;              * )       pdump=no ;;
   esac
 fi
 
@@ -1619,7 +1622,8 @@
   esac
 fi
 
-case "$opsys" in aix*) NON_GNU_CC=xlc ;; esac
+case "$opsys" in
+  aix* )   NON_GNU_CC=xlc ;;        darwin ) RANLIB="ranlib -c" ;;  esac
 
 stack_trace_eye_catcher=`echo ${PROGNAME}_${version}_${canonical} | sed 'y/.-/__/'`
 { test "$extra_verbose" = "yes" && cat << EOF
@@ -1683,7 +1687,7 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1687: checking for $ac_word" >&5
+echo "configure:1691: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1710,7 +1714,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1714: checking for $ac_word" >&5
+echo "configure:1718: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1758,7 +1762,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1762: checking for $ac_word" >&5
+echo "configure:1766: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1787,7 +1791,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1791: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1795: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -1800,12 +1804,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1804 "configure"
+#line 1808 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1833,19 +1837,19 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1837: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1841: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1842: checking whether we are using GNU C" >&5
+echo "configure:1846: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1863,7 +1867,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1867: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1871: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -1896,7 +1900,7 @@
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1900: checking for $ac_word" >&5
+echo "configure:1904: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1923,7 +1927,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1927: checking for $ac_word" >&5
+echo "configure:1931: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1971,7 +1975,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1975: checking for $ac_word" >&5
+echo "configure:1979: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2000,7 +2004,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2004: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2008: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -2013,12 +2017,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 2017 "configure"
+#line 2021 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:2022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -2046,19 +2050,19 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2050: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2054: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2055: checking whether we are using GNU C" >&5
+echo "configure:2059: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -2076,7 +2080,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2080: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2084: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -2109,7 +2113,7 @@
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2113: checking for $ac_word" >&5
+echo "configure:2117: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2136,7 +2140,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2140: checking for $ac_word" >&5
+echo "configure:2144: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2184,7 +2188,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2188: checking for $ac_word" >&5
+echo "configure:2192: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2213,7 +2217,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2217: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2221: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -2226,12 +2230,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 2230 "configure"
+#line 2234 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:2235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -2259,19 +2263,19 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2263: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2267: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2268: checking whether we are using GNU C" >&5
+echo "configure:2272: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -2289,7 +2293,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2293: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2297: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -2322,7 +2326,7 @@
 
 if test "$GCC" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 2326 "configure"
+#line 2330 "configure"
 #include "confdefs.h"
 int main () {
 #if __GNUC__ >= 3
@@ -2332,7 +2336,7 @@
 #endif
 }
 EOF
-if { (eval echo configure:2336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:2340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -2353,7 +2357,7 @@
 test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP"
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2357: checking how to run the C preprocessor" >&5
+echo "configure:2361: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2366,13 +2370,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2370 "configure"
+#line 2374 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2380: \"$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
   :
@@ -2383,13 +2387,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2387 "configure"
+#line 2391 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2397: \"$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
   :
@@ -2400,13 +2404,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2404 "configure"
+#line 2408 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2414: \"$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
   :
@@ -2432,9 +2436,9 @@
 
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:2436: checking for AIX" >&5
+echo "configure:2440: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2438 "configure"
+#line 2442 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -2461,9 +2465,9 @@
  
 
 echo $ac_n "checking for GNU libc""... $ac_c" 1>&6
-echo "configure:2465: checking for GNU libc" >&5
+echo "configure:2469: checking for GNU libc" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2467 "configure"
+#line 2471 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
@@ -2475,7 +2479,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_glibc=yes
 else
@@ -2552,7 +2556,7 @@
 esac
 
 cat > conftest.$ac_ext <<EOF
-#line 2556 "configure"
+#line 2560 "configure"
 #include "confdefs.h"
 int main () {
 #if defined __SUNPRO_C
@@ -2566,7 +2570,7 @@
 #endif
 }
 EOF
-if { (eval echo configure:2570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:2574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -2818,17 +2822,17 @@
 
 if test "$__USLC__" = yes; then
   echo $ac_n "checking for whether the -Kalloca compiler flag is needed""... $ac_c" 1>&6
-echo "configure:2822: checking for whether the -Kalloca compiler flag is needed" >&5
+echo "configure:2826: checking for whether the -Kalloca compiler flag is needed" >&5
   need_kalloca=no
   cat > conftest.$ac_ext <<EOF
-#line 2825 "configure"
+#line 2829 "configure"
 #include "confdefs.h"
 
 int main() {
 void *x = alloca(4);
 ; return 0; }
 EOF
-if { (eval echo configure:2832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   :
 else
@@ -2839,14 +2843,14 @@
     xe_save_c_switch_system="$c_switch_system"
     c_switch_system="$c_switch_system -Kalloca"
     cat > conftest.$ac_ext <<EOF
-#line 2843 "configure"
+#line 2847 "configure"
 #include "confdefs.h"
 
 int main() {
 void *x = alloca(4);
 ; return 0; }
 EOF
-if { (eval echo configure:2850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    need_kalloca=yes 
 else
@@ -2906,7 +2910,7 @@
 
 if test "$GCC" = "yes"; then
 echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6
-echo "configure:2910: checking for buggy gcc versions" >&5
+echo "configure:2914: checking for buggy gcc versions" >&5
 GCC_VERSION=`$CC --version`
 case `uname -s`:`uname -m`:$GCC_VERSION in
 		    *:sun4*:2.8.1|*:sun4*:egcs-2.90.*)
@@ -2964,7 +2968,7 @@
 
 if test "$pdump" != "yes"; then
   echo $ac_n "checking for \"-z nocombreloc\" linker flag""... $ac_c" 1>&6
-echo "configure:2968: checking for \"-z nocombreloc\" linker flag" >&5
+echo "configure:2972: 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 ;;
@@ -3053,7 +3057,7 @@
  fi
 
 echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:3057: checking for dynodump" >&5
+echo "configure:3061: checking for dynodump" >&5
 if test "$unexec" != "unexsol2.o"; then
   echo "$ac_t""no" 1>&6
 else
@@ -3091,12 +3095,12 @@
   done
   
 echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6
-echo "configure:3095: checking for terminateAndUnload in -lC" >&5
+echo "configure:3099: checking for terminateAndUnload in -lC" >&5
 ac_lib_var=`echo C'_'terminateAndUnload | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lC "
 cat > conftest.$ac_ext <<EOF
-#line 3100 "configure"
+#line 3104 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3107,7 +3111,7 @@
 terminateAndUnload()
 ; return 0; }
 EOF
-if { (eval echo configure:3111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3115: \"$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
@@ -3215,7 +3219,7 @@
 
 if test "$add_runtime_path" = "yes"; then
       echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:3219: checking "for runtime libraries flag"" >&5
+echo "configure:3223: checking "for runtime libraries flag"" >&5
   case "$opsys" in
     sol2 ) dash_r="-R" ;;
     decosf* | linux* | irix*) dash_r="-rpath " ;;
@@ -3237,14 +3241,14 @@
   done
 fi
         cat > conftest.$ac_ext <<EOF
-#line 3241 "configure"
+#line 3245 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   dash_r="$try_dash_r"
 else
@@ -3345,10 +3349,10 @@
 fi
 after_morecore_hook_exists=yes
 echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
-echo "configure:3349: checking for malloc_set_state" >&5
+echo "configure:3353: checking for malloc_set_state" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3352 "configure"
+#line 3356 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_set_state(); below.  */
@@ -3371,7 +3375,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_malloc_set_state=yes"
 else
@@ -3391,16 +3395,16 @@
 fi
 
 echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
-echo "configure:3395: checking whether __after_morecore_hook exists" >&5
+echo "configure:3399: checking whether __after_morecore_hook exists" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3397 "configure"
+#line 3401 "configure"
 #include "confdefs.h"
 extern void (* __after_morecore_hook)();
 int main() {
 __after_morecore_hook = 0
 ; return 0; }
 EOF
-if { (eval echo configure:3404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -3456,7 +3460,7 @@
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3460: checking for $ac_word" >&5
+echo "configure:3464: checking for $ac_word" >&5
 
 if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -3511,7 +3515,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:3515: checking for a BSD compatible install" >&5
+echo "configure:3519: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 
   IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
@@ -3565,7 +3569,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3569: checking for $ac_word" >&5
+echo "configure:3573: checking for $ac_word" >&5
 
 if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -3597,15 +3601,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3601: checking for $ac_hdr" >&5
+echo "configure:3605: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3604 "configure"
+#line 3608 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3609: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3613: \"$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*
@@ -3635,10 +3639,10 @@
 done
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3639: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3643: checking for sys/wait.h that is POSIX.1 compatible" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3642 "configure"
+#line 3646 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3654,7 +3658,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -3678,10 +3682,10 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3682: checking for ANSI C header files" >&5
+echo "configure:3686: checking for ANSI C header files" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3685 "configure"
+#line 3689 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3689,7 +3693,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3693: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3697: \"$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*
@@ -3706,7 +3710,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3710 "configure"
+#line 3714 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3724,7 +3728,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3728 "configure"
+#line 3732 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3742,7 +3746,7 @@
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
 cat > conftest.$ac_ext <<EOF
-#line 3746 "configure"
+#line 3750 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3753,7 +3757,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:3757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -3779,10 +3783,10 @@
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3783: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3787: checking whether time.h and sys/time.h may both be included" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3786 "configure"
+#line 3790 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3791,7 +3795,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -3815,10 +3819,10 @@
 fi
 
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:3819: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:3823: checking for sys_siglist declaration in signal.h or unistd.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3822 "configure"
+#line 3826 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3830,7 +3834,7 @@
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:3834: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -3856,9 +3860,9 @@
 
 
 echo $ac_n "checking for utime""... $ac_c" 1>&6
-echo "configure:3860: checking for utime" >&5
+echo "configure:3864: checking for utime" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3862 "configure"
+#line 3866 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <utime.h>
@@ -3866,7 +3870,7 @@
 struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x);
 ; return 0; }
 EOF
-if { (eval echo configure:3870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3874: \"$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
@@ -3885,10 +3889,10 @@
       for ac_func in utimes
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3889: checking for $ac_func" >&5
+echo "configure:3893: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3892 "configure"
+#line 3896 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3911,7 +3915,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3919: \"$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
@@ -3943,10 +3947,10 @@
 
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3947: checking return type of signal handlers" >&5
+echo "configure:3951: checking return type of signal handlers" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3950 "configure"
+#line 3954 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3963,7 +3967,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -3985,10 +3989,10 @@
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3989: checking for size_t" >&5
+echo "configure:3993: checking for size_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3992 "configure"
+#line 3996 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4019,10 +4023,10 @@
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:4023: checking for pid_t" >&5
+echo "configure:4027: checking for pid_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4026 "configure"
+#line 4030 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4053,10 +4057,10 @@
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:4057: checking for uid_t in sys/types.h" >&5
+echo "configure:4061: checking for uid_t in sys/types.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4060 "configure"
+#line 4064 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -4092,10 +4096,10 @@
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:4096: checking for mode_t" >&5
+echo "configure:4100: checking for mode_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4099 "configure"
+#line 4103 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4126,10 +4130,10 @@
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:4130: checking for off_t" >&5
+echo "configure:4134: checking for off_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4133 "configure"
+#line 4137 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4160,10 +4164,10 @@
 fi
 
 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:4164: checking for ssize_t" >&5
+echo "configure:4168: checking for ssize_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4167 "configure"
+#line 4171 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4194,10 +4198,43 @@
 fi
 
 
+if test "$ac_cv_header_inttypes_h" != "yes"; then
+echo $ac_n "checking for intptr_t in sys/types.h""... $ac_c" 1>&6
+echo "configure:4204: checking for intptr_t in sys/types.h" >&5
+cat > conftest.$ac_ext <<EOF
+#line 4206 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+intptr_t x;
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:4215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  echo "$ac_t""yes" 1>&6
+      { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_INTPTR_T_IN_SYS_TYPES_H = 1
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_INTPTR_T_IN_SYS_TYPES_H 1
+EOF
+}
+
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
+fi
+rm -f conftest*
+fi
+
 echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:4199: checking for socklen_t" >&5
+echo "configure:4236: checking for socklen_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4201 "configure"
+#line 4238 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -4207,7 +4244,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -4216,7 +4253,7 @@
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 4220 "configure"
+#line 4257 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -4226,7 +4263,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 echo "$ac_t""size_t" 1>&6
@@ -4258,9 +4295,9 @@
 rm -f conftest*
 
 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:4262: checking for struct timeval" >&5
+echo "configure:4299: checking for struct timeval" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4264 "configure"
+#line 4301 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -4276,7 +4313,7 @@
 static struct timeval x; x.tv_sec = x.tv_usec;
 ; return 0; }
 EOF
-if { (eval echo configure:4280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
   HAVE_TIMEVAL=yes
@@ -4298,10 +4335,10 @@
 rm -f conftest*
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:4302: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:4339: checking whether struct tm is in sys/time.h or time.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4305 "configure"
+#line 4342 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -4309,7 +4346,7 @@
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:4313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -4333,10 +4370,10 @@
 fi
 
 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:4337: checking for tm_zone in struct tm" >&5
+echo "configure:4374: checking for tm_zone in struct tm" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4340 "configure"
+#line 4377 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -4344,7 +4381,7 @@
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:4348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_zone=yes
 else
@@ -4367,10 +4404,10 @@
 
 else
   echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:4371: checking for tzname" >&5
+echo "configure:4408: checking for tzname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4374 "configure"
+#line 4411 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -4380,7 +4417,7 @@
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:4384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_var_tzname=yes
 else
@@ -4406,10 +4443,10 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4410: checking for working const" >&5
+echo "configure:4447: checking for working const" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4413 "configure"
+#line 4450 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4458,7 +4495,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -4483,7 +4520,7 @@
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:4487: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:4524: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 
 cat > conftestmake <<\EOF
@@ -4508,12 +4545,12 @@
 
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:4512: checking whether byte ordering is bigendian" >&5
+echo "configure:4549: checking whether byte ordering is bigendian" >&5
 
 ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 4517 "configure"
+#line 4554 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4524,11 +4561,11 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4528: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 4532 "configure"
+#line 4569 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4539,7 +4576,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -4556,7 +4593,7 @@
 rm -f conftest*
 if test $ac_cv_c_bigendian = unknown; then
 cat > conftest.$ac_ext <<EOF
-#line 4560 "configure"
+#line 4597 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -4569,7 +4606,7 @@
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:4573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_bigendian=no
 else
@@ -4596,10 +4633,10 @@
 
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:4600: checking size of short" >&5
+echo "configure:4637: checking size of short" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4603 "configure"
+#line 4640 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4610,7 +4647,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -4638,10 +4675,10 @@
   exit 1
 fi
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4642: checking size of int" >&5
+echo "configure:4679: checking size of int" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4645 "configure"
+#line 4682 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4652,7 +4689,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -4674,10 +4711,10 @@
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4678: checking size of long" >&5
+echo "configure:4715: checking size of long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4681 "configure"
+#line 4718 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4688,7 +4725,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -4710,10 +4747,10 @@
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4714: checking size of long long" >&5
+echo "configure:4751: checking size of long long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4717 "configure"
+#line 4754 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4724,7 +4761,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -4746,10 +4783,10 @@
 
 
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:4750: checking size of void *" >&5
+echo "configure:4787: checking size of void *" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4753 "configure"
+#line 4790 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4760,7 +4797,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_void_p=`cat conftestval`
 else
@@ -4783,7 +4820,7 @@
 
 
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:4787: checking for long file names" >&5
+echo "configure:4824: checking for long file names" >&5
 
 ac_cv_sys_long_file_names=yes
 # Test for long file names in all the places we know might matter:
@@ -4829,10 +4866,10 @@
 
 
 echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:4833: checking for sin" >&5
+echo "configure:4870: checking for sin" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4836 "configure"
+#line 4873 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sin(); below.  */
@@ -4855,7 +4892,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_sin=yes"
 else
@@ -4873,12 +4910,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:4877: checking for sin in -lm" >&5
+echo "configure:4914: checking for sin in -lm" >&5
 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lm "
 cat > conftest.$ac_ext <<EOF
-#line 4882 "configure"
+#line 4919 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4889,7 +4926,7 @@
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:4893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4930: \"$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
@@ -4924,14 +4961,14 @@
 
 
 cat > conftest.$ac_ext <<EOF
-#line 4928 "configure"
+#line 4965 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
 return atanh(1.0) + asinh(1.0) + acosh(1.0); 
 ; return 0; }
 EOF
-if { (eval echo configure:4935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_INVERSE_HYPERBOLIC
@@ -4950,10 +4987,10 @@
 for ac_func in mkstemp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4954: checking for $ac_func" >&5
+echo "configure:4991: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4957 "configure"
+#line 4994 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4976,7 +5013,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5017: \"$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
@@ -5005,14 +5042,14 @@
 
 
 echo "checking type of mail spool file locking" 1>&6
-echo "configure:5009: checking type of mail spool file locking" >&5
+echo "configure:5046: checking type of mail spool file locking" >&5
 for ac_func in lockf flock
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5013: checking for $ac_func" >&5
+echo "configure:5050: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5016 "configure"
+#line 5053 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5035,7 +5072,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5076: \"$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
@@ -5117,12 +5154,12 @@
 case "$opsys" in decosf*)
   
 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:5121: checking for cma_open in -lpthreads" >&5
+echo "configure:5158: checking for cma_open in -lpthreads" >&5
 ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpthreads "
 cat > conftest.$ac_ext <<EOF
-#line 5126 "configure"
+#line 5163 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5133,7 +5170,7 @@
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:5137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5174: \"$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
@@ -5170,7 +5207,7 @@
 
 
 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:5174: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:5211: 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;
@@ -5182,7 +5219,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:5186: checking for \"-z ignore\" linker flag" >&5
+echo "configure:5223: 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 ;;
@@ -5193,7 +5230,7 @@
 
 
 echo "checking "for specified window system"" 1>&6
-echo "configure:5197: checking "for specified window system"" >&5
+echo "configure:5234: checking "for specified window system"" >&5
 
 
 GNOME_CONFIG=no
@@ -5201,7 +5238,7 @@
 
 if test "$with_gnome" != "no"; then
    echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6
-echo "configure:5205: checking for GNOME configuration script" >&5
+echo "configure:5242: checking for GNOME configuration script" >&5
    for possible in gnome-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5232,7 +5269,7 @@
 
 if test "$with_gtk" != "no";then
    echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6
-echo "configure:5236: checking for GTK configuration script" >&5
+echo "configure:5273: checking for GTK configuration script" >&5
    for possible in gtk12-config gtk14-config gtk-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5254,18 +5291,18 @@
 
 if test "${GTK_CONFIG}" != "no"; then
       echo $ac_n "checking gtk version""... $ac_c" 1>&6
-echo "configure:5258: checking gtk version" >&5
+echo "configure:5295: 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:5263: checking gtk libs" >&5
+echo "configure:5300: 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:5269: checking gtk cflags" >&5
+echo "configure:5306: checking gtk cflags" >&5
       GTK_CFLAGS=`${GTK_CONFIG} --cflags`
       if test "$GCC" = "yes"; then
       	GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow"
@@ -5275,19 +5312,19 @@
 
       
 echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6
-echo "configure:5279: checking for main in -lgdk_imlib" >&5
+echo "configure:5316: 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 5284 "configure"
+#line 5321 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5328: \"$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
@@ -5309,12 +5346,12 @@
 
       
 echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6
-echo "configure:5313: checking for Imlib_init in -lImlib" >&5
+echo "configure:5350: 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 5318 "configure"
+#line 5355 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5325,7 +5362,7 @@
 Imlib_init()
 ; return 0; }
 EOF
-if { (eval echo configure:5329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5366: \"$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
@@ -5348,10 +5385,10 @@
       for ac_func in gdk_imlib_init
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5352: checking for $ac_func" >&5
+echo "configure:5389: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5355 "configure"
+#line 5392 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5374,7 +5411,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5415: \"$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
@@ -5440,15 +5477,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5444: checking for $ac_hdr" >&5
+echo "configure:5481: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5447 "configure"
+#line 5484 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5489: \"$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*
@@ -5479,19 +5516,19 @@
 
       
 echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6
-echo "configure:5483: checking for main in -lxml" >&5
+echo "configure:5520: 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 5488 "configure"
+#line 5525 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5532: \"$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
@@ -5513,19 +5550,19 @@
 
       
 echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6
-echo "configure:5517: checking for main in -lglade" >&5
+echo "configure:5554: 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 5522 "configure"
+#line 5559 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5566: \"$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
@@ -5547,19 +5584,19 @@
 
       
 echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6
-echo "configure:5551: checking for main in -lglade-gnome" >&5
+echo "configure:5588: 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 5556 "configure"
+#line 5593 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5600: \"$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
@@ -5580,7 +5617,7 @@
 
 
       cat > conftest.$ac_ext <<EOF
-#line 5584 "configure"
+#line 5621 "configure"
 #include "confdefs.h"
 #include <glade/glade-xml.h>
 EOF
@@ -5639,7 +5676,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:5643: checking for X" >&5
+echo "configure:5680: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -5699,12 +5736,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 5703 "configure"
+#line 5740 "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:5708: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5745: \"$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*
@@ -5773,14 +5810,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5777 "configure"
+#line 5814 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:5784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5821: \"$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.
@@ -5889,17 +5926,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:5893: checking whether -R must be followed by a space" >&5
+echo "configure:5930: 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 5896 "configure"
+#line 5933 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -5915,14 +5952,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 5919 "configure"
+#line 5956 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -5958,12 +5995,12 @@
 else
 
 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:5962: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:5999: 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 5967 "configure"
+#line 6004 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5974,7 +6011,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6015: \"$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
@@ -5998,12 +6035,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:6002: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:6039: 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 6007 "configure"
+#line 6044 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6014,7 +6051,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:6018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6055: \"$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 +6080,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:6047: checking for gethostbyname" >&5
+echo "configure:6084: checking for gethostbyname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6050 "configure"
+#line 6087 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -6069,7 +6106,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:6110: \"$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
@@ -6090,12 +6127,12 @@
     if test $ac_cv_func_gethostbyname = no; then
       
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:6094: checking for gethostbyname in -lnsl" >&5
+echo "configure:6131: 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 6099 "configure"
+#line 6136 "configure"
 #include "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 +6143,7 @@
 gethostbyname()
 ; 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:6147: \"$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
@@ -6136,10 +6173,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:6140: checking for connect" >&5
+echo "configure:6177: checking for connect" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6143 "configure"
+#line 6180 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -6162,7 +6199,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6203: \"$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
@@ -6185,12 +6222,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:6189: checking "$xe_msg_checking"" >&5
+echo "configure:6226: 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 6194 "configure"
+#line 6231 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6201,7 +6238,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:6205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6242: \"$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
@@ -6225,10 +6262,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:6229: checking for remove" >&5
+echo "configure:6266: checking for remove" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6232 "configure"
+#line 6269 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -6251,7 +6288,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6292: \"$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
@@ -6272,12 +6309,12 @@
     if test $ac_cv_func_remove = no; then
       
 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:6276: checking for remove in -lposix" >&5
+echo "configure:6313: 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 6281 "configure"
+#line 6318 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6288,7 +6325,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:6292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6329: \"$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
@@ -6312,10 +6349,10 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:6316: checking for shmat" >&5
+echo "configure:6353: checking for shmat" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6319 "configure"
+#line 6356 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -6338,7 +6375,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -6359,12 +6396,12 @@
     if test $ac_cv_func_shmat = no; then
       
 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:6363: checking for shmat in -lipc" >&5
+echo "configure:6400: 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 6368 "configure"
+#line 6405 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6375,7 +6412,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:6379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6416: \"$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
@@ -6411,12 +6448,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:6415: checking "$xe_msg_checking"" >&5
+echo "configure:6452: 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 6420 "configure"
+#line 6457 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6427,7 +6464,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:6431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6468: \"$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
@@ -6470,19 +6507,91 @@
   MAKE_SUBDIR="$MAKE_SUBDIR lwlib" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"lwlib\" to \$MAKE_SUBDIR"; fi
   SRC_SUBDIR_DEPS="$SRC_SUBDIR_DEPS lwlib" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"lwlib\" to \$SRC_SUBDIR_DEPS"; fi
 
-      for lib_dir in "/usr/dt/lib" "/usr/lib/Motif2.1" "/usr/lib/Motif1.2" "/usr/lib/Motif1.1"; do
-    inc_dir=`echo $lib_dir | sed -e 's/lib/include/'`
-    if test -d "$lib_dir" -a -d "$inc_dir"; then
-      case "$x_libraries" in *"$lib_dir"* ) ;; *)
-        x_libraries="$lib_dir $x_libraries"
-        X_LIBS="-L${lib_dir} $X_LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-L${lib_dir}\" to \$X_LIBS"; fi ;;
-      esac
-      case "$x_includes" in "$inc_dir"* ) ;; *)
-        x_includes="$inc_dir $x_includes"
-        X_CFLAGS="-I${inc_dir} $X_CFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-I${inc_dir}\" to \$X_CFLAGS"; fi ;;
-      esac
-      break;       fi
-  done
+
+    ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
+echo "configure:6514: checking for Xm/Xm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6517 "configure"
+#include "confdefs.h"
+#include <Xm/Xm.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:6522: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
+echo "configure:6539: 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 6544 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char XmStringFree();
+
+int main() {
+XmStringFree()
+; return 0; }
+EOF
+if { (eval echo configure:6555: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+  echo "$ac_t""yes" 1>&6
+  got_motif=yes
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+  if test "$got_motif" != "yes"; then
+            for lib_dir in "/usr/dt/lib" "/usr/lib/Motif2.1" \
+                   "/usr/lib/Motif1.2" "/usr/lib/Motif1.1"; do
+      inc_dir=`echo $lib_dir | sed -e 's/lib/include/'`
+      if test -d "$lib_dir" -a -d "$inc_dir"; then
+	case "$x_libraries" in *"$lib_dir"* ) ;; *)
+	  x_libraries="$lib_dir $x_libraries"
+	  X_LIBS="-L${lib_dir} $X_LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-L${lib_dir}\" to \$X_LIBS"; fi ;;
+	esac
+	case "$x_includes" in "$inc_dir"* ) ;; *)
+	  x_includes="$inc_dir $x_includes"
+	  X_CFLAGS="-I${inc_dir} $X_CFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-I${inc_dir}\" to \$X_CFLAGS"; fi ;;
+	esac
+	break; 	fi
+    done
+  fi
 
     for rel in "X11R6" "X11R5" "X11R4"; do
     lib_dir="/usr/contrib/$rel/lib" inc_dir="/usr/contrib/$rel/include"
@@ -6594,7 +6703,7 @@
 
 
     echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:6598: checking for X defines extracted by xmkmf" >&5
+echo "configure:6707: checking for X defines extracted by xmkmf" >&5
   rm -fr conftestdir
   if mkdir conftestdir; then
     cd conftestdir
@@ -6643,15 +6752,15 @@
 
     ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:6647: checking for X11/Intrinsic.h" >&5
+echo "configure:6756: checking for X11/Intrinsic.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6650 "configure"
+#line 6759 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6764: \"$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*
@@ -6675,12 +6784,12 @@
 
       
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:6679: checking for XOpenDisplay in -lX11" >&5
+echo "configure:6788: 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 6684 "configure"
+#line 6793 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6691,7 +6800,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6804: \"$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
@@ -6716,12 +6825,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:6720: checking "$xe_msg_checking"" >&5
+echo "configure:6829: 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 6725 "configure"
+#line 6834 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6732,7 +6841,7 @@
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:6736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6845: \"$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
@@ -6759,12 +6868,12 @@
 
     
 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:6763: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:6872: 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 6768 "configure"
+#line 6877 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6775,7 +6884,7 @@
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:6779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6888: \"$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
@@ -6798,12 +6907,12 @@
 
     
 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:6802: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:6911: 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 6807 "configure"
+#line 6916 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6814,7 +6923,7 @@
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6927: \"$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
@@ -6837,14 +6946,14 @@
 
 
   echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:6841: checking the version of X11 being used" >&5
+echo "configure:6950: checking the version of X11 being used" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6843 "configure"
+#line 6952 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
     int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:6848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest foobar; x11_release=$?
 else
@@ -6875,10 +6984,10 @@
   for ac_func in XConvertCase
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6879: checking for $ac_func" >&5
+echo "configure:6988: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6882 "configure"
+#line 6991 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6901,7 +7010,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7014: \"$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
@@ -6933,15 +7042,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6937: checking for $ac_hdr" >&5
+echo "configure:7046: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6940 "configure"
+#line 7049 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7054: \"$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*
@@ -6974,10 +7083,10 @@
     for ac_func in XRegisterIMInstantiateCallback
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6978: checking for $ac_func" >&5
+echo "configure:7087: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6981 "configure"
+#line 7090 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7000,7 +7109,7 @@
 
 ; 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:7113: \"$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
@@ -7028,9 +7137,9 @@
 done
 
   echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6
-echo "configure:7032: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+echo "configure:7141: checking for standard XRegisterIMInstantiateCallback prototype" >&5
   cat > conftest.$ac_ext <<EOF
-#line 7034 "configure"
+#line 7143 "configure"
 #include "confdefs.h"
 
 #define NeedFunctionPrototypes 1
@@ -7042,7 +7151,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -7063,12 +7172,12 @@
 
     test -z "$with_xmu" && { 
 echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:7067: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:7176: 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 7072 "configure"
+#line 7181 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7079,7 +7188,7 @@
 XmuReadBitmapDataFromFile()
 ; return 0; }
 EOF
-if { (eval echo configure:7083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7192: \"$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
@@ -7118,19 +7227,19 @@
 
       
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:7122: checking for main in -lXbsd" >&5
+echo "configure:7231: 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 7127 "configure"
+#line 7236 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7243: \"$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
@@ -7167,22 +7276,22 @@
 fi 
 if test "$with_msw" != "no"; then
   echo "checking for MS-Windows" 1>&6
-echo "configure:7171: checking for MS-Windows" >&5
+echo "configure:7280: checking for MS-Windows" >&5
   
 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:7174: checking for main in -lgdi32" >&5
+echo "configure:7283: 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 7179 "configure"
+#line 7288 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7295: \"$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
@@ -7233,12 +7342,12 @@
       test "$with_widgets"    != "no" && with_widgets=msw
     fi
         cat > conftest.$ac_ext <<EOF
-#line 7237 "configure"
+#line 7346 "configure"
 #include "confdefs.h"
 #include <fcntl.h>
     int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
 EOF
-if { (eval echo configure:7242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MSG_SELECT
@@ -7299,15 +7408,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:7303: checking for X11/extensions/shape.h" >&5
+echo "configure:7412: checking for X11/extensions/shape.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7306 "configure"
+#line 7415 "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:7311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7420: \"$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*
@@ -7357,7 +7466,7 @@
 esac
 
 echo "checking for WM_COMMAND option" 1>&6
-echo "configure:7361: checking for WM_COMMAND option" >&5;
+echo "configure:7470: checking for WM_COMMAND option" >&5;
 if test "$with_wmcommand" != "no"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_WMCOMMAND
@@ -7372,15 +7481,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:7376: checking for X11/Xauth.h" >&5
+echo "configure:7485: checking for X11/Xauth.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7379 "configure"
+#line 7488 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7493: \"$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*
@@ -7403,12 +7512,12 @@
  }
 test -z "$with_xauth" && { 
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:7407: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:7516: 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 7412 "configure"
+#line 7521 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7419,7 +7528,7 @@
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:7423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7466,7 +7575,7 @@
 
 if test "$with_modules" != "no"; then
   echo "checking for module support" 1>&6
-echo "configure:7470: checking for module support" >&5
+echo "configure:7579: checking for module support" >&5
 
     if test "$with_msw" = "yes"; then
     have_dl=yes;
@@ -7483,15 +7592,15 @@
      * )
             ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:7487: checking for dlfcn.h" >&5
+echo "configure:7596: checking for dlfcn.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7490 "configure"
+#line 7599 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7604: \"$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*
@@ -7508,16 +7617,16 @@
   echo "$ac_t""yes" 1>&6
   
 	echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:7512: checking for dlopen in -lc" >&5
+echo "configure:7621: checking for dlopen in -lc" >&5
 	cat > conftest.$ac_ext <<EOF
-#line 7514 "configure"
+#line 7623 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	  dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:7521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -7526,18 +7635,18 @@
   rm -rf conftest*
   
 	  echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:7530: checking for dlopen in -ldl" >&5
+echo "configure:7639: checking for dlopen in -ldl" >&5
 	ac_save_LIBS="$LIBS"
 	LIBS="-ldl $LIBS"
 	cat > conftest.$ac_ext <<EOF
-#line 7534 "configure"
+#line 7643 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	  dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:7541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -7566,12 +7675,12 @@
       else
 	
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:7570: checking for shl_load in -ldld" >&5
+echo "configure:7679: 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 7575 "configure"
+#line 7684 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7582,7 +7691,7 @@
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:7586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7695: \"$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
@@ -7609,12 +7718,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:7613: checking for dld_init in -ldld" >&5
+echo "configure:7722: 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 7618 "configure"
+#line 7727 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7625,7 +7734,7 @@
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:7629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7738: \"$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
@@ -7670,7 +7779,7 @@
 xealias=$internal_configuration
 
 echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:7674: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:7783: checking how to build dynamic libraries for ${xehost}" >&5
 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
 case "$xehost" in
 *-*-linux-gnu*) ;;
@@ -7698,9 +7807,9 @@
   XEGCC=yes
 else
   echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:7702: checking checking whether we are using GNU C" >&5
+echo "configure:7811: checking checking whether we are using GNU C" >&5
   cat > conftest.$ac_ext <<EOF
-#line 7704 "configure"
+#line 7813 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -7722,7 +7831,7 @@
 fi
 
 echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:7726: checking how to produce PIC code" >&5
+echo "configure:7835: checking how to produce PIC code" >&5
 wl=
 
 can_build_shared=yes
@@ -7828,18 +7937,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:7832: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:7941: checking if PIC flag ${dll_cflags} really works" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $dll_cflags -DPIC"
   cat > conftest.$ac_ext <<EOF
-#line 7836 "configure"
+#line 7945 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:7843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7952: \"$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
@@ -7874,7 +7983,7 @@
 xldf=
 xcldf=
 echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:7878: checking if C compiler can produce shared libraries" >&5
+echo "configure:7987: checking if C compiler can produce shared libraries" >&5
 if test "$XEGCC" = yes; then
   xcldf="-shared"
   xldf="-shared"
@@ -7925,14 +8034,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 7929 "configure"
+#line 8038 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; 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:8045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cc_produces_so=yes
 else
@@ -7957,7 +8066,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:7961: checking for ld used by GCC" >&5
+echo "configure:8070: checking for ld used by GCC" >&5
     ac_prog=`($CC -print-prog-name=ld) 2>&5`
     case "$ac_prog" in
     # Accept absolute paths.
@@ -7983,7 +8092,7 @@
     esac
   else
     echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:7987: checking for GNU ld" >&5
+echo "configure:8096: checking for GNU ld" >&5
   fi
 
   if test -z "$LTLD"; then
@@ -8021,7 +8130,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:8025: checking if the linker is GNU ld" >&5
+echo "configure:8134: 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
@@ -8049,7 +8158,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:8053: checking whether the linker supports shared libraries" >&5
+echo "configure:8162: checking whether the linker supports shared libraries" >&5
   dll_ld=$CC
   dll_ldflags=$LDFLAGS
   ld_shlibs=yes
@@ -8257,10 +8366,10 @@
     for ac_func in dlerror _dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8261: checking for $ac_func" >&5
+echo "configure:8370: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8264 "configure"
+#line 8373 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8283,7 +8392,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8396: \"$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
@@ -8345,15 +8454,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:8349: checking for ${dir}tt_c.h" >&5
+echo "configure:8458: checking for ${dir}tt_c.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8352 "configure"
+#line 8461 "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:8357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8389,12 +8498,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:8393: checking "$xe_msg_checking"" >&5
+echo "configure:8502: 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 8398 "configure"
+#line 8507 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8405,7 +8514,7 @@
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:8409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8518: \"$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
@@ -8459,15 +8568,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:8463: checking for Dt/Dt.h" >&5
+echo "configure:8572: checking for Dt/Dt.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8466 "configure"
+#line 8575 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8580: \"$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*
@@ -8490,12 +8599,12 @@
  }
 test -z "$with_cde" && { 
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:8494: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:8603: 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 8499 "configure"
+#line 8608 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8506,7 +8615,7 @@
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:8510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8619: \"$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
@@ -8587,7 +8696,7 @@
 
 if test "$with_dragndrop" != "no" ; then
   echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
-echo "configure:8591: checking if drag and drop API is needed" >&5
+echo "configure:8700: 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
@@ -8607,19 +8716,19 @@
 fi
 
 echo "checking for LDAP" 1>&6
-echo "configure:8611: checking for LDAP" >&5
+echo "configure:8720: checking for LDAP" >&5
 ldap_libs=
 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:8615: checking for ldap.h" >&5
+echo "configure:8724: checking for ldap.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8618 "configure"
+#line 8727 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8732: \"$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*
@@ -8642,15 +8751,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:8646: checking for lber.h" >&5
+echo "configure:8755: checking for lber.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8649 "configure"
+#line 8758 "configure"
 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8654: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8763: \"$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*
@@ -8674,12 +8783,12 @@
 if test "$with_ldap" != "no"; then
   
 echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
-echo "configure:8678: checking for ldap_search in -lldap" >&5
+echo "configure:8787: 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 8683 "configure"
+#line 8792 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8690,7 +8799,7 @@
 ldap_search()
 ; return 0; }
 EOF
-if { (eval echo configure:8694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8803: \"$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
@@ -8715,12 +8824,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:8719: checking "$xe_msg_checking"" >&5
+echo "configure:8828: 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 8724 "configure"
+#line 8833 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8731,7 +8840,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:8735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8844: \"$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
@@ -8756,12 +8865,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:8760: checking "$xe_msg_checking"" >&5
+echo "configure:8869: 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 8765 "configure"
+#line 8874 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8772,7 +8881,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:8776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8885: \"$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
@@ -8797,12 +8906,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:8801: checking "$xe_msg_checking"" >&5
+echo "configure:8910: 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 8806 "configure"
+#line 8915 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8813,7 +8922,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:8817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8926: \"$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
@@ -8862,10 +8971,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:8866: checking for $ac_func" >&5
+echo "configure:8975: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8869 "configure"
+#line 8978 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8888,7 +8997,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9001: \"$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
@@ -8927,20 +9036,20 @@
 postgresql_libs=
 if test "$with_postgresql" != "no"; then
   echo "checking for PostgreSQL" 1>&6
-echo "configure:8931: checking for PostgreSQL" >&5
+echo "configure:9040: 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:8936: checking for ${header_dir}libpq-fe.h" >&5
+echo "configure:9045: checking for ${header_dir}libpq-fe.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8939 "configure"
+#line 9048 "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:8944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9053: \"$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*
@@ -8964,12 +9073,12 @@
 
   test -n "$libpq_fe_h_file" && { 
 echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:8968: checking for PQconnectdb in -lpq" >&5
+echo "configure:9077: 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 8973 "configure"
+#line 9082 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8980,7 +9089,7 @@
 PQconnectdb()
 ; return 0; }
 EOF
-if { (eval echo configure:8984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9093: \"$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
@@ -9013,12 +9122,12 @@
 
     
 echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
-echo "configure:9017: checking for PQconnectStart in -lpq" >&5
+echo "configure:9126: 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 9022 "configure"
+#line 9131 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9029,7 +9138,7 @@
 PQconnectStart()
 ; return 0; }
 EOF
-if { (eval echo configure:9033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9142: \"$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
@@ -9080,7 +9189,7 @@
 
 if test "$window_system" != "none"; then
   echo "checking for graphics libraries" 1>&6
-echo "configure:9084: checking for graphics libraries" >&5
+echo "configure:9193: checking for graphics libraries" >&5
 
       libpath_xpm=
   incpath_xpm=
@@ -9106,10 +9215,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:9110: checking for Xpm - no older than 3.4f" >&5
+echo "configure:9219: checking for Xpm - no older than 3.4f" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 9113 "configure"
+#line 9222 "configure"
 #include "confdefs.h"
 #define XPM_NUMBERS
 #include <X11/xpm.h>
@@ -9118,7 +9227,7 @@
       XpmIncludeVersion != XpmLibraryVersion() ? 1 :
       XpmIncludeVersion < 30406 ? 2 : 0 ;}
 EOF
-if { (eval echo configure:9122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9231: \"$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
@@ -9162,17 +9271,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:9166: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:9275: checking for \"FOR_MSW\" xpm" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 9169 "configure"
+#line 9278 "configure"
 #include "confdefs.h"
 
 int main() {
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:9176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   xpm_for_msw=no
 else
@@ -9198,15 +9307,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:9202: checking for compface.h" >&5
+echo "configure:9311: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9205 "configure"
+#line 9314 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9319: \"$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*
@@ -9229,12 +9338,12 @@
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:9233: checking for UnGenFace in -lcompface" >&5
+echo "configure:9342: 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 9238 "configure"
+#line 9347 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9245,7 +9354,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:9249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9358: \"$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
@@ -9294,12 +9403,12 @@
       if test "$with_png $with_tiff" != "no no"; then
     
 echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
-echo "configure:9298: checking for inflate in -lc" >&5
+echo "configure:9407: 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 9303 "configure"
+#line 9412 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9310,7 +9419,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:9314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9423: \"$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
@@ -9329,12 +9438,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:9333: checking for inflate in -lz" >&5
+echo "configure:9442: 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 9338 "configure"
+#line 9447 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9345,7 +9454,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:9349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9458: \"$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
@@ -9364,12 +9473,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:9368: checking for inflate in -lgz" >&5
+echo "configure:9477: 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 9373 "configure"
+#line 9482 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9380,7 +9489,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:9384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9493: \"$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
@@ -9410,15 +9519,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:9414: checking for jpeglib.h" >&5
+echo "configure:9523: checking for jpeglib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9417 "configure"
+#line 9526 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9531: \"$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*
@@ -9441,12 +9550,12 @@
  }
   test -z "$with_jpeg" && { 
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:9445: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:9554: 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 9450 "configure"
+#line 9559 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9457,7 +9566,7 @@
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:9461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9570: \"$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
@@ -9493,10 +9602,10 @@
 
     png_problem=""
   test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:9497: checking for pow" >&5
+echo "configure:9606: checking for pow" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9500 "configure"
+#line 9609 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pow(); below.  */
@@ -9519,7 +9628,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:9523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_pow=yes"
 else
@@ -9540,15 +9649,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:9544: checking for png.h" >&5
+echo "configure:9653: checking for png.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9547 "configure"
+#line 9656 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9552: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9661: \"$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*
@@ -9571,12 +9680,12 @@
  }
   test -z "$with_png" && { 
 echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:9575: checking for png_read_image in -lpng" >&5
+echo "configure:9684: 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 9580 "configure"
+#line 9689 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9587,7 +9696,7 @@
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:9591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9700: \"$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
@@ -9610,10 +9719,10 @@
  }
   if test -z "$with_png"; then
     echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:9614: checking for workable png version information" >&5
+echo "configure:9723: checking for workable png version information" >&5
     xe_check_libs="-lpng -lz"
     cat > conftest.$ac_ext <<EOF
-#line 9617 "configure"
+#line 9726 "configure"
 #include "confdefs.h"
 #include <png.h>
     int main(int c, char **v) {
@@ -9621,7 +9730,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:9625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9734: \"$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
@@ -9664,15 +9773,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:9668: checking for tiffio.h" >&5
+echo "configure:9777: checking for tiffio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9671 "configure"
+#line 9780 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9695,12 +9804,12 @@
  }
   test -z "$with_tiff" && { 
 echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:9699: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:9808: 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 9704 "configure"
+#line 9813 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9711,7 +9820,7 @@
 TIFFClientOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:9715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9824: \"$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
@@ -9750,15 +9859,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:9754: checking for compface.h" >&5
+echo "configure:9863: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9757 "configure"
+#line 9866 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9871: \"$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*
@@ -9781,12 +9890,12 @@
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:9785: checking for UnGenFace in -lcompface" >&5
+echo "configure:9894: 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 9790 "configure"
+#line 9899 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9797,7 +9906,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:9801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9910: \"$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
@@ -9836,7 +9945,7 @@
 
 if test "$with_x11" = "yes"; then
   echo "checking for X11 graphics libraries" 1>&6
-echo "configure:9840: checking for X11 graphics libraries" >&5
+echo "configure:9949: checking for X11 graphics libraries" >&5
 fi
 
 case "$with_widgets" in
@@ -9846,7 +9955,7 @@
 
 if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then
   echo "checking for the Athena widgets" 1>&6
-echo "configure:9850: checking for the Athena widgets" >&5
+echo "configure:9959: checking for the Athena widgets" >&5
 
     case "$with_athena" in
         "xaw" | "")	athena_variant=Xaw	athena_3d=no  ;;
@@ -9860,12 +9969,12 @@
     if test "$athena_3d" = "no"; then
     
 echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9864: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:9973: 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 9869 "configure"
+#line 9978 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9876,7 +9985,7 @@
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:9880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9989: \"$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
@@ -9892,12 +10001,12 @@
   echo "$ac_t""yes" 1>&6
           
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9896: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:10005: 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 9901 "configure"
+#line 10010 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9908,7 +10017,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:9912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10021: \"$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
@@ -9939,12 +10048,12 @@
   else
         
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9943: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:10052: 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 9948 "configure"
+#line 10057 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9955,7 +10064,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:9959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10068: \"$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
@@ -9973,12 +10082,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6
-echo "configure:9977: checking for threeDClassRec in -lXaw" >&5
+echo "configure:10086: 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 9982 "configure"
+#line 10091 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9989,7 +10098,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:9993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10102: \"$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
@@ -10020,15 +10129,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:10024: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:10133: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10027 "configure"
+#line 10136 "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:10032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10141: \"$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*
@@ -10048,15 +10157,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:10052: checking for X11/Xaw/XawInit.h" >&5
+echo "configure:10161: checking for X11/Xaw/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10055 "configure"
+#line 10164 "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:10060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10169: \"$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*
@@ -10082,15 +10191,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:10086: checking for X11/$athena_variant/XawInit.h" >&5
+echo "configure:10195: checking for X11/$athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10089 "configure"
+#line 10198 "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:10094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10203: \"$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*
@@ -10107,15 +10216,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:10111: checking for X11/$athena_variant/ThreeD.h" >&5
+echo "configure:10220: checking for X11/$athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10114 "configure"
+#line 10223 "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:10119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10228: \"$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*
@@ -10143,15 +10252,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:10147: checking for $athena_variant/XawInit.h" >&5
+echo "configure:10256: checking for $athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10150 "configure"
+#line 10259 "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:10155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10264: \"$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*
@@ -10168,15 +10277,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:10172: checking for $athena_variant/ThreeD.h" >&5
+echo "configure:10281: checking for $athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10175 "configure"
+#line 10284 "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:10180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10289: \"$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*
@@ -10205,15 +10314,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:10209: checking for X11/Xaw3d/XawInit.h" >&5
+echo "configure:10318: checking for X11/Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10212 "configure"
+#line 10321 "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:10217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10326: \"$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*
@@ -10230,15 +10339,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:10234: checking for X11/Xaw3d/ThreeD.h" >&5
+echo "configure:10343: checking for X11/Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10237 "configure"
+#line 10346 "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:10242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10351: \"$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*
@@ -10270,15 +10379,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:10274: checking for Xaw3d/XawInit.h" >&5
+echo "configure:10383: checking for Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10277 "configure"
+#line 10386 "configure"
 #include "confdefs.h"
 #include <Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10282: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10391: \"$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*
@@ -10295,15 +10404,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:10299: checking for Xaw3d/ThreeD.h" >&5
+echo "configure:10408: checking for Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10302 "configure"
+#line 10411 "configure"
 #include "confdefs.h"
 #include <Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10416: \"$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*
@@ -10335,15 +10444,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:10339: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:10448: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10342 "configure"
+#line 10451 "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:10347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10456: \"$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*
@@ -10382,15 +10491,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:10386: checking for Xm/Xm.h" >&5
+echo "configure:10495: checking for Xm/Xm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10389 "configure"
+#line 10498 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10394: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10503: \"$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*
@@ -10407,12 +10516,12 @@
   echo "$ac_t""yes" 1>&6
   
 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:10411: checking for XmStringFree in -lXm" >&5
+echo "configure:10520: 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 10416 "configure"
+#line 10525 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10423,7 +10532,7 @@
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:10427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10536: \"$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
@@ -10452,9 +10561,9 @@
 
   if test "$have_motif" = "yes"; then
         echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:10456: checking for Lesstif" >&5
+echo "configure:10565: checking for Lesstif" >&5
     cat > conftest.$ac_ext <<EOF
-#line 10458 "configure"
+#line 10567 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 #ifdef LESSTIF_VERSION
@@ -10827,7 +10936,7 @@
 
 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
-echo "configure:10831: checking for Mule-related features" >&5
+echo "configure:10940: checking for Mule-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
@@ -10841,15 +10950,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10845: checking for $ac_hdr" >&5
+echo "configure:10954: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10848 "configure"
+#line 10957 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10962: \"$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*
@@ -10880,12 +10989,12 @@
 
   
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:10884: checking for strerror in -lintl" >&5
+echo "configure:10993: 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 10889 "configure"
+#line 10998 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10896,7 +11005,7 @@
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:10900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11009: \"$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
@@ -10929,18 +11038,18 @@
 
 
   echo "checking for Mule input methods" 1>&6
-echo "configure:10933: checking for Mule input methods" >&5
+echo "configure:11042: checking for Mule input methods" >&5
         case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6
-echo "configure:10936: checking for XIM" >&5
+echo "configure:11045: checking for XIM" >&5
     
 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:10939: checking for XOpenIM in -lX11" >&5
+echo "configure:11048: 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 10944 "configure"
+#line 11053 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10951,7 +11060,7 @@
 XOpenIM()
 ; return 0; }
 EOF
-if { (eval echo configure:10955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11064: \"$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
@@ -10975,12 +11084,12 @@
         if test "$have_motif $have_lesstif" = "yes no"; then
       
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:10979: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:11088: 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 10984 "configure"
+#line 11093 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10991,7 +11100,7 @@
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:10995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11104: \"$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
@@ -11056,15 +11165,15 @@
 
     if test "$with_xfs" = "yes" ; then
     echo "checking for XFontSet" 1>&6
-echo "configure:11060: checking for XFontSet" >&5
+echo "configure:11169: checking for XFontSet" >&5
     
 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:11063: checking for XmbDrawString in -lX11" >&5
+echo "configure:11172: 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 11068 "configure"
+#line 11177 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11075,7 +11184,7 @@
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:11079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11188: \"$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
@@ -11115,15 +11224,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:11119: checking for wnn/jllib.h" >&5
+echo "configure:11228: checking for wnn/jllib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11122 "configure"
+#line 11231 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11236: \"$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*
@@ -11146,15 +11255,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:11150: checking for wnn/commonhd.h" >&5
+echo "configure:11259: checking for wnn/commonhd.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11153 "configure"
+#line 11262 "configure"
 #include "confdefs.h"
 #include <wnn/commonhd.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11267: \"$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*
@@ -11179,10 +11288,10 @@
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11183: checking for $ac_func" >&5
+echo "configure:11292: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11186 "configure"
+#line 11295 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11205,7 +11314,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11318: \"$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
@@ -11234,12 +11343,12 @@
 
     test "$ac_cv_func_crypt" != "yes" && { 
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:11238: checking for crypt in -lcrypt" >&5
+echo "configure:11347: 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 11243 "configure"
+#line 11352 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11250,7 +11359,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:11254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11363: \"$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
@@ -11285,12 +11394,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:11289: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:11398: 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 11294 "configure"
+#line 11403 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11301,7 +11410,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:11305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11414: \"$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
@@ -11319,12 +11428,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:11323: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:11432: 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 11328 "configure"
+#line 11437 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11335,7 +11444,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:11339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11448: \"$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
@@ -11353,12 +11462,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:11357: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:11466: 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 11362 "configure"
+#line 11471 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11369,7 +11478,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:11373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11482: \"$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
@@ -11387,12 +11496,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:11391: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:11500: 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 11396 "configure"
+#line 11505 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11403,7 +11512,7 @@
 dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:11407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11516: \"$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
@@ -11448,12 +11557,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:11452: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:11561: 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 11457 "configure"
+#line 11566 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11464,7 +11573,7 @@
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:11468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11577: \"$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
@@ -11499,15 +11608,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:11503: checking for canna/jrkanji.h" >&5
+echo "configure:11612: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11506 "configure"
+#line 11615 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11620: \"$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*
@@ -11534,15 +11643,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:11538: checking for canna/jrkanji.h" >&5
+echo "configure:11647: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11541 "configure"
+#line 11650 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11546: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11655: \"$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*
@@ -11570,15 +11679,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:11574: checking for canna/RK.h" >&5
+echo "configure:11683: checking for canna/RK.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11577 "configure"
+#line 11686 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11691: \"$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*
@@ -11601,12 +11710,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:11605: checking for RkBgnBun in -lRKC" >&5
+echo "configure:11714: 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 11610 "configure"
+#line 11719 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11617,7 +11726,7 @@
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:11621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11730: \"$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
@@ -11640,12 +11749,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:11644: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:11753: 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 11649 "configure"
+#line 11758 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11656,7 +11765,7 @@
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:11660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11769: \"$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
@@ -11702,12 +11811,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:11706: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:11815: 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 11711 "configure"
+#line 11820 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11718,7 +11827,7 @@
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:11722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11831: \"$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
@@ -11805,10 +11914,10 @@
 for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror strlwr strupr symlink tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask wcslen wcscmp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11809: checking for $ac_func" >&5
+echo "configure:11918: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11812 "configure"
+#line 11921 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11831,7 +11940,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11944: \"$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
@@ -11872,10 +11981,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:11876: checking for $ac_func" >&5
+echo "configure:11985: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11879 "configure"
+#line 11988 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11898,7 +12007,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12011: \"$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
@@ -11927,10 +12036,10 @@
 
 
 echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:11931: checking for openpty" >&5
+echo "configure:12040: checking for openpty" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11934 "configure"
+#line 12043 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char openpty(); below.  */
@@ -11953,7 +12062,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12066: \"$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
@@ -11972,12 +12081,12 @@
 
   
 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:11976: checking for openpty in -lutil" >&5
+echo "configure:12085: 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 11981 "configure"
+#line 12090 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11988,7 +12097,7 @@
 openpty()
 ; return 0; }
 EOF
-if { (eval echo configure:11992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12101: \"$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
@@ -12023,15 +12132,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12027: checking for $ac_hdr" >&5
+echo "configure:12136: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12030 "configure"
+#line 12139 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12144: \"$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*
@@ -12068,15 +12177,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12072: checking for $ac_hdr" >&5
+echo "configure:12181: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12075 "configure"
+#line 12184 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12189: \"$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*
@@ -12109,15 +12218,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12113: checking for $ac_hdr" >&5
+echo "configure:12222: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12116 "configure"
+#line 12225 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12121: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12230: \"$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*
@@ -12150,15 +12259,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12154: checking for $ac_hdr" >&5
+echo "configure:12263: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12157 "configure"
+#line 12266 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12271: \"$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*
@@ -12194,15 +12303,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12198: checking for $ac_hdr" >&5
+echo "configure:12307: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12201 "configure"
+#line 12310 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12315: \"$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*
@@ -12235,10 +12344,10 @@
   for ac_func in isastream
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12239: checking for $ac_func" >&5
+echo "configure:12348: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12242 "configure"
+#line 12351 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12261,7 +12370,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12374: \"$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
@@ -12292,15 +12401,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12296: checking for $ac_hdr" >&5
+echo "configure:12405: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12299 "configure"
+#line 12408 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12413: \"$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*
@@ -12333,10 +12442,10 @@
 for ac_func in getloadavg
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12337: checking for $ac_func" >&5
+echo "configure:12446: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12340 "configure"
+#line 12449 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12359,7 +12468,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12472: \"$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
@@ -12392,15 +12501,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12396: checking for $ac_hdr" >&5
+echo "configure:12505: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12399 "configure"
+#line 12508 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12436,12 +12545,12 @@
 
     
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:12440: checking for kstat_open in -lkstat" >&5
+echo "configure:12549: 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 12445 "configure"
+#line 12554 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12452,7 +12561,7 @@
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:12456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12565: \"$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
@@ -12487,15 +12596,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12491: checking for $ac_hdr" >&5
+echo "configure:12600: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12494 "configure"
+#line 12603 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12608: \"$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*
@@ -12527,12 +12636,12 @@
 
     
 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:12531: checking for kvm_read in -lkvm" >&5
+echo "configure:12640: 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 12536 "configure"
+#line 12645 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12543,7 +12652,7 @@
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:12547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12656: \"$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
@@ -12577,16 +12686,16 @@
 fi
 
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:12581: checking whether netdb declares h_errno" >&5
+echo "configure:12690: checking whether netdb declares h_errno" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12583 "configure"
+#line 12692 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:12590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12699: \"$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
@@ -12606,16 +12715,16 @@
 rm -f conftest*
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:12610: checking for sigsetjmp" >&5
+echo "configure:12719: checking for sigsetjmp" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12612 "configure"
+#line 12721 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:12619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12728: \"$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
@@ -12635,11 +12744,11 @@
 rm -f conftest*
 
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:12639: checking whether localtime caches TZ" >&5
+echo "configure:12748: checking whether localtime caches TZ" >&5
 
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 12643 "configure"
+#line 12752 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
@@ -12674,7 +12783,7 @@
   exit (0);
 }
 EOF
-if { (eval echo configure:12678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
@@ -12704,9 +12813,9 @@
 
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:12708: checking whether gettimeofday accepts one or two arguments" >&5
+echo "configure:12817: checking whether gettimeofday accepts one or two arguments" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12710 "configure"
+#line 12819 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -12727,7 +12836,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12840: \"$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
@@ -12749,19 +12858,19 @@
 
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:12753: checking for inline" >&5
+echo "configure:12862: checking for inline" >&5
 
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 12758 "configure"
+#line 12867 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:12765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -12802,17 +12911,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:12806: checking for working alloca.h" >&5
+echo "configure:12915: checking for working alloca.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12809 "configure"
+#line 12918 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:12816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12925: \"$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
@@ -12836,10 +12945,10 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:12840: checking for alloca" >&5
+echo "configure:12949: checking for alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12843 "configure"
+#line 12952 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -12867,7 +12976,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:12871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12980: \"$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
@@ -12906,10 +13015,10 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:12910: checking whether alloca needs Cray hooks" >&5
+echo "configure:13019: checking whether alloca needs Cray hooks" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12913 "configure"
+#line 13022 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -12933,10 +13042,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:12937: checking for $ac_func" >&5
+echo "configure:13046: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12940 "configure"
+#line 13049 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12959,7 +13068,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13072: \"$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
@@ -12989,10 +13098,10 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:12993: checking stack direction for C alloca" >&5
+echo "configure:13102: checking stack direction for C alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12996 "configure"
+#line 13105 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -13011,7 +13120,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:13015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
@@ -13040,9 +13149,9 @@
 fi
 
 echo $ac_n "checking for working alloca in function calls""... $ac_c" 1>&6
-echo "configure:13044: checking for working alloca in function calls" >&5
+echo "configure:13153: checking for working alloca in function calls" >&5
 cat > conftest.$ac_ext <<EOF
-#line 13046 "configure"
+#line 13155 "configure"
 #include "confdefs.h"
 
 #if defined (__CYGWIN__)
@@ -13095,7 +13204,7 @@
 }
 
 EOF
-if { (eval echo configure:13099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   working_alloca_in_function_calls=yes
 else
@@ -13118,10 +13227,10 @@
 
 
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:13122: checking for working strcoll" >&5
+echo "configure:13231: checking for working strcoll" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13125 "configure"
+#line 13234 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -13131,7 +13240,7 @@
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:13135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
@@ -13159,10 +13268,10 @@
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13163: checking for $ac_func" >&5
+echo "configure:13272: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13166 "configure"
+#line 13275 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -13185,7 +13294,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13298: \"$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
@@ -13213,10 +13322,10 @@
 done
 
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:13217: checking whether getpgrp takes no argument" >&5
+echo "configure:13326: checking whether getpgrp takes no argument" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13220 "configure"
+#line 13329 "configure"
 #include "confdefs.h"
 
 /*
@@ -13271,7 +13380,7 @@
 }
 
 EOF
-if { (eval echo configure:13275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_getpgrp_void=yes
 else
@@ -13298,10 +13407,10 @@
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:13302: checking for working mmap" >&5
+echo "configure:13411: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 13305 "configure"
+#line 13414 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -13334,7 +13443,7 @@
   return 1;
 }
 EOF
-if { (eval echo configure:13338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   have_mmap=yes
 else
@@ -13363,9 +13472,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:13367: checking for M_MMAP_THRESHOLD" >&5
+echo "configure:13476: checking for M_MMAP_THRESHOLD" >&5
     cat > conftest.$ac_ext <<EOF
-#line 13369 "configure"
+#line 13478 "configure"
 #include "confdefs.h"
 #include <malloc.h>
 int main() {
@@ -13377,7 +13486,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   rel_alloc=no; echo "$ac_t""yes" 1>&6;
 else
@@ -13402,15 +13511,15 @@
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:13406: checking for termios.h" >&5
+echo "configure:13515: checking for termios.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13409 "configure"
+#line 13518 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13523: \"$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*
@@ -13453,15 +13562,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:13457: checking for termio.h" >&5
+echo "configure:13566: checking for termio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13460 "configure"
+#line 13569 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13574: \"$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*
@@ -13493,10 +13602,10 @@
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:13497: checking for socket" >&5
+echo "configure:13606: checking for socket" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13500 "configure"
+#line 13609 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -13519,7 +13628,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13632: \"$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
@@ -13534,15 +13643,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:13538: checking for netinet/in.h" >&5
+echo "configure:13647: checking for netinet/in.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13541 "configure"
+#line 13650 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13546: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13655: \"$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*
@@ -13559,15 +13668,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:13563: checking for arpa/inet.h" >&5
+echo "configure:13672: checking for arpa/inet.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13566 "configure"
+#line 13675 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13680: \"$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*
@@ -13592,9 +13701,9 @@
 }
 
       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:13596: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:13705: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 13598 "configure"
+#line 13707 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13605,7 +13714,7 @@
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:13609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13718: \"$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
@@ -13623,9 +13732,9 @@
 fi
 rm -f conftest*
       echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:13627: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:13736: checking "for ip_mreq struct in netinet/in.h"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 13629 "configure"
+#line 13738 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13635,7 +13744,7 @@
 static struct ip_mreq x;
 ; return 0; }
 EOF
-if { (eval echo configure:13639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13748: \"$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
@@ -13666,10 +13775,10 @@
 
 
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:13670: checking for msgget" >&5
+echo "configure:13779: checking for msgget" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13673 "configure"
+#line 13782 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
@@ -13692,7 +13801,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13805: \"$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
@@ -13707,15 +13816,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:13711: checking for sys/ipc.h" >&5
+echo "configure:13820: checking for sys/ipc.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13714 "configure"
+#line 13823 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13828: \"$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*
@@ -13732,15 +13841,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:13736: checking for sys/msg.h" >&5
+echo "configure:13845: checking for sys/msg.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13739 "configure"
+#line 13848 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13853: \"$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*
@@ -13778,15 +13887,15 @@
 
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:13782: checking for dirent.h" >&5
+echo "configure:13891: checking for dirent.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13785 "configure"
+#line 13894 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13899: \"$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*
@@ -13813,15 +13922,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:13817: checking for sys/dir.h" >&5
+echo "configure:13926: checking for sys/dir.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13820 "configure"
+#line 13929 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13934: \"$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*
@@ -13854,15 +13963,15 @@
 
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:13858: checking for nlist.h" >&5
+echo "configure:13967: checking for nlist.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13861 "configure"
+#line 13970 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13975: \"$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*
@@ -13892,22 +14001,22 @@
 
 
 echo "checking "for sound support"" 1>&6
-echo "configure:13896: checking "for sound support"" >&5
+echo "configure:14005: 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:13903: checking for multimedia/audio_device.h" >&5
+echo "configure:14012: checking for multimedia/audio_device.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13906 "configure"
+#line 14015 "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:13911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14020: \"$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*
@@ -13955,12 +14064,12 @@
       if test -z "$native_sound_lib"; then
         
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:13959: checking for ALopenport in -laudio" >&5
+echo "configure:14068: 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 13964 "configure"
+#line 14073 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13971,7 +14080,7 @@
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:13975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14084: \"$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
@@ -14002,12 +14111,12 @@
       if test -z "$native_sound_lib"; then
 	
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:14006: checking for AOpenAudio in -lAlib" >&5
+echo "configure:14115: 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 14011 "configure"
+#line 14120 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14018,7 +14127,7 @@
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:14022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14131: \"$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
@@ -14066,15 +14175,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:14070: checking for ${dir}/soundcard.h" >&5
+echo "configure:14179: checking for ${dir}/soundcard.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14073 "configure"
+#line 14182 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14078: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14187: \"$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*
@@ -14128,15 +14237,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:14132: checking for audio/audiolib.h" >&5
+echo "configure:14241: checking for audio/audiolib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14135 "configure"
+#line 14244 "configure"
 #include "confdefs.h"
 #include <audio/audiolib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14249: \"$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*
@@ -14154,12 +14263,12 @@
   
     
 echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6
-echo "configure:14158: checking for AuOpenServer in -laudio" >&5
+echo "configure:14267: 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 14163 "configure"
+#line 14272 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14170,7 +14279,7 @@
 AuOpenServer()
 ; return 0; }
 EOF
-if { (eval echo configure:14174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14283: \"$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
@@ -14209,7 +14318,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 14213 "configure"
+#line 14322 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
@@ -14240,7 +14349,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:14244: checking for $ac_word" >&5
+echo "configure:14353: 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.
@@ -14269,10 +14378,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:14273: checking for esd_play_stream" >&5
+echo "configure:14382: checking for esd_play_stream" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14276 "configure"
+#line 14385 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char esd_play_stream(); below.  */
@@ -14295,7 +14404,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_esd_play_stream=yes"
 else
@@ -14346,7 +14455,7 @@
 
 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:14350: checking for TTY-related features" >&5
+echo "configure:14459: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
@@ -14359,12 +14468,12 @@
     if test -z "$with_ncurses"; then
     
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:14363: checking for tgetent in -lncurses" >&5
+echo "configure:14472: 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 14368 "configure"
+#line 14477 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14375,7 +14484,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:14379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14488: \"$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
@@ -14408,15 +14517,15 @@
 
     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:14412: checking for ncurses/curses.h" >&5
+echo "configure:14521: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14415 "configure"
+#line 14524 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14529: \"$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*
@@ -14438,15 +14547,15 @@
 
     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:14442: checking for ncurses/term.h" >&5
+echo "configure:14551: checking for ncurses/term.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14445 "configure"
+#line 14554 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14559: \"$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*
@@ -14476,15 +14585,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:14480: checking for ncurses/curses.h" >&5
+echo "configure:14589: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14483 "configure"
+#line 14592 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14597: \"$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*
@@ -14519,12 +14628,12 @@
 	for lib in curses termlib termcap; do
 	  
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:14523: checking for tgetent in -l$lib" >&5
+echo "configure:14632: 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 14528 "configure"
+#line 14637 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14535,7 +14644,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:14539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14648: \"$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
@@ -14566,12 +14675,12 @@
       else
 	
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:14570: checking for tgetent in -lcurses" >&5
+echo "configure:14679: 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 14575 "configure"
+#line 14684 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14582,7 +14691,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:14586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14695: \"$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
@@ -14600,12 +14709,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:14604: checking for tgetent in -ltermcap" >&5
+echo "configure:14713: 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 14609 "configure"
+#line 14718 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14616,7 +14725,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:14620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14729: \"$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
@@ -14664,15 +14773,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:14668: checking for gpm.h" >&5
+echo "configure:14777: checking for gpm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14671 "configure"
+#line 14780 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14785: \"$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*
@@ -14695,12 +14804,12 @@
  }
   test -z "$with_gpm" && { 
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:14699: checking for Gpm_Open in -lgpm" >&5
+echo "configure:14808: 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 14704 "configure"
+#line 14813 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14711,7 +14820,7 @@
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:14715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14824: \"$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
@@ -14754,20 +14863,20 @@
 
 test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
   != "no no no" && echo "checking for database support" 1>&6
-echo "configure:14758: checking for database support" >&5
+echo "configure:14867: 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:14763: checking for ndbm.h" >&5
+echo "configure:14872: checking for ndbm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14766 "configure"
+#line 14875 "configure"
 #include "confdefs.h"
 #include <ndbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14880: \"$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*
@@ -14797,12 +14906,12 @@
 if test "$with_database_gdbm" != "no"; then
   
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:14801: checking for dbm_open in -lgdbm" >&5
+echo "configure:14910: 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 14806 "configure"
+#line 14915 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14813,7 +14922,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:14817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14926: \"$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
@@ -14841,10 +14950,10 @@
 
 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:14845: checking for dbm_open" >&5
+echo "configure:14954: checking for dbm_open" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14848 "configure"
+#line 14957 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -14867,7 +14976,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14980: \"$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
@@ -14886,12 +14995,12 @@
 
     
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:14890: checking for dbm_open in -ldbm" >&5
+echo "configure:14999: 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 14895 "configure"
+#line 15004 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14902,7 +15011,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:14906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15015: \"$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
@@ -14943,10 +15052,10 @@
 
 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:14947: checking for Berkeley db.h" >&5
+echo "configure:15056: checking for Berkeley db.h" >&5
   for header in "db/db.h" "db.h"; do
     cat > conftest.$ac_ext <<EOF
-#line 14950 "configure"
+#line 15059 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14968,7 +15077,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_file="$header"; break
 else
@@ -14984,9 +15093,9 @@
 
   if test "$with_database_berkdb" != "no"; then
     echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:14988: checking for Berkeley DB version" >&5
+echo "configure:15097: checking for Berkeley DB version" >&5
     cat > conftest.$ac_ext <<EOF
-#line 14990 "configure"
+#line 15099 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 1
@@ -14998,7 +15107,7 @@
   egrep "yes" >/dev/null 2>&1; then
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 15002 "configure"
+#line 15111 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 2
@@ -15009,26 +15118,45 @@
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "yes" >/dev/null 2>&1; then
   rm -rf conftest*
-  echo "$ac_t""3" 1>&6; dbfunc=db_create
+  cat > conftest.$ac_ext <<EOF
+#line 15123 "configure"
+#include "confdefs.h"
+#include <$db_h_file>
+#if DB_VERSION_MAJOR > 3
+yes
+#endif
+
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  echo "$ac_t""4" 1>&6; dbfunc=db_create; dbver=4
 else
   rm -rf conftest*
   
-    echo "$ac_t""2" 1>&6; dbfunc=db_open
+    echo "$ac_t""3" 1>&6; dbfunc=db_create; dbver=3
 fi
 rm -f conftest*
 
 else
   rm -rf conftest*
   
-    echo "$ac_t""1" 1>&6; dbfunc=dbopen
+    echo "$ac_t""2" 1>&6; dbfunc=db_open; dbver=2
+fi
+rm -f conftest*
+
+else
+  rm -rf conftest*
+  
+    echo "$ac_t""1" 1>&6; dbfunc=dbopen; dbver=1
 fi
 rm -f conftest*
 
     echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:15029: checking for $dbfunc" >&5
+echo "configure:15157: checking for $dbfunc" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 15032 "configure"
+#line 15160 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $dbfunc(); below.  */
@@ -15051,7 +15179,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:15055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15183: \"$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
@@ -15070,12 +15198,12 @@
 
     
 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:15074: checking for $dbfunc in -ldb" >&5
+echo "configure:15202: 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 15079 "configure"
+#line 15207 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15086,7 +15214,7 @@
 $dbfunc()
 ; return 0; }
 EOF
-if { (eval echo configure:15090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15218: \"$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
@@ -15110,6 +15238,54 @@
 
   fi
 
+    if test "$with_database_berkdb" != "yes" -a "$dbver" = "4"; then
+    rm -f $tempcname
+    echo "#include <$db_h_file>" > $tempcname
+    echo "configure___ dbfunc=db_create" >> $tempcname
+            eval `$CPP -Isrc $tempcname \
+	| sed -n -e "s/[ 	]*=[ 	\"]*/='/" -e "s/[ 	\"]*\$/'/" -e "s/^configure___//p"`
+        rm -f $tempcname
+    echo "configure: warning: "db_create is really $dbfunc"" 1>&2
+    
+echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
+echo "configure:15252: 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 15257 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $dbfunc();
+
+int main() {
+$dbfunc()
+; return 0; }
+EOF
+if { (eval echo configure:15268: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+  echo "$ac_t""yes" 1>&6
+  with_database_berkdb=yes need_libdb=yes
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+  fi
+
   if test "$with_database_berkdb" = "yes"; then
     { test "$extra_verbose" = "yes" && cat << EOF
     Defining DB_H_FILE = "$db_h_file"
@@ -15147,12 +15323,12 @@
 if test "$with_socks" = "yes"; then
   
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:15151: checking for SOCKSinit in -lsocks" >&5
+echo "configure:15327: 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 15156 "configure"
+#line 15332 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15163,7 +15339,7 @@
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:15167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15343: \"$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
@@ -15217,11 +15393,11 @@
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 15221 "configure"
+#line 15397 "configure"
 #include "confdefs.h"
 int main(int c,char *v[]){return 0;}
 EOF
-if { (eval echo configure:15225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:15401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
Index: configure.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.in,v
retrieving revision 1.195
retrieving revision 1.201
diff -u -r1.195 -r1.201
--- configure.in	24 Apr 2003 05:26:42 -0000	1.195
+++ configure.in	10 May 2003 02:57:07 -0000	1.201
@@ -332,9 +332,11 @@
 dnl apply * to a \( \) group.  Bleah.
 progname="`echo $0 | sed 's:^\./\./:\./:'`"
 
-dnl -----------------------------
+dnl -----------------------------------------------------------------
 dnl Establish some default values
-dnl -----------------------------
+dnl Some switches have idiosyncratic syntax, but in most cases a null
+dnl value means to autodetect
+dnl -----------------------------------------------------------------
 
 XE_APPEND(lib-src, MAKE_SUBDIR)
 XE_APPEND(lib-src, INSTALL_ARCH_DEP_SUBDIR)
@@ -380,6 +382,10 @@
 rel_alloc='default'
 with_system_malloc='default'
 with_dlmalloc='default'
+dnl ESD Considered Harmful (plays nasty games with interrupts)
+with_native_sound=''
+with_nas_sound=''
+with_esd_sound='no'
 native_sound_lib=''
 dnl These should be set to the empty string when we want gtk / gnome to
 dnl be auto-detected instead of manually specified.
@@ -389,17 +395,17 @@
 dnl world have core dumps turned off by default or \"cannot find where the
 dnl core file went\".  At least we should get some useful output ...
 use_assertions="yes"
-dnl the following is set to yes or no later.
 with_toolbars=""
 with_tty=""
 use_union_type="no"
 with_dnet=""
-dnl pdump defaults per opsys
+dnl pdump defaults per opsys, do not default it here
 pdump=""
-dnl dragndrop is still experimental, except on Windows.  When it is stable, comment out the following line:
+dnl dragndrop is still experimental, except on Windows.  When it is stable,
+dnl comment out the following line:
 with_dragndrop_default="no"
 dnl Too annoying, even if mandated by IPv6 (and I'm not even sure of that)
-dnl #### Change this to yes when somebody understands IPv6 and handle bugs.
+dnl Change this to yes when somebody understands IPv6 and handle bugs.
 with_ipv6_cname="no"
 
 dnl ------------------
@@ -1248,7 +1254,6 @@
   dnl Darwin, a.k.a. MacOS X (based on Mach and Freebsd)
   *-*-darwin*)
     opsys=darwin
-    RANLIB="ranlib -c" dnl Avoids a link error with lwlib-config.c
     ;;
 
   dnl Data General AViiON Machines
@@ -1609,9 +1614,9 @@
 
 if test -z "$pdump"; then
   case "$opsys" in
-    linux* )  pdump=yes ;;    dnl glibc 2.3.1 seems to hose unexec
-    darwin )  pdump=yes ;;    dnl No "native" working dumper available
-    *)        pdump=no ;;
+    linux* )  pdump=yes ;;          dnl glibc 2.3.1 seems to hose unexec
+    darwin )  pdump=yes ;;          dnl No "native" working dumper available
+    * )       pdump=no ;;
   esac
 fi
 
@@ -1638,8 +1643,11 @@
   esac
 fi
 
-dnl Use xlc by default on AIX
-case "$opsys" in aix*) NON_GNU_CC=xlc ;; esac
+dnl Tools configuration
+case "$opsys" in
+  aix* )   NON_GNU_CC=xlc ;;      dnl Use xlc by default on AIX
+  darwin ) RANLIB="ranlib -c" ;;  dnl Avoid link error in lwlib-config.c
+esac
 
 stack_trace_eye_catcher=`echo ${PROGNAME}_${version}_${canonical} | sed 'y/.-/__/'`
 AC_DEFINE_UNQUOTED(STACK_TRACE_EYE_CATCHER, $stack_trace_eye_catcher)
@@ -2525,6 +2533,16 @@
 AC_TYPE_OFF_T
 AC_CHECK_TYPE(ssize_t, int)
 
+dnl not AC_CHECK_TYPE; lisp.h does hairy conditional typedef
+if test "$ac_cv_header_inttypes_h" != "yes"; then
+AC_MSG_CHECKING(for intptr_t in sys/types.h)
+AC_TRY_COMPILE([#include <sys/types.h>
+intptr_t x;
+],[],[AC_MSG_RESULT(yes)
+      AC_DEFINE(HAVE_INTPTR_T_IN_SYS_TYPES_H,1)],
+     [AC_MSG_RESULT(no)])
+fi
+
 dnl check for Unix98 socklen_t
 AC_MSG_CHECKING(for socklen_t)
 AC_TRY_COMPILE([#include <sys/types.h>
@@ -2827,22 +2845,29 @@
   XE_APPEND(lwlib, MAKE_SUBDIR)
   XE_APPEND(lwlib, SRC_SUBDIR_DEPS)
 
-  dnl Try to find Motif/CDE/Tooltalk dirs
-  dnl These take precedence over other X libs/includes, so PRE-pend
-  for lib_dir in "/usr/dt/lib" "/usr/lib/Motif2.1" "/usr/lib/Motif1.2" "/usr/lib/Motif1.1"; do
-    inc_dir=`echo $lib_dir | sed -e 's/lib/include/'`
-    if test -d "$lib_dir" -a -d "$inc_dir"; then
-      case "$x_libraries" in *"$lib_dir"* ) ;; *)
-        x_libraries="$lib_dir $x_libraries"
-        XE_PREPEND(-L${lib_dir}, X_LIBS) ;;
-      esac
-      case "$x_includes" in "$inc_dir"* ) ;; *)
-        x_includes="$inc_dir $x_includes"
-        XE_PREPEND(-I${inc_dir}, X_CFLAGS) ;;
-      esac
-      break; dnl only need ONE Motif implementation!
-      fi
-  done
+
+  dnl Look for Motif, but only if not found in $x_includes and $x_libraries
+  AC_CHECK_HEADER(Xm/Xm.h, [AC_CHECK_LIB(Xm, XmStringFree, got_motif=yes)])
+
+  if test "$got_motif" != "yes"; then
+    dnl Try to find Motif/CDE/Tooltalk dirs
+    dnl These take precedence over other X libs/includes, so PRE-pend
+    for lib_dir in "/usr/dt/lib" "/usr/lib/Motif2.1" \
+                   "/usr/lib/Motif1.2" "/usr/lib/Motif1.1"; do
+      inc_dir=`echo $lib_dir | sed -e 's/lib/include/'`
+      if test -d "$lib_dir" -a -d "$inc_dir"; then
+	case "$x_libraries" in *"$lib_dir"* ) ;; *)
+	  x_libraries="$lib_dir $x_libraries"
+	  XE_PREPEND(-L${lib_dir}, X_LIBS) ;;
+	esac
+	case "$x_includes" in "$inc_dir"* ) ;; *)
+	  x_includes="$inc_dir $x_includes"
+	  XE_PREPEND(-I${inc_dir}, X_CFLAGS) ;;
+	esac
+	break; dnl only need ONE Motif implementation!
+	fi
+    done
+  fi
 
   dnl Contrib X libs/includes do NOT take precedence, so AP-pend
   for rel in "X11R6" "X11R5" "X11R4"; do
@@ -4621,11 +4646,32 @@
 #if DB_VERSION_MAJOR > 2
 yes
 #endif
-], [AC_MSG_RESULT(3); dbfunc=db_create],[
-    AC_MSG_RESULT(2); dbfunc=db_open])],[
-    AC_MSG_RESULT(1); dbfunc=dbopen])
+], [AC_EGREP_CPP(yes,
+[#include <$db_h_file>
+#if DB_VERSION_MAJOR > 3
+yes
+#endif
+], [AC_MSG_RESULT(4); dbfunc=db_create; dbver=4],[
+    AC_MSG_RESULT(3); dbfunc=db_create; dbver=3])],[
+    AC_MSG_RESULT(2); dbfunc=db_open; dbver=2])],[
+    AC_MSG_RESULT(1); dbfunc=dbopen; dbver=1])
     AC_CHECK_FUNC($dbfunc,     with_database_berkdb=yes need_libdb=no, [
     AC_CHECK_LIB(db, $dbfunc,  with_database_berkdb=yes need_libdb=yes)])
+  fi
+
+  dnl Berk db 4.1 decorates public functions with version information
+  if test "$with_database_berkdb" != "yes" -a "$dbver" = "4"; then
+    rm -f $tempcname
+    echo "#include <$db_h_file>" > $tempcname
+    echo "configure___ dbfunc=db_create" >> $tempcname
+    define(TAB, [	])dnl
+    changequote(, )dnl
+    eval `$CPP -Isrc $tempcname \
+	| sed -n -e "s/[ TAB]*=[ TAB\"]*/='/" -e "s/[ TAB\"]*\$/'/" -e "s/^configure___//p"`
+    changequote([, ])dnl
+    rm -f $tempcname
+    AC_MSG_WARN("db_create is really $dbfunc")
+    AC_CHECK_LIB(db, $dbfunc,  with_database_berkdb=yes need_libdb=yes)
   fi
 
   if test "$with_database_berkdb" = "yes"; then
Index: configure.usage
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.usage,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- configure.usage	15 Feb 2003 10:16:14 -0000	1.31
+++ configure.usage	7 May 2003 08:34:16 -0000	1.32
@@ -198,7 +198,8 @@
                         The first type can be `none' or `all'.  `none' means
                         `nonative,nonas,noesd'.  `all' means `native,nas,esd'.
                         Later options override earlier ones for the same TYPE.
-                        The default is to autodetect all sound support.
+                        The default is to autodetect all sound support except 
+                        for ESD which defaults to off.
 --native-sound-lib=LIB  Native sound support library.  Needed on Suns
                         with `--with-sound=native,nas' because both sound
                         libraries are called libaudio.
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.415
retrieving revision 1.431
diff -u -r1.415 -r1.431
--- version.sh	24 Apr 2003 23:41:31 -0000	1.415
+++ version.sh	10 May 2003 08:53:26 -0000	1.431
@@ -2,8 +2,8 @@
 emacs_is_beta=t
 emacs_major_version=21
 emacs_minor_version=5
-emacs_beta_version=12
-xemacs_codename="carrot"
+emacs_beta_version=13
+xemacs_codename="cauliflower"
 xemacs_extra_name=
 emacs_kit_version=
 infodock_major_version=4
Index: etc/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.24
diff -u -r1.22 -r1.24
--- etc/ChangeLog	24 Apr 2003 23:41:34 -0000	1.22
+++ etc/ChangeLog	10 May 2003 08:53:29 -0000	1.24
@@ -1,3 +1,14 @@
+2003-05-10  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.13 "cauliflower" is released.
+
+2003-05-03  Steve Youngs  <youngs@xemacs.org>
+
+	* package-index.LATEST.gpg: Updated to current reality.
+
+	* package-index.LATEST.pgp: Removed, 21.5 uses
+	'package-index.LATEST.gpg'. 
+
 2003-04-24  Steve Youngs  <youngs@xemacs.org>
 
 	* XEmacs 21.5.12 "carrot" is released.
Index: etc/package-index.LATEST.gpg
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/package-index.LATEST.gpg,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- etc/package-index.LATEST.gpg	21 Jul 2002 04:51:07 -0000	1.5
+++ etc/package-index.LATEST.gpg	2 May 2003 23:12:16 -0000	1.6
@@ -4,23 +4,287 @@
 ;; Package Index file -- Do not edit manually.
 ;;;@@@
 (package-get-update-base-entry (quote
-(ess
+(ecb
+  (standards-version 1.1
+   version "1.06"
+   author-version "1.93"
+   date "2002-12-06"
+   build-date "2002-12-06"
+   maintainer "Klaus Berndl <klaus.berndl@sdm.de>"
+   distribution xemacs
+   priority low
+   category "standard"
+   dump nil
+   description "Emacs source code browser."
+   filename "ecb-1.06-pkg.tar.gz"
+   md5sum "dcb59b7b57b89bfc151bd03c7839f2b6"
+   size 438192
+   provides (ecb-buffertab ecb-compilation ecb-cycle ecb ecb-eshell ecb-face ecb-help ecb-layout ecb-mode-line ecb-navigate ecb-speedbar ecb-upgrade ecb-util tree-buffer)
+   requires (xemacs-base semantic eieio fsf-compat edit-utils jde mail-lib eshell ediff xemacs-devel speedbar)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(pgg
   (standards-version 1.1
    version "1.02"
+   author-version "0.1"
+   date "2002-12-06"
+   build-date "2002-12-06"
+   maintainer "Simon Josefsson <simon@josefsson.org>"
+   distribution xemacs
+   priority low
+   category "standard"
+   dump nil
+   description "Emacs interface to various PGP implementations."
+   filename "pgg-1.02-pkg.tar.gz"
+   md5sum "d721f51a1e97a997e0cf256dfd19020a"
+   size 30199
+   provides (pgg pgg-def pgg-parse pgg-gpg pgg-pgp pgg-pgp5)
+   requires (xemacs-base fsf-compat edebug)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(perl-modes
+  (standards-version 1.1
+   version "1.04"
+   author-version "21.4"
+   date "2003-01-18"
+   build-date "2003-01-18"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution xemacs
+   priority low
+   category "standard"
+   dump nil
+   description "Perl support."
+   filename "perl-modes-1.04-pkg.tar.gz"
+   md5sum "13cd4e312af571aefbf5415cfefc4fad"
+   size 161021
+   provides (cperl-mode perl-mode)
+   requires (xemacs-base ispell ps-print edit-utils fsf-compat)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(python-modes
+  (standards-version 1.1
+   version "1.02"
+   author-version "21.4"
+   date "2003-01-13"
+   build-date "2003-01-13"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution xemacs
+   priority low
+   category "standard"
+   dump nil
+   description "Python support."
+   filename "python-modes-1.02-pkg.tar.gz"
+   md5sum "738bbb00e9bd21d3091ae41aedaac2f9"
+   size 81943
+   provides (pydoc python-mode)
+   requires (xemacs-base mail-lib)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(ruby-modes
+  (standards-version 1.1
+   version "1.01"
+   author-version "1.6.8"
+   date "2003-01-13"
+   build-date "2003-01-13"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution xemacs
+   priority low
+   category "standard"
+   dump nil
+   description "Ruby support."
+   filename "ruby-modes-1.01-pkg.tar.gz"
+   md5sum "923181c6dd43210e7c85c971c754f38a"
+   size 21775
+   provides (inf-ruby ruby-mode rubydb)
+   requires (xemacs-base debug)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(fortran-modes
+  (standards-version 1.1
+   version "1.02"
+   author-version "21.4"
+   date "2003-01-13"
+   build-date "2003-01-13"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution xemacs
+   priority low
+   category "standard"
+   dump nil
+   description "Fortran support."
+   filename "fortran-modes-1.02-pkg.tar.gz"
+   md5sum "ae3d346c19382f07227dd8756da53134"
+   size 66600
+   provides (f90 fortran)
+   requires (xemacs-base)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(psgml-dtds
+  (standards-version 1.1
+   version "1.02"
+   author-version "21.4"
+   date "2002-08-29"
+   build-date "2002-08-29"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution xemacs
+   priority low
+   category "standard"
+   dump nil
+   description "Deprecated collection of DTDs for psgml."
+   filename "psgml-dtds-1.02-pkg.tar.gz"
+   md5sum "90100411b64045dae38166116d1f8e3f"
+   size 367102
+   provides ()
+   requires (xemacs-base psgml edit-utils mail-lib fsf-compat eterm sh-script)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(docbookide
+  (standards-version 1.1
+   version "0.06"
+   author-version "0.1"
+   date "2003-01-13"
+   build-date "2003-01-13"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution xemacs
+   priority low
+   category "standard"
+   dump nil
+   description "DocBook editing support."
+   filename "docbookide-0.06-pkg.tar.gz"
+   md5sum "625c9ef5bb10c655b6f6dcba1b42ba2a"
+   size 31968
+   provides (dbide-abbrev dbide-data dbide-font dbide-process docbookide)
+   requires (xemacs-base ispell mail-lib)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(ecrypto
+  (standards-version 1.1
+   version "0.12"
+   author-version "2.0"
+   date "2002-09-25"
+   build-date "2002-09-25"
+   maintainer "Simon Josefsson <simon@josefsson.org>"
+   distribution xemacs
+   priority low
+   category "standard"
+   dump nil
+   description "Crypto functionality in Emacs Lisp."
+   filename "ecrypto-0.12-pkg.tar.gz"
+   md5sum "89d677c85349ff2d16f8a9ecb41eca61"
+   size 69163
+   provides (ascii-armor blowfish des hex-util md4 md5-dl md5-el md5 paranoid rander rc16 rijndael sha1-dl sha1-el sha1)
+   requires ()
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(ocaml
+  (standards-version 1.1
+   version "0.04"
+   author-version "3.06"
+   date "2003-01-13"
+   build-date "2003-01-13"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution xemacs
+   priority low
+   category "standard"
+   dump nil
+   description "Objective Caml editing support."
+   filename "ocaml-0.04-pkg.tar.gz"
+   md5sum "3b2bc2c431e334050074aebcf260d06e"
+   size 64814
+   provides (caml-compat camldebug caml caml-font caml-help inf-caml)
+   requires (xemacs-base fsf-compat)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(sasl
+  (standards-version 1.1
+   version "1.12"
+   author-version "1.14.4"
+   date "2002-08-12"
+   build-date "2002-08-12"
+   maintainer "Simon Josefsson <simon@josefsson.org>"
+   distribution xemacs
+   priority low
+   category "standard"
+   dump nil
+   description "Simple Authentication and Security Layer (SASL) library."
+   filename "sasl-1.12-pkg.tar.gz"
+   md5sum "7e8e46e9cbbc54732a68d097c88e5f65"
+   size 26693
+   provides (hmac-def hmac-md5 hmac-sha1 ntlm sasl sasl-cram sasl-digest sasl-ntlm sasl-plain sasl-login sasl-anonymous)
+   requires (ecrypto)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(sml-mode
+  (standards-version 1.1
+   version "0.09"
+   author-version "3.9.5"
+   date "2003-01-18"
+   build-date "2003-01-18"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution xemacs
+   priority low
+   category "standard"
+   dump nil
+   description "SML editing support."
+   filename "sml-mode-0.09-pkg.tar.gz"
+   md5sum "2022d71197f600716f0b41da3794c19b"
+   size 81547
+   provides (sml-compat sml-defs sml-mode sml-move sml-proc sml-util)
+   requires (xemacs-base edebug fsf-compat)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(ess
+  (standards-version 1.1
+   version "1.03"
    author-version "5.1.21"
-   date "2002-06-04"
-   build-date "2002-06-04"
+   date "2003-01-03"
+   build-date "2003-01-03"
    maintainer "A.J. Rossini <rossini@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "ESS: Emacs Speaks Statistics."
-   filename "ess-1.02-pkg.tar.gz"
-   md5sum "3eff981706623221b5af048dc8a00f17"
-   size 469304
+   filename "ess-1.03-pkg.tar.gz"
+   md5sum "933ffd4650b5f2815c8683f9bb2d5a27"
+   size 470257
    provides (ess-batch ess-comp ess-cust ess-dump ess-emcs ess-font-lock ess-help ess-inf ess-iw32 ess-latex-mode ess-menu ess-mode ess-mous ess-noweb ess-site ess-sysdp ess-utils ess-vars ess essa-r essa-sas essd-arc essd-els essd-r essd-omg essd-r essd-s3 essd-s4 essd-sas essd-sp3 essd-sp4 essd-sp5 essd-sp6 essd-sta essd-vst essd-xls essddr essdsp6w essl-bug essl-lsp essl-omg essl-py essl-s essl-sas essl-sta make-regexp mouseme msdos noweb-font-lock-mode noweb-mode)
-   requires (xemacs-base mail-lib fsf-compat edit-utils)
+   requires (xemacs-base mail-lib fsf-compat edit-utils speedbar sh-script eterm)
    type regular
 ))
 ))
@@ -28,19 +292,19 @@
 (package-get-update-base-entry (quote
 (haskell-mode
   (standards-version 1.1
-   version "1.03"
-   author-version "1.43"
-   date "2002-05-07"
-   build-date "2002-05-07"
-   maintainer "Ville Skytt� <ville.skytta@xemacs.org>"
+   version "1.05"
+   author-version "1.44"
+   date "2003-01-13"
+   build-date "2003-01-13"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Haskell editing support."
-   filename "haskell-mode-1.03-pkg.tar.gz"
-   md5sum "c734831433d7330094064fe3959d94f1"
-   size 91983
+   filename "haskell-mode-1.05-pkg.tar.gz"
+   md5sum "198a9d68d1b4115c9faf45e14c264f54"
+   size 94162
    provides (haskell-decl-scan haskell-doc haskell-font-lock haskell-indent haskell-mode haskell-simple-indent)
    requires (dired mail-lib xemacs-base edit-utils)
    type regular
@@ -50,19 +314,19 @@
 (package-get-update-base-entry (quote
 (xslide
   (standards-version 1.1
-   version "1.01"
+   version "1.06"
    author-version "0.2"
-   date "2002-03-25"
-   build-date "2002-03-26"
-   maintainer "Ville Skytt� <ville.skytta@xemacs.org>"
+   date "2003-01-13"
+   build-date "2003-01-13"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "XSL editing support."
-   filename "xslide-1.01-pkg.tar.gz"
-   md5sum "8f23eb3d45f7c2ca2f6024c3771a6d80"
-   size 35451
+   filename "xslide-1.06-pkg.tar.gz"
+   md5sum "138dedbfed8cd72785c7c1cd9aa5e7f3"
+   size 36027
    provides (xslide-abbrev xslide-data xslide-font xslide-process xslide)
    requires (ispell mail-lib xemacs-base)
    type regular
@@ -72,19 +336,19 @@
 (package-get-update-base-entry (quote
 (liece
   (standards-version 1.1
-   version "1.07"
-   author-version "1.4.7"
-   date "2002-07-14"
-   build-date "2002-07-14"
+   version "1.11"
+   author-version "1.4.9"
+   date "2002-10-15"
+   build-date "2002-10-15"
    maintainer "Daiki Ueno <ueno@unixuser.org>"
    distribution xemacs
    priority high
    category "standard"
    dump nil
    description "IRC (Internet Relay Chat) client for Emacs."
-   filename "liece-1.07-pkg.tar.gz"
-   md5sum "10a70f816b57757a6dc58b29f342881f"
-   size 197755
+   filename "liece-1.11-pkg.tar.gz"
+   md5sum "f4c6488e97125cdb6533bbe0ef5535f7"
+   size 198675
    provides (liece-xemacs gettext liece-clfns liece-handler liece-compat liece-version liece-vars liece-globals liece-inlines liece-filter liece-coding liece-dcc liece-menu liece-000 liece-200 liece-300 liece-400 liece-500 liece-nick liece-channel liece-commands liece-ctcp liece-q-el liece-message liece-handle liece-hilit liece-intl liece-mail liece-minibuf liece-misc liece-tcp liece-url liece-x-face liece-window liece)
    requires (apel mail-lib fsf-compat xemacs-base)
    type regular
@@ -94,21 +358,21 @@
 (package-get-update-base-entry (quote
 (latin-unity
   (standards-version 1.1
-   version "1.05"
-   author-version "1.05"
-   date "2002-05-07"
-   build-date "2002-05-07"
+   version "1.07"
+   author-version "1.07"
+   date "2002-11-01"
+   build-date "2002-11-01"
    maintainer "Stephen J. Turnbull <stephen@xemacs.org>"
    distribution mule
    priority high
    category "mule"
    dump nil
    description "MULE: find single ISO 8859 character set to encode a buffer."
-   filename "latin-unity-1.05-pkg.tar.gz"
-   md5sum "fc968dc2682d52ab37634e22028d8598"
-   size 86755
+   filename "latin-unity-1.07-pkg.tar.gz"
+   md5sum "7d4f163e1d98af367fab9f4ea5d01d8d"
+   size 116377
    provides (latin-unity latin-unity-tables latin-unity-utils)
-   requires (mule-base mule-ucs leim fsf-compat)
+   requires (mule-base mule-ucs leim fsf-compat dired)
    type regular
 ))
 ))
@@ -160,19 +424,19 @@
 (package-get-update-base-entry (quote
 (xemacs-base
   (standards-version 1.1
-   version "1.66"
-   author-version "21.5b6"
-   date "2002-07-14"
-   build-date "2002-07-14"
+   version "1.75"
+   author-version "21.4"
+   date "2003-01-18"
+   build-date "2003-01-18"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
    category "standard"
    dump nil
    description "Fundamental XEmacs support, you almost certainly need this."
-   filename "xemacs-base-1.66-pkg.tar.gz"
-   md5sum "108cb98a37dd6270618b942e0fe97b48"
-   size 464634
+   filename "xemacs-base-1.75-pkg.tar.gz"
+   md5sum "0d6c6012b7a21c867b59ae902d95ca77"
+   size 469016
    provides (add-log advice-preload 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 passwd pp regexp-opt regi ring shell skeleton sort thing time-stamp timezone tq xbm-button xpm-button)
    requires ()
    type regular
@@ -182,21 +446,21 @@
 (package-get-update-base-entry (quote
 (tramp
   (standards-version 1.1
-   version "1.05"
-   author-version "2002-02-18"
-   date "2002-04-24"
-   build-date "2002-04-24"
+   version "1.12"
+   author-version "2.0.22"
+   date "2003-01-03"
+   build-date "2003-01-03"
    maintainer "Kai Gro�johann <Kai.Grossjohann@CS.Uni-Dortmund.DE>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Remote shell-based file editing."
-   filename "tramp-1.05-pkg.tar.gz"
-   md5sum "a0c020f425b6344ea0c133dc26e7f689"
-   size 136196
+   filename "tramp-1.12-pkg.tar.gz"
+   md5sum "35f6508e3c4598bc9f8901ab530f3af0"
+   size 214545
    provides (tramp tramp-util tramp-vc trampcache)
-   requires (tramp xemacs-base vc fsf-compat efs dired mail-lib gnus)
+   requires (tramp xemacs-base vc fsf-compat efs dired mail-lib gnus ediff)
    type regular
 ))
 ))
@@ -204,20 +468,20 @@
 (package-get-update-base-entry (quote
 (text-modes
   (standards-version 1.1
-   version "1.48"
-   author-version "21.5b6"
-   date "2002-06-27"
-   build-date "2002-06-27"
+   version "1.60"
+   author-version "21.4"
+   date "2003-01-26"
+   build-date "2003-01-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
    category "standard"
    dump nil
    description "Miscellaneous support for editing text files."
-   filename "text-modes-1.48-pkg.tar.gz"
-   md5sum "f2df17af03a7f47e3b2e7b970d0b9f0b"
-   size 345796
-   provides (ansi-color autoinsert crontab-edit filladapt flyspell folding fold-isearch hexl htmlize image-mode iso-acc iso-ascii iso-cvt iso-insert iso-swed rtf-support swedish tabify whitespace-mode winmgr-mode xpm-mode xrdb-mode apache-mode po-mode css-mode)
+   filename "text-modes-1.60-pkg.tar.gz"
+   md5sum "f8043ec7562d5c68bc252c76ed10b63d"
+   size 358675
+   provides (ansi-color autoinsert crontab-edit filladapt flyspell folding fold-isearch hexl htmlize image-mode iso-acc iso-ascii iso-cvt iso-insert iso-swed rtf-support swedish tabify whitespace-mode winmgr-mode xpm-mode xrdb-mode apache-mode po-mode po-compat css-mode)
    requires (ispell fsf-compat xemacs-base)
    type regular
 ))
@@ -226,19 +490,19 @@
 (package-get-update-base-entry (quote
 (pcl-cvs
   (standards-version 1.1
-   version "1.63"
+   version "1.64"
    author-version "R-2_9_9"
-   date "2002-06-04"
-   build-date "2002-06-04"
+   date "2002-07-30"
+   build-date "2002-07-30"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "CVS frontend."
-   filename "pcl-cvs-1.63-pkg.tar.gz"
-   md5sum "87b7a9ebd1aa6d24ee4c3c0ff914daad"
-   size 161146
+   filename "pcl-cvs-1.64-pkg.tar.gz"
+   md5sum "3d8f9aac5c5edefec62a33cb9695db9f"
+   size 161512
    provides (cvs-compat cvs-edit cvs-log cvs-status easy-mmode pcl-cvs-defs pcl-cvs-info pcl-cvs-parse pcl-cvs-util pcl-cvs)
    requires (xemacs-base elib vc dired edebug ediff edit-utils mail-lib prog-modes)
    type regular
@@ -248,21 +512,21 @@
 (package-get-update-base-entry (quote
 (mail-lib
   (standards-version 1.1
-   version "1.47"
-   author-version "21.5b6"
-   date "2002-07-14"
-   build-date "2002-07-14"
+   version "1.57"
+   author-version "21.4"
+   date "2003-01-13"
+   build-date "2003-01-13"
    maintainer "Simon Josefsson <simon@josefsson.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Fundamental lisp files for providing email support."
-   filename "mail-lib-1.47-pkg.tar.gz"
-   md5sum "3cba556078ece30b7538ade56e138041"
-   size 186598
+   filename "mail-lib-1.57-pkg.tar.gz"
+   md5sum "c6419162479944320929ab7fed38dc92"
+   size 195163
    provides (base64 browse-url-xemacs browse-url highlight-headers mail-abbrevs mail-extr mail-utils mailheader netrc pop3 reporter rfc2104 rfc822 rmail rmail-mini rmailout sendmail smtpmail starttls)
-   requires (eterm xemacs-base fsf-compat sh-script)
+   requires (eterm xemacs-base fsf-compat sh-script ecrypto)
    type regular
 ))
 ))
@@ -270,20 +534,20 @@
 (package-get-update-base-entry (quote
 (jde
   (standards-version 1.1
-   version "1.35"
-   author-version "2.2.8"
-   date "2002-05-09"
-   build-date "2002-05-10"
-   maintainer "Paul Kinnucan <paulk@mathworks.com>"
+   version "1.45"
+   author-version "2.3.2"
+   date "2003-01-26"
+   build-date "2003-01-26"
+   maintainer "Andy Piper <andy@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
-   description "Java language and development support."
-   filename "jde-1.35-pkg.tar.gz"
-   md5sum "b0289c057ce2a0d95c417409f5f17ba4"
-   size 1635420
-   provides (jde)
+   description "Integrated Development Environment for Java."
+   filename "jde-1.45-pkg.tar.gz"
+   md5sum "64c39644d4e12e053aa0eb982d473405"
+   size 2403338
+   provides (beanshell efc jde-ant jde-bug jde-checkstyle jde-compat jde-compile jde-complete jde-db jde-dbo jde-dbs jde-ejb jde-gen jde-help jde-imenu jde-import jde-java-font-lock jde-java-grammar jde-javadoc-gen jde-javadoc jde-jdb jde-make jde-open-source jde-package jde-parse-class jde-parse jde-run jde-setnu jde-stat jde-util jde-which-method jde-widgets jde-wiz jde-xref jde tree-widget)
    requires (jde cc-mode semantic debug speedbar edit-utils eterm mail-lib xemacs-base xemacs-devel eieio elib sh-script fsf-compat)
    type regular
 ))
@@ -292,20 +556,20 @@
 (package-get-update-base-entry (quote
 (fsf-compat
   (standards-version 1.1
-   version "1.11"
-   author-version "21.5b5"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   version "1.12"
+   author-version "21.4"
+   date "2003-01-13"
+   build-date "2003-01-13"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
    category "standard"
    dump nil
    description "FSF Emacs compatibility files."
-   filename "fsf-compat-1.11-pkg.tar.gz"
-   md5sum "5616165f4aa5bf4a45982e9185851d22"
-   size 21263
-   provides (overlay thingatpt timer x-popup-menu)
+   filename "fsf-compat-1.12-pkg.tar.gz"
+   md5sum "43183434592aed9a96e38ab48585b5fd"
+   size 21442
+   provides (overlay thingatpt timer x-popup-menu goto-addr)
    requires (xemacs-base)
    type single
 ))
@@ -314,21 +578,21 @@
 (package-get-update-base-entry (quote
 (edit-utils
   (standards-version 1.1
-   version "1.89"
-   author-version "21.5b6"
-   date "2002-06-27"
-   build-date "2002-06-27"
+   version "2.00"
+   author-version "21.4"
+   date "2003-01-13"
+   build-date "2003-01-13"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
    category "standard"
    dump nil
    description "Miscellaneous editor extensions, you probably need this."
-   filename "edit-utils-1.89-pkg.tar.gz"
-   md5sum "b7d94a10cda4795bbb759e0ee88ae86e"
-   size 650996
+   filename "edit-utils-2.00-pkg.tar.gz"
+   md5sum "c0f7848cb86f2b391b8049f1bb87ed7e"
+   size 719489
    provides (abbrevlist after-save-commands 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 makesum man mic-paren paren mode-motion+ outl-mouse outln-18 page-ext blink-paren paren permanent-buffers popper power-macros recent-files redo reportmail resume rsz-minibuf saveconf savehist saveplace scroll-in-place setnu shell-font tempo toolbar-utils tree-menu uniquify vertical-mode where-was-i-db winring)
-   requires (xemacs-base fsf-compat dired mail-lib)
+   requires (xemacs-base xemacs-devel fsf-compat dired mail-lib)
    type single
 ))
 ))
@@ -336,19 +600,19 @@
 (package-get-update-base-entry (quote
 (skk
   (standards-version 1.1
-   version "1.22"
+   version "1.23"
    author-version "10.62a"
-   date "2002-04-30"
-   build-date "2002-04-30"
+   date "2002-09-25"
+   build-date "2002-09-25"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority medium
    category "mule"
    dump nil
    description "MULE: Japanese Language Input Method."
-   filename "skk-1.22-pkg.tar.gz"
-   md5sum "05457e10b156dbcc2e0f735d46d934a1"
-   size 1461781
+   filename "skk-1.23-pkg.tar.gz"
+   md5sum "dc35f20896a56c8cf2e7ba16b15e453b"
+   size 1506691
    provides (skk-auto skk-comp skk-cursor skk-develop skk-foreword skk-gadget skk-isearch skk-kakasi skk-kcode skk-leim skk-look skk-num skk-obsolete skk-server skk-tut skk-vars skk-viper skk vip)
    requires (viper mule-base elib xemacs-base apel)
    type regular
@@ -358,19 +622,19 @@
 (package-get-update-base-entry (quote
 (ps-print
   (standards-version 1.1
-   version "1.04"
+   version "1.08"
    author-version "6.5.6"
-   date "2002-04-24"
-   build-date "2002-04-24"
+   date "2002-08-29"
+   build-date "2002-08-29"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Printing functions and utilities"
-   filename "ps-print-1.04-pkg.tar.gz"
-   md5sum "e4c3f93b960454cf6dc559a0704fb084"
-   size 154281
+   filename "ps-print-1.08-pkg.tar.gz"
+   md5sum "bbfb58fe514cf4bd6fbec2f62c43c823"
+   size 153729
    provides (lpr ps-bdf ps-mule ps-print)
    requires (text-modes)
    type regular
@@ -380,21 +644,21 @@
 (package-get-update-base-entry (quote
 (sieve
   (standards-version 1.1
-   version "1.07"
-   author-version "21.5b6"
-   date "2002-06-04"
-   build-date "2002-06-04"
+   version "1.13"
+   author-version "21.4"
+   date "2003-01-13"
+   build-date "2003-01-13"
    maintainer "Simon Josefsson <simon@josefsson.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Manage Sieve email filtering scripts."
-   filename "sieve-1.07-pkg.tar.gz"
-   md5sum "d86e60ea1b6c552be2b6db7cca60e151"
-   size 23498
+   filename "sieve-1.13-pkg.tar.gz"
+   md5sum "a8816344f83e92821989f9298c415038"
+   size 25479
    provides (sieve sieve-mode sieve-manage)
-   requires (xemacs-base mail-lib cc-mode)
+   requires (xemacs-base mail-lib cc-mode sasl)
    type regular
 ))
 ))
@@ -424,7 +688,7 @@
 (package-get-update-base-entry (quote
 (clearcase
   (standards-version 1.0
-   version "1.04"
+   version "1.06"
    author-version "21.5b6"
    date "2002-06-27"
    build-date "2002-06-27"
@@ -434,9 +698,9 @@
    category "standard"
    dump nil
    description "New Clearcase Version Control for XEmacs (UNIX, Windows)."
-   filename "clearcase-1.04-pkg.tar.gz"
-   md5sum "c60546db0605910ec57af7151a7fc9a7"
-   size 89274
+   filename "clearcase-1.06-pkg.tar.gz"
+   md5sum "8f9a2485be7371b78b01b68039d91e09"
+   size 89634
    provides (clearcase)
    requires (dired fsf-compat mail-lib xemacs-base)
    type regular
@@ -468,19 +732,19 @@
 (package-get-update-base-entry (quote
 (build
   (standards-version 1.0
-   version "1.06"
-   author-version "2.00"
-   date "2002-07-20"
-   build-date "2002-07-20"
+   version "1.10"
+   author-version "2.02"
+   date "2003-01-13"
+   build-date "2003-01-13"
    maintainer "Adrian Aichner <adrian@xemacs.org>"
    distribution stable
    priority low
    category "standard"
    dump nil
    description "Build XEmacs from within (UNIX, Windows)."
-   filename "build-1.06-pkg.tar.gz"
-   md5sum "2d0fb08caf67bb89759be4ac54b6a0fb"
-   size 39500
+   filename "build-1.10-pkg.tar.gz"
+   md5sum "442bf6d4729f40545d1ee1ad8eca5a93"
+   size 49207
    provides (build)
    requires (xemacs-base pcl-cvs dired w3 prog-modes)
    type regular
@@ -490,21 +754,21 @@
 (package-get-update-base-entry (quote
 (xslt-process
   (standards-version 1.0
-   version "1.10"
+   version "1.11"
    author-version "1.2.1"
-   date "2002-07-14"
-   build-date "2002-07-14"
+   date "2002-10-08"
+   build-date "2002-10-08"
    maintainer "Ovidiu Predescu <ovidiu@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "XSLT processing support."
-   filename "xslt-process-1.10-pkg.tar.gz"
-   md5sum "b6fedc8eb356d6e4277ff505324a2abe"
-   size 199744
+   filename "xslt-process-1.11-pkg.tar.gz"
+   md5sum "30273cbe2e90ae703ea410879412e68b"
+   size 199873
    provides (xslt-process)
-   requires (jde cc-mode semantic debug speedbar edit-utils eterm mail-lib xemacs-base elib eieio sh-script fsf-compat)
+   requires (jde cc-mode semantic debug speedbar edit-utils eterm mail-lib xemacs-base elib eieio sh-script fsf-compat xemacs-devel)
    type regular
 ))
 ))
@@ -512,21 +776,21 @@
 (package-get-update-base-entry (quote
 (eieio
   (standards-version 1.1
-   version "1.02"
-   author-version "0.16"
-   date "2002-01-13"
-   build-date "2002-01-14"
+   version "1.04"
+   author-version "0.17"
+   date "2002-12-06"
+   build-date "2002-12-06"
    maintainer "Eric Ludlam <zappo@gnu.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Enhanced Implementation of Emacs Interpreted Objects"
-   filename "eieio-1.02-pkg.tar.gz"
-   md5sum "ab05fadf432fb733fcae6b6517741902"
-   size 136679
-   provides (call-tree chart compare-strings eieio-base eieio-comp eieio-custom eieio-doc eieio-opt eieio-speedbar eieio-tests eieio tree)
-   requires (eieio speedbar xemacs-base )
+   filename "eieio-1.04-pkg.tar.gz"
+   md5sum "6504c1a9225576fd0140cba9962e191b"
+   size 165595
+   provides (call-tree chart compare-strings eieio-base eieio-comp eieio-custom eieio-doc eieio-opt eieio-speedbar eieio-tests eieio linemark tree)
+   requires (speedbar xemacs-base edebug)
    type regular
 ))
 ))
@@ -578,19 +842,19 @@
 (package-get-update-base-entry (quote
 (lookup
   (standards-version 1.1
-   version "1.12"
+   version "1.13"
    author-version "1.0"
-   date "2002-06-27"
-   build-date "2002-06-27"
+   date "2002-09-25"
+   build-date "2002-09-25"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority high
    category "mule"
    dump nil
    description "MULE: Dictionary support"
-   filename "lookup-1.12-pkg.tar.gz"
-   md5sum "f07a3791e49f75c7f1504edb077a5560"
-   size 190864
+   filename "lookup-1.13-pkg.tar.gz"
+   md5sum "cd658e3024349bf67743f6a0cce96be5"
+   size 214806
    provides (evi-mule evi lookup-content lookup-defs lookup-entry lookup-select lookup-package lookup-select lookup-types lookup-utils lookup-vars lookup-vse lookup ndcookie ndeb ndic ndict ndkks ndmisc ndnmz ndspell ndsrd ndtp sdicf stem)
    requires (mule-base cookie lookup)
    type regular
@@ -600,21 +864,21 @@
 (package-get-update-base-entry (quote
 (leim
   (standards-version 1.1
-   version "1.18"
-   author-version "21.5b5"
-   date "2002-04-24"
-   build-date "2002-04-24"
+   version "1.20"
+   author-version "21.4"
+   date "2003-01-03"
+   build-date "2003-01-03"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority medium
    category "mule"
    dump nil
    description "MULE: Quail.  All non-English and non-Japanese language support."
-   filename "leim-1.18-pkg.tar.gz"
-   md5sum "b0467e2a3a93b46590bd2fe9bbf9675e"
-   size 1708615
+   filename "leim-1.20-pkg.tar.gz"
+   md5sum "33e2983108fb7c55f748b855a40e2a04"
+   size 1708682
    provides ()
-   requires (mule-base fsf-compat xemacs-base)
+   requires (leim mule-base fsf-compat xemacs-base)
    type regular
 ))
 ))
@@ -622,19 +886,19 @@
 (package-get-update-base-entry (quote
 (locale
   (standards-version 1.1
-   version "1.18"
-   author-version "21.1"
-   date "2000-11-08"
-   build-date "2001-01-15"
+   version "1.20"
+   author-version "21.4"
+   date "2002-11-01"
+   build-date "2002-11-01"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority high
    category "mule"
    dump nil
    description "MULE: Localized menubars and localized splash screens."
-   filename "locale-1.18-pkg.tar.gz"
-   md5sum "dbc3b123a7f12804fb81643b40fe766a"
-   size 38660
+   filename "locale-1.20-pkg.tar.gz"
+   md5sum "f91249a741613f91f89369eb26458a2d"
+   size 36563
    provides ()
    requires (mule-base)
    type regular
@@ -688,19 +952,19 @@
 (package-get-update-base-entry (quote
 (time
   (standards-version 1.1
-   version "1.11"
+   version "1.12"
    author-version "1.17"
-   date "2000-10-05"
-   build-date "2001-01-15"
+   date "2002-08-26"
+   build-date "2002-08-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
-   category "oa"
+   category "standard"
    dump nil
    description "Display time & date on the modeline."
-   filename "time-1.11-pkg.tar.gz"
-   md5sum "93ca34fe3275dc3ef5b8fd4c6824551d"
-   size 19983
+   filename "time-1.12-pkg.tar.gz"
+   md5sum "151911897d2540bd7461f1a5324017b5"
+   size 20127
    provides (time)
    requires (xemacs-base)
    type regular
@@ -754,21 +1018,21 @@
 (package-get-update-base-entry (quote
 (psgml
   (standards-version 1.1
-   version "1.28"
-   author-version "1.22"
-   date "2002-05-09"
-   build-date "2002-05-10"
+   version "1.40"
+   author-version "1.3.1"
+   date "2003-01-19"
+   build-date "2003-01-19"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Validated HTML/SGML editing."
-   filename "psgml-1.28-pkg.tar.gz"
-   md5sum "e559c5b88300e414654550806eab8c7a"
-   size 651867
-   provides (iso-sgml psgml-api psgml-charent psgml-debug psgml-dtd psgml-edit psgml-fs psgml-html psgml-info psgml-parse psgml-xemacs psgml sgml-mode)
-   requires (xemacs-base edit-utils edebug xemacs-devel mail-lib)
+   filename "psgml-1.40-pkg.tar.gz"
+   md5sum "794e98e745f17aaa5fc3d731a59b9d0d"
+   size 301036
+   provides (iso-sgml psgml-api psgml-charent psgml-debug psgml-dtd psgml-edit psgml-fs psgml-html psgml-info psgml-parse psgml-sysdep psgml-xemacs psgml sgml-mode)
+   requires (xemacs-base edit-utils edebug xemacs-devel mail-lib fsf-compat eterm sh-script ps-print)
    type regular
 ))
 ))
@@ -820,7 +1084,7 @@
 (package-get-update-base-entry (quote
 (hm--html-menus
   (standards-version 1.1
-   version "1.18"
+   version "1.20"
    author-version "5.9"
    date "2002-03-25"
    build-date "2002-03-25"
@@ -830,9 +1094,9 @@
    category "standard"
    dump nil
    description "HTML editing."
-   filename "hm--html-menus-1.18-pkg.tar.gz"
-   md5sum "ad6c2d438e56fdc1cf0a81945f52605d"
-   size 179112
+   filename "hm--html-menus-1.20-pkg.tar.gz"
+   md5sum "68e8c2a1a7011e184a42c971be52cbec"
+   size 179485
    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 internal-drag-and-drop tmpl-minor-mode)
    requires (dired xemacs-base)
    type regular
@@ -886,19 +1150,19 @@
 (package-get-update-base-entry (quote
 (calendar
   (standards-version 1.1
-   version "1.18"
-   author-version "21.5b3"
-   date "2001-12-22"
-   build-date "2001-12-22"
+   version "1.19"
+   author-version "21.4"
+   date "2002-09-26"
+   build-date "2002-09-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Calendar and diary support."
-   filename "calendar-1.18-pkg.tar.gz"
-   md5sum "1fbd29614f2b1b29494dc2ea3241c16a"
-   size 252308
+   filename "calendar-1.19-pkg.tar.gz"
+   md5sum "f41fe8405fc58fefe03fef27428223fe"
+   size 252793
    provides (appt cal-china cal-coptic cal-dst cal-french cal-hebrew cal-islam cal-iso cal-japanese cal-julian cal-mayan cal-move cal-persia cal-tex cal-x cal-xemacs calendar diary-lib holidays lunar solar)
    requires (xemacs-base)
    type regular
@@ -930,21 +1194,21 @@
 (package-get-update-base-entry (quote
 (speedbar
   (standards-version 1.1
-   version "1.23"
-   author-version "0.13"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   version "1.26"
+   author-version "0.14beta4"
+   date "2003-01-03"
+   build-date "2003-01-03"
    maintainer "Eric M. Ludlam <zappo@gnu.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Provides a separate frame with convenient references."
-   filename "speedbar-1.23-pkg.tar.gz"
-   md5sum "768952f9dcce464670fb4737b576dd89"
-   size 136753
-   provides (bigclock dframe rpm sb-gud sb-image sb-info sb-rmail sb-texinfo sb-w3 speedbar)
-   requires (xemacs-base)
+   filename "speedbar-1.26-pkg.tar.gz"
+   md5sum "1bcc0c31772870347b33fed82da4dc91"
+   size 163116
+   provides (bigclock dframe rpm sb-ant sb-gud sb-html sb-image sb-info sb-rmail sb-texinfo sb-w3 speedbar)
+   requires (xemacs-base edebug)
    type regular
 ))
 ))
@@ -952,21 +1216,21 @@
 (package-get-update-base-entry (quote
 (pcomplete
   (standards-version 1.1
-   version "1.01"
+   version "1.02"
    author-version "1.1.6"
-   date "2000-03-06"
-   build-date "2001-01-15"
+   date "2002-10-14"
+   build-date "2002-10-14"
    maintainer "John Wiegley <johnw@gnu.org>"
    distribution xemacs
    priority medium
-   category "os"
+   category "standard"
    dump nil
    description "Provides programmatic completion."
-   filename "pcomplete-1.01-pkg.tar.gz"
-   md5sum "ee42f90e2a4bb878bd5768ba49ed96ba"
-   size 37289
+   filename "pcomplete-1.02-pkg.tar.gz"
+   md5sum "badc7fe7baa939025c954e37168a8157"
+   size 37301
    provides (pcomplete)
-   requires (sh-script)
+   requires (sh-script xemacs-base)
    type regular
 ))
 ))
@@ -974,19 +1238,19 @@
 (package-get-update-base-entry (quote
 (eshell
   (standards-version 1.1
-   version "1.03"
+   version "1.05"
    author-version "2.4.1"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   date "2002-12-06"
+   build-date "2002-12-06"
    maintainer "John Wiegley <johnw@gnu.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Command shell implemented entirely in Emacs Lisp"
-   filename "eshell-1.03-pkg.tar.gz"
-   md5sum "d78600bee5b93c9dfc491bd8c03d012e"
-   size 231181
+   filename "eshell-1.05-pkg.tar.gz"
+   md5sum "657a26052b757a3caeb3a8f5256bfa64"
+   size 231854
    provides (em-alias em-banner em-basic em-cmpl em-dirs em-glob em-hist em-ls em-pred em-prompt em-rebind em-script em-smart em-term em-unix em-xtra esh-arg esh-cmd esh-ext esh-io esh-maint esh-mode esh-module esh-opt esh-proc esh-test esh-toggle esh-util esh-var eshell)
    requires (xemacs-base eterm)
    type regular
@@ -996,19 +1260,19 @@
 (package-get-update-base-entry (quote
 (view-process
   (standards-version 1.1
-   version "1.11"
+   version "1.12"
    author-version "2.4"
-   date "2000-10-05"
-   build-date "2001-01-15"
+   date "2002-08-26"
+   build-date "2002-08-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "os"
+   category "standard"
    dump nil
    description "A Unix process browsing tool."
-   filename "view-process-1.11-pkg.tar.gz"
-   md5sum "8273fcfd035804c4b376786629c7b205"
-   size 60260
+   filename "view-process-1.12-pkg.tar.gz"
+   md5sum "5259a3dbaa145eba1795d9b481589833"
+   size 60436
    provides (view-process-mode)
    requires (xemacs-base)
    type regular
@@ -1018,19 +1282,19 @@
 (package-get-update-base-entry (quote
 (os-utils
   (standards-version 1.1
-   version "1.28"
-   author-version "21.5b6"
-   date "2002-05-10"
-   build-date "2002-05-10"
+   version "1.30"
+   author-version "21.4"
+   date "2003-01-13"
+   build-date "2003-01-13"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Miscellaneous O/S utilities."
-   filename "os-utils-1.28-pkg.tar.gz"
-   md5sum "57d2aa4e6f7d1ad321e1d1d84b2c458c"
-   size 200020
+   filename "os-utils-1.30-pkg.tar.gz"
+   md5sum "f75e440032bdc0f4e09a52dce7296657"
+   size 201293
    provides (archive-mode background crypt++ crypt ftelnet inf-lisp jka-compr mchat rlogin ssh tar-mode telnet terminal uncompress)
    requires (xemacs-base)
    type single
@@ -1040,21 +1304,21 @@
 (package-get-update-base-entry (quote
 (ilisp
   (standards-version 1.1
-   version "1.27"
+   version "1.31"
    author-version "5.12.0"
-   date "2002-06-27"
-   build-date "2002-06-27"
+   date "2003-01-03"
+   build-date "2003-01-03"
    maintainer "ilisp Maintainers <ilisp@cons.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Front-end for Inferior Lisp."
-   filename "ilisp-1.27-pkg.tar.gz"
-   md5sum "a95a698b28301250971e8076d7ce89fd"
-   size 335702
+   filename "ilisp-1.31-pkg.tar.gz"
+   md5sum "c1fd42c184abe4341a389e8774ddab2f"
+   size 337557
    provides (bridge comint-ipc comint completer ilcompat compat-fsf18 compat-fsf-19 compat-fsf-20 ilisp-chs ilisp-cl-easy-menu ilisp-ext ilisp-lw ilisp-key ilisp-menu ilisp-mnb ilisp-scheme-easy-menu ilisp il-luc19 il-luc19)
-   requires (xemacs-base mail-lib fsf-compat eterm)
+   requires (xemacs-base mail-lib fsf-compat eterm sh-script)
    type regular
 ))
 ))
@@ -1062,21 +1326,21 @@
 (package-get-update-base-entry (quote
 (igrep
   (standards-version 1.1
-   version "1.08"
-   author-version "2.83"
-   date "1998-08-11"
-   build-date "2001-01-15"
+   version "1.10"
+   author-version "2.95"
+   date "2002-10-29"
+   build-date "2002-10-29"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "os"
+   category "standard"
    dump nil
    description "Enhanced front-end for Grep."
-   filename "igrep-1.08-pkg.tar.gz"
-   md5sum "bc3e4d7a897edb164f93ef49eeff87d3"
-   size 15184
+   filename "igrep-1.10-pkg.tar.gz"
+   md5sum "ab371bae5cee68fb53afd5fd737cd462"
+   size 16903
    provides (igrep)
-   requires (dired xemacs-base)
+   requires (dired xemacs-base efs)
    type regular
 ))
 ))
@@ -1106,19 +1370,19 @@
 (package-get-update-base-entry (quote
 (viper
   (standards-version 1.1
-   version "1.34"
+   version "1.35"
    author-version "3.09"
-   date "2002-04-24"
-   build-date "2002-04-24"
+   date "2002-09-25"
+   build-date "2002-09-25"
    maintainer "Michael Kifer <kifer@cs.sunysb.edu>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "VI emulation support."
-   filename "viper-1.34-pkg.tar.gz"
-   md5sum "c438c8c42dbedd5634c773623db5a4ff"
-   size 329580
+   filename "viper-1.35-pkg.tar.gz"
+   md5sum "e5ae74dedc17a8ae8ecd33cf46343526"
+   size 330509
    provides (viper-cmd viper-ex viper-init viper-keym viper-macs viper-mous viper-util viper)
    requires (xemacs-base)
    type regular
@@ -1150,19 +1414,19 @@
 (package-get-update-base-entry (quote
 (textools
   (standards-version 1.1
-   version "1.12"
-   author-version "21.1"
-   date "2000-10-05"
-   build-date "2001-01-15"
+   version "1.14"
+   author-version "21.4"
+   date "2003-01-13"
+   build-date "2003-01-13"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
-   category "wp"
+   category "standard"
    dump nil
    description "Miscellaneous TeX support."
-   filename "textools-1.12-pkg.tar.gz"
-   md5sum "2ce1dc6eb29773d2ab6ce2e04463e54f"
-   size 79212
+   filename "textools-1.14-pkg.tar.gz"
+   md5sum "baaa68caca74c6cc21f99798c0e8e0e5"
+   size 79510
    provides (bib-mode bibtex refer-to-bibtex)
    requires (xemacs-base)
    type single
@@ -1172,19 +1436,19 @@
 (package-get-update-base-entry (quote
 (texinfo
   (standards-version 1.1
-   version "1.20"
-   author-version "21.1"
-   date "2000-03-18"
-   build-date "2001-01-15"
+   version "1.23"
+   author-version "21.4"
+   date "2003-01-13"
+   build-date "2003-01-13"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
-   category "wp"
+   category "standard"
    dump nil
    description "XEmacs TeXinfo support."
-   filename "texinfo-1.20-pkg.tar.gz"
-   md5sum "25a3261b1700f4b83d229dc1dcf633ae"
-   size 133067
+   filename "texinfo-1.23-pkg.tar.gz"
+   md5sum "4321534b29660dc130a55bb6526ef128"
+   size 133424
    provides (makeinfo tex-mode texinfmt texinfo texnfo-tex texnfo-upd)
    requires (xemacs-base)
    type regular
@@ -1194,19 +1458,19 @@
 (package-get-update-base-entry (quote
 (reftex
   (standards-version 1.1
-   version "1.25"
-   author-version "4.16"
-   date "2002-03-25"
-   build-date "2002-03-25"
-   maintainer "Carsten Dominik <dominik@astro.uva.nl>"
+   version "1.28"
+   author-version "4.19"
+   date "2002-08-29"
+   build-date "2002-08-29"
+   maintainer "Carsten Dominik <dominik@science.uva.nl>"
    distribution xemacs
    priority medium
    category "wp"
    dump nil
    description "Emacs support for LaTeX cross-references, citations.."
-   filename "reftex-1.25-pkg.tar.gz"
-   md5sum "e044e921fe940d63e20ac5185e4bf8ca"
-   size 330512
+   filename "reftex-1.28-pkg.tar.gz"
+   md5sum "8bf789e67715eb6eb77bec7cc25e37ed"
+   size 340634
    provides (reftex-auc reftex-cite reftex-dcr reftex-vcr reftex-global reftex-index reftex-parse reftex-ref reftex-sel reftex-toc reftex-vars reftex)
    requires (fsf-compat xemacs-base)
    type regular
@@ -1260,19 +1524,19 @@
 (package-get-update-base-entry (quote
 (auctex
   (standards-version 1.1
-   version "1.32"
-   author-version "10.0g"
-   date "2002-06-27"
-   build-date "2002-06-27"
+   version "1.35"
+   author-version "11.13"
+   date "2003-01-03"
+   build-date "2003-01-03"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Basic TeX/LaTeX support."
-   filename "auctex-1.32-pkg.tar.gz"
-   md5sum "7d532a5a3d673f89f01c9dd3ed75ac80"
-   size 385505
+   filename "auctex-1.35-pkg.tar.gz"
+   md5sum "168e82155e152dab8c7c913bc9a4788b"
+   size 406466
    provides (auc-old auc-tex bib-cite font-latex latex multi-prompt tex-buf tex-info tex-jp tex-mik tex-site tex texmathp)
    requires (xemacs-base)
    type regular
@@ -1282,19 +1546,19 @@
 (package-get-update-base-entry (quote
 (vhdl
   (standards-version 1.1
-   version "1.15"
+   version "1.16"
    author-version "3.31.20"
-   date "2002-01-13"
-   build-date "2002-01-14"
+   date "2003-01-03"
+   build-date "2003-01-03"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Support for VHDL."
-   filename "vhdl-1.15-pkg.tar.gz"
-   md5sum "3670d96619d49ae091326134aa3efc2f"
-   size 272784
+   filename "vhdl-1.16-pkg.tar.gz"
+   md5sum "7fa9eff33c544529130a3c897faaf5e9"
+   size 272817
    provides (vhdl-mode)
    requires (xemacs-base edit-utils c-support speedbar ps-print os-utils)
    type regular
@@ -1302,21 +1566,43 @@
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
+(x-symbol
+  (standards-version 1.1
+   version "1.03"
+   author-version "4.5"
+   date "2003-04-02"
+   build-date "2003-04-02"
+   maintainer "Steve Youngs <youngs@xemacs.org>"
+   distribution xemacs
+   priority high
+   category "standard"
+   dump nil
+   description "Semi WYSIWYG for LaTeX, HTML, etc, using additional fonts."
+   filename "x-symbol-1.03-pkg.tar.gz"
+   md5sum "6ea6966d62caf49fbef5ba8d656e5f47"
+   size 585973
+   provides (x-symbol-bib x-symbol-hooks x-symbol-image x-symbol-macs x-symbol-mule x-symbol-nomule x-symbol-sgml x-symbol-tex x-symbol-texi x-symbol-vars x-symbol-xmacs x-symbol)
+   requires (x-symbol xemacs-base auctex mail-lib)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
 (vc
   (standards-version 1.1
-   version "1.33"
-   author-version "21.5b6"
-   date "2002-06-04"
-   build-date "2002-06-04"
+   version "1.37"
+   author-version "21.4"
+   date "2003-01-18"
+   build-date "2003-01-18"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Version Control for Free systems."
-   filename "vc-1.33-pkg.tar.gz"
-   md5sum "f3b8db930389eb6288af946398286ab6"
-   size 91716
+   filename "vc-1.37-pkg.tar.gz"
+   md5sum "a80fd60632202fd0fe566215e8c89451"
+   size 93512
    provides (vc vc-hooks)
    requires (dired xemacs-base vc mail-lib ediff)
    type regular
@@ -1348,19 +1634,19 @@
 (package-get-update-base-entry (quote
 (sh-script
   (standards-version 1.1
-   version "1.15"
+   version "1.17"
    author-version "2.0e"
-   date "2002-04-24"
-   build-date "2002-04-24"
+   date "2003-01-13"
+   build-date "2003-01-13"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Support for editing shell scripts."
-   filename "sh-script-1.15-pkg.tar.gz"
-   md5sum "72214e735ea0fda9147c051fbc3b6965"
-   size 36163
+   filename "sh-script-1.17-pkg.tar.gz"
+   md5sum "919e1c273b0eb05b17795f5f3382ef1c"
+   size 36945
    provides (sh-script executable)
    requires (xemacs-base)
    type regular
@@ -1370,19 +1656,19 @@
 (package-get-update-base-entry (quote
 (scheme
   (standards-version 1.1
-   version "1.11"
-   author-version "21.1"
-   date "1999-06-15"
-   build-date "2001-01-15"
+   version "1.13"
+   author-version "21.4"
+   date "2003-01-13"
+   build-date "2003-01-13"
    maintainer "Karl M. Hegbloom <karlheg@bittersweet.inetarena.com>"
    distribution xemacs
    priority low
-   category "prog"
+   category "standard"
    dump nil
    description "Front-end support for Inferior Scheme."
-   filename "scheme-1.11-pkg.tar.gz"
-   md5sum "8994fb43b37a55d4b9ad763af67a45ba"
-   size 36497
+   filename "scheme-1.13-pkg.tar.gz"
+   md5sum "570e81d6079fb548b0b52d0e1f68aae2"
+   size 37048
    provides (scheme xscheme cmuscheme cmuscheme48)
    requires (xemacs-base)
    type regular
@@ -1392,21 +1678,21 @@
 (package-get-update-base-entry (quote
 (prog-modes
   (standards-version 1.1
-   version "1.60"
-   author-version "21.5b6"
-   date "2002-07-14"
-   build-date "2002-07-14"
-   maintainer "Ville Skytt� <ville.skytta@xemacs.org>"
+   version "1.72"
+   author-version "21.4"
+   date "2003-01-24"
+   build-date "2003-01-24"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Support for various programming languages."
-   filename "prog-modes-1.60-pkg.tar.gz"
-   md5sum "74909e13093afae889e3f43a1879e51c"
-   size 985711
-   provides (autoconf-mode awk-mode c-mode cperl-mode cvs diff-mode eiffel-mode f90 fortran icon inf-ruby javascript-mode ksh-mode m4-mode makefile mode-compile mode-compile-kill modula2 p4 perl-mode php-mode postscript pydoc python-mode rexx-mode rpm-spec-mode ruby-mode simula-mode sql tcl teco verilog-mode)
-   requires (mail-lib xemacs-devel xemacs-base cc-mode ps-print fsf-compat edit-utils ediff emerge efs vc speedbar dired ilisp sh-script)
+   filename "prog-modes-1.72-pkg.tar.gz"
+   md5sum "39cc163d6e6408ae317a228c4430733d"
+   size 655779
+   provides (autoconf-mode awk-mode c-mode cvs diff-mode eiffel-mode icon javascript-mode ksh-mode m4-mode makefile mode-compile mode-compile-kill modula2 p4 php-mode postscript rexx-mode rpm-spec-mode simula-mode sql tcl teco verilog-mode)
+   requires (mail-lib xemacs-devel xemacs-base cc-mode fsf-compat edit-utils ediff emerge efs vc speedbar dired ilisp sh-script)
    type regular
 ))
 ))
@@ -1414,19 +1700,19 @@
 (package-get-update-base-entry (quote
 (idlwave
   (standards-version 1.1
-   version "1.25"
-   author-version "4.7"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   version "1.28"
+   author-version "4.15"
+   date "2003-01-13"
+   build-date "2003-01-13"
    maintainer "Carsten Dominik <dominik@astro.uva.nl>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Editing and Shell mode for the Interactive Data Language"
-   filename "idlwave-1.25-pkg.tar.gz"
-   md5sum "e828f3c89e29306bb573b3f720582c50"
-   size 345055
+   filename "idlwave-1.28-pkg.tar.gz"
+   md5sum "1e970d93e177fbdd3dff8d941bcc2dd0"
+   size 404471
    provides (idlw-rinfo idlwave-rinfo idlw-shell idlwave-shell idlw-toolbar idlwave-toolbar idlwave)
    requires (fsf-compat xemacs-base)
    type regular
@@ -1458,19 +1744,19 @@
 (package-get-update-base-entry (quote
 (ediff
   (standards-version 1.1
-   version "1.41"
+   version "1.46"
    author-version "2.75"
-   date "2002-04-30"
-   build-date "2002-04-30"
+   date "2003-01-26"
+   build-date "2003-01-26"
    maintainer "Michael Kifer <kifer@cs.sunysb.edu>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Interface over GNU patch."
-   filename "ediff-1.41-pkg.tar.gz"
-   md5sum "4a4b9435a99e5d1cb0ac2fc0843d92fa"
-   size 303663
+   filename "ediff-1.46-pkg.tar.gz"
+   md5sum "1f7c307d05ed8a511952b581dcd2f4e0"
+   size 305601
    provides (ediff-diff ediff-help ediff-hook ediff-init ediff-merg ediff-mult ediff-ptch ediff-tbar ediff-util ediff-vers ediff-wind ediff)
    requires (pcl-cvs elib dired xemacs-base edebug prog-modes)
    type regular
@@ -1480,19 +1766,19 @@
 (package-get-update-base-entry (quote
 (debug
   (standards-version 1.1
-   version "1.15"
-   author-version "21.5b6"
-   date "2002-05-01"
-   build-date "2002-05-01"
+   version "1.16"
+   author-version "21.4"
+   date "2002-09-25"
+   build-date "2002-09-25"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "GUD, gdb, dbx debugging support."
-   filename "debug-1.15-pkg.tar.gz"
-   md5sum "2b44d4c660f4cda44d4a159b40a6f457"
-   size 107347
+   filename "debug-1.16-pkg.tar.gz"
+   md5sum "1450bf0762934d079c1287d8baa5859c"
+   size 107641
    provides (dbx debug-toolbar gdb-highlight gdb gdbsrc gud history)
    requires (xemacs-base)
    type regular
@@ -1524,21 +1810,21 @@
 (package-get-update-base-entry (quote
 (ada
   (standards-version 1.1
-   version "1.10"
+   version "1.13"
    author-version "2.27"
-   date "2000-10-05"
-   build-date "2001-01-15"
+   date "2003-01-13"
+   build-date "2003-01-13"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "prog"
+   category "standard"
    dump nil
    description "Ada language support."
-   filename "ada-1.10-pkg.tar.gz"
-   md5sum "6ba6ca52a345831e8fafa241119db39f"
-   size 54387
+   filename "ada-1.13-pkg.tar.gz"
+   md5sum "2bed65b1357b24d371f27e4cca3fe352"
+   size 55694
    provides (ada-mode ada-stmt)
-   requires ()
+   requires (xemacs-base)
    type regular
 ))
 ))
@@ -1546,19 +1832,19 @@
 (package-get-update-base-entry (quote
 (cc-mode
   (standards-version 1.1
-   version "1.28"
+   version "1.33"
    author-version "5.28"
-   date "2002-05-09"
-   build-date "2002-05-10"
+   date "2003-01-13"
+   build-date "2003-01-13"
    maintainer "Martin Stjernholm <bug-cc-mode@gnu.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "C, C++ and Java language support."
-   filename "cc-mode-1.28-pkg.tar.gz"
-   md5sum "d2c87709e503e11755c480f2aa50ea8c"
-   size 262921
+   filename "cc-mode-1.33-pkg.tar.gz"
+   md5sum "c711a14526fe18470934455f65c689d2"
+   size 261483
    provides (cc-bytecomp cc-align cc-cmds cc-compat cc-defs cc-engine cc-guess cc-langs cc-lobotomy cc-menus cc-mode-19 cc-mode cc-styles cc-vars)
    requires (xemacs-base mail-lib)
    type regular
@@ -1568,21 +1854,21 @@
 (package-get-update-base-entry (quote
 (semantic
   (standards-version 1.1
-   version "1.12"
-   author-version "1.4beta8"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   version "1.17"
+   author-version "1.4.2"
+   date "2003-01-13"
+   build-date "2003-01-13"
    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.12-pkg.tar.gz"
-   md5sum "45b5137c5a17528ede8a667c0219208d"
-   size 281805
-   provides (document-vars document semantic-bnf semantic-c semantic-ctxt semantic-el semantic-imenu semantic-java semantic-load semantic-make semantic-sb semantic-scm semantic-texi semantic-util semantic semanticdb senator-isearch senator sformat working)
-   requires (eieio xemacs-base xemacs-devel edit-utils speedbar texinfo)
+   filename "semantic-1.17-pkg.tar.gz"
+   md5sum "6c374b18834351d2939683c5c62b44a6"
+   size 443557
+   provides (document-vars document semantic-analyze semantic-bnf semantic-c semantic-cb semantic-chart semantic-ctxt semantic-el semantic-example semantic-ia-sb semantic-ia semantic-imenu semantic-java semantic-load semantic-make semantic-sb semantic-scm semantic-skel semantic-texi semantic-util-modes semantic-util semantic semanticdb senator sformat working)
+   requires (eieio xemacs-base xemacs-devel edit-utils speedbar texinfo fsf-compat cc-mode edebug)
    type regular
 ))
 ))
@@ -1590,19 +1876,19 @@
 (package-get-update-base-entry (quote
 (misc-games
   (standards-version 1.1
-   version "1.15"
-   author-version "21.1"
-   date "2000-11-18"
-   build-date "2001-01-15"
+   version "1.16"
+   author-version "21.4"
+   date "2002-12-06"
+   build-date "2002-12-06"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "games"
+   category "standard"
    dump nil
    description "Other amusements and diversions."
-   filename "misc-games-1.15-pkg.tar.gz"
-   md5sum "a77db688d2d276aaca5840a7c16615f0"
-   size 166336
+   filename "misc-games-1.16-pkg.tar.gz"
+   md5sum "2aaccb449220bcd0388165e07592764e"
+   size 166197
    provides (decipher gomoku hanoi life morse rot13)
    requires (xemacs-base)
    type single
@@ -1744,19 +2030,19 @@
 (package-get-update-base-entry (quote
 (tm
   (standards-version 1.1
-   version "1.34"
-   author-version "21.5b6"
-   date "2002-06-27"
-   build-date "2002-06-27"
+   version "1.35"
+   author-version "21.4"
+   date "2003-01-03"
+   build-date "2003-01-03"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Emacs MIME support. Not needed for gnus >= 5.8.0"
-   filename "tm-1.34-pkg.tar.gz"
-   md5sum "80c9bf5cf48f9ba61b1b6395751c44e4"
-   size 189067
+   filename "tm-1.35-pkg.tar.gz"
+   md5sum "0fc1d56984ec0b70aa3f828abd42ba43"
+   size 189262
    provides (char-util cless gnus-art-mime gnus-charset gnus-mime gnus-sum-mime latex-math-symbol mel-b mel-g mel-q mel-u mel message-mime mime-setup mu-bbdb mu-cite range sc-setup signature texi-util tl-atype tl-list tl-misc tl-num tl-seq tl-str tm-bbdb tm-def tm-edit-mc tm-edit tm-ew-d tm-ew-e tm-file tm-ftp tm-html tm-image tm-latex tm-mail tm-mh-e tm-parse tm-partial tm-pgp tm-play tm-rmail tm-setup tm-tar tm-text tm-view tm-vm tmh-comp)
    requires (gnus mh-e rmail vm mailcrypt mail-lib apel xemacs-base fsf-compat)
    type regular
@@ -1766,21 +2052,21 @@
 (package-get-update-base-entry (quote
 (gnus
   (standards-version 1.1
-   version "1.62"
+   version "1.68"
    author-version "5.8.8"
-   date "2002-06-27"
-   build-date "2002-06-27"
+   date "2003-01-03"
+   build-date "2003-01-03"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "The Gnus Newsreader and Mailreader."
-   filename "gnus-1.62-pkg.tar.gz"
-   md5sum "b84bb02eab349e7c36b84d5f6bd5f194"
-   size 2356932
-   provides (binhex drums earcon flow-fill format-spec gnus-agent gnus-art gnus-async gnus-audio gnus-bcklg gnus-cache gnus-cite gnus-cus gnus-demon gnus-draft gnus-dup gnus-eform gnus-ems gnus-gl gnus-group gnus-int gnus-kill gnus-load gnus-logic gnus-mh gnus-ml gnus-mlspl gnus-move gnus-msg gnus-nocem gnus-picon gnus-range gnus-salt gnus-score gnus-setup gnus-soup gnus-spec gnus-srvr gnus-start gnus-sum gnus-topic gnus-undo gnus-util gnus-uu gnus-vm gnus-win gnus-xmas gnus ietf-drums imap lpath mail-parse mail-prsvr mail-source mailcap md5 message messagexmas messcompat mm-bodies mm-decode mm-encode mm-util mm-uu mm-view mml-smime mml nnagent nnbabyl nndb nndir nndoc nndraft nneething nnfolder nngateway nnheader nnheaderxm nnimap nnkiboze nnlistserv nnmail nnmbox nnmh nnml nnoo nnslashdot nnsoup nnspool nntp nnultimate nnvirtual nnwarchive nnweb nnwfm parse-time qp rfc1843 rfc2015 rfc2045 rfc2047 rfc2231 score-mode smiley smiley smime time-date utf7 uudecode vcard webmail)
-   requires (gnus w3 mh-e mailcrypt rmail eterm mail-lib xemacs-base fsf-compat)
+   filename "gnus-1.68-pkg.tar.gz"
+   md5sum "4a78d2088ede0a375922ebbb50fc3be9"
+   size 2358728
+   provides (binhex drums earcon flow-fill format-spec gnus-agent gnus-art gnus-async gnus-audio gnus-bcklg gnus-cache gnus-cite gnus-cus gnus-demon gnus-draft gnus-dup gnus-eform gnus-ems gnus-gl gnus-group gnus-int gnus-kill gnus-load gnus-logic gnus-mh gnus-ml gnus-mlspl gnus-move gnus-msg gnus-nocem gnus-picon gnus-range gnus-salt gnus-score gnus-setup gnus-soup gnus-spec gnus-srvr gnus-start gnus-sum gnus-topic gnus-undo gnus-util gnus-uu gnus-vm gnus-win gnus-xmas gnus ietf-drums imap lpath mail-parse mail-prsvr mail-source mailcap message messagexmas messcompat mm-bodies mm-decode mm-encode mm-util mm-uu mm-view mml-smime mml nnagent nnbabyl nndb nndir nndoc nndraft nneething nnfolder nngateway nnheader nnheaderxm nnimap nnkiboze nnlistserv nnmail nnmbox nnmh nnml nnoo nnslashdot nnsoup nnspool nntp nnultimate nnvirtual nnwarchive nnweb nnwfm parse-time qp rfc1843 rfc2015 rfc2045 rfc2047 rfc2231 score-mode smiley smiley smime time-date utf7 uudecode vcard webmail)
+   requires (gnus w3 mh-e mailcrypt rmail eterm mail-lib xemacs-base fsf-compat ecrypto tm apel)
    type regular
 ))
 ))
@@ -1810,19 +2096,19 @@
 (package-get-update-base-entry (quote
 (mailcrypt
   (standards-version 1.1
-   version "2.11"
-   author-version "3.5.6"
-   date "2002-01-07"
-   build-date "2002-01-14"
+   version "2.12"
+   author-version "3.5.8"
+   date "2002-10-07"
+   build-date "2002-10-07"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Support for messaging encryption with PGP."
-   filename "mailcrypt-2.11-pkg.tar.gz"
-   md5sum "ae92827caef07632a64a9a9f8589f42d"
-   size 141467
+   filename "mailcrypt-2.12-pkg.tar.gz"
+   md5sum "a82276fc399b6a72d8769d6e3bcc7e41"
+   size 153873
    provides (expect mailcrypt)
    requires (mail-lib fsf-compat xemacs-base cookie gnus mh-e rmail vm)
    type regular
@@ -1854,21 +2140,21 @@
 (package-get-update-base-entry (quote
 (mh-e
   (standards-version 1.1
-   version "1.14"
-   author-version "21.5b4"
-   date "2002-01-13"
-   build-date "2002-01-14"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   version "1.19"
+   author-version "7.2"
+   date "2003-01-13"
+   build-date "2003-01-13"
+   maintainer "Steve Youngs <mh-e-devel@lists.sf.net>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Front end support for MH."
-   filename "mh-e-1.14-pkg.tar.gz"
-   md5sum "fe842594b7e7c403b2f7e4ac1f37e040"
-   size 176937
-   provides (mh-comp mh-e mh-funcs mh-mime mh-pick mh-seq mh-utils)
-   requires (mail-lib xemacs-base)
+   filename "mh-e-1.19-pkg.tar.gz"
+   md5sum "a74a2a0836d5ba0f428fa250489a40c8"
+   size 466000
+   provides (mh-comp mh-e mh-funcs mh-index mh-mime mh-pick mh-seq mh-speed mh-utils mh-xemacs-compat)
+   requires (gnus mail-lib xemacs-base speedbar rmail tm apel sh-script fsf-compat)
    type regular
 ))
 ))
@@ -1920,21 +2206,21 @@
 (package-get-update-base-entry (quote
 (eudc
   (standards-version 1.1
-   version "1.36"
+   version "1.37"
    author-version "1.32"
-   date "2002-02-13"
-   build-date "2002-02-23"
+   date "2003-01-03"
+   build-date "2003-01-03"
    maintainer "Oscar Figueiredo <oscar@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Emacs Unified Directory Client (LDAP, PH)."
-   filename "eudc-1.36-pkg.tar.gz"
-   md5sum "899aaa20a136715c06f35b73f97cfa71"
-   size 79111
+   filename "eudc-1.37-pkg.tar.gz"
+   md5sum "cb04fd847a9f0c5e46a0a0ac1bd5839d"
+   size 79243
    provides (eudc eudc-vars eudc-hotlist eudc-export eudc-bob eudcb-ldap eudcb-ph eudcb-bbdb)
-   requires (fsf-compat xemacs-base bbdb mail-lib gnus)
+   requires (fsf-compat xemacs-base bbdb mail-lib gnus rmail tm apel)
    type regular
 ))
 ))
@@ -1942,21 +2228,21 @@
 (package-get-update-base-entry (quote
 (net-utils
   (standards-version 1.1
-   version "1.27"
-   author-version "21.5b6"
-   date "2002-06-27"
-   build-date "2002-06-27"
+   version "1.31"
+   author-version "21.4"
+   date "2003-01-24"
+   build-date "2003-01-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Miscellaneous Networking Utilities."
-   filename "net-utils-1.27-pkg.tar.gz"
-   md5sum "45563ca39defd1328c9dabd933d9a0f5"
-   size 120333
+   filename "net-utils-1.31-pkg.tar.gz"
+   md5sum "9a53646e3d5939b9348f0a459a4e91a4"
+   size 121893
    provides (ilisp-browse-cltl2 xemacsbug feedmail metamail net-utils rcompile shadowfile webjump webster-www)
-   requires (w3 efs mail-lib xemacs-base)
+   requires (bbdb w3 efs mail-lib xemacs-base fsf-compat eterm sh-script gnus rmail tm apel)
    type single
 ))
 ))
@@ -1964,21 +2250,21 @@
 (package-get-update-base-entry (quote
 (w3
   (standards-version 1.1
-   version "1.25"
-   author-version "4.0pre46"
-   date "2002-06-27"
-   build-date "2002-06-27"
+   version "1.28"
+   author-version "4.0pre47"
+   date "2003-01-13"
+   build-date "2003-01-13"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
    category "standard"
    dump nil
    description "A Web browser."
-   filename "w3-1.25-pkg.tar.gz"
-   md5sum "5eef9e6136c651a922d5cc341c8c7b56"
-   size 689340
-   provides (css devices w3-auto dsssl-flow dsssl font images md5 mm mule-sysdp socks ssl urlauth url-cache url-cookie url-file url-gopher url-gw url-http url-ldap url-mail url-misc url-news url-ns url-parse url-vars url w3-about w3-auto w3-cfg w3-cus w3-display w3-emacs19 w3-e19 w3-e20 w3-elisp w3-emulate w3-forms w3-hot w3-hotindex w3-imap w3-java w3-jscript w3-keyword w3-latex w3-menu w3-mouse w3-parse w3-print w3-props w3-script w3-structure w3-speak w3-style w3-sysdp w3-toolbar w3-vars w3-widget w3-xemacs w3-xemac w3)
-   requires (w3 mail-lib xemacs-base)
+   filename "w3-1.28-pkg.tar.gz"
+   md5sum "67c77722bdb50d6ab6287d3994f91b09"
+   size 695206
+   provides (css devices w3-auto dsssl-flow dsssl font images mm mule-sysdp socks ssl urlauth url-cache url-cookie url-file url-gopher url-gw url-http url-ldap url-mail url-misc url-news url-ns url-parse url-vars url w3-about w3-auto w3-cfg w3-cus w3-display w3-emacs19 w3-e19 w3-e20 w3-elisp w3-emulate w3-forms w3-hot w3-hotindex w3-imap w3-java w3-jscript w3-keyword w3-latex w3-menu w3-mouse w3-parse w3-print w3-props w3-script w3-structure w3-speak w3-style w3-sysdp w3-toolbar w3-vars w3-widget w3-xemacs w3-xemac w3)
+   requires (w3 mail-lib xemacs-base ecrypto)
    type regular
 ))
 ))
@@ -1986,8 +2272,8 @@
 (package-get-update-base-entry (quote
 (vm
   (standards-version 1.1
-   version "7.07"
-   author-version "7.07"
+   version "7.14"
+   author-version "7.14"
    date "2002-06-08"
    build-date "2002-06-08"
    maintainer "Kyle Jones <kyle_jones@wonderworks.com>"
@@ -1996,9 +2282,9 @@
    category "standard"
    dump nil
    description "An Emacs mailer."
-   filename "vm-7.07-pkg.tar.gz"
-   md5sum "ab2c67c7cda2fe8739a1fef49cfc0fc5"
-   size 718569
+   filename "vm-7.14-pkg.tar.gz"
+   md5sum "18c68c9165f4877a00f0fea395dc4aa3"
+   size 793198
    provides (tapestry vm-byteopts vm-delete vm-digest vm-easymenu vm-edit vm-folder vm-imap vm-license vm-macro vm-mark vm-menu vm-message vm-mime vm-minibuf vm-misc vm-motion vm-mouse vm-page vm-pop vm-reply vm-save vm-search vm-sort vm-startup vm-summary vm-thread vm-toolbar vm-undo vm-user vm-vars vm vm-version vm-virtual vm-window)
    requires (mail-lib xemacs-base)
    type regular
@@ -2052,21 +2338,21 @@
 (package-get-update-base-entry (quote
 (xemacs-devel
   (standards-version 1.1
-   version "1.47"
-   author-version "21.5b6"
-   date "2002-07-14"
-   build-date "2002-07-14"
+   version "1.52"
+   author-version "21.4"
+   date "2003-01-03"
+   build-date "2003-01-03"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Emacs Lisp developer support."
-   filename "xemacs-devel-1.47-pkg.tar.gz"
-   md5sum "0386b19a469f684dd97e67fe5ce15a99"
-   size 228197
+   filename "xemacs-devel-1.52-pkg.tar.gz"
+   md5sum "dc83cba7e8689c7de1f34fcd59872d55"
+   size 232825
    provides (checkdoc docref eldoc elp eval-expr find-func hide-copyleft ielm patcher pp trace patch-keywords)
-   requires (xemacs-base ispell mail-lib gnus)
+   requires (xemacs-base ispell mail-lib gnus rmail tm apel)
    type single
 ))
 ))
@@ -2118,19 +2404,19 @@
 (package-get-update-base-entry (quote
 (edebug
   (standards-version 1.1
-   version "1.14"
-   author-version "21.5b1"
-   date "2001-07-16"
-   build-date "2001-07-21"
+   version "1.17"
+   author-version "21.4"
+   date "2003-01-03"
+   build-date "2003-01-03"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "An Emacs Lisp debugger."
-   filename "edebug-1.14-pkg.tar.gz"
-   md5sum "8cac8a4c9e7f01bc3199f395fc9d975b"
-   size 112374
+   filename "edebug-1.17-pkg.tar.gz"
+   md5sum "3d97bf5db0f345a4cc838bd22fa23935"
+   size 113981
    provides (edebug cl-read cust-print eval-reg cl-specs)
    requires (xemacs-base)
    type regular
@@ -2162,19 +2448,19 @@
 (package-get-update-base-entry (quote
 (apel
   (standards-version 1.1
-   version "1.24"
+   version "1.26"
    author-version "10.2"
-   date "2002-07-14"
-   build-date "2002-07-15"
+   date "2003-01-03"
+   build-date "2003-01-03"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
    category "standard"
    dump nil
    description "A Portable Emacs Library.  Used by XEmacs MIME support."
-   filename "apel-1.24-pkg.tar.gz"
-   md5sum "107adb4ad0190fbd20beccff9c4e9acf"
-   size 108059
+   filename "apel-1.26-pkg.tar.gz"
+   md5sum "f8981e7b041e5f493d30fbd82b15f831"
+   size 108340
    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
@@ -2206,19 +2492,19 @@
 (package-get-update-base-entry (quote
 (dired
   (standards-version 1.0
-   version "1.12"
+   version "1.13"
    author-version "7.10"
-   date "2002-04-24"
-   build-date "2002-04-24"
+   date "2003-01-03"
+   build-date "2003-01-03"
    maintainer "Mike Sperber <sperber@informatik.uni-tuebingen.de>"
    distribution stable
    priority medium
    category "standard"
    dump nil
    description "Manage file systems."
-   filename "dired-1.12-pkg.tar.gz"
-   md5sum "be9971fc8b39136a495a1a06110bc964"
-   size 195581
+   filename "dired-1.13-pkg.tar.gz"
+   md5sum "bedcfcb1c8c9829663f0d66d6612154e"
+   size 196323
    provides (diff dired)
    requires (xemacs-base prog-modes)
    type regular
@@ -2227,10 +2513,9 @@
 ;;;@@@
 ;; Package Index file ends here
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.0.7 (GNU/Linux)
-Comment: The XEmacs Development Team
+Version: GnuPG v1.2.1 (FreeBSD)
 
-iD8DBQE9OJK0jNKQaxDVycURAkMoAJ0WlQCnejfjX9xCIgVNfTIuvVY6jgCgiy9L
-H10A7mDW78w/Ck4KApEHxvs=
-=YYE8
+iD8DBQE+lPqjgu3ywdHdhM0RAqwXAJ0bzFQGzRMeRB0mNfW4HPQwr2qt5ACg6ZYW
+P+HXtfEmt6eqKtwuXjS/zn8=
+=R2Oc
 -----END PGP SIGNATURE-----
Index: etc/package-index.LATEST.pgp
===================================================================
RCS file: etc/package-index.LATEST.pgp
diff -N etc/package-index.LATEST.pgp
--- etc/package-index.LATEST.pgp	21 Jul 2002 04:51:07 -0000	1.12
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,2225 +0,0 @@
-;; Package Index file -- Do not edit manually.
-;;;@@@
-(package-get-update-base-entry (quote
-(ess
-  (standards-version 1.1
-   version "1.02"
-   author-version "5.1.21"
-   date "2002-06-04"
-   build-date "2002-06-04"
-   maintainer "A.J. Rossini <rossini@xemacs.org>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "ESS: Emacs Speaks Statistics."
-   filename "ess-1.02-pkg.tar.gz"
-   md5sum "3eff981706623221b5af048dc8a00f17"
-   size 469304
-   provides (ess-batch ess-comp ess-cust ess-dump ess-emcs ess-font-lock ess-help ess-inf ess-iw32 ess-latex-mode ess-menu ess-mode ess-mous ess-noweb ess-site ess-sysdp ess-utils ess-vars ess essa-r essa-sas essd-arc essd-els essd-r essd-omg essd-r essd-s3 essd-s4 essd-sas essd-sp3 essd-sp4 essd-sp5 essd-sp6 essd-sta essd-vst essd-xls essddr essdsp6w essl-bug essl-lsp essl-omg essl-py essl-s essl-sas essl-sta make-regexp mouseme msdos noweb-font-lock-mode noweb-mode)
-   requires (xemacs-base mail-lib fsf-compat edit-utils)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(haskell-mode
-  (standards-version 1.1
-   version "1.03"
-   author-version "1.43"
-   date "2002-05-07"
-   build-date "2002-05-07"
-   maintainer "Ville Skytt� <ville.skytta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Haskell editing support."
-   filename "haskell-mode-1.03-pkg.tar.gz"
-   md5sum "c734831433d7330094064fe3959d94f1"
-   size 91983
-   provides (haskell-decl-scan haskell-doc haskell-font-lock haskell-indent haskell-mode haskell-simple-indent)
-   requires (dired mail-lib xemacs-base edit-utils)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(xslide
-  (standards-version 1.1
-   version "1.01"
-   author-version "0.2"
-   date "2002-03-25"
-   build-date "2002-03-26"
-   maintainer "Ville Skytt� <ville.skytta@xemacs.org>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "XSL editing support."
-   filename "xslide-1.01-pkg.tar.gz"
-   md5sum "8f23eb3d45f7c2ca2f6024c3771a6d80"
-   size 35451
-   provides (xslide-abbrev xslide-data xslide-font xslide-process xslide)
-   requires (ispell mail-lib xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(liece
-  (standards-version 1.1
-   version "1.07"
-   author-version "1.4.7"
-   date "2002-07-14"
-   build-date "2002-07-14"
-   maintainer "Daiki Ueno <ueno@unixuser.org>"
-   distribution xemacs
-   priority high
-   category "standard"
-   dump nil
-   description "IRC (Internet Relay Chat) client for Emacs."
-   filename "liece-1.07-pkg.tar.gz"
-   md5sum "10a70f816b57757a6dc58b29f342881f"
-   size 197755
-   provides (liece-xemacs gettext liece-clfns liece-handler liece-compat liece-version liece-vars liece-globals liece-inlines liece-filter liece-coding liece-dcc liece-menu liece-000 liece-200 liece-300 liece-400 liece-500 liece-nick liece-channel liece-commands liece-ctcp liece-q-el liece-message liece-handle liece-hilit liece-intl liece-mail liece-minibuf liece-misc liece-tcp liece-url liece-x-face liece-window liece)
-   requires (apel mail-lib fsf-compat xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(latin-unity
-  (standards-version 1.1
-   version "1.05"
-   author-version "1.05"
-   date "2002-05-07"
-   build-date "2002-05-07"
-   maintainer "Stephen J. Turnbull <stephen@xemacs.org>"
-   distribution mule
-   priority high
-   category "mule"
-   dump nil
-   description "MULE: find single ISO 8859 character set to encode a buffer."
-   filename "latin-unity-1.05-pkg.tar.gz"
-   md5sum "fc968dc2682d52ab37634e22028d8598"
-   size 86755
-   provides (latin-unity latin-unity-tables latin-unity-utils)
-   requires (mule-base mule-ucs leim fsf-compat)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(mmm-mode
-  (standards-version 1.1
-   version "1.00"
-   author-version "0.4.7"
-   date "2002-02-24"
-   build-date "2002-02-28"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "Multiple major modes in a single buffer"
-   filename "mmm-mode-1.00-pkg.tar.gz"
-   md5sum "c07c752ffd029d9a430c2fb118127e88"
-   size 176080
-   provides (mmm-auto mmm-class mmm-cmds mmm-compat mmm-mason mmm-mode mmm-region mmm-rpm mmm-sample mmm-univ mmm-utils mmm-vars)
-   requires (xemacs-base fsf-compat )
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(ibuffer
-  (standards-version 1.1
-   version "1.08"
-   author-version "21.5b6"
-   date "2002-07-14"
-   build-date "2002-07-14"
-   maintainer "John Paul Wallington <jpw@shootybangbang.com>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "Advanced replacement for buffer-menu"
-   filename "ibuffer-1.08-pkg.tar.gz"
-   md5sum "e7203eeeca98a89c2bfe051d81c729de"
-   size 87113
-   provides (ibuf-ext ibuf-macs ibuffer)
-   requires (ibuffer xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(xemacs-base
-  (standards-version 1.1
-   version "1.66"
-   author-version "21.5b6"
-   date "2002-07-14"
-   build-date "2002-07-14"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority high
-   category "standard"
-   dump nil
-   description "Fundamental XEmacs support, you almost certainly need this."
-   filename "xemacs-base-1.66-pkg.tar.gz"
-   md5sum "108cb98a37dd6270618b942e0fe97b48"
-   size 464634
-   provides (add-log advice-preload 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 passwd pp regexp-opt regi ring shell skeleton sort thing time-stamp timezone tq xbm-button xpm-button)
-   requires ()
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(tramp
-  (standards-version 1.1
-   version "1.05"
-   author-version "2002-02-18"
-   date "2002-04-24"
-   build-date "2002-04-24"
-   maintainer "Kai Gro�johann <Kai.Grossjohann@CS.Uni-Dortmund.DE>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Remote shell-based file editing."
-   filename "tramp-1.05-pkg.tar.gz"
-   md5sum "a0c020f425b6344ea0c133dc26e7f689"
-   size 136196
-   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
-(text-modes
-  (standards-version 1.1
-   version "1.48"
-   author-version "21.5b6"
-   date "2002-06-27"
-   build-date "2002-06-27"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority high
-   category "standard"
-   dump nil
-   description "Miscellaneous support for editing text files."
-   filename "text-modes-1.48-pkg.tar.gz"
-   md5sum "f2df17af03a7f47e3b2e7b970d0b9f0b"
-   size 345796
-   provides (ansi-color autoinsert crontab-edit filladapt flyspell folding fold-isearch hexl htmlize image-mode iso-acc iso-ascii iso-cvt iso-insert iso-swed rtf-support swedish tabify whitespace-mode winmgr-mode xpm-mode xrdb-mode apache-mode po-mode css-mode)
-   requires (ispell fsf-compat xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(pcl-cvs
-  (standards-version 1.1
-   version "1.63"
-   author-version "R-2_9_9"
-   date "2002-06-04"
-   build-date "2002-06-04"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "CVS frontend."
-   filename "pcl-cvs-1.63-pkg.tar.gz"
-   md5sum "87b7a9ebd1aa6d24ee4c3c0ff914daad"
-   size 161146
-   provides (cvs-compat cvs-edit cvs-log cvs-status easy-mmode pcl-cvs-defs pcl-cvs-info pcl-cvs-parse pcl-cvs-util pcl-cvs)
-   requires (xemacs-base elib vc dired edebug ediff edit-utils mail-lib prog-modes)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(mail-lib
-  (standards-version 1.1
-   version "1.47"
-   author-version "21.5b6"
-   date "2002-07-14"
-   build-date "2002-07-14"
-   maintainer "Simon Josefsson <simon@josefsson.org>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "Fundamental lisp files for providing email support."
-   filename "mail-lib-1.47-pkg.tar.gz"
-   md5sum "3cba556078ece30b7538ade56e138041"
-   size 186598
-   provides (base64 browse-url-xemacs browse-url highlight-headers mail-abbrevs mail-extr mail-utils mailheader netrc pop3 reporter rfc2104 rfc822 rmail rmail-mini rmailout sendmail smtpmail starttls)
-   requires (eterm xemacs-base fsf-compat sh-script)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(jde
-  (standards-version 1.1
-   version "1.35"
-   author-version "2.2.8"
-   date "2002-05-09"
-   build-date "2002-05-10"
-   maintainer "Paul Kinnucan <paulk@mathworks.com>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "Java language and development support."
-   filename "jde-1.35-pkg.tar.gz"
-   md5sum "b0289c057ce2a0d95c417409f5f17ba4"
-   size 1635420
-   provides (jde)
-   requires (jde cc-mode semantic debug speedbar edit-utils eterm mail-lib xemacs-base xemacs-devel eieio elib sh-script fsf-compat)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(fsf-compat
-  (standards-version 1.1
-   version "1.11"
-   author-version "21.5b5"
-   date "2002-03-25"
-   build-date "2002-03-25"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority high
-   category "standard"
-   dump nil
-   description "FSF Emacs compatibility files."
-   filename "fsf-compat-1.11-pkg.tar.gz"
-   md5sum "5616165f4aa5bf4a45982e9185851d22"
-   size 21263
-   provides (overlay thingatpt timer x-popup-menu)
-   requires (xemacs-base)
-   type single
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(edit-utils
-  (standards-version 1.1
-   version "1.89"
-   author-version "21.5b6"
-   date "2002-06-27"
-   build-date "2002-06-27"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority high
-   category "standard"
-   dump nil
-   description "Miscellaneous editor extensions, you probably need this."
-   filename "edit-utils-1.89-pkg.tar.gz"
-   md5sum "b7d94a10cda4795bbb759e0ee88ae86e"
-   size 650996
-   provides (abbrevlist after-save-commands 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 makesum man mic-paren paren mode-motion+ outl-mouse outln-18 page-ext blink-paren paren permanent-buffers popper power-macros recent-files redo reportmail resume rsz-minibuf saveconf savehist saveplace scroll-in-place setnu shell-font tempo toolbar-utils tree-menu uniquify vertical-mode where-was-i-db winring)
-   requires (xemacs-base fsf-compat dired mail-lib)
-   type single
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(skk
-  (standards-version 1.1
-   version "1.22"
-   author-version "10.62a"
-   date "2002-04-30"
-   build-date "2002-04-30"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution mule
-   priority medium
-   category "mule"
-   dump nil
-   description "MULE: Japanese Language Input Method."
-   filename "skk-1.22-pkg.tar.gz"
-   md5sum "05457e10b156dbcc2e0f735d46d934a1"
-   size 1461781
-   provides (skk-auto skk-comp skk-cursor skk-develop skk-foreword skk-gadget skk-isearch skk-kakasi skk-kcode skk-leim skk-look skk-num skk-obsolete skk-server skk-tut skk-vars skk-viper skk vip)
-   requires (viper mule-base elib xemacs-base apel)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(ps-print
-  (standards-version 1.1
-   version "1.04"
-   author-version "6.5.6"
-   date "2002-04-24"
-   build-date "2002-04-24"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "Printing functions and utilities"
-   filename "ps-print-1.04-pkg.tar.gz"
-   md5sum "e4c3f93b960454cf6dc559a0704fb084"
-   size 154281
-   provides (lpr ps-bdf ps-mule ps-print)
-   requires (text-modes)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(sieve
-  (standards-version 1.1
-   version "1.07"
-   author-version "21.5b6"
-   date "2002-06-04"
-   build-date "2002-06-04"
-   maintainer "Simon Josefsson <simon@josefsson.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Manage Sieve email filtering scripts."
-   filename "sieve-1.07-pkg.tar.gz"
-   md5sum "d86e60ea1b6c552be2b6db7cca60e151"
-   size 23498
-   provides (sieve sieve-mode sieve-manage)
-   requires (xemacs-base mail-lib cc-mode)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(mule-ucs
-  (standards-version 1.1
-   version "1.04"
-   author-version "0.84"
-   date "2002-03-25"
-   build-date "2002-03-25"
-   maintainer "Stephen J. Turnbull <stephen@xemacs.org>"
-   distribution mule
-   priority high
-   category "mule"
-   dump nil
-   description "MULE: Extended coding systems (including Unicode) for XEmacs."
-   filename "mule-ucs-1.04-pkg.tar.gz"
-   md5sum "08df8359e7999c60f62f6ec92cccc197"
-   size 1313726
-   provides (mccl-font mucs-ccl mucs-error mucs-type mucs mule-uni tae tbl-mg trans-util txt-tbl un-data un-define un-supple un-tools un-trbase unicode unidata utf u-cns-1 u-cns-2 u-cns-3 u-cns-4 u-cns-5 u-cns-6 u-cns-7 uascii ubig5 uetiopic ugb2312 uipa uiscii uiso8859-1 uiso8859-14 uiso8859-15 uiso8859-2 uiso8859-3 uiso8859-4 uiso8859-5 uiso8859-6 uiso8859-7 uiso8859-8 uiso8859-9 ujisx0201 ujisx0208 ujisx0212 uksc5601 usisheng usupple utibetan utis620 uviscii)
-   requires (mule-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(clearcase
-  (standards-version 1.0
-   version "1.04"
-   author-version "21.5b6"
-   date "2002-06-27"
-   build-date "2002-06-27"
-   maintainer "Michael Diers <mdiers@elego.de>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "New Clearcase Version Control for XEmacs (UNIX, Windows)."
-   filename "clearcase-1.04-pkg.tar.gz"
-   md5sum "c60546db0605910ec57af7151a7fc9a7"
-   size 89274
-   provides (clearcase)
-   requires (dired fsf-compat mail-lib xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(dictionary
-  (standards-version 1.1
-   version "1.11"
-   author-version "1.8"
-   date "2002-05-20"
-   build-date "2002-05-20"
-   maintainer "Torsten Hilbrich <dictionary@myrkr.in-berlin.de>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Interface to RFC2229 dictionary servers."
-   filename "dictionary-1.11-pkg.tar.gz"
-   md5sum "6bead861baac049fb1807dd2e03a1475"
-   size 39886
-   provides (dictionary connection link)
-   requires (xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(build
-  (standards-version 1.0
-   version "1.06"
-   author-version "2.00"
-   date "2002-07-20"
-   build-date "2002-07-20"
-   maintainer "Adrian Aichner <adrian@xemacs.org>"
-   distribution stable
-   priority low
-   category "standard"
-   dump nil
-   description "Build XEmacs from within (UNIX, Windows)."
-   filename "build-1.06-pkg.tar.gz"
-   md5sum "2d0fb08caf67bb89759be4ac54b6a0fb"
-   size 39500
-   provides (build)
-   requires (xemacs-base pcl-cvs dired w3 prog-modes)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(xslt-process
-  (standards-version 1.0
-   version "1.10"
-   author-version "1.2.1"
-   date "2002-07-14"
-   build-date "2002-07-14"
-   maintainer "Ovidiu Predescu <ovidiu@xemacs.org>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "XSLT processing support."
-   filename "xslt-process-1.10-pkg.tar.gz"
-   md5sum "b6fedc8eb356d6e4277ff505324a2abe"
-   size 199744
-   provides (xslt-process)
-   requires (jde cc-mode semantic debug speedbar edit-utils eterm mail-lib xemacs-base elib eieio sh-script fsf-compat)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(eieio
-  (standards-version 1.1
-   version "1.02"
-   author-version "0.16"
-   date "2002-01-13"
-   build-date "2002-01-14"
-   maintainer "Eric Ludlam <zappo@gnu.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Enhanced Implementation of Emacs Interpreted Objects"
-   filename "eieio-1.02-pkg.tar.gz"
-   md5sum "ab05fadf432fb733fcae6b6517741902"
-   size 136679
-   provides (call-tree chart compare-strings eieio-base eieio-comp eieio-custom eieio-doc eieio-opt eieio-speedbar eieio-tests eieio tree)
-   requires (eieio speedbar xemacs-base )
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(egg-its
-  (standards-version 1.1
-   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 "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
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(edict
-  (standards-version 1.1
-   version "1.13"
-   author-version "0.9.9"
-   date "2002-01-30"
-   build-date "2002-02-13"
-   maintainer "Stephen J. Turnbull <stephen@xemacs.org>"
-   distribution mule
-   priority high
-   category "mule"
-   dump nil
-   description "MULE: Lisp Interface to EDICT, Kanji Dictionary"
-   filename "edict-1.13-pkg.tar.gz"
-   md5sum "ceef82c336de553e504aa3d216fbd366"
-   size 95541
-   provides (dui-registry dui edict-edit edict-english edict-japanese edict-morphology edict-test edict ts-mode)
-   requires (mule-base xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(lookup
-  (standards-version 1.1
-   version "1.12"
-   author-version "1.0"
-   date "2002-06-27"
-   build-date "2002-06-27"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution mule
-   priority high
-   category "mule"
-   dump nil
-   description "MULE: Dictionary support"
-   filename "lookup-1.12-pkg.tar.gz"
-   md5sum "f07a3791e49f75c7f1504edb077a5560"
-   size 190864
-   provides (evi-mule evi lookup-content lookup-defs lookup-entry lookup-select lookup-package lookup-select lookup-types lookup-utils lookup-vars lookup-vse lookup ndcookie ndeb ndic ndict ndkks ndmisc ndnmz ndspell ndsrd ndtp sdicf stem)
-   requires (mule-base cookie lookup)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(leim
-  (standards-version 1.1
-   version "1.18"
-   author-version "21.5b5"
-   date "2002-04-24"
-   build-date "2002-04-24"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution mule
-   priority medium
-   category "mule"
-   dump nil
-   description "MULE: Quail.  All non-English and non-Japanese language support."
-   filename "leim-1.18-pkg.tar.gz"
-   md5sum "b0467e2a3a93b46590bd2fe9bbf9675e"
-   size 1708615
-   provides ()
-   requires (mule-base fsf-compat xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(locale
-  (standards-version 1.1
-   version "1.18"
-   author-version "21.1"
-   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 "MULE: Localized menubars and localized splash screens."
-   filename "locale-1.18-pkg.tar.gz"
-   md5sum "dbc3b123a7f12804fb81643b40fe766a"
-   size 38660
-   provides ()
-   requires (mule-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(mule-base
-  (standards-version 1.1
-   version "1.42"
-   author-version "21.5b6"
-   date "2002-06-27"
-   build-date "2002-06-27"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution mule
-   priority high
-   category "mule"
-   dump nil
-   description "MULE: Basic Mule support, required for building with Mule."
-   filename "mule-base-1.42-pkg.tar.gz"
-   md5sum "d521ca4256a8333db5dc686b9d719232"
-   size 443826
-   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
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(strokes
-  (standards-version 1.1
-   version "1.08"
-   author-version "21.1"
-   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.08-pkg.tar.gz"
-   md5sum "c5ab0860ceb23b40798b11a1fa4c0240"
-   size 43486
-   provides (strokes)
-   requires (text-modes edit-utils mail-lib xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(time
-  (standards-version 1.1
-   version "1.11"
-   author-version "1.17"
-   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.11-pkg.tar.gz"
-   md5sum "93ca34fe3275dc3ef5b8fd4c6824551d"
-   size 19983
-   provides (time)
-   requires (xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(slider
-  (standards-version 1.1
-   version "1.13"
-   author-version "0.3x1"
-   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.13-pkg.tar.gz"
-   md5sum "3fbc16b2caeef30e87969e19efa40f32"
-   size 12021
-   provides (slider color-selector)
-   requires ()
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(sgml
-  (standards-version 1.1
-   version "1.08"
-   author-version "21.1"
-   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.08-pkg.tar.gz"
-   md5sum "bdadf462489fa1540cc56d1c561aaa54"
-   size 26964
-   provides (sgml linuxdoc-sgml)
-   requires (xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(psgml
-  (standards-version 1.1
-   version "1.28"
-   author-version "1.22"
-   date "2002-05-09"
-   build-date "2002-05-10"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "Validated HTML/SGML editing."
-   filename "psgml-1.28-pkg.tar.gz"
-   md5sum "e559c5b88300e414654550806eab8c7a"
-   size 651867
-   provides (iso-sgml psgml-api psgml-charent psgml-debug psgml-dtd psgml-edit psgml-fs psgml-html psgml-info psgml-parse psgml-xemacs psgml sgml-mode)
-   requires (xemacs-base edit-utils edebug xemacs-devel mail-lib)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(pc
-  (standards-version 1.1
-   version "1.25"
-   author-version "21.5b6"
-   date "2002-06-04"
-   build-date "2002-06-04"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "PC style interface emulation."
-   filename "pc-1.25-pkg.tar.gz"
-   md5sum "03b7fcc55e1ce79a6017cdfa7fd49f3d"
-   size 17429
-   provides (delbs fusion pc-select pending-del s-region)
-   requires (xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(ispell
-  (standards-version 1.1
-   version "1.24"
-   author-version "3.2"
-   date "2002-01-07"
-   build-date "2002-01-14"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Spell-checking with GNU ispell."
-   filename "ispell-1.24-pkg.tar.gz"
-   md5sum "409bfa4ca95d91bc03d8dcfe7c8f7810"
-   size 72543
-   provides (ispell)
-   requires ()
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(hm--html-menus
-  (standards-version 1.1
-   version "1.18"
-   author-version "5.9"
-   date "2002-03-25"
-   build-date "2002-03-25"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "HTML editing."
-   filename "hm--html-menus-1.18-pkg.tar.gz"
-   md5sum "ad6c2d438e56fdc1cf0a81945f52605d"
-   size 179112
-   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 internal-drag-and-drop tmpl-minor-mode)
-   requires (dired xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(frame-icon
-  (standards-version 1.1
-   version "1.09"
-   author-version "21.1"
-   date "1998-07-14"
-   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.09-pkg.tar.gz"
-   md5sum "91922e43447422f175065428367fb00b"
-   size 33436
-   provides (forms forms-mode)
-   requires ()
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(forms
-  (standards-version 1.1
-   version "1.14"
-   author-version "2.37"
-   date "2002-01-07"
-   build-date "2002-01-14"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Forms editing support (obsolete, use Widget instead)."
-   filename "forms-1.14-pkg.tar.gz"
-   md5sum "c6530292a349a0c567311502c2038270"
-   size 48263
-   provides (forms forms-mode)
-   requires ()
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(calendar
-  (standards-version 1.1
-   version "1.18"
-   author-version "21.5b3"
-   date "2001-12-22"
-   build-date "2001-12-22"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Calendar and diary support."
-   filename "calendar-1.18-pkg.tar.gz"
-   md5sum "1fbd29614f2b1b29494dc2ea3241c16a"
-   size 252308
-   provides (appt cal-china cal-coptic cal-dst cal-french cal-hebrew cal-islam cal-iso cal-japanese cal-julian cal-mayan cal-move cal-persia cal-tex cal-x cal-xemacs calendar diary-lib holidays lunar solar)
-   requires (xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(calc
-  (standards-version 1.1
-   version "1.23"
-   author-version "2.02fX3"
-   date "2002-05-09"
-   build-date "2002-05-10"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Emacs calculator"
-   filename "calc-1.23-pkg.tar.gz"
-   md5sum "e66651dacc67325f6e6d033f80f2e989"
-   size 1615158
-   provides (calc-ext calc-macs calc)
-   requires (xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(speedbar
-  (standards-version 1.1
-   version "1.23"
-   author-version "0.13"
-   date "2002-03-25"
-   build-date "2002-03-25"
-   maintainer "Eric M. Ludlam <zappo@gnu.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Provides a separate frame with convenient references."
-   filename "speedbar-1.23-pkg.tar.gz"
-   md5sum "768952f9dcce464670fb4737b576dd89"
-   size 136753
-   provides (bigclock dframe rpm sb-gud sb-image sb-info sb-rmail sb-texinfo sb-w3 speedbar)
-   requires (xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(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.03"
-   author-version "2.4.1"
-   date "2002-03-25"
-   build-date "2002-03-25"
-   maintainer "John Wiegley <johnw@gnu.org>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "Command shell implemented entirely in Emacs Lisp"
-   filename "eshell-1.03-pkg.tar.gz"
-   md5sum "d78600bee5b93c9dfc491bd8c03d012e"
-   size 231181
-   provides (em-alias em-banner em-basic em-cmpl em-dirs em-glob em-hist em-ls em-pred em-prompt em-rebind em-script em-smart em-term em-unix em-xtra esh-arg esh-cmd esh-ext esh-io esh-maint esh-mode esh-module esh-opt esh-proc esh-test esh-toggle esh-util esh-var eshell)
-   requires (xemacs-base eterm)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(view-process
-  (standards-version 1.1
-   version "1.11"
-   author-version "2.4"
-   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.11-pkg.tar.gz"
-   md5sum "8273fcfd035804c4b376786629c7b205"
-   size 60260
-   provides (view-process-mode)
-   requires (xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(os-utils
-  (standards-version 1.1
-   version "1.28"
-   author-version "21.5b6"
-   date "2002-05-10"
-   build-date "2002-05-10"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "Miscellaneous O/S utilities."
-   filename "os-utils-1.28-pkg.tar.gz"
-   md5sum "57d2aa4e6f7d1ad321e1d1d84b2c458c"
-   size 200020
-   provides (archive-mode background crypt++ crypt ftelnet inf-lisp jka-compr mchat rlogin ssh tar-mode telnet terminal uncompress)
-   requires (xemacs-base)
-   type single
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(ilisp
-  (standards-version 1.1
-   version "1.27"
-   author-version "5.12.0"
-   date "2002-06-27"
-   build-date "2002-06-27"
-   maintainer "ilisp Maintainers <ilisp@cons.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Front-end for Inferior Lisp."
-   filename "ilisp-1.27-pkg.tar.gz"
-   md5sum "a95a698b28301250971e8076d7ce89fd"
-   size 335702
-   provides (bridge comint-ipc comint completer ilcompat compat-fsf18 compat-fsf-19 compat-fsf-20 ilisp-chs ilisp-cl-easy-menu ilisp-ext ilisp-lw ilisp-key ilisp-menu ilisp-mnb ilisp-scheme-easy-menu ilisp il-luc19 il-luc19)
-   requires (xemacs-base mail-lib fsf-compat eterm)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(igrep
-  (standards-version 1.1
-   version "1.08"
-   author-version "2.83"
-   date "1998-08-11"
-   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.08-pkg.tar.gz"
-   md5sum "bc3e4d7a897edb164f93ef49eeff87d3"
-   size 15184
-   provides (igrep)
-   requires (dired xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(eterm
-  (standards-version 1.1
-   version "1.13"
-   author-version "21.1"
-   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.13-pkg.tar.gz"
-   md5sum "ebd64834d12a2a3fc04bbb6f4dd836fa"
-   size 109184
-   provides (eterm)
-   requires (xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(viper
-  (standards-version 1.1
-   version "1.34"
-   author-version "3.09"
-   date "2002-04-24"
-   build-date "2002-04-24"
-   maintainer "Michael Kifer <kifer@cs.sunysb.edu>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "VI emulation support."
-   filename "viper-1.34-pkg.tar.gz"
-   md5sum "c438c8c42dbedd5634c773623db5a4ff"
-   size 329580
-   provides (viper-cmd viper-ex viper-init viper-keym viper-macs viper-mous viper-util viper)
-   requires (xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(tpu
-  (standards-version 1.1
-   version "1.12"
-   author-version "4.2X"
-   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.12-pkg.tar.gz"
-   md5sum "8ee6ca98afc9c18a1df013065c430f5e"
-   size 58850
-   provides (tpu)
-   requires ()
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(textools
-  (standards-version 1.1
-   version "1.12"
-   author-version "21.1"
-   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.12-pkg.tar.gz"
-   md5sum "2ce1dc6eb29773d2ab6ce2e04463e54f"
-   size 79212
-   provides (bib-mode bibtex refer-to-bibtex)
-   requires (xemacs-base)
-   type single
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(texinfo
-  (standards-version 1.1
-   version "1.20"
-   author-version "21.1"
-   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.20-pkg.tar.gz"
-   md5sum "25a3261b1700f4b83d229dc1dcf633ae"
-   size 133067
-   provides (makeinfo tex-mode texinfmt texinfo texnfo-tex texnfo-upd)
-   requires (xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(reftex
-  (standards-version 1.1
-   version "1.25"
-   author-version "4.16"
-   date "2002-03-25"
-   build-date "2002-03-25"
-   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.25-pkg.tar.gz"
-   md5sum "e044e921fe940d63e20ac5185e4bf8ca"
-   size 330512
-   provides (reftex-auc reftex-cite reftex-dcr reftex-vcr reftex-global reftex-index reftex-parse reftex-ref reftex-sel reftex-toc reftex-vars reftex)
-   requires (fsf-compat xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(edt
-  (standards-version 1.1
-   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 "standard"
-   dump nil
-   description "DEC EDIT/EDT emulation."
-   filename "edt-1.12-pkg.tar.gz"
-   md5sum "0d7649d0f65d9de732918d756f5cf48b"
-   size 62441
-   provides (edt)
-   requires (xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(crisp
-  (standards-version 1.1
-   version "1.12"
-   author-version "1.34"
-   date "1998-08-18"
-   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.12-pkg.tar.gz"
-   md5sum "30308c6e5fb14f621d53046894c8c180"
-   size 10075
-   provides (crisp scroll-lock)
-   requires ()
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(auctex
-  (standards-version 1.1
-   version "1.32"
-   author-version "10.0g"
-   date "2002-06-27"
-   build-date "2002-06-27"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "Basic TeX/LaTeX support."
-   filename "auctex-1.32-pkg.tar.gz"
-   md5sum "7d532a5a3d673f89f01c9dd3ed75ac80"
-   size 385505
-   provides (auc-old auc-tex bib-cite font-latex latex multi-prompt tex-buf tex-info tex-jp tex-mik tex-site tex texmathp)
-   requires (xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(vhdl
-  (standards-version 1.1
-   version "1.15"
-   author-version "3.31.20"
-   date "2002-01-13"
-   build-date "2002-01-14"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Support for VHDL."
-   filename "vhdl-1.15-pkg.tar.gz"
-   md5sum "3670d96619d49ae091326134aa3efc2f"
-   size 272784
-   provides (vhdl-mode)
-   requires (xemacs-base edit-utils c-support speedbar ps-print os-utils)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(vc
-  (standards-version 1.1
-   version "1.33"
-   author-version "21.5b6"
-   date "2002-06-04"
-   build-date "2002-06-04"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Version Control for Free systems."
-   filename "vc-1.33-pkg.tar.gz"
-   md5sum "f3b8db930389eb6288af946398286ab6"
-   size 91716
-   provides (vc vc-hooks)
-   requires (dired xemacs-base vc mail-lib ediff)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(vc-cc
-  (standards-version 1.1
-   version "1.21"
-   author-version "21.5b6"
-   date "2002-06-04"
-   build-date "2002-06-04"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Version Control for ClearCase (UnFree) systems."
-   filename "vc-cc-1.21-pkg.tar.gz"
-   md5sum "eb7ad3f9407b32509fa95fa272476b7d"
-   size 94556
-   provides (vc-cc vc-cc-hooks)
-   requires (dired xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(sh-script
-  (standards-version 1.1
-   version "1.15"
-   author-version "2.0e"
-   date "2002-04-24"
-   build-date "2002-04-24"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Support for editing shell scripts."
-   filename "sh-script-1.15-pkg.tar.gz"
-   md5sum "72214e735ea0fda9147c051fbc3b6965"
-   size 36163
-   provides (sh-script executable)
-   requires (xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(scheme
-  (standards-version 1.1
-   version "1.11"
-   author-version "21.1"
-   date "1999-06-15"
-   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.11-pkg.tar.gz"
-   md5sum "8994fb43b37a55d4b9ad763af67a45ba"
-   size 36497
-   provides (scheme xscheme cmuscheme cmuscheme48)
-   requires (xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(prog-modes
-  (standards-version 1.1
-   version "1.60"
-   author-version "21.5b6"
-   date "2002-07-14"
-   build-date "2002-07-14"
-   maintainer "Ville Skytt� <ville.skytta@xemacs.org>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "Support for various programming languages."
-   filename "prog-modes-1.60-pkg.tar.gz"
-   md5sum "74909e13093afae889e3f43a1879e51c"
-   size 985711
-   provides (autoconf-mode awk-mode c-mode cperl-mode cvs diff-mode eiffel-mode f90 fortran icon inf-ruby javascript-mode ksh-mode m4-mode makefile mode-compile mode-compile-kill modula2 p4 perl-mode php-mode postscript pydoc python-mode rexx-mode rpm-spec-mode ruby-mode simula-mode sql tcl teco verilog-mode)
-   requires (mail-lib xemacs-devel xemacs-base cc-mode ps-print fsf-compat edit-utils ediff emerge efs vc speedbar dired ilisp sh-script)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(idlwave
-  (standards-version 1.1
-   version "1.25"
-   author-version "4.7"
-   date "2002-03-25"
-   build-date "2002-03-25"
-   maintainer "Carsten Dominik <dominik@astro.uva.nl>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "Editing and Shell mode for the Interactive Data Language"
-   filename "idlwave-1.25-pkg.tar.gz"
-   md5sum "e828f3c89e29306bb573b3f720582c50"
-   size 345055
-   provides (idlw-rinfo idlwave-rinfo idlw-shell idlwave-shell idlw-toolbar idlwave-toolbar idlwave)
-   requires (fsf-compat xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(emerge
-  (standards-version 1.1
-   version "1.09"
-   author-version "21.1"
-   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.09-pkg.tar.gz"
-   md5sum "231c8120d60da2c9ddd856510da2491c"
-   size 61043
-   provides (emerge)
-   requires ()
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(ediff
-  (standards-version 1.1
-   version "1.41"
-   author-version "2.75"
-   date "2002-04-30"
-   build-date "2002-04-30"
-   maintainer "Michael Kifer <kifer@cs.sunysb.edu>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "Interface over GNU patch."
-   filename "ediff-1.41-pkg.tar.gz"
-   md5sum "4a4b9435a99e5d1cb0ac2fc0843d92fa"
-   size 303663
-   provides (ediff-diff ediff-help ediff-hook ediff-init ediff-merg ediff-mult ediff-ptch ediff-tbar ediff-util ediff-vers ediff-wind 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.15"
-   author-version "21.5b6"
-   date "2002-05-01"
-   build-date "2002-05-01"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "GUD, gdb, dbx debugging support."
-   filename "debug-1.15-pkg.tar.gz"
-   md5sum "2b44d4c660f4cda44d4a159b40a6f457"
-   size 107347
-   provides (dbx debug-toolbar gdb-highlight gdb gdbsrc gud history)
-   requires (xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(c-support
-  (standards-version 1.1
-   version "1.16"
-   author-version "21.1"
-   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.16-pkg.tar.gz"
-   md5sum "047accf51457a041bf920c9563de1bf6"
-   size 70393
-   provides (c-comment-edit cmacexp ctypes hideif hideshow)
-   requires (cc-mode xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(ada
-  (standards-version 1.1
-   version "1.10"
-   author-version "2.27"
-   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.10-pkg.tar.gz"
-   md5sum "6ba6ca52a345831e8fafa241119db39f"
-   size 54387
-   provides (ada-mode ada-stmt)
-   requires ()
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(cc-mode
-  (standards-version 1.1
-   version "1.28"
-   author-version "5.28"
-   date "2002-05-09"
-   build-date "2002-05-10"
-   maintainer "Martin Stjernholm <bug-cc-mode@gnu.org>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "C, C++ and Java language support."
-   filename "cc-mode-1.28-pkg.tar.gz"
-   md5sum "d2c87709e503e11755c480f2aa50ea8c"
-   size 262921
-   provides (cc-bytecomp cc-align cc-cmds cc-compat cc-defs cc-engine cc-guess cc-langs cc-lobotomy cc-menus cc-mode-19 cc-mode cc-styles cc-vars)
-   requires (xemacs-base mail-lib)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(semantic
-  (standards-version 1.1
-   version "1.12"
-   author-version "1.4beta8"
-   date "2002-03-25"
-   build-date "2002-03-25"
-   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.12-pkg.tar.gz"
-   md5sum "45b5137c5a17528ede8a667c0219208d"
-   size 281805
-   provides (document-vars document semantic-bnf semantic-c semantic-ctxt semantic-el semantic-imenu semantic-java semantic-load semantic-make semantic-sb semantic-scm semantic-texi semantic-util semantic semanticdb senator-isearch senator sformat working)
-   requires (eieio xemacs-base xemacs-devel edit-utils speedbar texinfo)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(misc-games
-  (standards-version 1.1
-   version "1.15"
-   author-version "21.1"
-   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.15-pkg.tar.gz"
-   md5sum "a77db688d2d276aaca5840a7c16615f0"
-   size 166336
-   provides (decipher gomoku hanoi life morse rot13)
-   requires (xemacs-base)
-   type single
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(mine
-  (standards-version 1.1
-   version "1.14"
-   author-version "1.9"
-   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.14-pkg.tar.gz"
-   md5sum "ebe471b68642906786db139d402002c7"
-   size 66727
-   provides (xmine)
-   requires (xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(games
-  (standards-version 1.1
-   version "1.13"
-   author-version "1.04"
-   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.13-pkg.tar.gz"
-   md5sum "4138cc59fd6a9316adbb14e7468af593"
-   size 32438
-   provides (gamegrid snake tetris sokoban)
-   requires (xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(cookie
-  (standards-version 1.1
-   version "1.14"
-   author-version "21.5b5"
-   date "2002-03-25"
-   build-date "2002-03-25"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Spook and Yow (Zippy quotes)."
-   filename "cookie-1.14-pkg.tar.gz"
-   md5sum "50581960785fb3949faabaae49896c32"
-   size 34543
-   provides (cookie1 yow)
-   requires (xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(bbdb
-  (standards-version 1.1
-   version "1.21"
-   author-version "2.34"
-   date "2002-06-27"
-   build-date "2002-06-27"
-   maintainer "Ronan Waide <waider@waider.ie>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "The Big Brother Data Base"
-   filename "bbdb-1.21-pkg.tar.gz"
-   md5sum "8b1d6fe03d444a4977a358a431f1430e"
-   size 373823
-   provides (bbdb-com bbdb-ftp bbdb-gnus bbdb-gui bbdb-hooks bbdb-merge bbdb-mhe bbdb-migrate bbdb-print bbdb-reportmail bbdb-rmail bbdb-sc bbdb-snarf bbdb-srv bbdb-vm bbdb-w3 bbdb-whois bbdb-xemacs bbdb)
-   requires (bbdb edit-utils gnus mh-e rmail supercite vm tm apel mail-lib xemacs-base w3)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(zenirc
-  (standards-version 1.1
-   version "1.13"
-   author-version "2.112"
-   date "2002-01-07"
-   build-date "2002-01-14"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "ZENIRC IRC Client."
-   filename "zenirc-1.13-pkg.tar.gz"
-   md5sum "38200c80672a32056426ed32c09473cf"
-   size 276760
-   provides (zenirc-18 zenirc-8ball zenirc-away zenirc-bork zenirc-color zenirc-command-queue zenirc-complete zenirc-ctcp-flood zenirc-dcc zenirc-doto zenirc-fill zenirc-finnish zenirc-format zenirc-fortran zenirc-french zenirc-history zenirc-ignore zenirc-iwantop zenirc-klingon zenirc-latin zenirc-meditate zenirc-netsplit zenirc-notify zenirc-oink zenirc-ojnk zenirc-pjg zenirc-popup zenirc-random-away zenirc-random-nick zenirc-signal zenirc-stamp zenirc-swedish zenirc-trigger zenirc-yow-filter zenirc-yow zenirc)
-   requires (zenirc)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(mew
-  (standards-version 1.1
-   version "1.17"
-   author-version "1.94.2"
-   date "2002-03-25"
-   build-date "2002-03-25"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Messaging in an Emacs World."
-   filename "mew-1.17-pkg.tar.gz"
-   md5sum "03fa0583b534322d0375901796d22ec5"
-   size 654737
-   provides (mew-addrbook mew-attach mew-bq mew-cache mew-complete mew-decode mew-demo mew-draft mew-encode mew-env mew-ext mew-fib mew-func mew-header mew-highlight mew-lang-jp mew-mark mew-message mew-mime mew-minibuf mew-mule mew-mule0 mew-mule2 mew-mule3 mew-os2 mew-pgp mew-pick mew-refile mew-scan mew-sort mew-summary mew-syntax mew-temacs mew-unix mew-vars mew-virtual mew-win32 mew-xemacs mew)
-   requires (mew w3 efs mail-lib xemacs-base fsf-compat)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(tm
-  (standards-version 1.1
-   version "1.34"
-   author-version "21.5b6"
-   date "2002-06-27"
-   build-date "2002-06-27"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Emacs MIME support. Not needed for gnus >= 5.8.0"
-   filename "tm-1.34-pkg.tar.gz"
-   md5sum "80c9bf5cf48f9ba61b1b6395751c44e4"
-   size 189067
-   provides (char-util cless gnus-art-mime gnus-charset gnus-mime gnus-sum-mime latex-math-symbol mel-b mel-g mel-q mel-u mel message-mime mime-setup mu-bbdb mu-cite range sc-setup signature texi-util tl-atype tl-list tl-misc tl-num tl-seq tl-str tm-bbdb tm-def tm-edit-mc tm-edit tm-ew-d tm-ew-e tm-file tm-ftp tm-html tm-image tm-latex tm-mail tm-mh-e tm-parse tm-partial tm-pgp tm-play tm-rmail tm-setup tm-tar tm-text tm-view tm-vm tmh-comp)
-   requires (gnus mh-e rmail vm mailcrypt mail-lib apel xemacs-base fsf-compat)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(gnus
-  (standards-version 1.1
-   version "1.62"
-   author-version "5.8.8"
-   date "2002-06-27"
-   build-date "2002-06-27"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "The Gnus Newsreader and Mailreader."
-   filename "gnus-1.62-pkg.tar.gz"
-   md5sum "b84bb02eab349e7c36b84d5f6bd5f194"
-   size 2356932
-   provides (binhex drums earcon flow-fill format-spec gnus-agent gnus-art gnus-async gnus-audio gnus-bcklg gnus-cache gnus-cite gnus-cus gnus-demon gnus-draft gnus-dup gnus-eform gnus-ems gnus-gl gnus-group gnus-int gnus-kill gnus-load gnus-logic gnus-mh gnus-ml gnus-mlspl gnus-move gnus-msg gnus-nocem gnus-picon gnus-range gnus-salt gnus-score gnus-setup gnus-soup gnus-spec gnus-srvr gnus-start gnus-sum gnus-topic gnus-undo gnus-util gnus-uu gnus-vm gnus-win gnus-xmas gnus ietf-drums imap lpath mail-parse mail-prsvr mail-source mailcap md5 message messagexmas messcompat mm-bodies mm-decode mm-encode mm-util mm-uu mm-view mml-smime mml nnagent nnbabyl nndb nndir nndoc nndraft nneething nnfolder nngateway nnheader nnheaderxm nnimap nnkiboze nnlistserv nnmail nnmbox nnmh nnml nnoo nnslashdot nnsoup nnspool nntp nnultimate nnvirtual nnwarchive nnweb nnwfm parse-time qp rfc1843 rfc2015 rfc2045 rfc2047 rfc2231 score-mode smiley smiley smime time-date utf7 uudecode vcard webmail)
-   requires (gnus w3 mh-e mailcrypt rmail eterm mail-lib xemacs-base fsf-compat)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(rmail
-  (standards-version 1.1
-   version "1.13"
-   author-version "21.5b4"
-   date "2002-01-13"
-   build-date "2002-01-14"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "An obsolete Emacs mailer."
-   filename "rmail-1.13-pkg.tar.gz"
-   md5sum "4da12b01ea3735412f95edeb2a2bd0bd"
-   size 96265
-   provides (rmail-kill rmail-xemacs rmail rmailsort)
-   requires (tm apel mail-lib xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(mailcrypt
-  (standards-version 1.1
-   version "2.11"
-   author-version "3.5.6"
-   date "2002-01-07"
-   build-date "2002-01-14"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Support for messaging encryption with PGP."
-   filename "mailcrypt-2.11-pkg.tar.gz"
-   md5sum "ae92827caef07632a64a9a9f8589f42d"
-   size 141467
-   provides (expect mailcrypt)
-   requires (mail-lib fsf-compat xemacs-base cookie gnus mh-e rmail vm)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(supercite
-  (standards-version 1.1
-   version "1.19"
-   author-version "3.55x3"
-   date "2002-01-07"
-   build-date "2002-01-14"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "An Emacs citation tool for News & Mail messages."
-   filename "supercite-1.19-pkg.tar.gz"
-   md5sum "8f6767ea4e03306d1e5553501ed7cd2e"
-   size 100881
-   provides (supercite)
-   requires (mail-lib xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(mh-e
-  (standards-version 1.1
-   version "1.14"
-   author-version "21.5b4"
-   date "2002-01-13"
-   build-date "2002-01-14"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Front end support for MH."
-   filename "mh-e-1.14-pkg.tar.gz"
-   md5sum "fe842594b7e7c403b2f7e4ac1f37e040"
-   size 176937
-   provides (mh-comp mh-e mh-funcs mh-mime mh-pick mh-seq mh-utils)
-   requires (mail-lib xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(gnats
-  (standards-version 1.1
-   version "1.15"
-   author-version "3.101"
-   date "2002-06-27"
-   build-date "2002-06-27"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority high
-   category "standard"
-   dump nil
-   description "XEmacs bug reports."
-   filename "gnats-1.15-pkg.tar.gz"
-   md5sum "9503a79e2e396eb13151aec7eadf561b"
-   size 189524
-   provides (gnats gnats-admin send-pr)
-   requires (mail-lib xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(footnote
-  (standards-version 1.1
-   version "1.15"
-   author-version "0.18x"
-   date "2002-04-24"
-   build-date "2002-04-24"
-   maintainer "SL Baur <steve@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Footnoting in mail message editing modes."
-   filename "footnote-1.15-pkg.tar.gz"
-   md5sum "1cbe1e587881611006d9a8fc82be3be1"
-   size 21917
-   provides (footnote-cyrillic footnote-greek footnote-han footnote-hebrew footnote-kana footnote)
-   requires (mail-lib xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(eudc
-  (standards-version 1.1
-   version "1.36"
-   author-version "1.32"
-   date "2002-02-13"
-   build-date "2002-02-23"
-   maintainer "Oscar Figueiredo <oscar@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Emacs Unified Directory Client (LDAP, PH)."
-   filename "eudc-1.36-pkg.tar.gz"
-   md5sum "899aaa20a136715c06f35b73f97cfa71"
-   size 79111
-   provides (eudc eudc-vars eudc-hotlist eudc-export eudc-bob eudcb-ldap eudcb-ph eudcb-bbdb)
-   requires (fsf-compat xemacs-base bbdb mail-lib gnus)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(net-utils
-  (standards-version 1.1
-   version "1.27"
-   author-version "21.5b6"
-   date "2002-06-27"
-   build-date "2002-06-27"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "Miscellaneous Networking Utilities."
-   filename "net-utils-1.27-pkg.tar.gz"
-   md5sum "45563ca39defd1328c9dabd933d9a0f5"
-   size 120333
-   provides (ilisp-browse-cltl2 xemacsbug feedmail metamail net-utils rcompile shadowfile webjump webster-www)
-   requires (w3 efs mail-lib xemacs-base)
-   type single
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(w3
-  (standards-version 1.1
-   version "1.25"
-   author-version "4.0pre46"
-   date "2002-06-27"
-   build-date "2002-06-27"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority high
-   category "standard"
-   dump nil
-   description "A Web browser."
-   filename "w3-1.25-pkg.tar.gz"
-   md5sum "5eef9e6136c651a922d5cc341c8c7b56"
-   size 689340
-   provides (css devices w3-auto dsssl-flow dsssl font images md5 mm mule-sysdp socks ssl urlauth url-cache url-cookie url-file url-gopher url-gw url-http url-ldap url-mail url-misc url-news url-ns url-parse url-vars url w3-about w3-auto w3-cfg w3-cus w3-display w3-emacs19 w3-e19 w3-e20 w3-elisp w3-emulate w3-forms w3-hot w3-hotindex w3-imap w3-java w3-jscript w3-keyword w3-latex w3-menu w3-mouse w3-parse w3-print w3-props w3-script w3-structure w3-speak w3-style w3-sysdp w3-toolbar w3-vars w3-widget w3-xemacs w3-xemac w3)
-   requires (w3 mail-lib xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(vm
-  (standards-version 1.1
-   version "7.07"
-   author-version "7.07"
-   date "2002-06-08"
-   build-date "2002-06-08"
-   maintainer "Kyle Jones <kyle_jones@wonderworks.com>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "An Emacs mailer."
-   filename "vm-7.07-pkg.tar.gz"
-   md5sum "ab2c67c7cda2fe8739a1fef49cfc0fc5"
-   size 718569
-   provides (tapestry vm-byteopts vm-delete vm-digest vm-easymenu vm-edit vm-folder vm-imap vm-license vm-macro vm-mark vm-menu vm-message vm-mime vm-minibuf vm-misc vm-motion vm-mouse vm-page vm-pop vm-reply vm-save vm-search vm-sort vm-startup vm-summary vm-thread vm-toolbar vm-undo vm-user vm-vars vm vm-version vm-virtual vm-window)
-   requires (mail-lib xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(sounds-wav
-  (standards-version 1.1
-   version "1.10"
-   author-version "21.1"
-   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.10-pkg.tar.gz"
-   md5sum "89dff9f3b8e1aaaa19f000035e3aa199"
-   size 149162
-   provides ()
-   requires ()
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(sounds-au
-  (standards-version 1.1
-   version "1.10"
-   author-version "21.1"
-   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.10-pkg.tar.gz"
-   md5sum "256e09c0570a19ae545350681bacaf3e"
-   size 126306
-   provides ()
-   requires ()
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(xemacs-devel
-  (standards-version 1.1
-   version "1.47"
-   author-version "21.5b6"
-   date "2002-07-14"
-   build-date "2002-07-14"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "Emacs Lisp developer support."
-   filename "xemacs-devel-1.47-pkg.tar.gz"
-   md5sum "0386b19a469f684dd97e67fe5ce15a99"
-   size 228197
-   provides (checkdoc docref eldoc elp eval-expr find-func hide-copyleft ielm patcher pp trace patch-keywords)
-   requires (xemacs-base ispell mail-lib gnus)
-   type single
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(tooltalk
-  (standards-version 1.1
-   version "1.13"
-   author-version "21.1"
-   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.13-pkg.tar.gz"
-   md5sum "3f01dab216a3bc318d11f362d22ea89c"
-   size 9301
-   provides ()
-   requires ()
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(elib
-  (standards-version 1.1
-   version "1.10"
-   author-version "1.0"
-   date "2002-01-07"
-   build-date "2002-01-14"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority high
-   category "standard"
-   dump nil
-   description "Portable Emacs Lisp utilities library."
-   filename "elib-1.10-pkg.tar.gz"
-   md5sum "01deb690554da8c3f7c97e0ae170ae69"
-   size 73309
-   provides (avltree bintree cookie dll elib-node queue-f queue-m read stack-f stack-m string)
-   requires ()
-   type single
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(edebug
-  (standards-version 1.1
-   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 "standard"
-   dump nil
-   description "An Emacs Lisp debugger."
-   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
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(Sun
-  (standards-version 1.1
-   version "1.13"
-   author-version "21.1"
-   date "1998-07-25"
-   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.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
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(apel
-  (standards-version 1.1
-   version "1.24"
-   author-version "10.2"
-   date "2002-07-14"
-   build-date "2002-07-15"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority high
-   category "standard"
-   dump nil
-   description "A Portable Emacs Library.  Used by XEmacs MIME support."
-   filename "apel-1.24-pkg.tar.gz"
-   md5sum "107adb4ad0190fbd20beccff9c4e9acf"
-   size 108059
-   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
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(efs
-  (standards-version 1.0
-   version "1.29"
-   author-version "1.20"
-   date "2002-04-24"
-   build-date "2002-04-24"
-   maintainer "Mike Sperber <sperber@informatik.uni-tuebingen.de>"
-   distribution stable
-   priority medium
-   category "standard"
-   dump nil
-   description "Treat files on remote systems the same as local files."
-   filename "efs-1.29-pkg.tar.gz"
-   md5sum "8c2c6c00cfbdc5f8d64ad54ddfb731df"
-   size 371905
-   provides (efs)
-   requires (xemacs-base dired)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(dired
-  (standards-version 1.0
-   version "1.12"
-   author-version "7.10"
-   date "2002-04-24"
-   build-date "2002-04-24"
-   maintainer "Mike Sperber <sperber@informatik.uni-tuebingen.de>"
-   distribution stable
-   priority medium
-   category "standard"
-   dump nil
-   description "Manage file systems."
-   filename "dired-1.12-pkg.tar.gz"
-   md5sum "be9971fc8b39136a495a1a06110bc964"
-   size 195581
-   provides (diff dired)
-   requires (xemacs-base prog-modes)
-   type regular
-))
-))
-;;;@@@
-;; Package Index file ends here
Index: lib-src/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- lib-src/ChangeLog	24 Apr 2003 23:41:34 -0000	1.158
+++ lib-src/ChangeLog	10 May 2003 08:53:30 -0000	1.159
@@ -1,3 +1,7 @@
+2003-05-10  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.13 "cauliflower" is released.
+
 2003-04-24  Steve Youngs  <youngs@xemacs.org>
 
 	* XEmacs 21.5.12 "carrot" is released.
Index: lisp/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.498
retrieving revision 1.504
diff -u -r1.498 -r1.504
--- lisp/ChangeLog	24 Apr 2003 23:41:35 -0000	1.498
+++ lisp/ChangeLog	10 May 2003 08:53:31 -0000	1.504
@@ -1,3 +1,33 @@
+2003-05-10  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.13 "cauliflower" is released.
+
+2003-05-08  Jerry James  <james@xemacs.org>
+
+	* code-init.el (coding-system-variable-default-value-table): Use
+	undecided-unix for keyboards to avoid EOL autodetection on TTYs.
+	* code-init.el (coding-system-variable-default-value): Update the
+	comment to reflect the changed table.
+
+2003-05-03  Steve Youngs  <youngs@xemacs.org>
+
+	* package-admin.el (package-admin-find-top-directory): You can't
+	concat a string & a char, so convert 'directory-sep-char' to a string.
+
+2003-05-02  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* cmdloop.el (command-error): Ensure exit msg is on separate line.
+
+2003-05-01  Steve Youngs  <youngs@xemacs.org>
+
+	* package-get.el (package-get-require-signed-base-updates): Force
+	default to nil while I sort out some PGP problems.
+
+2003-04-16  Jerry James  <james@xemacs.org>
+
+	* keydefs.el: Remove mappings for keys mapped to the nowhere
+	defined function function-key-error.
+
 2003-04-24  Steve Youngs  <youngs@xemacs.org>
 
 	* XEmacs 21.5.12 "carrot" is released.
Index: lisp/cmdloop.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/cmdloop.el,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- lisp/cmdloop.el	9 Mar 2003 02:27:33 -0000	1.15
+++ lisp/cmdloop.el	2 May 2003 06:32:29 -0000	1.16
@@ -164,7 +164,7 @@
 
     (if (noninteractive)
         (progn
-          (message "%s exiting.\n" emacs-program-name)
+          (message "\n%s exiting.\n" emacs-program-name)
           (kill-emacs -1)))
     t))
 
Index: lisp/code-init.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/code-init.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lisp/code-init.el	21 Feb 2003 06:56:47 -0000	1.5
+++ lisp/code-init.el	10 May 2003 04:18:52 -0000	1.6
@@ -79,7 +79,7 @@
     (native
      binary binary binary raw-text-dos mswindows-multibyte-system-default-dos)
     (keyboard
-     binary raw-text undecided raw-text undecided)
+     binary raw-text undecided-unix raw-text undecided-unix)
     ;; the `terminal' coding system is used for output to stderr.  such
     ;; streams do automatic lf->crlf encoding in the C library, so we need
     ;; to not do the same translations ourselves.
@@ -158,16 +158,16 @@
 The table of default values looks like this: (see below for abbreviations)
 
 
-                 Unix      Unix+EOL    Unix+Mule   MSW           MSW+Mule
-------------------------------------------------------------------------------
-bfcs-for-read    binary    raw-text    undecided   raw-text      undecided
-default bfcs     binary    binary      iso-2022-8  raw-text-dos  MSW-MB-dos
-native           binary    binary      binary      raw-text-dos  MSW-MB-SD-dos
-keyboard         binary    raw-text    undecided   raw-text      undecided
-terminal         binary    binary      binary      binary        MSW-MB-unix
-process-read     binary    raw-text    undecided   raw-text      undecided
-process-write    binary    binary      binary      raw-text      MSW-MB-SD
-no-conv-cs       binary    raw-text    raw-text    raw-text      MSW-MB
+               Unix    Unix+EOL  Unix+Mule       MSW           MSW+Mule
+-----------------------------------------------------------------------------
+bfcs-for-read  binary  raw-text  undecided       raw-text      undecided
+default bfcs   binary  binary    iso-2022-8      raw-text-dos  MSW-MB-dos
+native         binary  binary    binary          raw-text-dos  MSW-MB-SD-dos
+keyboard       binary  raw-text  undecided-unix  raw-text      undecided-unix
+terminal       binary  binary    binary          binary        MSW-MB-unix
+process-read   binary  raw-text  undecided       raw-text      undecided
+process-write  binary  binary    binary          raw-text      MSW-MB-SD
+no-conv-cs     binary  raw-text  raw-text        raw-text      MSW-MB
 
 
 VAR can be one of: (abbreviations in parens)
Index: lisp/keydefs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/keydefs.el,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- lisp/keydefs.el	2 Mar 2003 09:38:39 -0000	1.17
+++ lisp/keydefs.el	28 Apr 2003 16:18:23 -0000	1.18
@@ -665,13 +665,13 @@
 (define-key global-map 'kp-8		'self-insert-command)
 (define-key global-map 'kp-9		'self-insert-command)
 
-(define-key global-map 'select		'function-key-error)
-(define-key global-map 'print		'function-key-error)
+;(define-key global-map 'select		'function-key-error)
+;(define-key global-map 'print		'function-key-error)
 (define-key global-map 'execute		'execute-extended-command)
-(define-key global-map 'clearline	'function-key-error)
+;(define-key global-map 'clearline	'function-key-error)
 (define-key global-map 'insertline	'open-line)
 (define-key global-map 'deleteline	'kill-line)
-(define-key global-map 'insertchar	'function-key-error)
+;(define-key global-map 'insertchar	'function-key-error)
 (define-key global-map 'deletechar	'delete-char)
 
 ;;; keydefs.el ends here
Index: lisp/package-admin.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/package-admin.el,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- lisp/package-admin.el	14 Apr 2003 03:40:27 -0000	1.22
+++ lisp/package-admin.el	2 May 2003 22:51:04 -0000	1.23
@@ -174,13 +174,13 @@
 	  (cond ((eq type 'std)
 		 (while path-list
 		   (if (equal (substring (car path-list) -16) 
-			      (concat "xemacs-packages" directory-sep-char))
+			      (concat "xemacs-packages" (char-to-string directory-sep-char)))
 		       (setq top-dir (car path-list)))
 		   (setq path-list (cdr path-list))))
 		((eq type 'mule)
 		 (while path-list
 		   (if (equal (substring (car path-list) -14) 
-			      (concat "mule-packages" directory-sep-char))
+			      (concat "mule-packages" (char-to-string directory-sep-char)))
 		       (setq top-dir (car path-list)))
 		   (setq path-list (cdr path-list)))))))
     ;; Wasn't in the environment, try `user-init-directory' if
@@ -201,13 +201,13 @@
 	  (cond ((eq type 'std)
 		 (while path-list
 		   (if (equal (substring (car path-list) -16) 
-			      (concat "xemacs-packages" directory-sep-char))
+			      (concat "xemacs-packages" (char-to-string directory-sep-char)))
 		       (setq top-dir (car path-list)))
 		   (setq path-list (cdr path-list))))
 		((eq type 'mule)
 		 (while path-list
 		   (if (equal (substring (car path-list) -14) 
-			      (concat "mule-packages" directory-sep-char))
+			      (concat "mule-packages" (char-to-string directory-sep-char)))
 		       (setq top-dir (car path-list)))
 		   (setq path-list (cdr path-list)))))))
     ;; Now return either the directory or nil.
Index: lisp/package-get.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/package-get.el,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- lisp/package-get.el	14 Apr 2003 03:40:27 -0000	1.60
+++ lisp/package-get.el	1 May 2003 02:29:00 -0000	1.61
@@ -410,7 +410,11 @@
 	result
       nil)))
 
-(defcustom package-get-require-signed-base-updates (package-get-pgp-available-p)
+;;; FIXME: There's something strange happening with verifying the
+;;; package-index file, it is reporting "The message was corrupt" even
+;;; though verifying from the command line (outside of XEmacs) reports
+;;; a good signature. --SY
+(defcustom package-get-require-signed-base-updates nil
   "*If non-nil, try to verify the package index database via PGP.
 
 If nil, no PGP verification is done.  If the package index database
Index: lwlib/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.53
diff -u -r1.51 -r1.53
--- lwlib/ChangeLog	24 Apr 2003 23:41:37 -0000	1.51
+++ lwlib/ChangeLog	10 May 2003 08:53:32 -0000	1.53
@@ -1,3 +1,12 @@
+2003-05-10  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.13 "cauliflower" is released.
+
+2003-05-05  Steve Youngs  <youngs@xemacs.org>
+
+	* lwlib-Xm.c (xm_update_one_widget): Only call
+	`xm_update_progress' if `LWLIB_WIDGETS_MOTIF' is defined.
+
 2003-04-24  Steve Youngs  <youngs@xemacs.org>
 
 	* XEmacs 21.5.12 "carrot" is released.
Index: lwlib/lwlib-Xm.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/lwlib-Xm.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- lwlib/lwlib-Xm.c	1 Mar 2003 07:25:31 -0000	1.20
+++ lwlib/lwlib-Xm.c	5 May 2003 04:52:40 -0000	1.21
@@ -902,10 +902,12 @@
       xm_update_scrollbar (instance, widget, val);
     }
 #endif
+#ifdef LWLIB_WIDGETS_MOTIF
   else if (class_ == xmScaleWidgetClass)
     {
       xm_update_progress (instance, widget, val);
     }
+#endif
   /* Lastly update our global arg values. */
   if (val->args && val->args->nargs)
     XtSetValues (widget, val->args->args, val->args->nargs);
Index: man/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v
retrieving revision 1.217
retrieving revision 1.220
diff -u -r1.217 -r1.220
--- man/ChangeLog	24 Apr 2003 23:41:38 -0000	1.217
+++ man/ChangeLog	10 May 2003 08:53:33 -0000	1.220
@@ -1,3 +1,15 @@
+2003-05-10  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.13 "cauliflower" is released.
+
+2003-05-09  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* lispref/searching.texi (Match Data): Failed match preserves data.
+
+2003-04-28  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* xemacs-faq.texi (Q6.4.3): New: auxiliary programs for Windows.
+
 2003-04-24  Steve Youngs  <youngs@xemacs.org>
 
 	* XEmacs 21.5.12 "carrot" is released.
Index: man/xemacs-faq.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs-faq.texi,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- man/xemacs-faq.texi	27 Mar 2003 12:57:48 -0000	1.69
+++ man/xemacs-faq.texi	2 May 2003 06:00:43 -0000	1.70
@@ -7,7 +7,7 @@
 @finalout
 @titlepage
 @title XEmacs FAQ
-@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2003/03/27 12:57:48 $
+@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2003/05/02 06:00:43 $
 @sp 1
 @author Tony Rossini <rossini@@biostat.washington.edu>
 @author Ben Wing <ben@@xemacs.org>
@@ -415,6 +415,7 @@
 Troubleshooting:
 * Q6.4.1::      XEmacs won't start on Windows.
 * Q6.4.2::      Why do I get a blank toolbar on Windows 95?
+* Q6.4.3::      XEmacs complains "No such file or directory, diff"
 
 
 Current Events:
@@ -6237,6 +6238,8 @@
 Troubleshooting:
 * Q6.4.1::      XEmacs won't start on Windows.
 * Q6.4.2::      Why do I get a blank toolbar on Windows 95?
+* Q6.4.3::      XEmacs complains "No such file or directory, diff"
+
 @end menu
 
 @node Q6.0.1, Q6.0.2, MS Windows, MS Windows
@@ -6877,7 +6880,7 @@
 binaries, but you can use the 21.1 binaries if you are very paranoid
 about stability.  @xref{Q6.0.3}.
 
-@node Q6.4.2, , Q6.4.1, MS Windows
+@node Q6.4.2, Q6.4.3, Q6.4.1, MS Windows
 @unnumberedsubsec Q6.4.2 Why do I get a blank toolbar on Windows 95?
 
 You need at least version 4.71 of the system file @file{comctl32.dll}.
@@ -6885,6 +6888,21 @@
 you are avoiding IE you can also download it from the Microsoft web
 site.  Go into support and search for @file{comctl32.dll}.  The download
 is a self-installing executable.
+
+@node Q6.4.3, , Q6.4.2, MS Windows
+@unnumberedsubsec Q6.4.3 XEmacs complains "No such file or directory, diff"
+
+or "ispell" or other commands that seem related to whatever you just
+tried to do (M-x ediff or M-$, for example).
+
+There are a large number of common (in the sense that "everyone has
+these, they really do") Unix utilities that are not provided with
+XEmacs.  The GNU Project's implementations are available for Windows in
+the the Cygwin distribution (@uref{http://www.cygwin.com/}), which also
+provides a complete Unix emulation environment (and thus makes ports of
+Unix utilities nearly trivial).  Another implementation is that from
+MinGW (@uref{http://www.mingw.org/msys.shtml}).  If you know of others,
+please let us know!
 
 
 
Index: man/lispref/searching.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/searching.texi,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- man/lispref/searching.texi	12 Apr 2001 18:22:20 -0000	1.9
+++ man/lispref/searching.texi	9 May 2003 14:52:43 -0000	1.10
@@ -1058,11 +1058,19 @@
 message, and then extract parts of the match under control of the
 pattern.
 
-  Because the match data normally describe the most recent search only,
-you must be careful not to do another search inadvertently between the
-search you wish to refer back to and the use of the match data.  If you
-can't avoid another intervening search, you must save and restore the
-match data around it, to prevent it from being overwritten.
+  Because the match data normally describe the most recent successful
+search only, you must be careful not to do another search inadvertently
+between the search you wish to refer back to and the use of the match
+data.  If you can't avoid another intervening search, you must save and
+restore the match data around it, to prevent it from being overwritten.
+
+To make it possible to write iterative or recursive code that repeatedly
+searches, and uses the data from the last successful search when no more
+matches can be found, a search or match which fails will preserve the
+match data from the last successful search.  (You must not depend on
+match data being preserved in case the search or match signals an
+error.)  If for some reason you need to clear the match data, you may
+use @code{(store-match-data nil)}.
 
 @menu
 * Simple Match Data::     Accessing single items of match data,
Index: modules/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- modules/ChangeLog	24 Apr 2003 23:41:39 -0000	1.17
+++ modules/ChangeLog	10 May 2003 08:53:34 -0000	1.18
@@ -1,3 +1,7 @@
+2003-05-10  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.13 "cauliflower" is released.
+
 2003-04-24  Steve Youngs  <youngs@xemacs.org>
 
 	* XEmacs 21.5.12 "carrot" is released.
Index: netinstall/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/netinstall/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- netinstall/ChangeLog	24 Apr 2003 23:41:40 -0000	1.25
+++ netinstall/ChangeLog	10 May 2003 08:53:35 -0000	1.26
@@ -1,3 +1,7 @@
+2003-05-10  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.13 "cauliflower" is released.
+
 2003-04-24  Steve Youngs  <youngs@xemacs.org>
 
 	* XEmacs 21.5.12 "carrot" is released.
@@ -475,6 +479,6 @@
 
 	* all: port from cygwin setup.
 
-%%% $Id: ChangeLog,v 1.25 2003/04/24 23:41:40 youngs Exp $
-$Revision: 1.25 $
+%%% $Id: ChangeLog,v 1.26 2003/05/10 08:53:35 youngs Exp $
+$Revision: 1.26 $
 
Index: nt/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/ChangeLog,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- nt/ChangeLog	24 Apr 2003 23:41:41 -0000	1.160
+++ nt/ChangeLog	10 May 2003 08:53:36 -0000	1.161
@@ -1,3 +1,7 @@
+2003-05-10  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.13 "cauliflower" is released.
+
 2003-04-24  Steve Youngs  <youngs@xemacs.org>
 
 	* XEmacs 21.5.12 "carrot" is released.
Index: nt/installer/Wise/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/installer/Wise/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nt/installer/Wise/ChangeLog	24 Apr 2003 23:41:41 -0000	1.14
+++ nt/installer/Wise/ChangeLog	10 May 2003 08:53:37 -0000	1.15
@@ -1,3 +1,7 @@
+2003-05-10  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.13 "cauliflower" is released.
+
 2003-04-24  Steve Youngs  <youngs@xemacs.org>
 
 	* XEmacs 21.5.12 "carrot" is released.
Index: src/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.584
retrieving revision 1.594
diff -u -r1.584 -r1.594
--- src/ChangeLog	24 Apr 2003 23:41:43 -0000	1.584
+++ src/ChangeLog	10 May 2003 08:53:38 -0000	1.594
@@ -1,3 +1,95 @@
+2003-05-10  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.13 "cauliflower" is released.
+
+2003-05-09  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* search.c (search_regs): Make comment reflect reality.
+	(clear_search_regs): Unconditionally clear global regs.
+	(set_search_regs): Call clear_search_regs to clear unused regs.
+	(looking_at_1):
+	(string_match_1):
+	(search_buffer):
+	(simple_search):
+	(boyer_moore):
+	Don't call clear_search_regs directly.
+	(Flooking_at):
+	(Fposix_looking_at):
+	(Fstring_match):
+	(Fposix_string_match):
+	(Fsearch_backward):
+	(Fsearch_forward):
+	(Fword_search_backward):
+	(Fword_search_forward):
+	(Fre_search_backward): 
+	(Fre_search_forward): 
+	(Fposix_search_backward):
+	(Fposix_search_forward):
+	Document that search/match failure preserves match data.
+	(Freplace_match):
+	(Fstore_match_data):
+	Improve docstrings.
+
+	* regex.c (re_match_2_internal): Init syn1, syn2 to quiet compiler.
+
+	* regex.h (struct re_registers): Add comment.
+
+2003-05-09  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	Various cleanups against the possibility that <sys/stat.h> does
+	#define stat ... .
+
+	* lisp.h: Remove struct stat declaration.
+
+2003-05-06  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* broken-sun.h: Warn about possibility of #define stat.
+
+2000-07-22  Ilya N. Golubev  <gin@mo.msk.ru>
+
+	* lisp.h (filemodestring): Remove
+	
+	* sysfile.h (filemodestring): Put it here
+
+	* filemode.c (filemodestring): Note in comment where it is
+	declared.
+
+2003-05-09  Martin Buchholz  <martin@xemacs.org>
+
+	* dumper.c (pdump_load): Pdump'ed XEmacs can't find its .dmp file.
+	Scenario: Prepend ~/bin to PATH; then `mkdir ~/bin/xemacs'
+	Result: "temacs can only be run in -batch mode."
+	Fix: Check xemacs executable candidate for directory-ness.
+
+2003-05-06  Martin Buchholz  <martin@xemacs.org>
+
+	* database.c: Berkeley DB wants __STDC__ to be defined.
+
+2003-04-05  Martin Buchholz  <martin@xemacs.org>
+
+	* EmacsFrameP.h (EmacsFramePart):
+	Kludge to allow compiling with Motif1, but linking with Motif2.
+
+2003-05-04  Robert Pluim  <rpluim@bigfoot.com>
+
+	* database.c: Don't use the u_int8_t etc typedefs on FreeBSD,
+	  they conflict with <sys/types.h>.
+
+2003-05-02  Andrew Begel  <abegel@CS.Berkeley.EDU>
+
+	* lrecord.h: Added casts from int to enum lrecord_type to support
+	externally defined lrecord types.
+
+2003-05-01  Andrew Begel  <abegel@CS.Berkeley.EDU>
+
+	* text.h (IBYTE_STRING_TO_ALLOCA): Removed a stray backslash from
+	the preceding comment.
+
+2003-05-02  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* config.h.in (HAVE_INTPTR_T_IN_SYS_TYPES_H): New.
+	lisp.h (intptr_t): Use it.
+
 2003-04-24  Steve Youngs  <youngs@xemacs.org>
 
 	* XEmacs 21.5.12 "carrot" is released.
Index: src/EmacsFrameP.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsFrameP.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- src/EmacsFrameP.h	7 Jun 2002 13:34:50 -0000	1.6
+++ src/EmacsFrameP.h	4 May 2003 02:34:35 -0000	1.7
@@ -32,6 +32,31 @@
 #include "EmacsFrame.h"
 
 typedef struct {
+
+#ifdef LWLIB_USES_MOTIF
+#if XmVERSION < 2
+  /* It's easy to erroneously compile with Motif 1 headers, but link
+     with Motif 2 libraries.
+
+     For example, AIX stupidly provides Motif headers in
+     /usr/dt/include, but fails to provide the corresponding libraries
+     in /usr/dt/lib.
+
+     We actually try to survive such a version mismatch, since Motif 2
+     is _almost_ binary compatible with Motif 1.  Motif 2's
+     XmPrimitivePart has some trailing data members which overlay the
+     start of this struct.  We create dummy members to make space for
+     XmPrimitivePart's added members.  These must, of course, be at
+     the beginning of this struct.
+
+     Delete this kludge when no one has Motif1 on their system anymore,
+     perhaps in 2010. */
+  XtCallbackList Motif2_dummy_convert_callback;
+  XtCallbackList Motif2_dummy_popup_handler_callback;
+  long           Motif2_dummy_layout_direction;
+#endif
+#endif
+
   struct frame*	frame;		/* the *emacs* frame object */
 
   /* Resources that can't be done from lisp.
Index: src/config.h.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/config.h.in,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- src/config.h.in	26 Mar 2003 04:22:49 -0000	1.86
+++ src/config.h.in	2 May 2003 06:25:03 -0000	1.87
@@ -892,6 +892,11 @@
 #undef SIZEOF_LONG_LONG
 #undef SIZEOF_VOID_P
 
+/* some systems (Cygwin) typedef u?intptr_t in <sys/types.h>
+   but the standard is <inttypes.h>
+   ugliness due to last-resort conditional typedef'ing in lisp.h */
+#undef HAVE_INTPTR_T_IN_SYS_TYPES_H
+
 /* Does the keyword `inline' exist?  */
 #undef inline
 
Index: src/database.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/database.c,v
retrieving revision 1.26
retrieving revision 1.28
diff -u -r1.26 -r1.28
--- src/database.c	24 Mar 2003 15:01:50 -0000	1.26
+++ src/database.c	6 May 2003 04:54:21 -0000	1.28
@@ -47,14 +47,20 @@
 #ifdef HAVE_INTTYPES_H
 #define __BIT_TYPES_DEFINED__
 #include <inttypes.h>
+#ifndef __FreeBSD__
 typedef uint8_t  u_int8_t;
 typedef uint16_t u_int16_t;
 typedef uint32_t u_int32_t;
 #ifdef WE_DONT_NEED_QUADS
 typedef uint64_t u_int64_t;
 #endif /* WE_DONT_NEED_QUADS */
+#endif /* __FreeBSD__ */
 #endif /* HAVE_INTTYPES_H */
 #endif /* !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1) */
+/* Berkeley DB wants __STDC__ to be defined; else if does `#define const' */
+#if ! defined (__STDC__) && ! defined(__cplusplus)
+#define __STDC__ 0
+#endif
 #include DB_H_FILE              /* Berkeley db's header file */
 #ifndef DB_VERSION_MAJOR
 # define DB_VERSION_MAJOR 1
Index: src/dumper.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dumper.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- src/dumper.c	2 Mar 2003 09:38:52 -0000	1.14
+++ src/dumper.c	9 May 2003 01:41:56 -0000	1.15
@@ -1595,8 +1595,17 @@
 	    }
 	  strcpy (w, name);
 
-	  if (!access (exe_path, X_OK))
-	    break;
+#undef access /* avoid !@#$%^& encapsulated access */
+#undef stat   /* avoid !@#$%^& encapsulated stat */
+
+	  {
+	    struct stat statbuf;
+	    if (access (exe_path, X_OK) == 0
+		&& stat (exe_path, &statbuf) == 0
+		&& ! S_ISDIR (statbuf.st_mode))
+	      break;
+	  }
+
 	  if (!*p)
 	    {
 	      /* Oh well, let's have some kind of default */
Index: src/filemode.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/filemode.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- src/filemode.c	12 Apr 2001 18:23:45 -0000	1.2
+++ src/filemode.c	9 May 2003 09:50:42 -0000	1.3
@@ -30,7 +30,9 @@
 static void rwx (unsigned short bits, char *chars);
 static void setst (unsigned short bits, char *chars);
 
-/* filemodestring - fill in string STR with an ls-style ASCII
+/* declared in "sysfile.h"
+
+   filemodestring - fill in string STR with an ls-style ASCII
    representation of the st_mode field of file stats block STATP.
    10 characters are stored in STR; no terminating null is added.
    The characters stored in STR are:
Index: src/lisp.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v
retrieving revision 1.100
retrieving revision 1.102
diff -u -r1.100 -r1.102
--- src/lisp.h	24 Apr 2003 05:33:44 -0000	1.100
+++ src/lisp.h	9 May 2003 09:50:41 -0000	1.102
@@ -797,6 +797,8 @@
 
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
+#elif defined(HAVE_INTPTR_T_IN_SYS_TYPES_H)
+/* included elsewhere */
 #elif SIZEOF_VOID_P == SIZEOF_INT
 typedef int intptr_t;
 typedef unsigned int uintptr_t;
@@ -1403,7 +1405,6 @@
 struct extent;
 struct frame;			/* "frame.h" */
 struct window;                  /* "window.h" */
-struct stat;                    /* <sys/stat.h> */
 struct utimbuf;                 /* "systime.h" or <utime.h> */
 struct display_line;
 struct display_glyph_area;
@@ -4280,9 +4281,6 @@
 void unlock_file (Lisp_Object);
 void unlock_all_files (void);
 void unlock_buffer (struct buffer *);
-
-/* Defined in filemode.c */
-void filemodestring (struct stat *, char *);
 
 /* Defined in floatfns.c */
 EXFUN (Ftruncate, 1);
Index: src/regex.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/regex.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- src/regex.c	23 Apr 2003 15:42:45 -0000	1.45
+++ src/regex.c	9 May 2003 14:52:38 -0000	1.46
@@ -6080,7 +6080,8 @@
 	       emch1, emch2 is the character at d, and syn2 is the
 	       syntax of emch2. */
 	    Ichar emch1, emch2;
-	    int syn1, syn2;
+	    int syn1 = 0,
+	        syn2 = 0;
 	    re_char *d_before, *d_after;
 	    int result,
 		at_beg = AT_STRINGS_BEG (d),
Index: src/regex.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/regex.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- src/regex.h	5 May 2002 11:32:23 -0000	1.11
+++ src/regex.h	9 May 2003 14:52:38 -0000	1.12
@@ -418,7 +418,7 @@
    regex.texinfo for a full description of what registers match.  */
 struct re_registers
 {
-  int num_regs;
+  int num_regs;			/* number of registers allocated */
   regoff_t *start;
   regoff_t *end;
 };
Index: src/search.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/search.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- src/search.c	23 Apr 2003 15:42:45 -0000	1.38
+++ src/search.c	9 May 2003 14:52:38 -0000	1.39
@@ -93,29 +93,20 @@
    */
 static struct re_registers search_regs;
 
-/* Every function that _may_ set the match data _must_ clear the search
-   registers on entry.  An unsuccessful search should leave the search
-   registers cleared.  Applications that are no-ops by definition (eg,
-   searches with a repetition count of 0) _must not_ clear the search
-   registers.
+/* Every function that sets the match data _must_ clear unused search
+   registers on success.  An unsuccessful search or match _must_ preserve
+   the search registers.  The traditional documentation implied that
+   any match operation might trash the registers, but in fact failures
+   have always preserved the match data (in GNU Emacs as well).  Some
+   plausible code depends on this behavior (cf. `w3-configuration-data'
+   in library "w3-cfg").
 
-   XEmacs 21.5 up to beta 11 may have permitted the following idiom to
-   "win" in the sense that the match data was set to the last successful
-   match's match data, and not cleared as the current implemenation does:
-
-   (while (search_forward "string"))
-   (use-match-data-of-last-successful-search)
-
-   This no longer can work.  You must use save-match-data to preserve the
-   match data:
-
-   (let (md)
-     (while (when (search-forward "string") (setq md (match-data))))
-     (set-match-data md))
-   (use-match-data-of-last-successful-search)
+   Ordinary string searchs use set_search_regs to set the whole-string
+   match.  That function takes care of clearing the unused subexpression
+   registers.
    */
 static void set_search_regs (struct buffer *buf, Charbpos beg, Charcount len);
-static void clear_search_regs (struct re_registers *regp);
+static void clear_search_regs (void);
 
 /* The buffer in which the last search was performed, or
    Qt if the last search was done in a string;
@@ -326,9 +317,6 @@
   struct syntax_cache scache_struct;
   struct syntax_cache *scache = &scache_struct;
   
-  /* clear search registers *now*.  no mercy, not even for errors */
-  clear_search_regs (&search_regs);
-
   CHECK_STRING (string);
   bufp = compile_pattern (string, &search_regs,
 			  (!NILP (buf->case_fold_search)
@@ -382,9 +370,11 @@
 
 DEFUN ("looking-at", Flooking_at, 1, 2, 0, /*
 Return t if text after point matches regular expression REGEXP.
-This function modifies the match data that `match-beginning',
-`match-end' and `match-data' access; save and restore the match
-data if you want to preserve them.
+When the match is successful, this function modifies the match data
+that `match-beginning', `match-end' and `match-data' access; save the
+match data with `match-data' and restore it with `store-match-data' if
+you want to preserve them.  If the match fails, the match data from the
+previous success match is preserved.
 
 Optional argument BUFFER defaults to the current buffer.
 */
@@ -396,9 +386,11 @@
 DEFUN ("posix-looking-at", Fposix_looking_at, 1, 2, 0, /*
 Return t if text after point matches regular expression REGEXP.
 Find the longest match, in accord with Posix regular expression rules.
-This function modifies the match data that `match-beginning',
-`match-end' and `match-data' access; save and restore the match
-data if you want to preserve them.
+When the match is successful, this function modifies the match data
+that `match-beginning', `match-end' and `match-data' access; save the
+match data with `match-data' and restore it with `store-match-data' if
+you want to preserve them.  If the match fails, the match data from the
+previous success match is preserved.
 
 Optional argument BUFFER defaults to the current buffer.
 */
@@ -419,9 +411,6 @@
      data.  Not necessary because we don't call process filters
      asynchronously (i.e. from within QUIT). */
 
-  /* clear search registers *now*.  no mercy, not even for errors */
-  clear_search_regs (&search_regs);
-
   CHECK_STRING (regexp);
   CHECK_STRING (string);
 
@@ -491,9 +480,14 @@
          (string-match "^foo.*bar" string))
 
    but the case, syntax, and category tables come from the standard tables,
-   which are accessed through functions `default-{case,syntax,category}-table' and serve as the parents of the
-   tables in particular buffer
+   which are accessed through functions `default-{case,syntax,category}-table'
+   and serve as the parents of the tables in particular buffer.
 
+When the match is successful, this function modifies the match data
+that `match-beginning', `match-end' and `match-data' access; save the
+match data with `match-data' and restore it with `store-match-data' if
+you want to preserve them.  If the match fails, the match data from the
+previous success match is preserved.
 */
        (regexp, string, start, buffer))
 {
@@ -513,6 +507,12 @@
 Optional arg BUFFER controls how case folding is done (according to
 the value of `case-fold-search' in that buffer and that buffer's case
 tables) and defaults to the current buffer.
+
+When the match is successful, this function modifies the match data
+that `match-beginning', `match-end' and `match-data' access; save the
+match data with `match-data' and restore it with `store-match-data' if
+you want to preserve them.  If the match fails, the match data from the
+previous success match is preserved.
 */
        (regexp, string, start, buffer))
 {
@@ -1251,9 +1251,6 @@
   if (n == 0)
     return charbpos;
 
-  /* clear the search regs now */
-  clear_search_regs (&search_regs);
-
   /* Null string is found at starting position.  */
   if (len == 0)
     {
@@ -1647,9 +1644,6 @@
     simple_translate[i] = (Ibyte) i;
   i = 0;
 
-  /* clear search regs now */
-  clear_search_regs (&search_regs);
-
   while (i != infinity)
     {
       Ibyte *ptr = base_pat + i;
@@ -2004,23 +1998,22 @@
       search_regs.num_regs = 1;
     }
 
+  clear_search_regs ();
   search_regs.start[0] = beg;
   search_regs.end[0] = beg + len;
   last_thing_searched = wrap_buffer (buf);
 }
 
-/* Clear search registers so match data will be null.
-   REGP is a pointer to the register structure to clear, usually the global
-   search_regs. */
+/* Clear search registers so match data will be null. */
 
 static void
-clear_search_regs (struct re_registers *regp)
+clear_search_regs (void)
 {
   /* This function has been Mule-ized. */
   int i;
 
-  for (i = 0; i < regp->num_regs; i++)
-    regp->start[i] = regp->end[i] = -1;
+  for (i = 0; i < search_regs.num_regs; i++)
+    search_regs.start[i] = search_regs.end[i] = -1;
 }
 
 
@@ -2106,7 +2099,13 @@
 Optional fifth argument BUFFER specifies the buffer to search in and
 defaults to the current buffer.
 
-See also the functions `match-beginning', `match-end' and `replace-match'.
+When the match is successful, this function modifies the match data
+that `match-beginning', `match-end' and `match-data' access; save the
+match data with `match-data' and restore it with `store-match-data' if
+you want to preserve them.  If the match fails, the match data from the
+previous success match is preserved.
+
+See also the function `replace-match'.
 */
        (string, limit, noerror, count, buffer))
 {
@@ -2131,7 +2130,13 @@
 Optional fifth argument BUFFER specifies the buffer to search in and
 defaults to the current buffer.
 
-See also the functions `match-beginning', `match-end' and `replace-match'.
+When the match is successful, this function modifies the match data
+that `match-beginning', `match-end' and `match-data' access; save the
+match data with `match-data' and restore it with `store-match-data' if
+you want to preserve them.  If the match fails, the match data from the
+previous success match is preserved.
+
+See also the function `replace-match'.
 */
        (string, limit, noerror, count, buffer))
 {
@@ -2157,7 +2162,13 @@
 Optional fifth argument BUFFER specifies the buffer to search in and
 defaults to the current buffer.
 
-See also the functions `match-beginning', `match-end' and `replace-match'.
+When the match is successful, this function modifies the match data
+that `match-beginning', `match-end' and `match-data' access; save the
+match data with `match-data' and restore it with `store-match-data' if
+you want to preserve them.  If the match fails, the match data from the
+previous success match is preserved.
+
+See also the function `replace-match'.
 */
        (string, limit, noerror, count, buffer))
 {
@@ -2183,7 +2194,13 @@
 Optional fifth argument BUFFER specifies the buffer to search in and
 defaults to the current buffer.
 
-See also the functions `match-beginning', `match-end' and `replace-match'.
+When the match is successful, this function modifies the match data
+that `match-beginning', `match-end' and `match-data' access; save the
+match data with `match-data' and restore it with `store-match-data' if
+you want to preserve them.  If the match fails, the match data from the
+previous success match is preserved.
+
+See also the function `replace-match'.
 */
        (string, limit, noerror, count, buffer))
 {
@@ -2212,7 +2229,13 @@
 Optional fifth argument BUFFER specifies the buffer to search in and
 defaults to the current buffer.
 
-See also the functions `match-beginning', `match-end' and `replace-match'.
+When the match is successful, this function modifies the match data
+that `match-beginning', `match-end' and `match-data' access; save the
+match data with `match-data' and restore it with `store-match-data' if
+you want to preserve them.  If the match fails, the match data from the
+previous success match is preserved.
+
+See also the function `replace-match'.
 */
        (regexp, limit, noerror, count, buffer))
 {
@@ -2237,7 +2260,13 @@
 Optional fifth argument BUFFER specifies the buffer to search in and
 defaults to the current buffer.
 
-See also the functions `match-beginning', `match-end' and `replace-match'.
+When the match is successful, this function modifies the match data
+that `match-beginning', `match-end' and `match-data' access; save the
+match data with `match-data' and restore it with `store-match-data' if
+you want to preserve them.  If the match fails, the match data from the
+previous success match is preserved.
+
+See also the function `replace-match'.
 */
        (regexp, limit, noerror, count, buffer))
 {
@@ -2266,7 +2295,13 @@
 Optional fifth argument BUFFER specifies the buffer to search in and
 defaults to the current buffer.
 
-See also the functions `match-beginning', `match-end' and `replace-match'.
+When the match is successful, this function modifies the match data
+that `match-beginning', `match-end' and `match-data' access; save the
+match data with `match-data' and restore it with `store-match-data' if
+you want to preserve them.  If the match fails, the match data from the
+previous success match is preserved.
+
+See also the function `replace-match'.
 */
        (regexp, limit, noerror, count, buffer))
 {
@@ -2292,7 +2327,13 @@
 Optional fifth argument BUFFER specifies the buffer to search in and
 defaults to the current buffer.
 
-See also the functions `match-beginning', `match-end' and `replace-match'.
+When the match is successful, this function modifies the match data
+that `match-beginning', `match-end' and `match-data' access; save the
+match data with `match-data' and restore it with `store-match-data' if
+you want to preserve them.  If the match fails, the match data from the
+previous success match is preserved.
+
+See also the function `replace-match'.
 */
        (regexp, limit, noerror, count, buffer))
 {
@@ -2351,11 +2392,11 @@
 whole match.  This is useful only after a regular expression search or
 match since only regular expressions have distinguished subexpressions.
 
-If no match (including searches) has been conducted, the last match
-operation failed, or the requested subexpression was not matched, an
-`args-out-of-range' error will be signaled.  (If no match has ever been
-conducted in this instance of XEmacs, an `invalid-operation' error will
-be signaled.  This is very rare.)
+If no match (including searches) has been conducted or the requested
+subexpression was not matched, an `args-out-of-range' error will be
+signaled.  (If no match has ever been conducted in this instance of
+XEmacs, an `invalid-operation' error will be signaled.  This is very
+rare.)
 */
        (replacement, fixedcase, literal, string, strbuffer))
 {
@@ -2919,7 +2960,8 @@
 
 DEFUN ("store-match-data", Fstore_match_data, 1, 1, 0, /*
 Set internal data on last search match from elements of LIST.
-LIST should have been created by calling `match-data' previously.
+LIST should have been created by calling `match-data' previously,
+or be nil, to clear the internal match data.
 */
        (list))
 {
Index: src/sysfile.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sysfile.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- src/sysfile.h	20 Feb 2003 08:19:43 -0000	1.16
+++ src/sysfile.h	9 May 2003 09:50:42 -0000	1.17
@@ -58,6 +58,9 @@
 # include <sys/file.h>
 #endif
 
+/* Some systems (SCO 3.2v5) do #define stat ... in this header.  So it
+   _must_ be included before any use of struct stat.  Most emacs files
+   should include sysfile.h.  The unex*.c include <sys/stat.h> directly. */
 #include <sys/stat.h>
 
 #ifdef WIN32_ANY
@@ -368,6 +371,11 @@
 
 int qxe_unlink (const Ibyte *path);
 
+/* definition in filemode.c
+   must be declared here to ensure that struct stat is properly formed
+   on systems like SCO 3.2v5 */
+void filemodestring (struct stat *, char *);
+
 #endif /* emacs */
 
 
@@ -477,6 +485,5 @@
 #endif /* WIN32_ANY */
 
 #endif /* emacs */
-
 
 #endif /* INCLUDED_sysfile_h_ */
Index: src/text.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/text.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- src/text.h	2 Mar 2003 09:38:54 -0000	1.16
+++ src/text.h	3 May 2003 01:55:35 -0000	1.17
@@ -1097,7 +1097,7 @@
   memcpy (*_lta_, XSTRING_DATA (_lta_2), 1 + XSTRING_LENGTH (_lta_2));	\
 } while (0)
 
-/* Make an alloca'd copy of a Ibyte * */	\
+/* Make an alloca'd copy of a Ibyte * */
 #define IBYTE_STRING_TO_ALLOCA(p, lval)		\
 do {						\
   Ibyte **_bsta_ = (Ibyte **) &(lval);		\
Index: tests/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.35
diff -u -r1.33 -r1.35
--- tests/ChangeLog	24 Apr 2003 23:41:44 -0000	1.33
+++ tests/ChangeLog	10 May 2003 08:53:40 -0000	1.35
@@ -1,3 +1,13 @@
+2003-05-10  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.13 "cauliflower" is released.
+
+2003-05-09  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* automated/regexp-tests.el (replace-match): Revert test to Assert
+	that registers are preserved on a failed match.
+	(stale match data): Test for preserve-on-failure behavior.
+
 2003-04-24  Steve Youngs  <youngs@xemacs.org>
 
 	* XEmacs 21.5.12 "carrot" is released.
Index: tests/automated/regexp-tests.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/automated/regexp-tests.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tests/automated/regexp-tests.el	23 Apr 2003 15:42:52 -0000	1.9
+++ tests/automated/regexp-tests.el	10 May 2003 07:44:24 -0000	1.10
@@ -205,13 +205,14 @@
 
 ;; (test-regex-charset-mule-paranoid)
 
-;; Test that replace-match errors after a failed match
+;; Test that replace-match does not clobber registers after a failed match
 (with-temp-buffer
   (insert "This is a test buffer.")
   (goto-char (point-min))
   (search-forward "this is a test ")
   (looking-at "Unmatchable text")
-  (Check-Error args-out-of-range (replace-match "")))
+  (replace-match "")
+  (Assert (looking-at "^buffer.$")))
 
 ;; Test that trivial regexps reset unused registers
 ;; Thanks to Martin Sternholm for the report.
@@ -283,15 +284,31 @@
 ;; Thanks to <bjacob@ca.metsci.com>.
 ;; These tests used to fail because we cleared match data only on success.
 ;; Fixed 2003-04-17.
-(Assert (not (progn (string-match "a" "a")
-		    (string-match "b" "a")
-		    (match-string 0 "a"))))
-(Assert (not (progn (string-match "a" "a")
-		    (string-match "b" "a")
-		    (match-string 1 "a"))))
-(Assert (not (progn (string-match "\\(a\\)" "a")
-		    (string-match "\\(b\\)" "a")
-		    (match-string 0 "a"))))
-(Assert (not (progn (string-match "\\(a\\)" "a")
-		    (string-match "\\(b\\)" "a")
-		    (match-string 1 "a"))))
+;; Have to revert 2003-05-09; too much code depends on failed matches
+;; preserving match-data.
+;; string match and regexp match are equivalent
+(let ((a "a"))
+  (Assert (string= (progn (string-match "a" a)
+			  (string-match "b" a)
+			  (match-string 0 a))
+		   a))
+  (Assert (not (progn (string-match "a" a)
+		      (string-match "b" a)
+		      (match-string 1 a))))
+  ;; test both for the second match is a plain string match and a regexp match
+  (Assert (string= (progn (string-match "\\(a\\)" a)
+			  (string-match "\\(b\\)" a)
+			  (match-string 0 a))
+		   a))
+  (Assert (string= (progn (string-match "\\(a\\)" a)
+			  (string-match "b" a)
+			  (match-string 0 a))
+		   a))
+  (Assert (string= (progn (string-match "\\(a\\)" a)
+			  (string-match "\\(b\\)" a)
+			  (match-string 1 a))
+		   a))
+  (Assert (string= (progn (string-match "\\(a\\)" a)
+			  (string-match "b" a)
+			  (match-string 1 a))
+		   a)))