Mercurial > hg > xemacs-beta

changeset 1111:184461bc8de4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-11-18 06:52:23 by ben] warning fixes, etc. * s/cygwin32.h: -fvtable-thunks is obsolete in GCC 3 and generates warnings. * s/mingw32.h: * s/windowsnt.h: Comment fixes. * emodules.h: Fix warnings from redefining symbols. * eval.c: Fix C++ errors -- no automatic casting between function pointers and void *, function declarations inside of functions not allowed. * event-Xt.c (emacs_Xt_enqueue_focus_event): Warning fixes. * fileio.c (Ffile_truename): Warning fixes. Use LOCAL_TO_WIN32_FILE_FORMAT rather than duplicating it. * glyphs-x.c: Fix style. * intl-auto-encap-win32.c: * intl-auto-encap-win32.h: * intl-encap-win32.c: * intl-encap-win32.c (qxeRegConnectRegistry): * syswindows.h (RegConnectRegistry): DdeCreateStringHandle needs to be manual due to new Cygwin bug. * intl-win32.c: wcslen/wcscmp don't seem to exist under G++ 3, Cygwin. * lisp.h: * lisp-union.h: * lisp-disunion.h: * process-unix.c (unix_send_process): Ugh, C needs volatile and C++ must not have volatile. Remove previous volatile hacks, which don't seem to be working any more. * sheap.c (STATIC_HEAP_SLOP): Try to get a working Cygwin build with old unexec. * sheap.c (more_static_core): No NL's in literals allowed. * symbols.c (Fset): Fix C++ errors. * syswindows.h: Fix Cygwin complaints now that some missing structs have been added. aclocal.m4: Disable shared library modules under Cygwin for the moment, since we need some more tricky coding done and I don't have the time right now. configure.in, configure.usage: code-files.el, loadhist.el: Fix warnings. package-get.el: Fix warnings. NOTE: This was already fixed awhile ago, but reverted by Steve Y. Please be careful. postgresql/Makefile.in.in: Removed. Move common stuff into modues/common/Makefile.common. (Also add extraclean target and a couple of other fixes in that file.) postgresql/configure.ac: Extract out common configure stuff into modules/common/configure-{pre,post}.ac. postgresql/postgresql.c: Fix warning. ldap/Makefile.in.in: Removed. Move common stuff into modues/common/Makefile.common. (Also add extraclean target and a couple of other fixes in that file.) ldap/configure.ac: Extract out common configure stuff into modules/common/configure-{pre,post}.ac. common/Makefile.common: Common stuff is here.
author ben
date Mon, 18 Nov 2002 06:53:08 +0000
parents 49065a0d2943
children cc40d0ec4ad2
files ChangeLog aclocal.m4 configure configure.in configure.usage lib-src/ChangeLog lib-src/ellcc.c lib-src/ellcc.h.in lib-src/make-docfile.c lisp/ChangeLog lisp/code-files.el lisp/loadhist.el lisp/package-get.el modules/ChangeLog modules/common/Makefile.common modules/ldap/Makefile.in.in modules/ldap/configure.ac modules/postgresql/Makefile.in.in modules/postgresql/configure modules/postgresql/configure.ac modules/postgresql/postgresql.c nt/make-nt-depend src/ChangeLog src/alloca.c src/charset.h src/depend src/emodules.h src/eval.c src/event-Xt.c src/event-msw.c src/fileio.c src/glyphs-x.c src/glyphs.h src/intl-auto-encap-win32.c src/intl-auto-encap-win32.h src/intl-encap-win32.c src/intl-win32.c src/lisp-disunion.h src/lisp-union.h src/lisp.h src/process-unix.c src/procimpl.h src/s/cygwin32.h src/s/mingw32.h src/s/windowsnt.h src/sheap.c src/symbols.c src/symeval.h src/syswindows.h src/unexcw.c
diffstat 50 files changed, 1818 insertions(+), 1559 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Nov 17 22:53:08 2002 +0000
+++ b/ChangeLog	Mon Nov 18 06:53:08 2002 +0000
@@ -1,3 +1,49 @@
+2002-11-17  Ben Wing  <ben@xemacs.org>
+
+	* aclocal.m4 (cygwin_warn): New.
+	Disable shared library modules under Cygwin for the moment,
+	since we need some more tricky coding done and I don't have the
+	time right now.
+
+	* configure.in:
+	* configure.in (need_modules_common): New.
+	* configure.in (quoted_arguments):
+	* configure.in (stack_trace_eye_catcher):
+	* configure.in (CPP):
+	* configure.in (CFLAGS): New.
+	* configure.in (bitmapdir):
+	* configure.in (ldap_libs):
+	* configure.in (postgresql_libs):
+	* configure.in (all_widgets):
+	* configure.in (SUBDIR_MAKEFILES):
+	* configure.in (RECURSIVE_MAKE):
+	* configure.in (null_string):
+	* configure.in (Mail):
+	* configure.usage (--cflags):
+	* configure.usage (--cflags_warning): New.
+
+	Make sure we use the compiler in --xemacs-compiler to compile
+	the modules, too, or we will get link errors when trying to do
+	a C++ build.
+
+	Create a directory modules/common, in which is code common to all
+	the module Makefiles and configure.ac's.  We create a separate
+	directory because we may be building in a separate source tree,
+	and need a way of accessing the common code (at least in the case
+	of the Makefile).  Either we create symlinks for all necessary
+	files or one just for the directory -- the latter is more robust.
+
+	Add code to create the symlink for modules/common as necessary.
+	When creating the modules Makefiles, append the common code.
+
+	Check for wcslen/wcscmp; apparently missing sometimes in Cygwin and
+	G++ v3.
+
+	Output correct compiler name in messages.
+
+	Separate warning flags from other C flags so that user-specified
+	--cflags doesn't disable warnings.
+
 2002-11-12  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* PROBLEMS (Running/Linux): Lesstif 0.93.36 info, from F. McIngvale.
--- a/aclocal.m4	Sun Nov 17 22:53:08 2002 +0000
+++ b/aclocal.m4	Mon Nov 18 06:53:08 2002 +0000
@@ -84,6 +84,7 @@
 wl=
 
 can_build_shared=yes
+cygwin_warn=
 if test "$XEGCC" = yes; then
   wl='-Wl,'
 
@@ -103,6 +104,10 @@
     ;;
   *cygwin* | *mingw* )
     # PIC is the default
+    cygwin_warn=yes
+    # #### Need some trickery involving import libraries that we don't
+    # currently support.
+    can_build_shared=no
     ;;
   *)
     dll_cflags='-fPIC'
@@ -200,6 +205,10 @@
   AC_MSG_RESULT(none)
 fi
 
+if test -n "$cygwin_warn"; then
+  AC_MSG_WARN([Cannot currently build modules under Cygwin.])
+fi
+
 dnl
 dnl Now comes the LD trickery. We do things differently to libtool here.
 dnl I believe that libtool is incorrect in trying to drive the linker
--- a/configure	Sun Nov 17 22:53:08 2002 +0000
+++ b/configure	Mon Nov 18 06:53:08 2002 +0000
@@ -235,6 +235,7 @@
 with_prefix='yes'
 with_site_lisp='no'
 with_site_modules='yes'
+need_modules_common=''
 with_menubars=''
 with_scrollbars=''
 with_widgets=''
@@ -380,6 +381,7 @@
 	compiler	| \
 	xemacs_compiler	| \
 	cflags		| \
+        cflags_warning  | \
 	cpp		| \
 	cppflags	| \
 	libs		| \
@@ -857,7 +859,7 @@
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:861: checking whether ln -s works" >&5
+echo "configure:863: checking whether ln -s works" >&5
 
 rm -f conftestdata
 if ln -s X conftestdata 2>/dev/null
@@ -1143,7 +1145,7 @@
 
 
 echo $ac_n "checking "host system type"""... $ac_c" 1>&6
-echo "configure:1147: checking "host system type"" >&5
+echo "configure:1149: 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/'`
@@ -1651,12 +1653,17 @@
   else cflags_specified=no;
 fi
 
+if test "${cflags_warning-unset}" != unset
+  then cflags_warning_specified=yes;
+  else cflags_warning_specified=no;
+fi
+
 xe_save_CFLAGS="$CFLAGS"
 
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1660: checking for $ac_word" >&5
+echo "configure:1667: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1683,7 +1690,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:1687: checking for $ac_word" >&5
+echo "configure:1694: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1731,7 +1738,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:1735: checking for $ac_word" >&5
+echo "configure:1742: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1760,7 +1767,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1764: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1771: 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'
@@ -1773,12 +1780,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1777 "configure"
+#line 1784 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1789: \"$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
@@ -1806,19 +1813,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:1810: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1817: 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:1815: checking whether we are using GNU C" >&5
+echo "configure:1822: 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:1822: \"$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:1829: \"$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
@@ -1836,7 +1843,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1840: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1847: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -1869,7 +1876,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:1873: checking for $ac_word" >&5
+echo "configure:1880: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1896,7 +1903,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:1900: checking for $ac_word" >&5
+echo "configure:1907: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1944,7 +1951,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:1948: checking for $ac_word" >&5
+echo "configure:1955: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1973,7 +1980,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1977: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1984: 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'
@@ -1986,12 +1993,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1990 "configure"
+#line 1997 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2002: \"$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
@@ -2019,19 +2026,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:2023: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2030: 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:2028: checking whether we are using GNU C" >&5
+echo "configure:2035: 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:2035: \"$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:2042: \"$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
@@ -2049,7 +2056,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2053: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2060: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -2082,7 +2089,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:2086: checking for $ac_word" >&5
+echo "configure:2093: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2109,7 +2116,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:2113: checking for $ac_word" >&5
+echo "configure:2120: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2157,7 +2164,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:2161: checking for $ac_word" >&5
+echo "configure:2168: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2186,7 +2193,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2190: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2197: 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'
@@ -2199,12 +2206,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 2203 "configure"
+#line 2210 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:2208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2215: \"$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
@@ -2232,19 +2239,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:2236: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2243: 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:2241: checking whether we are using GNU C" >&5
+echo "configure:2248: 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:2248: \"$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:2255: \"$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
@@ -2262,7 +2269,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2266: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2273: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -2299,7 +2306,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:2303: checking how to run the C preprocessor" >&5
+echo "configure:2310: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2312,13 +2319,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2316 "configure"
+#line 2323 "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:2322: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2329: \"$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
   :
@@ -2329,13 +2336,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2333 "configure"
+#line 2340 "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:2339: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2346: \"$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
   :
@@ -2346,13 +2353,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2350 "configure"
+#line 2357 "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:2356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2363: \"$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
   :
@@ -2378,9 +2385,9 @@
 
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:2382: checking for AIX" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2384 "configure"
+echo "configure:2389: checking for AIX" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2391 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -2407,9 +2414,9 @@
  
 
 echo $ac_n "checking for GNU libc""... $ac_c" 1>&6
-echo "configure:2411: checking for GNU libc" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2413 "configure"
+echo "configure:2418: checking for GNU libc" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2420 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
@@ -2421,7 +2428,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_glibc=yes
 else
@@ -2498,7 +2505,7 @@
 esac
 
 cat > conftest.$ac_ext <<EOF
-#line 2502 "configure"
+#line 2509 "configure"
 #include "confdefs.h"
 int main () {
 #if defined __SUNPRO_C
@@ -2512,7 +2519,7 @@
 #endif
 }
 EOF
-if { (eval echo configure:2516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -2764,17 +2771,17 @@
 
 if test "$__USLC__" = yes; then
   echo $ac_n "checking for whether the -Kalloca compiler flag is needed""... $ac_c" 1>&6
-echo "configure:2768: checking for whether the -Kalloca compiler flag is needed" >&5
+echo "configure:2775: checking for whether the -Kalloca compiler flag is needed" >&5
   need_kalloca=no
   cat > conftest.$ac_ext <<EOF
-#line 2771 "configure"
+#line 2778 "configure"
 #include "confdefs.h"
 
 int main() {
 void *x = alloca(4);
 ; return 0; }
 EOF
-if { (eval echo configure:2778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   :
 else
@@ -2785,14 +2792,14 @@
     xe_save_c_switch_system="$c_switch_system"
     c_switch_system="$c_switch_system -Kalloca"
     cat > conftest.$ac_ext <<EOF
-#line 2789 "configure"
+#line 2796 "configure"
 #include "confdefs.h"
 
 int main() {
 void *x = alloca(4);
 ; return 0; }
 EOF
-if { (eval echo configure:2796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    need_kalloca=yes 
 else
@@ -2809,28 +2816,47 @@
 
 if test "$cflags_specified" = "no"; then
       if   test "$GCC" = "yes"; then
-    CFLAGS="-g -O3 -Wall -Wno-switch -Winline -Wmissing-prototypes"
-        CFLAGS="$CFLAGS -Wsign-compare"
-                    if test "$xemacs_compiler" != "g++"; then
-      CFLAGS="$CFLAGS -Wshadow"
-    fi
-            test "$have_glibc" != "yes" && CFLAGS="$CFLAGS -Wpointer-arith"
+    CFLAGS="-g -O3"
               elif test "$__SUNPRO_C" = "yes"; then
     case "$opsys" in
-      sol2    ) CFLAGS="-v -xO4" ;;
-      sunos4* ) CFLAGS="-xO2";;
+      sol2    ) CFLAGS="-xO4" ;;
+      sunos4* ) CFLAGS="-xO2" ;;
     esac
   elif test "$__DECC" = "yes"; then
     CFLAGS="-O3"
   elif test "$CC" = "xlc"; then
-    CFLAGS="-g -O3 -qstrict -qnoansialias -qlibansi -qinfo -qro -qmaxmem=20000"
+    CFLAGS="-g -O3 -qstrict -qnoansialias -qlibansi -qro -qmaxmem=20000"
     else
     CFLAGS="-O" ;  fi
 fi
 
+
+if test "$cflags_warning_specified" = "no"; then
+    if   test "$GCC" = "yes"; then
+    cflags_warning="-Wall -Wno-switch -Winline -Wmissing-prototypes"
+        cflags_warning="$cflags_warning -Wsign-compare"
+                cflags_warning="$cflags_warning -Wundef -Wstrict-prototypes -Wpacked"
+                    if test "$xemacs_compiler" != "g++"; then
+          cflags_warning="$cflags_warning -Wshadow -Wmissing-declarations"
+    else
+      cflags_warning="$cflags_warning -Weffc++"
+    fi
+            test "$have_glibc" != "yes" && \
+      cflags_warning="$cflags_warning -Wpointer-arith"
+  elif test "$__SUNPRO_C" = "yes"; then
+    case "$opsys" in
+      sol2    ) cflags_warning="-v" ;;
+    esac
+  elif test "$CC" = "xlc"; then
+    cflags_warning="-qinfo"
+    fi
+fi
+
+CFLAGS="$cflags_warning $CFLAGS"
+
 if test "$GCC" = "yes"; then
 echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6
-echo "configure:2834: checking for buggy gcc versions" >&5
+echo "configure:2860: 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.*)
@@ -2888,7 +2914,7 @@
 
 if test "$pdump" != "yes"; then
   echo $ac_n "checking for \"-z nocombreloc\" linker flag""... $ac_c" 1>&6
-echo "configure:2892: checking for \"-z nocombreloc\" linker flag" >&5
+echo "configure:2918: 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 ;;
@@ -2977,7 +3003,7 @@
  fi
 
 echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:2981: checking for dynodump" >&5
+echo "configure:3007: checking for dynodump" >&5
 if test "$unexec" != "unexsol2.o"; then
   echo "$ac_t""no" 1>&6
 else
@@ -3015,12 +3041,12 @@
   done
   
 echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6
-echo "configure:3019: checking for terminateAndUnload in -lC" >&5
+echo "configure:3045: 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 3024 "configure"
+#line 3050 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3031,7 +3057,7 @@
 terminateAndUnload()
 ; return 0; }
 EOF
-if { (eval echo configure:3035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3061: \"$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
@@ -3139,7 +3165,7 @@
 
 if test "$add_runtime_path" = "yes"; then
       echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:3143: checking "for runtime libraries flag"" >&5
+echo "configure:3169: checking "for runtime libraries flag"" >&5
   case "$opsys" in
     sol2 ) dash_r="-R" ;;
     decosf* | linux* | irix*) dash_r="-rpath " ;;
@@ -3161,14 +3187,14 @@
   done
 fi
         cat > conftest.$ac_ext <<EOF
-#line 3165 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:3172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+#line 3191 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:3198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   dash_r="$try_dash_r"
 else
@@ -3269,10 +3295,10 @@
 fi
 after_morecore_hook_exists=yes
 echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
-echo "configure:3273: checking for malloc_set_state" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3276 "configure"
+echo "configure:3299: checking for malloc_set_state" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3302 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_set_state(); below.  */
@@ -3295,7 +3321,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3325: \"$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
@@ -3315,16 +3341,16 @@
 fi
 
 echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
-echo "configure:3319: checking whether __after_morecore_hook exists" >&5
-cat > conftest.$ac_ext <<EOF
-#line 3321 "configure"
+echo "configure:3345: checking whether __after_morecore_hook exists" >&5
+cat > conftest.$ac_ext <<EOF
+#line 3347 "configure"
 #include "confdefs.h"
 extern void (* __after_morecore_hook)();
 int main() {
 __after_morecore_hook = 0
 ; return 0; }
 EOF
-if { (eval echo configure:3328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3354: \"$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
@@ -3380,7 +3406,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:3384: checking for $ac_word" >&5
+echo "configure:3410: checking for $ac_word" >&5
 
 if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -3435,7 +3461,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:3439: checking for a BSD compatible install" >&5
+echo "configure:3465: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 
   IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
@@ -3489,7 +3515,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:3493: checking for $ac_word" >&5
+echo "configure:3519: checking for $ac_word" >&5
 
 if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -3521,15 +3547,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3525: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3528 "configure"
+echo "configure:3551: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3554 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3559: \"$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*
@@ -3559,10 +3585,10 @@
 done
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3563: checking for sys/wait.h that is POSIX.1 compatible" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3566 "configure"
+echo "configure:3589: checking for sys/wait.h that is POSIX.1 compatible" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3592 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3578,7 +3604,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3608: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -3602,10 +3628,10 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3606: checking for ANSI C header files" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3609 "configure"
+echo "configure:3632: checking for ANSI C header files" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3635 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3613,7 +3639,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3617: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3643: \"$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*
@@ -3630,7 +3656,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 3634 "configure"
+#line 3660 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3648,7 +3674,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 3652 "configure"
+#line 3678 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3666,7 +3692,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 3670 "configure"
+#line 3696 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3677,7 +3703,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:3681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -3703,10 +3729,10 @@
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3707: checking whether time.h and sys/time.h may both be included" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3710 "configure"
+echo "configure:3733: checking whether time.h and sys/time.h may both be included" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3736 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3715,7 +3741,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -3739,10 +3765,10 @@
 fi
 
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:3743: checking for sys_siglist declaration in signal.h or unistd.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3746 "configure"
+echo "configure:3769: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3772 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3754,7 +3780,7 @@
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:3758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -3780,9 +3806,9 @@
 
 
 echo $ac_n "checking for utime""... $ac_c" 1>&6
-echo "configure:3784: checking for utime" >&5
-cat > conftest.$ac_ext <<EOF
-#line 3786 "configure"
+echo "configure:3810: checking for utime" >&5
+cat > conftest.$ac_ext <<EOF
+#line 3812 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <utime.h>
@@ -3790,7 +3816,7 @@
 struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x);
 ; return 0; }
 EOF
-if { (eval echo configure:3794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3820: \"$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
@@ -3809,10 +3835,10 @@
       for ac_func in utimes
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3813: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3816 "configure"
+echo "configure:3839: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3842 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3835,7 +3861,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3865: \"$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
@@ -3867,10 +3893,10 @@
 
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3871: checking return type of signal handlers" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3874 "configure"
+echo "configure:3897: checking return type of signal handlers" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3900 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3887,7 +3913,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -3909,10 +3935,10 @@
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3913: checking for size_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3916 "configure"
+echo "configure:3939: checking for size_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3942 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3943,10 +3969,10 @@
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3947: checking for pid_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3950 "configure"
+echo "configure:3973: checking for pid_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3976 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3977,10 +4003,10 @@
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3981: checking for uid_t in sys/types.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3984 "configure"
+echo "configure:4007: checking for uid_t in sys/types.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4010 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -4016,10 +4042,10 @@
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:4020: checking for mode_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4023 "configure"
+echo "configure:4046: checking for mode_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4049 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4050,10 +4076,10 @@
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:4054: checking for off_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4057 "configure"
+echo "configure:4080: checking for off_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4083 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4084,10 +4110,10 @@
 fi
 
 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:4088: checking for ssize_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4091 "configure"
+echo "configure:4114: checking for ssize_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4117 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4119,9 +4145,9 @@
 
 
 echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:4123: checking for socklen_t" >&5
-cat > conftest.$ac_ext <<EOF
-#line 4125 "configure"
+echo "configure:4149: checking for socklen_t" >&5
+cat > conftest.$ac_ext <<EOF
+#line 4151 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 socklen_t x;
@@ -4130,7 +4156,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -4139,7 +4165,7 @@
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 4143 "configure"
+#line 4169 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 int accept (int, struct sockaddr *, size_t *);
@@ -4148,7 +4174,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 echo "$ac_t""size_t" 1>&6
@@ -4180,9 +4206,9 @@
 rm -f conftest*
 
 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:4184: checking for struct timeval" >&5
-cat > conftest.$ac_ext <<EOF
-#line 4186 "configure"
+echo "configure:4210: checking for struct timeval" >&5
+cat > conftest.$ac_ext <<EOF
+#line 4212 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -4198,7 +4224,7 @@
 static struct timeval x; x.tv_sec = x.tv_usec;
 ; return 0; }
 EOF
-if { (eval echo configure:4202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
   HAVE_TIMEVAL=yes
@@ -4220,10 +4246,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:4224: checking whether struct tm is in sys/time.h or time.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4227 "configure"
+echo "configure:4250: checking whether struct tm is in sys/time.h or time.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4253 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -4231,7 +4257,7 @@
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:4235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -4255,10 +4281,10 @@
 fi
 
 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:4259: checking for tm_zone in struct tm" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4262 "configure"
+echo "configure:4285: checking for tm_zone in struct tm" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4288 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -4266,7 +4292,7 @@
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:4270: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_zone=yes
 else
@@ -4289,10 +4315,10 @@
 
 else
   echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:4293: checking for tzname" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4296 "configure"
+echo "configure:4319: checking for tzname" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4322 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -4302,7 +4328,7 @@
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:4306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_var_tzname=yes
 else
@@ -4328,10 +4354,10 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4332: checking for working const" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4335 "configure"
+echo "configure:4358: checking for working const" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4361 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4380,7 +4406,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -4405,7 +4431,7 @@
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:4409: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:4435: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 
 cat > conftestmake <<\EOF
@@ -4430,12 +4456,12 @@
 
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:4434: checking whether byte ordering is bigendian" >&5
+echo "configure:4460: 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 4439 "configure"
+#line 4465 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4446,11 +4472,11 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4476: \"$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 4454 "configure"
+#line 4480 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4461,7 +4487,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -4478,7 +4504,7 @@
 rm -f conftest*
 if test $ac_cv_c_bigendian = unknown; then
 cat > conftest.$ac_ext <<EOF
-#line 4482 "configure"
+#line 4508 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -4491,7 +4517,7 @@
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:4495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_bigendian=no
 else
@@ -4518,10 +4544,10 @@
 
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:4522: checking size of short" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4525 "configure"
+echo "configure:4548: checking size of short" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4551 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4532,7 +4558,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -4560,10 +4586,10 @@
   exit 1
 fi
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4564: checking size of int" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4567 "configure"
+echo "configure:4590: checking size of int" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4593 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4574,7 +4600,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -4596,10 +4622,10 @@
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4600: checking size of long" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4603 "configure"
+echo "configure:4626: checking size of long" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4629 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4610,7 +4636,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:4640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -4632,10 +4658,10 @@
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4636: checking size of long long" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4639 "configure"
+echo "configure:4662: checking size of long long" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4665 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4646,7 +4672,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4676: \"$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
@@ -4668,10 +4694,10 @@
 
 
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:4672: checking size of void *" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4675 "configure"
+echo "configure:4698: checking size of void *" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4701 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4682,7 +4708,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4712: \"$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
@@ -4705,7 +4731,7 @@
 
 
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:4709: checking for long file names" >&5
+echo "configure:4735: 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:
@@ -4751,10 +4777,10 @@
 
 
 echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:4755: checking for sin" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4758 "configure"
+echo "configure:4781: checking for sin" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4784 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sin(); below.  */
@@ -4777,7 +4803,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4807: \"$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
@@ -4795,12 +4821,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:4799: checking for sin in -lm" >&5
+echo "configure:4825: 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 4804 "configure"
+#line 4830 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4811,7 +4837,7 @@
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:4815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4841: \"$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
@@ -4855,14 +4881,14 @@
 
 
 cat > conftest.$ac_ext <<EOF
-#line 4859 "configure"
+#line 4885 "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:4866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4892: \"$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
@@ -4881,10 +4907,10 @@
 for ac_func in mkstemp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4885: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4888 "configure"
+echo "configure:4911: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4914 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4907,7 +4933,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4937: \"$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
@@ -4936,14 +4962,14 @@
 
 
 echo "checking type of mail spool file locking" 1>&6
-echo "configure:4940: checking type of mail spool file locking" >&5
+echo "configure:4966: 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:4944: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4947 "configure"
+echo "configure:4970: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4973 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4966,7 +4992,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4996: \"$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
@@ -5048,12 +5074,12 @@
 case "$opsys" in decosf*)
   
 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:5052: checking for cma_open in -lpthreads" >&5
+echo "configure:5078: 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 5057 "configure"
+#line 5083 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5064,7 +5090,7 @@
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:5068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5094: \"$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
@@ -5101,7 +5127,7 @@
 
 
 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:5105: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:5131: 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;
@@ -5113,7 +5139,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:5117: checking for \"-z ignore\" linker flag" >&5
+echo "configure:5143: 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 ;;
@@ -5124,7 +5150,7 @@
 
 
 echo "checking "for specified window system"" 1>&6
-echo "configure:5128: checking "for specified window system"" >&5
+echo "configure:5154: checking "for specified window system"" >&5
 
 
 GNOME_CONFIG=no
@@ -5132,7 +5158,7 @@
 
 if test "$with_gnome" != "no"; then
    echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6
-echo "configure:5136: checking for GNOME configuration script" >&5
+echo "configure:5162: checking for GNOME configuration script" >&5
    for possible in gnome-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5163,7 +5189,7 @@
 
 if test "$with_gtk" != "no";then
    echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6
-echo "configure:5167: checking for GTK configuration script" >&5
+echo "configure:5193: checking for GTK configuration script" >&5
    for possible in gtk12-config gtk14-config gtk-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5185,18 +5211,18 @@
 
 if test "${GTK_CONFIG}" != "no"; then
       echo $ac_n "checking gtk version""... $ac_c" 1>&6
-echo "configure:5189: checking gtk version" >&5
+echo "configure:5215: 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:5194: checking gtk libs" >&5
+echo "configure:5220: 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:5200: checking gtk cflags" >&5
+echo "configure:5226: checking gtk cflags" >&5
       GTK_CFLAGS=`${GTK_CONFIG} --cflags`
       if test "$GCC" = "yes"; then
       	GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow"
@@ -5206,19 +5232,19 @@
 
       
 echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6
-echo "configure:5210: checking for main in -lgdk_imlib" >&5
+echo "configure:5236: 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 5215 "configure"
+#line 5241 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5248: \"$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
@@ -5240,12 +5266,12 @@
 
       
 echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6
-echo "configure:5244: checking for Imlib_init in -lImlib" >&5
+echo "configure:5270: 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 5249 "configure"
+#line 5275 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5256,7 +5282,7 @@
 Imlib_init()
 ; return 0; }
 EOF
-if { (eval echo configure:5260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5286: \"$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
@@ -5279,10 +5305,10 @@
       for ac_func in gdk_imlib_init
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5283: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5286 "configure"
+echo "configure:5309: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5312 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5305,7 +5331,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5335: \"$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
@@ -5371,15 +5397,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5375: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5378 "configure"
+echo "configure:5401: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5404 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5409: \"$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*
@@ -5410,19 +5436,19 @@
 
       
 echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6
-echo "configure:5414: checking for main in -lxml" >&5
+echo "configure:5440: 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 5419 "configure"
+#line 5445 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5452: \"$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
@@ -5444,19 +5470,19 @@
 
       
 echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6
-echo "configure:5448: checking for main in -lglade" >&5
+echo "configure:5474: 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 5453 "configure"
+#line 5479 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5486: \"$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
@@ -5478,19 +5504,19 @@
 
       
 echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6
-echo "configure:5482: checking for main in -lglade-gnome" >&5
+echo "configure:5508: 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 5487 "configure"
+#line 5513 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5520: \"$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
@@ -5511,7 +5537,7 @@
 
 
       cat > conftest.$ac_ext <<EOF
-#line 5515 "configure"
+#line 5541 "configure"
 #include "confdefs.h"
 #include <glade/glade-xml.h>
 EOF
@@ -5570,7 +5596,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:5574: checking for X" >&5
+echo "configure:5600: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -5630,12 +5656,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 5634 "configure"
+#line 5660 "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:5639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5665: \"$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*
@@ -5704,14 +5730,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5708 "configure"
+#line 5734 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:5715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5741: \"$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.
@@ -5820,17 +5846,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:5824: checking whether -R must be followed by a space" >&5
+echo "configure:5850: 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 5827 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:5834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+#line 5853 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:5860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -5846,14 +5872,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 5850 "configure"
-#include "confdefs.h"
-
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:5857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+#line 5876 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:5883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -5889,12 +5915,12 @@
 else
 
 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:5893: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:5919: 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 5898 "configure"
+#line 5924 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5905,7 +5931,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5929,12 +5955,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:5933: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:5959: 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 5938 "configure"
+#line 5964 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5945,7 +5971,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5975: \"$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
@@ -5974,10 +6000,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:5978: checking for gethostbyname" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5981 "configure"
+echo "configure:6004: checking for gethostbyname" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6007 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -6000,7 +6026,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6030: \"$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
@@ -6021,12 +6047,12 @@
     if test $ac_cv_func_gethostbyname = no; then
       
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:6025: checking for gethostbyname in -lnsl" >&5
+echo "configure:6051: 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 6030 "configure"
+#line 6056 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6037,7 +6063,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:6041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6067: \"$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
@@ -6067,10 +6093,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:6071: checking for connect" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6074 "configure"
+echo "configure:6097: checking for connect" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6100 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -6093,7 +6119,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6123: \"$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
@@ -6116,12 +6142,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:6120: checking "$xe_msg_checking"" >&5
+echo "configure:6146: 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 6125 "configure"
+#line 6151 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6132,7 +6158,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:6136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6162: \"$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
@@ -6156,10 +6182,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:6160: checking for remove" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6163 "configure"
+echo "configure:6186: checking for remove" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6189 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -6182,7 +6208,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6212: \"$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
@@ -6203,12 +6229,12 @@
     if test $ac_cv_func_remove = no; then
       
 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:6207: checking for remove in -lposix" >&5
+echo "configure:6233: 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 6212 "configure"
+#line 6238 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6219,7 +6245,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:6223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6249: \"$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
@@ -6243,10 +6269,10 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:6247: checking for shmat" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6250 "configure"
+echo "configure:6273: checking for shmat" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6276 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -6269,7 +6295,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6299: \"$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
@@ -6290,12 +6316,12 @@
     if test $ac_cv_func_shmat = no; then
       
 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:6294: checking for shmat in -lipc" >&5
+echo "configure:6320: 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 6299 "configure"
+#line 6325 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6306,7 +6332,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:6310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6336: \"$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
@@ -6342,12 +6368,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:6346: checking "$xe_msg_checking"" >&5
+echo "configure:6372: 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 6351 "configure"
+#line 6377 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6358,7 +6384,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:6362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6388: \"$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
@@ -6525,7 +6551,7 @@
 
 
     echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:6529: checking for X defines extracted by xmkmf" >&5
+echo "configure:6555: checking for X defines extracted by xmkmf" >&5
   rm -fr conftestdir
   if mkdir conftestdir; then
     cd conftestdir
@@ -6574,15 +6600,15 @@
 
     ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:6578: checking for X11/Intrinsic.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6581 "configure"
+echo "configure:6604: checking for X11/Intrinsic.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6607 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6612: \"$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*
@@ -6606,12 +6632,12 @@
 
       
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:6610: checking for XOpenDisplay in -lX11" >&5
+echo "configure:6636: 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 6615 "configure"
+#line 6641 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6622,7 +6648,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6652: \"$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
@@ -6647,12 +6673,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:6651: checking "$xe_msg_checking"" >&5
+echo "configure:6677: 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 6656 "configure"
+#line 6682 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6663,7 +6689,7 @@
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:6667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6693: \"$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
@@ -6690,12 +6716,12 @@
 
     
 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:6694: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:6720: 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 6699 "configure"
+#line 6725 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6706,7 +6732,7 @@
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:6710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6736: \"$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
@@ -6729,12 +6755,12 @@
 
     
 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:6733: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:6759: 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 6738 "configure"
+#line 6764 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6745,7 +6771,7 @@
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6775: \"$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
@@ -6768,14 +6794,14 @@
 
 
   echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:6772: checking the version of X11 being used" >&5
+echo "configure:6798: checking the version of X11 being used" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6774 "configure"
+#line 6800 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
     int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:6779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest foobar; x11_release=$?
 else
@@ -6806,10 +6832,10 @@
   for ac_func in XConvertCase
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6810: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6813 "configure"
+echo "configure:6836: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6839 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6832,7 +6858,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6862: \"$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
@@ -6864,15 +6890,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6868: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6871 "configure"
+echo "configure:6894: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6897 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6902: \"$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*
@@ -6905,10 +6931,10 @@
     for ac_func in XRegisterIMInstantiateCallback
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6909: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6912 "configure"
+echo "configure:6935: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6938 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6931,7 +6957,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6961: \"$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
@@ -6959,9 +6985,9 @@
 done
 
   echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6
-echo "configure:6963: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+echo "configure:6989: checking for standard XRegisterIMInstantiateCallback prototype" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6965 "configure"
+#line 6991 "configure"
 #include "confdefs.h"
 
 #define NeedFunctionPrototypes 1
@@ -6973,7 +6999,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -6994,12 +7020,12 @@
 
     test -z "$with_xmu" && { 
 echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:6998: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:7024: 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 7003 "configure"
+#line 7029 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7010,7 +7036,7 @@
 XmuReadBitmapDataFromFile()
 ; return 0; }
 EOF
-if { (eval echo configure:7014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7040: \"$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
@@ -7049,19 +7075,19 @@
 
       
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:7053: checking for main in -lXbsd" >&5
+echo "configure:7079: 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 7058 "configure"
+#line 7084 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7091: \"$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
@@ -7098,22 +7124,22 @@
 fi 
 if test "$with_msw" != "no"; then
   echo "checking for MS-Windows" 1>&6
-echo "configure:7102: checking for MS-Windows" >&5
+echo "configure:7128: checking for MS-Windows" >&5
   
 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:7105: checking for main in -lgdi32" >&5
+echo "configure:7131: 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 7110 "configure"
+#line 7136 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7143: \"$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
@@ -7164,12 +7190,12 @@
       test "$with_widgets"    != "no" && with_widgets=msw
     fi
         cat > conftest.$ac_ext <<EOF
-#line 7168 "configure"
+#line 7194 "configure"
 #include "confdefs.h"
 #include <fcntl.h>
     int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
 EOF
-if { (eval echo configure:7173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7199: \"$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
@@ -7230,15 +7256,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:7234: checking for X11/extensions/shape.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7237 "configure"
+echo "configure:7260: checking for X11/extensions/shape.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7263 "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:7242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7268: \"$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*
@@ -7288,7 +7314,7 @@
 esac
 
 echo "checking for WM_COMMAND option" 1>&6
-echo "configure:7292: checking for WM_COMMAND option" >&5;
+echo "configure:7318: checking for WM_COMMAND option" >&5;
 if test "$with_wmcommand" != "no"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_WMCOMMAND
@@ -7303,15 +7329,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:7307: checking for X11/Xauth.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7310 "configure"
+echo "configure:7333: checking for X11/Xauth.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7336 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7341: \"$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*
@@ -7334,12 +7360,12 @@
  }
 test -z "$with_xauth" && { 
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:7338: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:7364: 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 7343 "configure"
+#line 7369 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7350,7 +7376,7 @@
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:7354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7380: \"$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
@@ -7391,24 +7417,28 @@
 
 
 
+
+test -n "$xemacs_compiler" && XEMACS_CC="$xemacs_compiler"
+: ${XEMACS_CC:="$CC"}
+
 if test "$with_modules" != "no"; then
   echo "checking for module support" 1>&6
-echo "configure:7397: checking for module support" >&5
+echo "configure:7427: checking for module support" >&5
 
     if test "$with_msw" = "yes"; then
     have_dl=yes;
   else
         ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:7404: checking for dlfcn.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7407 "configure"
+echo "configure:7434: checking for dlfcn.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7437 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7442: \"$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*
@@ -7425,16 +7455,16 @@
   echo "$ac_t""yes" 1>&6
   
       echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:7429: checking for dlopen in -lc" >&5
+echo "configure:7459: checking for dlopen in -lc" >&5
       cat > conftest.$ac_ext <<EOF
-#line 7431 "configure"
+#line 7461 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:7438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -7443,18 +7473,18 @@
   rm -rf conftest*
   
       echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:7447: checking for dlopen in -ldl" >&5
+echo "configure:7477: checking for dlopen in -ldl" >&5
       ac_save_LIBS="$LIBS"
       LIBS="-ldl $LIBS"
       cat > conftest.$ac_ext <<EOF
-#line 7451 "configure"
+#line 7481 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:7458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -7483,12 +7513,12 @@
     else
       
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:7487: checking for shl_load in -ldld" >&5
+echo "configure:7517: 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 7492 "configure"
+#line 7522 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7499,7 +7529,7 @@
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:7503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7533: \"$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
@@ -7526,12 +7556,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:7530: checking for dld_init in -ldld" >&5
+echo "configure:7560: 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 7535 "configure"
+#line 7565 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7542,7 +7572,7 @@
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:7546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7576: \"$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
@@ -7587,7 +7617,7 @@
 xealias=$internal_configuration
 
 echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:7591: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:7621: checking how to build dynamic libraries for ${xehost}" >&5
 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
 case "$xehost" in
 *-*-linux-gnu*) ;;
@@ -7615,9 +7645,9 @@
   XEGCC=yes
 else
   echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:7619: checking checking whether we are using GNU C" >&5
+echo "configure:7649: checking checking whether we are using GNU C" >&5
   cat > conftest.$ac_ext <<EOF
-#line 7621 "configure"
+#line 7651 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -7639,10 +7669,11 @@
 fi
 
 echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:7643: checking how to produce PIC code" >&5
+echo "configure:7673: checking how to produce PIC code" >&5
 wl=
 
 can_build_shared=yes
+cygwin_warn=
 if test "$XEGCC" = yes; then
   wl='-Wl,'
 
@@ -7662,6 +7693,10 @@
     ;;
   *cygwin* | *mingw* )
     # PIC is the default
+    cygwin_warn=yes
+    # #### Need some trickery involving import libraries that we don't
+    # currently support.
+    can_build_shared=no
     ;;
   *)
     dll_cflags='-fPIC'
@@ -7740,18 +7775,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:7744: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:7779: checking if PIC flag ${dll_cflags} really works" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $dll_cflags -DPIC"
   cat > conftest.$ac_ext <<EOF
-#line 7748 "configure"
+#line 7783 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:7755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7790: \"$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
@@ -7777,12 +7812,16 @@
   echo "$ac_t""none" 1>&6
 fi
 
+if test -n "$cygwin_warn"; then
+  echo "configure: warning: Cannot currently build modules under Cygwin." 1>&2
+fi
+
 if test "$can_build_shared" = "yes"; then
 cc_produces_so=no
 xldf=
 xcldf=
 echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:7786: checking if C compiler can produce shared libraries" >&5
+echo "configure:7825: checking if C compiler can produce shared libraries" >&5
 if test "$XEGCC" = yes; then
   xcldf="-shared"
   xldf="-shared"
@@ -7833,14 +7872,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 7837 "configure"
+#line 7876 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:7844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cc_produces_so=yes
 else
@@ -7865,7 +7904,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:7869: checking for ld used by GCC" >&5
+echo "configure:7908: checking for ld used by GCC" >&5
     ac_prog=`($CC -print-prog-name=ld) 2>&5`
     case "$ac_prog" in
     # Accept absolute paths.
@@ -7891,7 +7930,7 @@
     esac
   else
     echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:7895: checking for GNU ld" >&5
+echo "configure:7934: checking for GNU ld" >&5
   fi
 
   if test -z "$LTLD"; then
@@ -7929,7 +7968,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:7933: checking if the linker is GNU ld" >&5
+echo "configure:7972: 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
@@ -7957,7 +7996,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:7961: checking whether the linker supports shared libraries" >&5
+echo "configure:8000: checking whether the linker supports shared libraries" >&5
   dll_ld=$CC
   dll_ldflags=$LDFLAGS
   ld_shlibs=yes
@@ -8165,10 +8204,10 @@
     for ac_func in dlerror _dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8169: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8172 "configure"
+echo "configure:8208: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8211 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8191,7 +8230,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8234: \"$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
@@ -8231,7 +8270,7 @@
       echo "    No module support."
     fi
     with_modules=no
-    MOD_CC=${CC}
+    MOD_CC="$XEMACS_CC"
     MODCFLAGS="\$(CFLAGS) -I../../src -I\$(srcdir)/../../src"
     INSTALLPATH=""
     MOD_INSTALL_PROGRAM="true"
@@ -8253,15 +8292,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:8257: checking for ${dir}tt_c.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8260 "configure"
+echo "configure:8296: checking for ${dir}tt_c.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8299 "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:8265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8304: \"$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*
@@ -8297,12 +8336,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:8301: checking "$xe_msg_checking"" >&5
+echo "configure:8340: 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 8306 "configure"
+#line 8345 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8313,7 +8352,7 @@
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:8317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8356: \"$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
@@ -8367,15 +8406,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:8371: checking for Dt/Dt.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8374 "configure"
+echo "configure:8410: checking for Dt/Dt.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8413 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8379: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8418: \"$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*
@@ -8398,12 +8437,12 @@
  }
 test -z "$with_cde" && { 
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:8402: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:8441: 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 8407 "configure"
+#line 8446 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8414,7 +8453,7 @@
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:8418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8457: \"$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
@@ -8495,7 +8534,7 @@
 
 if test "$with_dragndrop" != "no" ; then
   echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
-echo "configure:8499: checking if drag and drop API is needed" >&5
+echo "configure:8538: 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
@@ -8515,19 +8554,19 @@
 fi
 
 echo "checking for LDAP" 1>&6
-echo "configure:8519: checking for LDAP" >&5
+echo "configure:8558: 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:8523: checking for ldap.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8526 "configure"
+echo "configure:8562: checking for ldap.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8565 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8570: \"$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*
@@ -8550,15 +8589,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:8554: checking for lber.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8557 "configure"
+echo "configure:8593: checking for lber.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8596 "configure"
 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8601: \"$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*
@@ -8582,12 +8621,12 @@
 if test "$with_ldap" != "no"; then
   
 echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
-echo "configure:8586: checking for ldap_search in -lldap" >&5
+echo "configure:8625: 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 8591 "configure"
+#line 8630 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8598,7 +8637,7 @@
 ldap_search()
 ; return 0; }
 EOF
-if { (eval echo configure:8602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8641: \"$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
@@ -8623,12 +8662,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:8627: checking "$xe_msg_checking"" >&5
+echo "configure:8666: 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 8632 "configure"
+#line 8671 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8639,7 +8678,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:8643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8682: \"$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
@@ -8664,12 +8703,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:8668: checking "$xe_msg_checking"" >&5
+echo "configure:8707: 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 8673 "configure"
+#line 8712 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8680,7 +8719,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:8684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8723: \"$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
@@ -8705,12 +8744,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:8709: checking "$xe_msg_checking"" >&5
+echo "configure:8748: 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 8714 "configure"
+#line 8753 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8721,7 +8760,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:8725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8770,10 +8809,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:8774: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8777 "configure"
+echo "configure:8813: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8816 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8796,7 +8835,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8839: \"$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
@@ -8825,6 +8864,7 @@
 
   LIBS="$save_LIBS"
   MAKE_SUBDIR="$MAKE_SUBDIR modules/ldap" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"modules/ldap\" to \$MAKE_SUBDIR"; fi
+  need_modules_common=yes
   if test "$with_modules" = "yes"; then
     INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/ldap" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"modules/ldap\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
   fi
@@ -8834,20 +8874,20 @@
 postgresql_libs=
 if test "$with_postgresql" != "no"; then
   echo "checking for PostgreSQL" 1>&6
-echo "configure:8838: checking for PostgreSQL" >&5
+echo "configure:8878: 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:8843: checking for ${header_dir}libpq-fe.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8846 "configure"
+echo "configure:8883: checking for ${header_dir}libpq-fe.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8886 "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:8851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8891: \"$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*
@@ -8871,12 +8911,12 @@
 
   test -n "$libpq_fe_h_file" && { 
 echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:8875: checking for PQconnectdb in -lpq" >&5
+echo "configure:8915: 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 8880 "configure"
+#line 8920 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8887,7 +8927,7 @@
 PQconnectdb()
 ; return 0; }
 EOF
-if { (eval echo configure:8891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8920,12 +8960,12 @@
 
     
 echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
-echo "configure:8924: checking for PQconnectStart in -lpq" >&5
+echo "configure:8964: 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 8929 "configure"
+#line 8969 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8936,7 +8976,7 @@
 PQconnectStart()
 ; return 0; }
 EOF
-if { (eval echo configure:8940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8980: \"$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
@@ -8974,6 +9014,7 @@
 
     postgresql_libs="-lpq $postgresql_libs" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lpq\" to \$postgresql_libs"; fi
     MAKE_SUBDIR="$MAKE_SUBDIR modules/postgresql" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"modules/postgresql\" to \$MAKE_SUBDIR"; fi
+    need_modules_common=yes
     if test "$with_modules" = "yes"; then
       INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR modules/postgresql" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"modules/postgresql\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
     fi
@@ -8986,7 +9027,7 @@
 
 if test "$window_system" != "none"; then
   echo "checking for graphics libraries" 1>&6
-echo "configure:8990: checking for graphics libraries" >&5
+echo "configure:9031: checking for graphics libraries" >&5
 
       libpath_xpm=
   incpath_xpm=
@@ -9012,10 +9053,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:9016: checking for Xpm - no older than 3.4f" >&5
+echo "configure:9057: checking for Xpm - no older than 3.4f" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 9019 "configure"
+#line 9060 "configure"
 #include "confdefs.h"
 #define XPM_NUMBERS
 #include <X11/xpm.h>
@@ -9024,7 +9065,7 @@
       XpmIncludeVersion != XpmLibraryVersion() ? 1 :
       XpmIncludeVersion < 30406 ? 2 : 0 ;}
 EOF
-if { (eval echo configure:9028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9069: \"$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
@@ -9068,17 +9109,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:9072: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:9113: checking for \"FOR_MSW\" xpm" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 9075 "configure"
+#line 9116 "configure"
 #include "confdefs.h"
 
 int main() {
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:9082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   xpm_for_msw=no
 else
@@ -9104,15 +9145,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:9108: checking for compface.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9111 "configure"
+echo "configure:9149: checking for compface.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9152 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9157: \"$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*
@@ -9135,12 +9176,12 @@
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:9139: checking for UnGenFace in -lcompface" >&5
+echo "configure:9180: 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 9144 "configure"
+#line 9185 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9151,7 +9192,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:9155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9196: \"$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
@@ -9200,12 +9241,12 @@
       if test "$with_png $with_tiff" != "no no"; then
     
 echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
-echo "configure:9204: checking for inflate in -lc" >&5
+echo "configure:9245: 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 9209 "configure"
+#line 9250 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9216,7 +9257,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:9220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9261: \"$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
@@ -9235,12 +9276,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:9239: checking for inflate in -lz" >&5
+echo "configure:9280: 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 9244 "configure"
+#line 9285 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9251,7 +9292,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:9255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9296: \"$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
@@ -9270,12 +9311,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:9274: checking for inflate in -lgz" >&5
+echo "configure:9315: 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 9279 "configure"
+#line 9320 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9286,7 +9327,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:9290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9331: \"$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
@@ -9316,15 +9357,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:9320: checking for jpeglib.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9323 "configure"
+echo "configure:9361: checking for jpeglib.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9364 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9369: \"$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*
@@ -9347,12 +9388,12 @@
  }
   test -z "$with_jpeg" && { 
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:9351: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:9392: 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 9356 "configure"
+#line 9397 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9363,7 +9404,7 @@
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:9367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9399,10 +9440,10 @@
 
     png_problem=""
   test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:9403: checking for pow" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9406 "configure"
+echo "configure:9444: checking for pow" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9447 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pow(); below.  */
@@ -9425,7 +9466,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:9429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9470: \"$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
@@ -9446,15 +9487,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:9450: checking for png.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9453 "configure"
+echo "configure:9491: checking for png.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9494 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9499: \"$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*
@@ -9477,12 +9518,12 @@
  }
   test -z "$with_png" && { 
 echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:9481: checking for png_read_image in -lpng" >&5
+echo "configure:9522: 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 9486 "configure"
+#line 9527 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9493,7 +9534,7 @@
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:9497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9538: \"$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
@@ -9516,10 +9557,10 @@
  }
   if test -z "$with_png"; then
     echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:9520: checking for workable png version information" >&5
+echo "configure:9561: checking for workable png version information" >&5
     xe_check_libs="-lpng -lz"
     cat > conftest.$ac_ext <<EOF
-#line 9523 "configure"
+#line 9564 "configure"
 #include "confdefs.h"
 #include <png.h>
     int main(int c, char **v) {
@@ -9527,7 +9568,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:9531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9572: \"$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
@@ -9570,15 +9611,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:9574: checking for tiffio.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9577 "configure"
+echo "configure:9615: checking for tiffio.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9618 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9623: \"$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*
@@ -9601,12 +9642,12 @@
  }
   test -z "$with_tiff" && { 
 echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:9605: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:9646: 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 9610 "configure"
+#line 9651 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9617,7 +9658,7 @@
 TIFFClientOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:9621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9662: \"$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
@@ -9656,15 +9697,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:9660: checking for compface.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9663 "configure"
+echo "configure:9701: checking for compface.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9704 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9709: \"$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*
@@ -9687,12 +9728,12 @@
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:9691: checking for UnGenFace in -lcompface" >&5
+echo "configure:9732: 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 9696 "configure"
+#line 9737 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9703,7 +9744,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:9707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9748: \"$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
@@ -9742,7 +9783,7 @@
 
 if test "$with_x11" = "yes"; then
   echo "checking for X11 graphics libraries" 1>&6
-echo "configure:9746: checking for X11 graphics libraries" >&5
+echo "configure:9787: checking for X11 graphics libraries" >&5
 fi
 
 case "$with_widgets" in
@@ -9752,7 +9793,7 @@
 
 if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then
   echo "checking for the Athena widgets" 1>&6
-echo "configure:9756: checking for the Athena widgets" >&5
+echo "configure:9797: checking for the Athena widgets" >&5
 
     case "$with_athena" in
         "xaw" | "")	athena_variant=Xaw	athena_3d=no  ;;
@@ -9766,12 +9807,12 @@
     if test "$athena_3d" = "no"; then
     
 echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9770: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:9811: 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 9775 "configure"
+#line 9816 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9782,7 +9823,7 @@
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:9786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9827: \"$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
@@ -9798,12 +9839,12 @@
   echo "$ac_t""yes" 1>&6
           
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9802: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:9843: 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 9807 "configure"
+#line 9848 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9814,7 +9855,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:9818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9859: \"$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
@@ -9845,12 +9886,12 @@
   else
         
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:9849: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:9890: 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 9854 "configure"
+#line 9895 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9861,7 +9902,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:9865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9906: \"$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
@@ -9879,12 +9920,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6
-echo "configure:9883: checking for threeDClassRec in -lXaw" >&5
+echo "configure:9924: 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 9888 "configure"
+#line 9929 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9895,7 +9936,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:9899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9940: \"$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
@@ -9926,15 +9967,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:9930: checking for X11/Xaw/ThreeD.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9933 "configure"
+echo "configure:9971: checking for X11/Xaw/ThreeD.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9974 "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:9938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9979: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9954,15 +9995,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:9958: checking for X11/Xaw/XawInit.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9961 "configure"
+echo "configure:9999: checking for X11/Xaw/XawInit.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10002 "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:9966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10007: \"$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*
@@ -9988,15 +10029,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:9992: checking for X11/$athena_variant/XawInit.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9995 "configure"
+echo "configure:10033: checking for X11/$athena_variant/XawInit.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10036 "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:10000: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10041: \"$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*
@@ -10013,15 +10054,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:10017: checking for X11/$athena_variant/ThreeD.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10020 "configure"
+echo "configure:10058: checking for X11/$athena_variant/ThreeD.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10061 "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:10025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10066: \"$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*
@@ -10049,15 +10090,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:10053: checking for $athena_variant/XawInit.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10056 "configure"
+echo "configure:10094: checking for $athena_variant/XawInit.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10097 "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:10061: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10102: \"$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*
@@ -10074,15 +10115,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:10078: checking for $athena_variant/ThreeD.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10081 "configure"
+echo "configure:10119: checking for $athena_variant/ThreeD.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10122 "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:10086: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10127: \"$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*
@@ -10111,15 +10152,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:10115: checking for X11/Xaw3d/XawInit.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10118 "configure"
+echo "configure:10156: checking for X11/Xaw3d/XawInit.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10159 "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:10123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10164: \"$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*
@@ -10136,15 +10177,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:10140: checking for X11/Xaw3d/ThreeD.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10143 "configure"
+echo "configure:10181: checking for X11/Xaw3d/ThreeD.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10184 "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:10148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10189: \"$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*
@@ -10176,15 +10217,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:10180: checking for Xaw3d/XawInit.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10183 "configure"
+echo "configure:10221: checking for Xaw3d/XawInit.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10224 "configure"
 #include "confdefs.h"
 #include <Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10229: \"$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*
@@ -10201,15 +10242,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:10205: checking for Xaw3d/ThreeD.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10208 "configure"
+echo "configure:10246: checking for Xaw3d/ThreeD.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10249 "configure"
 #include "confdefs.h"
 #include <Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10254: \"$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*
@@ -10241,15 +10282,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:10245: checking for X11/Xaw/ThreeD.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10248 "configure"
+echo "configure:10286: checking for X11/Xaw/ThreeD.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10289 "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:10253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10294: \"$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*
@@ -10288,15 +10329,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:10292: checking for Xm/Xm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10295 "configure"
+echo "configure:10333: checking for Xm/Xm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10336 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10341: \"$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*
@@ -10313,12 +10354,12 @@
   echo "$ac_t""yes" 1>&6
   
 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:10317: checking for XmStringFree in -lXm" >&5
+echo "configure:10358: 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 10322 "configure"
+#line 10363 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10329,7 +10370,7 @@
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:10333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10374: \"$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
@@ -10358,9 +10399,9 @@
 
   if test "$have_motif" = "yes"; then
         echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:10362: checking for Lesstif" >&5
+echo "configure:10403: checking for Lesstif" >&5
     cat > conftest.$ac_ext <<EOF
-#line 10364 "configure"
+#line 10405 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 #ifdef LESSTIF_VERSION
@@ -10733,7 +10774,7 @@
 
 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
-echo "configure:10737: checking for Mule-related features" >&5
+echo "configure:10778: checking for Mule-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
@@ -10747,15 +10788,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10751: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10754 "configure"
+echo "configure:10792: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10795 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10759: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10800: \"$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*
@@ -10786,12 +10827,12 @@
 
   
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:10790: checking for strerror in -lintl" >&5
+echo "configure:10831: 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 10795 "configure"
+#line 10836 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10802,7 +10843,7 @@
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:10806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10847: \"$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
@@ -10835,18 +10876,18 @@
 
 
   echo "checking for Mule input methods" 1>&6
-echo "configure:10839: checking for Mule input methods" >&5
+echo "configure:10880: checking for Mule input methods" >&5
         case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6
-echo "configure:10842: checking for XIM" >&5
+echo "configure:10883: checking for XIM" >&5
     
 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:10845: checking for XOpenIM in -lX11" >&5
+echo "configure:10886: 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 10850 "configure"
+#line 10891 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10857,7 +10898,7 @@
 XOpenIM()
 ; return 0; }
 EOF
-if { (eval echo configure:10861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10902: \"$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
@@ -10881,12 +10922,12 @@
         if test "$have_motif $have_lesstif" = "yes no"; then
       
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:10885: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:10926: 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 10890 "configure"
+#line 10931 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10897,7 +10938,7 @@
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:10901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10942: \"$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
@@ -10962,15 +11003,15 @@
 
     if test "$with_xfs" = "yes" ; then
     echo "checking for XFontSet" 1>&6
-echo "configure:10966: checking for XFontSet" >&5
+echo "configure:11007: checking for XFontSet" >&5
     
 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:10969: checking for XmbDrawString in -lX11" >&5
+echo "configure:11010: 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 10974 "configure"
+#line 11015 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10981,7 +11022,7 @@
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:10985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11026: \"$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
@@ -11021,15 +11062,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:11025: checking for wnn/jllib.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11028 "configure"
+echo "configure:11066: checking for wnn/jllib.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11069 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11074: \"$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*
@@ -11052,15 +11093,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:11056: checking for wnn/commonhd.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11059 "configure"
+echo "configure:11097: checking for wnn/commonhd.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11100 "configure"
 #include "confdefs.h"
 #include <wnn/commonhd.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11105: \"$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*
@@ -11085,10 +11126,10 @@
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11089: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11092 "configure"
+echo "configure:11130: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11133 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11111,7 +11152,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11156: \"$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
@@ -11140,12 +11181,12 @@
 
     test "$ac_cv_func_crypt" != "yes" && { 
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:11144: checking for crypt in -lcrypt" >&5
+echo "configure:11185: 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 11149 "configure"
+#line 11190 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11156,7 +11197,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:11160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11201: \"$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
@@ -11191,12 +11232,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:11195: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:11236: 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 11200 "configure"
+#line 11241 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11207,7 +11248,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:11211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11252: \"$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
@@ -11225,12 +11266,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:11229: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:11270: 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 11234 "configure"
+#line 11275 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11241,7 +11282,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:11245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11286: \"$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
@@ -11259,12 +11300,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:11263: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:11304: 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 11268 "configure"
+#line 11309 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11275,7 +11316,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:11279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11320: \"$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
@@ -11293,12 +11334,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:11297: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:11338: 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 11302 "configure"
+#line 11343 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11309,7 +11350,7 @@
 dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:11313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11354: \"$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
@@ -11354,12 +11395,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:11358: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:11399: 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 11363 "configure"
+#line 11404 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11370,7 +11411,7 @@
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:11374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11415: \"$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
@@ -11405,15 +11446,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:11409: checking for canna/jrkanji.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11412 "configure"
+echo "configure:11450: checking for canna/jrkanji.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11453 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11417: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11458: \"$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*
@@ -11440,15 +11481,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:11444: checking for canna/jrkanji.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11447 "configure"
+echo "configure:11485: checking for canna/jrkanji.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11488 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11493: \"$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*
@@ -11476,15 +11517,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:11480: checking for canna/RK.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11483 "configure"
+echo "configure:11521: checking for canna/RK.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11524 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11529: \"$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*
@@ -11507,12 +11548,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:11511: checking for RkBgnBun in -lRKC" >&5
+echo "configure:11552: 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 11516 "configure"
+#line 11557 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11523,7 +11564,7 @@
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:11527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11546,12 +11587,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:11550: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:11591: 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 11555 "configure"
+#line 11596 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11562,7 +11603,7 @@
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:11566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11607: \"$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
@@ -11608,12 +11649,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:11612: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:11653: 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 11617 "configure"
+#line 11658 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11624,7 +11665,7 @@
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:11628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11669: \"$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
@@ -11708,13 +11749,13 @@
 fi
 
 
-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 symlink tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask
+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 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:11715: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11718 "configure"
+echo "configure:11756: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11759 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11737,7 +11778,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11782: \"$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
@@ -11778,10 +11819,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:11782: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11785 "configure"
+echo "configure:11823: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11826 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11804,7 +11845,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11849: \"$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
@@ -11833,10 +11874,10 @@
 
 
 echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:11837: checking for openpty" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11840 "configure"
+echo "configure:11878: checking for openpty" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11881 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char openpty(); below.  */
@@ -11859,7 +11900,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11904: \"$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
@@ -11878,12 +11919,12 @@
 
   
 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:11882: checking for openpty in -lutil" >&5
+echo "configure:11923: 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 11887 "configure"
+#line 11928 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11894,7 +11935,7 @@
 openpty()
 ; return 0; }
 EOF
-if { (eval echo configure:11898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11939: \"$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
@@ -11929,15 +11970,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11933: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11936 "configure"
+echo "configure:11974: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11977 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11941: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11982: \"$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*
@@ -11974,47 +12015,6 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11978: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11981 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11986: \"$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
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  { test "$extra_verbose" = "yes" && cat << EOF
-    Defining $ac_tr_hdr
-EOF
-cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
-}
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
- ;;
-  *) for ac_hdr in pty.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 echo "configure:12019: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
@@ -12051,8 +12051,8 @@
   echo "$ac_t""no" 1>&6
 fi
 done
-
-     test "$ac_cv_header_pty_h" = "no" && for ac_hdr in sys/pty.h
+ ;;
+  *) for ac_hdr in pty.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -12093,6 +12093,47 @@
 fi
 done
 
+     test "$ac_cv_header_pty_h" = "no" && for ac_hdr in sys/pty.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:12101: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12104 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:12109: \"$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
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_hdr
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+}
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
      ;;
 esac
 
@@ -12100,15 +12141,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12104: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12107 "configure"
+echo "configure:12145: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12148 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12153: \"$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*
@@ -12141,10 +12182,10 @@
   for ac_func in isastream
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12145: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12148 "configure"
+echo "configure:12186: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12189 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12167,7 +12208,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12212: \"$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
@@ -12198,15 +12239,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12202: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12205 "configure"
+echo "configure:12243: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12246 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12251: \"$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*
@@ -12239,10 +12280,10 @@
 for ac_func in getloadavg
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12243: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12246 "configure"
+echo "configure:12284: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12287 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12265,7 +12306,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12310: \"$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
@@ -12298,15 +12339,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12302: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12305 "configure"
+echo "configure:12343: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12346 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12351: \"$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*
@@ -12342,12 +12383,12 @@
 
     
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:12346: checking for kstat_open in -lkstat" >&5
+echo "configure:12387: 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 12351 "configure"
+#line 12392 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12358,7 +12399,7 @@
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:12362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12403: \"$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
@@ -12393,15 +12434,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12397: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12400 "configure"
+echo "configure:12438: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12441 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12446: \"$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*
@@ -12433,12 +12474,12 @@
 
     
 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:12437: checking for kvm_read in -lkvm" >&5
+echo "configure:12478: 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 12442 "configure"
+#line 12483 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12449,7 +12490,7 @@
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:12453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12494: \"$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
@@ -12483,16 +12524,16 @@
 fi
 
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:12487: checking whether netdb declares h_errno" >&5
-cat > conftest.$ac_ext <<EOF
-#line 12489 "configure"
+echo "configure:12528: checking whether netdb declares h_errno" >&5
+cat > conftest.$ac_ext <<EOF
+#line 12530 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:12496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12537: \"$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
@@ -12512,16 +12553,16 @@
 rm -f conftest*
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:12516: checking for sigsetjmp" >&5
-cat > conftest.$ac_ext <<EOF
-#line 12518 "configure"
+echo "configure:12557: checking for sigsetjmp" >&5
+cat > conftest.$ac_ext <<EOF
+#line 12559 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:12525: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12566: \"$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
@@ -12541,11 +12582,11 @@
 rm -f conftest*
 
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:12545: checking whether localtime caches TZ" >&5
+echo "configure:12586: checking whether localtime caches TZ" >&5
 
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 12549 "configure"
+#line 12590 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
@@ -12580,7 +12621,7 @@
   exit (0);
 }
 EOF
-if { (eval echo configure:12584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
@@ -12610,9 +12651,9 @@
 
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:12614: checking whether gettimeofday accepts one or two arguments" >&5
-cat > conftest.$ac_ext <<EOF
-#line 12616 "configure"
+echo "configure:12655: checking whether gettimeofday accepts one or two arguments" >&5
+cat > conftest.$ac_ext <<EOF
+#line 12657 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -12633,7 +12674,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12678: \"$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
@@ -12655,19 +12696,19 @@
 
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:12659: checking for inline" >&5
+echo "configure:12700: checking for inline" >&5
 
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 12664 "configure"
+#line 12705 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:12671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -12708,17 +12749,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:12712: checking for working alloca.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12715 "configure"
+echo "configure:12753: checking for working alloca.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12756 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:12722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12763: \"$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
@@ -12742,10 +12783,10 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:12746: checking for alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12749 "configure"
+echo "configure:12787: checking for alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12790 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -12773,7 +12814,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:12777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12818: \"$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
@@ -12812,10 +12853,10 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:12816: checking whether alloca needs Cray hooks" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12819 "configure"
+echo "configure:12857: checking whether alloca needs Cray hooks" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12860 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -12839,10 +12880,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:12843: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12846 "configure"
+echo "configure:12884: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12887 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12865,7 +12906,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12910: \"$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
@@ -12895,10 +12936,10 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:12899: checking stack direction for C alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12902 "configure"
+echo "configure:12940: checking stack direction for C alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12943 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -12917,7 +12958,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:12921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
@@ -12946,10 +12987,10 @@
 fi
 
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:12950: checking for working strcoll" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12953 "configure"
+echo "configure:12991: checking for working strcoll" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12994 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -12959,7 +13000,7 @@
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:12963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
@@ -12987,10 +13028,10 @@
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12991: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12994 "configure"
+echo "configure:13032: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13035 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -13013,7 +13054,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13058: \"$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
@@ -13041,10 +13082,10 @@
 done
 
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:13045: checking whether getpgrp takes no argument" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13048 "configure"
+echo "configure:13086: checking whether getpgrp takes no argument" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13089 "configure"
 #include "confdefs.h"
 
 /*
@@ -13099,7 +13140,7 @@
 }
 
 EOF
-if { (eval echo configure:13103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_getpgrp_void=yes
 else
@@ -13126,10 +13167,10 @@
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:13130: checking for working mmap" >&5
+echo "configure:13171: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 13133 "configure"
+#line 13174 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -13162,7 +13203,7 @@
   return 1;
 }
 EOF
-if { (eval echo configure:13166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   have_mmap=yes
 else
@@ -13191,9 +13232,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:13195: checking for M_MMAP_THRESHOLD" >&5
+echo "configure:13236: checking for M_MMAP_THRESHOLD" >&5
     cat > conftest.$ac_ext <<EOF
-#line 13197 "configure"
+#line 13238 "configure"
 #include "confdefs.h"
 #include <malloc.h>
 int main() {
@@ -13205,7 +13246,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   rel_alloc=no; echo "$ac_t""yes" 1>&6;
 else
@@ -13230,15 +13271,15 @@
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:13234: checking for termios.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13237 "configure"
+echo "configure:13275: checking for termios.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13278 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13283: \"$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*
@@ -13281,15 +13322,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:13285: checking for termio.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13288 "configure"
+echo "configure:13326: checking for termio.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13329 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13334: \"$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*
@@ -13321,10 +13362,10 @@
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:13325: checking for socket" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13328 "configure"
+echo "configure:13366: checking for socket" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13369 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -13347,7 +13388,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13392: \"$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
@@ -13362,15 +13403,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:13366: checking for netinet/in.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13369 "configure"
+echo "configure:13407: checking for netinet/in.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13410 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13415: \"$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*
@@ -13387,15 +13428,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:13391: checking for arpa/inet.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13394 "configure"
+echo "configure:13432: checking for arpa/inet.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13435 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13440: \"$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*
@@ -13420,9 +13461,9 @@
 }
 
       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:13424: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:13465: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 13426 "configure"
+#line 13467 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13433,7 +13474,7 @@
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:13437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13478: \"$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
@@ -13451,9 +13492,9 @@
 fi
 rm -f conftest*
       echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:13455: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:13496: checking "for ip_mreq struct in netinet/in.h"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 13457 "configure"
+#line 13498 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13463,7 +13504,7 @@
 static struct ip_mreq x;
 ; return 0; }
 EOF
-if { (eval echo configure:13467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13508: \"$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
@@ -13494,10 +13535,10 @@
 
 
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:13498: checking for msgget" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13501 "configure"
+echo "configure:13539: checking for msgget" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13542 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
@@ -13520,7 +13561,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13565: \"$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
@@ -13535,15 +13576,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:13539: checking for sys/ipc.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13542 "configure"
+echo "configure:13580: checking for sys/ipc.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13583 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13588: \"$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*
@@ -13560,15 +13601,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:13564: checking for sys/msg.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13567 "configure"
+echo "configure:13605: checking for sys/msg.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13608 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13613: \"$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*
@@ -13606,15 +13647,15 @@
 
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:13610: checking for dirent.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13613 "configure"
+echo "configure:13651: checking for dirent.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13654 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13618: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13659: \"$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*
@@ -13641,15 +13682,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:13645: checking for sys/dir.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13648 "configure"
+echo "configure:13686: checking for sys/dir.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13689 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13694: \"$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*
@@ -13682,15 +13723,15 @@
 
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:13686: checking for nlist.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13689 "configure"
+echo "configure:13727: checking for nlist.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13730 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13735: \"$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*
@@ -13720,22 +13761,22 @@
 
 
 echo "checking "for sound support"" 1>&6
-echo "configure:13724: checking "for sound support"" >&5
+echo "configure:13765: 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:13731: checking for multimedia/audio_device.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13734 "configure"
+echo "configure:13772: checking for multimedia/audio_device.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13775 "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:13739: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13780: \"$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*
@@ -13783,12 +13824,12 @@
       if test -z "$native_sound_lib"; then
         
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:13787: checking for ALopenport in -laudio" >&5
+echo "configure:13828: 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 13792 "configure"
+#line 13833 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13799,7 +13840,7 @@
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:13803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13844: \"$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
@@ -13830,12 +13871,12 @@
       if test -z "$native_sound_lib"; then
 	
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:13834: checking for AOpenAudio in -lAlib" >&5
+echo "configure:13875: 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 13839 "configure"
+#line 13880 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13846,7 +13887,7 @@
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:13850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13891: \"$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
@@ -13894,15 +13935,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:13898: checking for ${dir}/soundcard.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13901 "configure"
+echo "configure:13939: checking for ${dir}/soundcard.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 13942 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13906: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13947: \"$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*
@@ -13956,15 +13997,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:13960: checking for audio/audiolib.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 13963 "configure"
+echo "configure:14001: checking for audio/audiolib.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14004 "configure"
 #include "confdefs.h"
 #include <audio/audiolib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14009: \"$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*
@@ -13982,12 +14023,12 @@
   
     
 echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6
-echo "configure:13986: checking for AuOpenServer in -laudio" >&5
+echo "configure:14027: 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 13991 "configure"
+#line 14032 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13998,7 +14039,7 @@
 AuOpenServer()
 ; return 0; }
 EOF
-if { (eval echo configure:14002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14043: \"$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
@@ -14037,7 +14078,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 14041 "configure"
+#line 14082 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
@@ -14068,7 +14109,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:14072: checking for $ac_word" >&5
+echo "configure:14113: 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.
@@ -14097,10 +14138,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:14101: checking for esd_play_stream" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 14104 "configure"
+echo "configure:14142: checking for esd_play_stream" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14145 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char esd_play_stream(); below.  */
@@ -14123,7 +14164,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14168: \"$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
@@ -14174,7 +14215,7 @@
 
 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:14178: checking for TTY-related features" >&5
+echo "configure:14219: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
@@ -14187,12 +14228,12 @@
     if test -z "$with_ncurses"; then
     
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:14191: checking for tgetent in -lncurses" >&5
+echo "configure:14232: 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 14196 "configure"
+#line 14237 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14203,7 +14244,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:14207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14248: \"$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
@@ -14236,15 +14277,15 @@
 
     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:14240: checking for ncurses/curses.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 14243 "configure"
+echo "configure:14281: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14284 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14248: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14289: \"$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*
@@ -14266,15 +14307,15 @@
 
     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:14270: checking for ncurses/term.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 14273 "configure"
+echo "configure:14311: checking for ncurses/term.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14314 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14278: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14319: \"$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*
@@ -14304,15 +14345,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:14308: checking for ncurses/curses.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 14311 "configure"
+echo "configure:14349: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14352 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14357: \"$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*
@@ -14347,12 +14388,12 @@
 	for lib in curses termlib termcap; do
 	  
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:14351: checking for tgetent in -l$lib" >&5
+echo "configure:14392: 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 14356 "configure"
+#line 14397 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14363,7 +14404,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:14367: \"$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_lib_$ac_lib_var=yes"
 else
@@ -14394,12 +14435,12 @@
       else
 	
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:14398: checking for tgetent in -lcurses" >&5
+echo "configure:14439: 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 14403 "configure"
+#line 14444 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14410,7 +14451,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:14414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14455: \"$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
@@ -14428,12 +14469,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:14432: checking for tgetent in -ltermcap" >&5
+echo "configure:14473: 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 14437 "configure"
+#line 14478 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14444,7 +14485,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:14448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14489: \"$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
@@ -14492,15 +14533,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:14496: checking for gpm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 14499 "configure"
+echo "configure:14537: checking for gpm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14540 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14545: \"$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*
@@ -14523,12 +14564,12 @@
  }
   test -z "$with_gpm" && { 
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:14527: checking for Gpm_Open in -lgpm" >&5
+echo "configure:14568: 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 14532 "configure"
+#line 14573 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14539,7 +14580,7 @@
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:14543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14584: \"$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
@@ -14582,20 +14623,20 @@
 
 test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
   != "no no no" && echo "checking for database support" 1>&6
-echo "configure:14586: checking for database support" >&5
+echo "configure:14627: 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:14591: checking for ndbm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 14594 "configure"
+echo "configure:14632: checking for ndbm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14635 "configure"
 #include "confdefs.h"
 #include <ndbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14640: \"$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*
@@ -14625,12 +14666,12 @@
 if test "$with_database_gdbm" != "no"; then
   
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:14629: checking for dbm_open in -lgdbm" >&5
+echo "configure:14670: 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 14634 "configure"
+#line 14675 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14641,7 +14682,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:14645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14686: \"$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
@@ -14669,10 +14710,10 @@
 
 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:14673: checking for dbm_open" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 14676 "configure"
+echo "configure:14714: checking for dbm_open" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14717 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -14695,7 +14736,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14740: \"$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
@@ -14714,12 +14755,12 @@
 
     
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:14718: checking for dbm_open in -ldbm" >&5
+echo "configure:14759: 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 14723 "configure"
+#line 14764 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14730,7 +14771,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:14734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14775: \"$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
@@ -14771,10 +14812,10 @@
 
 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:14775: checking for Berkeley db.h" >&5
+echo "configure:14816: checking for Berkeley db.h" >&5
   for header in "db/db.h" "db.h"; do
     cat > conftest.$ac_ext <<EOF
-#line 14778 "configure"
+#line 14819 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -14796,7 +14837,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_file="$header"; break
 else
@@ -14812,9 +14853,9 @@
 
   if test "$with_database_berkdb" != "no"; then
     echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:14816: checking for Berkeley DB version" >&5
+echo "configure:14857: checking for Berkeley DB version" >&5
     cat > conftest.$ac_ext <<EOF
-#line 14818 "configure"
+#line 14859 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 1
@@ -14826,7 +14867,7 @@
   egrep "yes" >/dev/null 2>&1; then
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 14830 "configure"
+#line 14871 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 2
@@ -14853,10 +14894,10 @@
 rm -f conftest*
 
     echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:14857: checking for $dbfunc" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 14860 "configure"
+echo "configure:14898: checking for $dbfunc" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14901 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $dbfunc(); below.  */
@@ -14879,7 +14920,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14924: \"$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
@@ -14898,12 +14939,12 @@
 
     
 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:14902: checking for $dbfunc in -ldb" >&5
+echo "configure:14943: 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 14907 "configure"
+#line 14948 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14914,7 +14955,7 @@
 $dbfunc()
 ; return 0; }
 EOF
-if { (eval echo configure:14918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14959: \"$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
@@ -14975,12 +15016,12 @@
 if test "$with_socks" = "yes"; then
   
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:14979: checking for SOCKSinit in -lsocks" >&5
+echo "configure:15020: 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 14984 "configure"
+#line 15025 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14991,7 +15032,7 @@
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:14995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15036: \"$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
@@ -15045,11 +15086,11 @@
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 15049 "configure"
+#line 15090 "configure"
 #include "confdefs.h"
 int main(int c,char *v[]){return 0;}
 EOF
-if { (eval echo configure:15053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:15094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -15187,6 +15228,15 @@
   fi
 done
 
+if test "$need_modules_common" = "yes"; then
+  for dir in modules/common; do
+    if test ! -d "$dir" ; then
+      echo Making symbolic link to "$srcdir/$dir"
+      ${LN_S} "$srcdir/$dir" "$dir"
+    fi
+  done
+fi
+
 if test "$extra_verbose" = "yes"; then
   echo ""
   for var in extra_objs    c_switch_general  c_switch_window_system  c_switch_all   ld_switch_general ld_switch_window_system ld_switch_all     ld_libs_general   ld_libs_window_system   ld_libs_all; do eval "echo \"$var = '\$$var'\""; done
@@ -15396,9 +15446,6 @@
 
 
 
-test -n "$xemacs_compiler" && XEMACS_CC="$xemacs_compiler"
-: ${XEMACS_CC:="$CC"}
-
 
 if test "$with_prefix" = "yes"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
@@ -15679,7 +15726,7 @@
 else echo "  Not using any machine description file"
 fi
 
-echo "  Compiler:                          $CC $CFLAGS"
+echo "  Compiler:                          $XEMACS_CC $CFLAGS"
 echo "  Relocating allocator for buffers:  $rel_alloc"
 echo "  GNU version of malloc:             ${GNU_MALLOC}${GNU_MALLOC_reason}"
 case "$ld_switch_site" in
@@ -15861,8 +15908,10 @@
 
 
 for file in $internal_makefile_list; do
-  test "$file" = src/Makefile.in && \
-    file="src/Makefile.in:src/Makefile.in.in:src/depend"
+  case $file in
+    src/Makefile.in ) file="src/Makefile.in:src/Makefile.in.in:src/depend" ;;
+    modules/* ) file="${file}:${file}.in:modules/common/Makefile.common" ;;
+  esac
   ac_output_files="$ac_output_files $file" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"$file\" to \$ac_output_files"; fi
 done
 ac_output_files="$ac_output_files src/paths.h lib-src/config.values"
--- a/configure.in	Sun Nov 17 22:53:08 2002 +0000
+++ b/configure.in	Mon Nov 18 06:53:08 2002 +0000
@@ -53,6 +53,14 @@
 dnl autoconf system), so quote them like this: [[foo]]
 
 AC_PREREQ(2.13)dnl
+
+dnl #### Doesn't work currently.  it would be really nice if we could
+dnl get this working, because many autoconfs v2.5 come with support for
+dnl v2.1 source files but get snafued by our nasty configure.ac kludge.
+dnl
+dnl m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), 2.5), -1,
+dnl       [m4_fatal([Autoconf version 2.5 or higher not supported])])
+
 dnl Redefine some standard autoconf macros
 dnl here is how XEmacs is different:
 dnl - no cache file
@@ -346,6 +354,7 @@
 with_prefix='yes'
 with_site_lisp='no'
 with_site_modules='yes'
+need_modules_common=''
 with_menubars=''
 with_scrollbars=''
 with_widgets=''
@@ -533,6 +542,7 @@
 	compiler	| \
 	xemacs_compiler	| \
 	cflags		| \
+        cflags_warning  | \
 	cpp		| \
 	cppflags	| \
 	libs		| \
@@ -1646,6 +1656,11 @@
   else cflags_specified=no;
 fi
 
+if test "${cflags_warning-unset}" != unset
+  then cflags_warning_specified=yes;
+  else cflags_warning_specified=no;
+fi
+
 xe_save_CFLAGS="$CFLAGS"
 
 AC_PROG_CC dnl Autoconf has its own magic for compiler autodetection
@@ -1931,37 +1946,67 @@
   dnl Following values of CFLAGS are known to work well.
   dnl Should we take debugging options into consideration?
   if   test "$GCC" = "yes"; then
-    CFLAGS="-g -O3 -Wall -Wno-switch -Winline -Wmissing-prototypes"
+    CFLAGS="-g -O3"
+    dnl I'm not convinced this is a good idea any more. -sb
+    dnl test "$opsys $machine" = "linux intel386" && \
+    dnl CFLAGS="$CFLAGS -fno-strength-reduce -malign-loops=2 -malign-jumps=2 -malign-functions=2"
+  elif test "$__SUNPRO_C" = "yes"; then
+    case "$opsys" in
+      sol2    ) CFLAGS="-xO4" ;;
+      sunos4* ) CFLAGS="-xO2" ;;
+    esac
+  elif test "$__DECC" = "yes"; then
+    CFLAGS="-O3"
+  elif test "$CC" = "xlc"; then
+    CFLAGS="-g -O3 -qstrict -qnoansialias -qlibansi -qro -qmaxmem=20000"
+  dnl ### Add optimal CFLAGS support for other compilers HERE!
+  else
+    CFLAGS="-O" ;dnl The only POSIX-approved flag
+  fi
+fi
+
+dnl Calculate warning flags.  We now separate the flags for warnings from
+dnl the other flags because we really really want the warnings to be seen
+dnl by everyone.
+
+if test "$cflags_warning_specified" = "no"; then
+  dnl Following warning flags are known to work well.
+  if   test "$GCC" = "yes"; then
+    cflags_warning="-Wall -Wno-switch -Winline -Wmissing-prototypes"
     dnl Yuck, bad compares have been worth at least 3 crashes!
-    CFLAGS="$CFLAGS -Wsign-compare"
+    cflags_warning="$cflags_warning -Wsign-compare"
+    dnl NOTE: The following three, as well as -Wmissing-declarations and
+    dnl -Weffc++ below, have been recently added.  If you are getting
+    dnl grief from them, please notify ben@xemacs.org!
+    cflags_warning="$cflags_warning -Wundef -Wstrict-prototypes -Wpacked"
     dnl With g++, -Wshadow produces five zillion utterly random warnings --
     dnl a local var named `buffer' conflicts with `struct buffer' for
     dnl example.  Even with gcc, -Wshadow is questionable because of its
     dnl complaints about parameters with the same names as global functions.
     if test "$xemacs_compiler" != "g++"; then
-      CFLAGS="$CFLAGS -Wshadow"
+    dnl no -Wmissing-declarations under g++.
+      cflags_warning="$cflags_warning -Wshadow -Wmissing-declarations"
+    else
+      cflags_warning="$cflags_warning -Weffc++"
     fi
     dnl glibc is intentionally not `-Wpointer-arith'-clean.
     dnl Ulrich Drepper has rejected patches to fix the glibc header files.
-    test "$have_glibc" != "yes" && CFLAGS="$CFLAGS -Wpointer-arith"
-    dnl I'm not convinced this is a good idea any more. -sb
-    dnl test "$opsys $machine" = "linux intel386" && \
-    dnl CFLAGS="$CFLAGS -fno-strength-reduce -malign-loops=2 -malign-jumps=2 -malign-functions=2"
+    test "$have_glibc" != "yes" && \
+      cflags_warning="$cflags_warning -Wpointer-arith"
   elif test "$__SUNPRO_C" = "yes"; then
     case "$opsys" in
-      sol2    ) CFLAGS="-v -xO4" ;;
-      sunos4* ) CFLAGS="-xO2";;
+      sol2    ) cflags_warning="-v" ;;
     esac
-  elif test "$__DECC" = "yes"; then
-    CFLAGS="-O3"
   elif test "$CC" = "xlc"; then
-    CFLAGS="-g -O3 -qstrict -qnoansialias -qlibansi -qinfo -qro -qmaxmem=20000"
-  dnl ### Add optimal CFLAGS support for other compilers HERE!
-  else
-    CFLAGS="-O" ;dnl The only POSIX-approved flag
+    cflags_warning="-qinfo"
+  dnl ### Add optimal cflags_warning support for other compilers HERE!
   fi
 fi
 
+dnl Now combine all C flags.  Put the warning flags first so that
+dnl user-specified flags will override.
+CFLAGS="$cflags_warning $CFLAGS"
+
 dnl Search for GCC specific build problems we know about
 if test "$GCC" = "yes"; then
 AC_MSG_CHECKING(for buggy gcc versions)
@@ -3065,6 +3110,19 @@
 dnl offix.c, so that the thing is dumped after lastfile.o
 AC_SUBST(dnd_objs)
 
+dnl Support for using a different compiler for xemacs itself.
+dnl Useful for building XEmacs with a C++ compiler.
+dnl For example, `configure --compiler=gcc --xemacs-compiler=g++
+
+dnl The compiler used to build xemacs, as opposed to the compiler
+dnl used by configure and lib-src, is determined from the following
+dnl sources, in order of priority:
+dnl o --xemacs-compiler configure flag
+dnl o XEMACS_CC environment variable
+dnl o same as the regular compiler, (determined previously)
+test -n "$xemacs_compiler" && XEMACS_CC="$xemacs_compiler"
+: ${XEMACS_CC:="$CC"}
+
 dnl Autodetect dll support
 dnl This must come before the detection code for anything that is in a module
 if test "$with_modules" != "no"; then
@@ -3121,7 +3179,7 @@
       echo "    No module support."
     fi
     with_modules=no
-    MOD_CC=${CC}
+    MOD_CC="$XEMACS_CC"
     MODCFLAGS="\$(CFLAGS) -I../../src -I\$(srcdir)/../../src"
     INSTALLPATH=""
     MOD_INSTALL_PROGRAM="true"
@@ -3270,6 +3328,7 @@
   AC_CHECK_FUNCS(ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result)
   LIBS="$save_LIBS"
   XE_APPEND(modules/ldap, MAKE_SUBDIR)
+  need_modules_common=yes
   if test "$with_modules" = "yes"; then
     XE_APPEND(modules/ldap, INSTALL_ARCH_DEP_SUBDIR)
   fi
@@ -3304,6 +3363,7 @@
     AC_DEFINE_UNQUOTED(LIBPQ_FE_H_FILE, "$libpq_fe_h_file")
     XE_PREPEND(-lpq, postgresql_libs)
     XE_APPEND(modules/postgresql, MAKE_SUBDIR)
+    need_modules_common=yes
     if test "$with_modules" = "yes"; then
       XE_APPEND(modules/postgresql, INSTALL_ARCH_DEP_SUBDIR)
     fi
@@ -3888,7 +3948,7 @@
 dnl Check for POSIX functions.
 dnl ----------------------------------------------------------------
 
-AC_CHECK_FUNCS(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 symlink tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask)
+AC_CHECK_FUNCS(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 symlink tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask wcslen wcscmp)
 
 dnl getaddrinfo() is borked under hpux11
 if test "$ac_cv_func_getaddrinfo" != "no" ; then
@@ -4568,7 +4628,7 @@
 AC_SUBST(MAKE_SUBDIR)
 AC_SUBST(SUBDIR_MAKEFILES)
 
-dnl Make s&m symlinks in the src directory, for config.h
+dnl Make s&m symlinks in the src directory, for config.h.
 for dir in src/s src/m; do
   if test ! -d "$dir" ; then
     echo Making symbolic link to "$srcdir/$dir"
@@ -4576,6 +4636,16 @@
   fi
 done
 
+dnl Also make modules/common link if needed for the module Makefiles.
+if test "$need_modules_common" = "yes"; then
+  for dir in modules/common; do
+    if test ! -d "$dir" ; then
+      echo Making symbolic link to "$srcdir/$dir"
+      ${LN_S} "$srcdir/$dir" "$dir"
+    fi
+  done
+fi
+
 if test "$extra_verbose" = "yes"; then
   echo ""
   PRINT_VAR(extra_objs
@@ -4806,18 +4876,6 @@
 AC_SUBST(RANLIB)
 AC_SUBST(dynodump_arch)
 
-dnl Support for using a different compiler for xemacs itself.
-dnl Useful for building XEmacs with a C++ compiler.
-dnl For example, `configure --compiler=gcc --xemacs-compiler=g++
-
-dnl The compiler used to build xemacs, as opposed to the compiler
-dnl used by configure and lib-src, is determined from the following
-dnl sources, in order of priority:
-dnl o --xemacs-compiler configure flag
-dnl o XEMACS_CC environment variable
-dnl o same as the regular compiler, (determined previously)
-test -n "$xemacs_compiler" && XEMACS_CC="$xemacs_compiler"
-: ${XEMACS_CC:="$CC"}
 AC_SUBST(XEMACS_CC)
 
 dnl The default is yes
@@ -4928,7 +4986,7 @@
 else echo "  Not using any machine description file"
 fi
 
-echo "  Compiler:                          $CC $CFLAGS"
+echo "  Compiler:                          $XEMACS_CC $CFLAGS"
 echo "  Relocating allocator for buffers:  $rel_alloc"
 echo "  GNU version of malloc:             ${GNU_MALLOC}${GNU_MALLOC_reason}"
 case "$ld_switch_site" in
@@ -5115,10 +5173,15 @@
 
 dnl Build Makefile.in's from Makefile.in.in's
 dnl except ./Makefile from $srcdir/Makefile.in
+dnl src/Makefile.in will have src/depend appended to it;
+dnl module Makefiles will have the common text in
+dnl modules/common/Makefile.common appended.
 
 for file in $internal_makefile_list; do
-  test "$file" = src/Makefile.in && \
-    file="src/Makefile.in:src/Makefile.in.in:src/depend"
+  case $file in
+    src/Makefile.in ) file="src/Makefile.in:src/Makefile.in.in:src/depend" ;;
+    modules/* ) file="${file}:${file}.in:modules/common/Makefile.common" ;;
+  esac
   XE_APPEND($file, ac_output_files)
 done
 ac_output_files="$ac_output_files src/paths.h lib-src/config.values"
--- a/configure.usage	Sun Nov 17 22:53:08 2002 +0000
+++ b/configure.usage	Mon Nov 18 06:53:08 2002 +0000
@@ -31,7 +31,12 @@
 --compiler=PROG         C compiler to use
 --xemacs-compiler=PROG  compiler to use to compile just the xemacs executable
 --with-gcc (*)          Use GCC to compile XEmacs.
---cflags=FLAGS          Compiler flags (such as -O)
+--cflags=FLAGS          Compiler flags (such as -O); setting this overrides
+                        all default compiler flags except those that control
+                        warnings.
+--cflags_warning=FLAGS  Override compiler flags used to control warnings.
+                        Normally, don't set this, as XEmacs already turns on
+                        the maximum safe warning level.
 --cpp=PROG              C preprocessor to use (e.g. /usr/ccs/lib/cpp or cc -E)
 --cppflags=FLAGS        C preprocessor flags (e.g. -I/foo or -Dfoo=bar)
 --libs=LIBS             Additional libraries (e.g. -lfoo)
--- a/lib-src/ChangeLog	Sun Nov 17 22:53:08 2002 +0000
+++ b/lib-src/ChangeLog	Mon Nov 18 06:53:08 2002 +0000
@@ -1,3 +1,17 @@
+2002-11-17  Ben Wing  <ben@xemacs.org>
+
+	* ellcc.c (do_init_mode):
+	Use full prototypes.
+
+	* ellcc.h.in:
+	Use the correct user-specified compiler.
+	
+	* make-docfile.c:
+	* make-docfile.c (read_c_string):
+	* make-docfile.c (scan_c_file):
+	Fix shadowing warnings.  NOTE: This was already fixed
+	awhile ago, but reverted by Jerry.  Please be careful.
+
 2002-08-08  Jerry James  <james@xemacs.org>
 
 	* config.values.in: Regenerate.
--- a/lib-src/ellcc.c	Sun Nov 17 22:53:08 2002 +0000
+++ b/lib-src/ellcc.c	Mon Nov 18 06:53:08 2002 +0000
@@ -723,7 +723,8 @@
   fprintf (mout, "const char *emodule_version = \"%s\";\n", SSTR(mod_version));
   fprintf (mout, "const char *emodule_title = \"%s\";\n", SSTR(mod_title));
   fprintf (mout, "\n\n");
-  fprintf (mout, "void docs_of_%s()\n", SSTR(mod_name));
+  fprintf (mout, "void docs_of_%s (void);\n", SSTR(mod_name));
+  fprintf (mout, "void docs_of_%s (void)\n", SSTR(mod_name));
   if (fclose (mout) != 0)
     {
       fatal ("Failed to close output file %s", mod_output);
--- a/lib-src/ellcc.h.in	Sun Nov 17 22:53:08 2002 +0000
+++ b/lib-src/ellcc.h.in	Mon Nov 18 06:53:08 2002 +0000
@@ -8,7 +8,7 @@
 #ifndef ELLCC_HDR
 #define ELLCC_HDR
 
-#define ELLCC_CC            "@CC@"
+#define ELLCC_CC            "@XEMACS_CC@"
 #define ELLCC_CFLAGS        "@CFLAGS@"
 #define ELLCC_CPPFLAGS      "@CPPFLAGS@"
 #define ELLCC_LDFLAGS       "@LDFLAGS@"
--- a/lib-src/make-docfile.c	Sun Nov 17 22:53:08 2002 +0000
+++ b/lib-src/make-docfile.c	Mon Nov 18 06:53:08 2002 +0000
@@ -373,7 +373,7 @@
 }
 
 
-char buf[128];
+char globalbuf[128];
 
 /* Skip a C string from INFILE,
  and return the character that follows the closing ".
@@ -387,7 +387,7 @@
 read_c_string (FILE *infile, int printflag, int c_docstring)
 {
   register int prevc = 0, c = 0;
-  char *p = buf;
+  char *p = globalbuf;
   int start = -1;	/* XEmacs addition */
 
   MDGET;
@@ -774,7 +774,7 @@
 	      if (c < 0)
 		goto eof;
 	      if (defunflag && c == '(')
-		fatal ("Missing doc string for DEFUN %s\n", buf);
+		fatal ("Missing doc string for DEFUN %s\n", globalbuf);
 	      c = getc (infile);
 	    }
 	  c = getc (infile);
@@ -804,12 +804,12 @@
 	  /* XEmacs change: the original code is in the "else" clause */
 	  if (ellcc)
 	    fprintf (outfile, "  CDOC%s(\"%s\", \"\\\n",
-		     defvarflag ? "SYM" : "SUBR", buf);
+		     defvarflag ? "SYM" : "SUBR", globalbuf);
 	  else
 	    {
 	      putc (037, outfile);
 	      putc (defvarflag ? 'V' : 'F', outfile);
-	      fprintf (outfile, "%s\n", buf);
+	      fprintf (outfile, "%s\n", globalbuf);
 	    }
 	  c = read_c_string (infile, 1, defunflag || defvarflag);
 
@@ -850,7 +850,7 @@
 		fprintf (outfile, "\\n\\\n\\n\\\n");
 	      else
 		fprintf (outfile, "\n\n");
-	      write_c_args (outfile, buf, argbuf, minargs, maxargs);
+	      write_c_args (outfile, globalbuf, argbuf, minargs, maxargs);
 	    }
 	  if (ellcc)
 	    fprintf (outfile, "\\n\");\n\n");
--- a/lisp/ChangeLog	Sun Nov 17 22:53:08 2002 +0000
+++ b/lisp/ChangeLog	Mon Nov 18 06:53:08 2002 +0000
@@ -1,3 +1,15 @@
+2002-11-17  Ben Wing  <ben@xemacs.org>
+
+	* code-files.el (load):
+	* loadhist.el (unload-feature):
+	Fix warnings.
+
+	* package-get.el (package-get-update-base-from-buffer):
+	Fix warnings.
+
+	NOTE: This was already fixed awhile ago, but reverted by Steve Y.
+	Please be careful.
+
 2002-10-14  Jerry James  <james@xemacs.org>
 
 	* gtk-font-menu.el (gtk-reset-device-font-menus): Simplify code
--- a/lisp/code-files.el	Sun Nov 17 22:53:08 2002 +0000
+++ b/lisp/code-files.el	Mon Nov 18 06:53:08 2002 +0000
@@ -233,6 +233,7 @@
 If optional fourth arg NOSUFFIX is non-nil, don't try adding
  suffixes .elc, .el, or .ell to the specified name FILE.
 Return t if file exists."
+  (declare (special load-modules-quietly))
   (let* ((filename (substitute-in-file-name file))
 	 (handler (find-file-name-handler filename 'load))
 	 (path nil))
@@ -278,7 +279,7 @@
 				   '(".ell" ".dll" ".so" ""))))
 	    (if (featurep 'modules)
 		(let ((load-modules-quietly nomessage))
-		  (load-module filename))
+		  (declare-fboundp (load-module filename)))
 	      (signal 'file-error '("This XEmacs does not support modules")))
 	  (and (null noerror)
 	       (signal 'file-error (list "Cannot open load file" filename))))
--- a/lisp/loadhist.el	Sun Nov 17 22:53:08 2002 +0000
+++ b/lisp/loadhist.el	Mon Nov 18 06:53:08 2002 +0000
@@ -154,7 +154,7 @@
       (setq load-history (delq elt load-history)))
     ;; If it is a module, really unload it.
     (if unloading-module
-	(unload-module (symbol-name feature)))))
+	(declare-fboundp (unload-module (symbol-name feature))))))
 
 (provide 'loadhist)
 
--- a/lisp/package-get.el	Sun Nov 17 22:53:08 2002 +0000
+++ b/lisp/package-get.el	Mon Nov 18 06:53:08 2002 +0000
@@ -454,21 +454,22 @@
 		  (progn
 		    (setq package-get-continue-update-base nil)
 		    (autoload 'mc-setversion "mc-setversion")
-		    (cond ((locate-file "gpg" exec-path
-					'("" ".btm" ".bat" ".cmd" ".exe" ".com")
-					'executable)
-			   (mc-setversion "gpg"))
-			  ((locate-file "pgpe" exec-path
-					'("" ".btm" ".bat" ".cmd" ".exe" ".com")
-					'executable)
-			   (mc-setversion "5.0"))
-			  ((locate-file "pgp" exec-path
-					'("" ".btm" ".bat" ".cmd" ".exe" ".com")
-					'executable)
-			   (mc-setversion "2.6"))
-			  (t
-			   (error 'search-failed 
-				  "Can't find a suitable PGP executable")))
+		    (with-fboundp 'mc-setversion
+		      (cond ((locate-file "gpg" exec-path
+					  '("" ".btm" ".bat" ".cmd" ".exe"
+					    ".com") 'executable)
+			     (mc-setversion "gpg"))
+			    ((locate-file "pgpe" exec-path
+					  '("" ".btm" ".bat" ".cmd" ".exe"
+					    ".com") 'executable)
+			     (mc-setversion "5.0"))
+			    ((locate-file "pgp" exec-path
+					  '("" ".btm" ".bat" ".cmd" ".exe"
+					    ".com") 'executable)
+			     (mc-setversion "2.6"))
+			    (t
+			     (error 'search-failed 
+				    "Can't find a suitable PGP executable"))))
 		    (autoload 'mc-verify "mc-toplev")
 		    (declare-fboundp (mc-verify))
 		    (setq package-get-continue-update-base t))
--- a/modules/ChangeLog	Sun Nov 17 22:53:08 2002 +0000
+++ b/modules/ChangeLog	Mon Nov 18 06:53:08 2002 +0000
@@ -1,3 +1,95 @@
+2002-11-17  Ben Wing  <ben@xemacs.org>
+
+	* postgresql/Makefile.in.in:
+	* postgresql/Makefile.in.in (SRCS):
+	* postgresql/Makefile.in.in (SRC_SRCS): Removed.
+	* postgresql/Makefile.in.in (OBJS): Removed.
+	* postgresql/Makefile.in.in (SHELL): Removed.
+	* postgresql/Makefile.in.in (RM): Removed.
+	* postgresql/Makefile.in.in (PROGNAME): Removed.
+	* postgresql/Makefile.in.in (CFLAGS): Removed.
+	* postgresql/Makefile.in.in (INSTALL): Removed.
+	* postgresql/Makefile.in.in (version): Removed.
+	* postgresql/Makefile.in.in (prefix): Removed.
+	* postgresql/Makefile.in.in (exec_prefix): Removed.
+	* postgresql/Makefile.in.in (libdir): Removed.
+	* postgresql/Makefile.in.in (instvardir): Removed.
+	* postgresql/Makefile.in.in (configuration): Removed.
+	* postgresql/Makefile.in.in (moduledir): Removed.
+	* postgresql/Makefile.in.in (with_modules): Removed.
+	* postgresql/Makefile.in.in (srcdir): Removed.
+	* postgresql/Makefile.in.in (VPATH): Removed.
+	* postgresql/Makefile.in.in (CC): Removed.
+	* postgresql/Makefile.in.in (MODARCHDIR): Removed.
+	* postgresql/Makefile.in.in (MAKE_DOCFILE): Removed.
+	* postgresql/Makefile.in.in (MODCFLAGS): Removed.
+	* postgresql/Makefile.in.in (INSTALLPATH): Removed.
+	* postgresql/Makefile.in.in (INSTALL_PROGRAM): Removed.
+	* postgresql/Makefile.in.in (OBJECT_TO_BUILD): Removed.
+	* postgresql/Makefile.in.in (.PHONY): Removed.
+	* postgresql/Makefile.in.in (all): Removed.
+	* postgresql/Makefile.in.in (.c.o): Removed.
+	* postgresql/Makefile.in.in (clean): Removed.
+	* postgresql/Makefile.in.in (distclean): Removed.
+	* postgresql/Makefile.in.in (install): Removed.
+	Move common stuff into modues/common/Makefile.common. (Also
+	add extraclean target and a couple of other fixes in that file.)
+
+	* postgresql/configure.ac:
+	Extract out common configure stuff into
+	modules/common/configure-{pre,post}.ac.
+
+	* postgresql/postgresql.c (WARNING):
+	Fix warning.
+
+2002-11-17  Ben Wing  <ben@xemacs.org>
+
+	* ldap/Makefile.in.in:
+	* ldap/Makefile.in.in (SRCS):
+	* ldap/Makefile.in.in (SRC_SRCS): Removed.
+	* ldap/Makefile.in.in (OBJS): Removed.
+	* ldap/Makefile.in.in (SHELL): Removed.
+	* ldap/Makefile.in.in (RM): Removed.
+	* ldap/Makefile.in.in (PROGNAME): Removed.
+	* ldap/Makefile.in.in (CFLAGS): Removed.
+	* ldap/Makefile.in.in (INSTALL): Removed.
+	* ldap/Makefile.in.in (version): Removed.
+	* ldap/Makefile.in.in (prefix): Removed.
+	* ldap/Makefile.in.in (exec_prefix): Removed.
+	* ldap/Makefile.in.in (libdir): Removed.
+	* ldap/Makefile.in.in (instvardir): Removed.
+	* ldap/Makefile.in.in (configuration): Removed.
+	* ldap/Makefile.in.in (moduledir): Removed.
+	* ldap/Makefile.in.in (with_modules): Removed.
+	* ldap/Makefile.in.in (srcdir): Removed.
+	* ldap/Makefile.in.in (VPATH): Removed.
+	* ldap/Makefile.in.in (CC): Removed.
+	* ldap/Makefile.in.in (MODARCHDIR): Removed.
+	* ldap/Makefile.in.in (MAKE_DOCFILE): Removed.
+	* ldap/Makefile.in.in (MODCFLAGS): Removed.
+	* ldap/Makefile.in.in (INSTALLPATH): Removed.
+	* ldap/Makefile.in.in (INSTALL_PROGRAM): Removed.
+	* ldap/Makefile.in.in (OBJECT_TO_BUILD): Removed.
+	* ldap/Makefile.in.in (.PHONY): Removed.
+	* ldap/Makefile.in.in (all): Removed.
+	* ldap/Makefile.in.in (.c.o): Removed.
+	* ldap/Makefile.in.in (clean): Removed.
+	* ldap/Makefile.in.in (distclean): Removed.
+	* ldap/Makefile.in.in (install): Removed.
+	Move common stuff into modues/common/Makefile.common. (Also
+	add extraclean target and a couple of other fixes in that file.)
+
+	* ldap/configure.ac:
+	* ldap/configure.ac (have_ldap):
+	Extract out common configure stuff into
+	modules/common/configure-{pre,post}.ac.
+
+2002-11-17  Ben Wing  <ben@xemacs.org>
+
+	* common/Makefile.common:
+	* common/Makefile.common (SHELL):
+	Common stuff is here.
+
 2002-09-20  Steve Youngs  <youngs@xemacs.org>
 
 	* postgresql/Makefile.in.in (LDFLAGS): Add @ld_switch_all@ to pick
--- a/modules/common/Makefile.common	Sun Nov 17 22:53:08 2002 +0000
+++ b/modules/common/Makefile.common	Mon Nov 18 06:53:08 2002 +0000
@@ -25,6 +25,8 @@
 ## source tree, and to support both module and non-module building inside the
 ## source tree.
 
+## Note: This will be appended to the individual module Makefiles by configure.
+
 SRC_SRCS=$(SRCS:%=$(srcdir)/%)
 OBJS=$(SRCS:.c=.o)
 
--- a/modules/ldap/Makefile.in.in	Sun Nov 17 22:53:08 2002 +0000
+++ b/modules/ldap/Makefile.in.in	Mon Nov 18 06:53:08 2002 +0000
@@ -18,12 +18,7 @@
 ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ## Boston, MA 02111-1307, USA.
 
-## Synched up with: Not synched with FSF.
-
-## This is more complicated than would normally be the case, as this makefile
-## has been tailored to work both inside and independently of the XEmacs
-## source tree, and to support both module and non-module building inside the
-## source tree.
+## Synched up with: Not in FSF.
 
 ### Specialize this part for your module
 MODNAME=eldap
@@ -32,54 +27,4 @@
 LDFLAGS=@LDFLAGS@ @ld_switch_all@ @ldap_libs@
 SRCS=eldap.c
 
-### You should not need to modify anything below this line
-SRC_SRCS=$(SRCS:%=$(srcdir)/%)
-OBJS=$(SRCS:.c=.o)
-
-SHELL=/bin/sh
-RM=rm -f
-PROGNAME=@PROGNAME@
-CFLAGS=@CFLAGS@
-INSTALL=@INSTALL@
-version=@version@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-instvardir=@instvardir@
-configuration=@configuration@
-moduledir=@moduledir@
-with_modules=@with_modules@
-
-srcdir=@srcdir@
-VPATH=@srcdir@
-
-CC=@MOD_CC@
-MODARCHDIR=@MODARCHDIR@
-MAKE_DOCFILE=@MAKE_DOCFILE@
-MODCFLAGS=@MODCFLAGS@
-INSTALLPATH=@INSTALLPATH@
-INSTALL_PROGRAM=@MOD_INSTALL_PROGRAM@
-OBJECT_TO_BUILD=@OBJECT_TO_BUILD@
-
-.PHONY:	clean distclean install
-all: $(OBJECT_TO_BUILD)
-
-.c.o:
-	$(CC) $(MODCFLAGS) -c $<
-
-$(MODNAME).ell: $(OBJS) $(MODNAME)_i.o
-	$(CC) --mode=link --mod-output=$@ $^ $(LDFLAGS)
-
-$(MODNAME)_i.c: $(SRCS)
-	ELLMAKEDOC=$(MAKE_DOCFILE) $(CC) --mode=init --mod-output=$@ \
-	--mod-name=$(MODNAME) --mod-version=$(MODVER) \
-	--mod-title=$(MODTITLE) $(SRC_SRCS)
-
-clean:
-	$(RM) $(MODNAME).ell $(OBJS) $(MODNAME)_i.* *~
-
-distclean: clean
-	$(RM) Makefile config.* configure
-
-install: $(OBJECT_TO_BUILD)
-	$(INSTALL_PROGRAM) $< $(INSTALLPATH)
+## Note: modules/common/Makefile.common will be appended by configure
--- a/modules/ldap/configure.ac	Sun Nov 17 22:53:08 2002 +0000
+++ b/modules/ldap/configure.ac	Mon Nov 18 06:53:08 2002 +0000
@@ -2,7 +2,7 @@
 # This is only used for independent module building.
 AC_INIT([LDAP module], [1.0], [xemacs-beta@xemacs.org])
 AC_PREREQ(2.53)
-AC_REVISION($Revision: 1.1 $)
+AC_REVISION($Revision: 1.2 $)
 AC_COPYRIGHT([Configuration script for the LDAP module.
 Copyright (C) 2002 Jerry James.
 
@@ -24,15 +24,8 @@
 02111-1307, USA.])
 
 AC_CONFIG_SRCDIR([eldap.c])
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_SUBST(CFLAGS)
-AC_SUBST(LDFLAGS)
 
-# Find ELLCC
-AC_ARG_VAR([ELLCC], [The path to the ellcc module compiler])
-AC_PATH_PROG([ELLCC], [ellcc], ["FAIL"])
-AS_IF([test "$ELLCC" = "FAIL"], [AS_ERROR([Cannot find ellcc])])
+m4_include([../common/configure-pre.ac])
 
 # Find the LDAP headers and libraries
 have_ldap="yes"
@@ -52,15 +45,4 @@
   [AS_ERROR([Cannot link with the LDAP library])])
 AC_SUBST(ldap_libs, "$LIBS")
 
-# This part should appear unchanged in every module configure.ac
-AC_SUBST(PROGNAME, "module")
-AC_SUBST(MOD_CC, "@ELLCC@")
-AC_SUBST(MODARCHDIR, "\$(shell @ELLCC@ --mod-archdir)")
-AC_SUBST(MAKE_DOCFILE, "\$(MODARCHDIR)/make-docfile")
-AC_SUBST(MODCFLAGS, "\$(CFLAGS) --mode=compile --mod-output=\$@ -I\$(MODARCHDIR)/include")
-AC_SUBST(INSTALLPATH, "\$(shell @ELLCC@ --mod-site-location)")
-AC_SUBST(MOD_INSTALL_PROGRAM, "@INSTALL_PROGRAM@")
-AC_SUBST(OBJECT_TO_BUILD, "\$(MODNAME).ell")
-
-AC_CONFIG_FILES([Makefile.in Makefile])
-AC_OUTPUT
+m4_include([../common/configure-post.ac])
--- a/modules/postgresql/Makefile.in.in	Sun Nov 17 22:53:08 2002 +0000
+++ b/modules/postgresql/Makefile.in.in	Mon Nov 18 06:53:08 2002 +0000
@@ -18,12 +18,7 @@
 ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ## Boston, MA 02111-1307, USA.
 
-## Synched up with: Not synched with FSF.
-
-## This is more complicated than would normally be the case, as this makefile
-## has been tailored to work both inside and independently of the XEmacs
-## source tree, and to support both module and non-module building inside the
-## source tree.
+## Synched up with: Not in FSF.
 
 ### Specialize this part for your module
 MODNAME=postgresql
@@ -32,54 +27,4 @@
 LDFLAGS=@LDFLAGS@ @ld_switch_all@ @postgresql_libs@
 SRCS=postgresql.c
 
-### You should not need to modify anything below this line
-SRC_SRCS=$(SRCS:%=$(srcdir)/%)
-OBJS=$(SRCS:.c=.o)
-
-SHELL=/bin/sh
-RM=rm -f
-PROGNAME=@PROGNAME@
-CFLAGS=@CFLAGS@
-INSTALL=@INSTALL@
-version=@version@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-instvardir=@instvardir@
-configuration=@configuration@
-moduledir=@moduledir@
-with_modules=@with_modules@
-
-srcdir=@srcdir@
-VPATH=@srcdir@
-
-CC=@MOD_CC@
-MODARCHDIR=@MODARCHDIR@
-MAKE_DOCFILE=@MAKE_DOCFILE@
-MODCFLAGS=@MODCFLAGS@
-INSTALLPATH=@INSTALLPATH@
-INSTALL_PROGRAM=@MOD_INSTALL_PROGRAM@
-OBJECT_TO_BUILD=@OBJECT_TO_BUILD@
-
-.PHONY:	clean distclean install
-all: $(OBJECT_TO_BUILD)
-
-.c.o:
-	$(CC) $(MODCFLAGS) -c $<
-
-$(MODNAME).ell: $(OBJS) $(MODNAME)_i.o
-	$(CC) --mode=link --mod-output=$@ $^ $(LDFLAGS)
-
-$(MODNAME)_i.c: $(SRCS)
-	ELLMAKEDOC=$(MAKE_DOCFILE) $(CC) --mode=init --mod-output=$@ \
-	--mod-name=$(MODNAME) --mod-version=$(MODVER) \
-	--mod-title=$(MODTITLE) $(SRC_SRCS)
-
-clean:
-	$(RM) $(MODNAME).ell $(OBJS) $(MODNAME)_i.* *~
-
-distclean: clean
-	$(RM) Makefile config.* configure
-
-install: $(OBJECT_TO_BUILD)
-	$(INSTALL_PROGRAM) $< $(INSTALLPATH)
+## Note: modules/common/Makefile.common will be appended by configure
--- a/modules/postgresql/configure	Sun Nov 17 22:53:08 2002 +0000
+++ b/modules/postgresql/configure	Mon Nov 18 06:53:08 2002 +0000
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 1.0 .
+# From configure.ac Revision: 1.1 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53b for PostgreSQL module 1.0.
+# Generated by GNU Autoconf 2.53a for PostgreSQL module 1.0.
 #
 # Report bugs to <xemacs-beta@xemacs.org>.
 #
@@ -281,7 +281,6 @@
 # Initializations.
 #
 ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
 cross_compiling=no
 subdirs=
 MFLAGS=
@@ -338,8 +337,6 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA ELLCC CPP EGREP postgresql_libs PROGNAME MOD_CC MODARCHDIR MAKE_DOCFILE MODCFLAGS INSTALLPATH MOD_INSTALL_PROGRAM OBJECT_TO_BUILD LIBOBJS LTLIBOBJS'
-ac_subst_files=''
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -946,7 +943,7 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 PostgreSQL module configure 1.0
-generated by GNU Autoconf 2.53b
+generated by GNU Autoconf 2.53a
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 Free Software Foundation, Inc.
@@ -981,7 +978,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by PostgreSQL module $as_me 1.0, which was
-generated by GNU Autoconf 2.53b.  Invocation command line was
+generated by GNU Autoconf 2.53a.  Invocation command line was
 
   $ $0 $@
 
@@ -1064,7 +1061,6 @@
   # Save into config.log some information that might help in debugging.
   {
     echo
-
     cat <<\_ASBOX
 ## ---------------- ##
 ## Cache variables. ##
@@ -1087,35 +1083,6 @@
     esac;
 }
     echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-        echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
     if test -s confdefs.h; then
       cat <<\_ASBOX
 ## ----------- ##
@@ -1123,7 +1090,7 @@
 ## ----------- ##
 _ASBOX
       echo
-      sed "/^$/d" confdefs.h | sort
+      sed "/^$/d" confdefs.h
       echo
     fi
     test "$ac_signal" != 0 &&
@@ -1294,6 +1261,7 @@
 
 
 
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -1631,6 +1599,12 @@
 #line $LINENO "configure"
 #include "confdefs.h"
 
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
 int
 main ()
 {
@@ -1766,6 +1740,12 @@
 #line $LINENO "configure"
 #include "confdefs.h"
 
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
 int
 main ()
 {
@@ -1810,6 +1790,12 @@
 #line $LINENO "configure"
 #include "confdefs.h"
 
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
 int
 main ()
 {
@@ -1858,6 +1844,12 @@
 #line $LINENO "configure"
 #include "confdefs.h"
 
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
 int
 main ()
 {
@@ -1941,6 +1933,12 @@
 int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
 int argc;
 char **argv;
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
 int
 main ()
 {
@@ -2029,6 +2027,12 @@
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
 int
 main ()
 {
@@ -2060,6 +2064,12 @@
 #line $LINENO "configure"
 #include "confdefs.h"
 $ac_declaration
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
 int
 main ()
 {
@@ -2259,6 +2269,7 @@
 fi
 
 
+
 for header_dir in "" "pgsql/" "postgresql/"; do
 
 ac_ext=c
@@ -2295,7 +2306,7 @@
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
+  egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2328,7 +2339,7 @@
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
+  egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2386,7 +2397,7 @@
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
+  egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2419,7 +2430,7 @@
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
+  egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2462,21 +2473,6 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
-
-
 echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
@@ -2494,7 +2490,7 @@
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
+  egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2525,7 +2521,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
+  egrep "memchr" >/dev/null 2>&1; then
   :
 else
   ac_cv_header_stdc=no
@@ -2543,7 +2539,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
+  egrep "free" >/dev/null 2>&1; then
   :
 else
   ac_cv_header_stdc=no
@@ -2602,7 +2598,7 @@
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
@@ -2726,7 +2722,7 @@
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
+  egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -2811,6 +2807,12 @@
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
 char PQconnectdb ();
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
 int
 main ()
 {
@@ -2873,6 +2875,12 @@
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
 char PQconnectStart ();
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
 int
 main ()
 {
@@ -2916,6 +2924,7 @@
 postgresql_libs="$LIBS"
 
 
+
 # This part should appear unchanged in every module configure.ac
 PROGNAME="module"
 
@@ -3043,21 +3052,6 @@
 rm -f confdef2opt.sed
 
 
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -3333,7 +3327,7 @@
 cat >&5 <<_CSEOF
 
 This file was extended by PostgreSQL module $as_me 1.0, which was
-generated by GNU Autoconf 2.53b.  Invocation command line was
+generated by GNU Autoconf 2.53a.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -3387,7 +3381,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 PostgreSQL module config.status 1.0
-configured by $0, generated by GNU Autoconf 2.53b,
+configured by $0, generated by GNU Autoconf 2.53a,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -3570,7 +3564,6 @@
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
 s,@ELLCC@,$ELLCC,;t t
 s,@CPP@,$CPP,;t t
-s,@EGREP@,$EGREP,;t t
 s,@postgresql_libs@,$postgresql_libs,;t t
 s,@PROGNAME@,$PROGNAME,;t t
 s,@MOD_CC@,$MOD_CC,;t t
@@ -3580,8 +3573,6 @@
 s,@INSTALLPATH@,$INSTALLPATH,;t t
 s,@MOD_INSTALL_PROGRAM@,$MOD_INSTALL_PROGRAM,;t t
 s,@OBJECT_TO_BUILD@,$OBJECT_TO_BUILD,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
 
 _ACEOF
@@ -3814,3 +3805,4 @@
   $ac_cs_success || { (exit 1); exit 1; }
 fi
 
+
--- a/modules/postgresql/configure.ac	Sun Nov 17 22:53:08 2002 +0000
+++ b/modules/postgresql/configure.ac	Mon Nov 18 06:53:08 2002 +0000
@@ -2,7 +2,7 @@
 # This is only used for independent module building.
 AC_INIT([PostgreSQL module], [1.0], [xemacs-beta@xemacs.org])
 AC_PREREQ(2.53)
-AC_REVISION($Revision: 1.1 $)
+AC_REVISION($Revision: 1.2 $)
 AC_COPYRIGHT([Configuration script for the PostgreSQL module.
 Copyright (C) 2002 Jerry James.
 
@@ -24,15 +24,8 @@
 02111-1307, USA.])
 
 AC_CONFIG_SRCDIR([postgresql.c])
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_SUBST(CFLAGS)
-AC_SUBST(LDFLAGS)
 
-# Find ELLCC
-AC_ARG_VAR([ELLCC], [The path to the ellcc module compiler])
-AC_PATH_PROG([ELLCC], [ellcc], ["FAIL"])
-AS_IF([test "$ELLCC" = "FAIL"], [AS_ERROR([Cannot find ellcc])])
+m4_include([../common/configure-pre.ac])
 
 dnl On many Linux systems, PostgreSQL is packaged to be installed in /usr;
 dnl in this case, configure will easily detect it there.
@@ -58,15 +51,4 @@
              AC_DEFINE(HAVE_POSTGRESQLV7)])
 AC_SUBST(postgresql_libs, "$LIBS")
 
-# This part should appear unchanged in every module configure.ac
-AC_SUBST(PROGNAME, "module")
-AC_SUBST(MOD_CC, "@ELLCC@")
-AC_SUBST(MODARCHDIR, "\$(shell @ELLCC@ --mod-archdir)")
-AC_SUBST(MAKE_DOCFILE, "\$(MODARCHDIR)/make-docfile")
-AC_SUBST(MODCFLAGS, "\$(CFLAGS) --mode=compile --mod-output=\$@ -I\$(MODARCHDIR)/include")
-AC_SUBST(INSTALLPATH, "\$(shell @ELLCC@ --mod-site-location)")
-AC_SUBST(MOD_INSTALL_PROGRAM, "@INSTALL_PROGRAM@")
-AC_SUBST(OBJECT_TO_BUILD, "\$(MODNAME).ell")
-
-AC_CONFIG_FILES([Makefile.in Makefile])
-AC_OUTPUT
+m4_include([../common/configure-post.ac])
--- a/modules/postgresql/postgresql.c	Sun Nov 17 22:53:08 2002 +0000
+++ b/modules/postgresql/postgresql.c	Mon Nov 18 06:53:08 2002 +0000
@@ -1879,6 +1879,7 @@
 }
 
 #ifdef HAVE_SHLIB
+void unload_postgresql (void);
 void
 unload_postgresql (void)
 {
--- a/nt/make-nt-depend	Sun Nov 17 22:53:08 2002 +0000
+++ b/nt/make-nt-depend	Mon Nov 18 06:53:08 2002 +0000
@@ -46,6 +46,10 @@
 
 while (<>)
   {
+    # must hack away CRLF junk.  wouldn't it be nice if perl handled this
+    # right??  really can't be that hard!!!
+    s/\r\n/\n/g;
+
     # rewrite references to generating script
     s/make-src-depend/make-nt-depend/;
 
@@ -64,5 +68,5 @@
     # add dependency on config.inc to all objects (this might be too broad)
     s/^(.+)\.o:(.+)/$obj\\$1.obj:$2 $config\\config.inc/;
 
-    print;
+   print;
   }
--- a/src/ChangeLog	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/ChangeLog	Mon Nov 18 06:53:08 2002 +0000
@@ -1,3 +1,71 @@
+2002-11-17  Ben Wing  <ben@xemacs.org>
+
+	* s/cygwin32.h:
+	* s/cygwin32.h (TEXT_START):
+	-fvtable-thunks is obsolete in GCC 3 and generates warnings.
+
+	* s/mingw32.h:
+	* s/windowsnt.h:
+	Comment fixes.
+
+2002-11-17  Ben Wing  <ben@xemacs.org>
+
+	* emodules.h:
+	Fix warnings from redefining symbols.
+	
+	* eval.c:
+	* eval.c (call_with_condition_handler):
+	* eval.c (run_post_gc_hook):
+	* eval.c (Ffuncall):
+	Fix C++ errors -- no automatic casting between function pointers
+	and void *, function declarations inside of functions not allowed.
+	
+	* event-Xt.c (emacs_Xt_enqueue_focus_event):
+	Warning fixes.
+	
+	* fileio.c (Ffile_truename):
+	Warning fixes.
+	Use LOCAL_TO_WIN32_FILE_FORMAT rather than duplicating it.
+	
+	* glyphs-x.c:
+	* glyphs-x.c (x_map_subwindow):
+	Fix style.
+	
+	* intl-auto-encap-win32.c:
+	* intl-auto-encap-win32.h:
+	* intl-encap-win32.c:
+	* intl-encap-win32.c (qxeRegConnectRegistry):
+	* syswindows.h (RegConnectRegistry):
+	DdeCreateStringHandle needs to be manual due to new Cygwin bug.
+	
+	* intl-win32.c:
+	* intl-win32.c (wcscmp):
+	* intl-win32.c (wcslen):
+	wcslen/wcscmp don't seem to exist under G++ 3, Cygwin.
+	
+	* lisp.h:
+	* lisp-union.h:
+	* lisp-disunion.h:
+	* process-unix.c (unix_send_process):
+	Ugh, C needs volatile and C++ must not have volatile.  Remove
+	previous volatile hacks, which don't seem to be working any more.
+	
+	* sheap.c (STATIC_HEAP_SLOP):
+	Try to get a working Cygwin build with old unexec.
+	
+	* sheap.c (more_static_core):
+	No NL's in literals allowed.
+	
+	* symbols.c (Fset):
+	Fix C++ errors.
+	
+	* syswindows.h:
+	* syswindows.h (struct):
+	* syswindows.h (tagNMDATETIMEFORMATW):
+	* syswindows.h (tagNMTTDISPIFNOA):
+	* syswindows.h (tagNMTTDISPINFOW):
+	Fix Cygwin complaints now that some missing structs have been added.
+
 2002-10-14  Jerry James  <james@xemacs.org>
 
 	* alloc.c: Unconditionally use LISP_FLOAT_TYPE code.
--- a/src/alloca.c	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/alloca.c	Mon Nov 18 06:53:08 2002 +0000
@@ -75,7 +75,7 @@
 #define	STACK_DIR	stack_dir
 
 static void
-find_stack_direction ()
+find_stack_direction (void)
 {
   static char *addr = NULL;	/* Address of first `dummy', once known.  */
   auto char dummy;		/* To get stack address.  */
--- a/src/charset.h	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/charset.h	Mon Nov 18 06:53:08 2002 +0000
@@ -339,13 +339,13 @@
   Ibyte next_allocated_2_byte_leading_byte;
 };
 
+extern struct charset_lookup *chlook;
+
 DECLARE_INLINE_HEADER (
 Lisp_Object
 charset_by_leading_byte (int lb)
 )
 {
-  extern struct charset_lookup *chlook;
-
 #ifdef ERROR_CHECK_TEXT
   /* When error-checking is on, x86 GCC 2.95.2 -O3 miscompiles the
      following unless we introduce `tem'. */
@@ -360,8 +360,6 @@
 charset_by_attributes (int type, int final, int dir)
 )
 {
-  extern struct charset_lookup *chlook;
-
   type_checking_assert (type  < countof (chlook->charset_by_attributes) &&
 			final < countof (chlook->charset_by_attributes[0]) &&
 			dir   < countof (chlook->charset_by_attributes[0][0]));
--- a/src/depend	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/depend	Mon Nov 18 06:53:08 2002 +0000
@@ -1,5 +1,3 @@
-## This file is automatically generated by `make-src-depend'.  Do not modify.
-
 #if defined(USE_UNION_TYPE)
 LISP_UNION_H=lisp-union.h
 #else
@@ -136,7 +134,7 @@
 frame.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h events.h extents.h faces.h frame-impl.h frame.h frameslots.h glyphs.h gui.h gutter.h menubar.h opaque.h redisplay.h scrollbar.h specifier.h systime.h toolbar.h window-impl.h window.h winslots.h
 free-hook.o: $(LISP_H) hash.h
 general.o: $(LISP_H)
-getloadavg.o: $(LISP_H) sysfile.h
+getloadavg.o: $(LISP_H) sysfile.h syssignal.h
 gif_io.o: $(LISP_H) gifrlib.h sysfile.h
 glade.o: bytecode.h
 glyphs-eimage.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h faces.h file-coding.h frame.h gifrlib.h glyphs.h lstream.h objects-impl.h objects.h opaque.h redisplay.h scrollbar.h specifier.h sysfile.h window-impl.h window.h winslots.h
@@ -171,7 +169,7 @@
 lread.o: $(LISP_H) buffer.h bufslots.h bytecode.h casetab.h charset.h chartab.h elhash.h file-coding.h intl-auto-encap-win32.h lstream.h opaque.h sysfile.h sysfloat.h syswindows.h
 lstream.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h insdel.h lstream.h sysfile.h
 macros.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h commands.h conslots.h console-impl.h console.h device.h events.h frame.h keymap.h macros.h opaque.h redisplay.h scrollbar.h systime.h window.h
-malloc.o: config.h getpagesize.h
+malloc.o: config.h getpagesize.h syssignal.h
 marker.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h
 md5.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h file-coding.h lstream.h
 menubar.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h frame-impl.h frame.h frameslots.h gui.h keymap.h menubar.h redisplay.h scrollbar.h specifier.h window-impl.h window.h winslots.h
@@ -234,7 +232,7 @@
 unexelfsgi.o: config.h
 unexenix.o: config.h
 unexfreebsd.o: config.h
-unexhp9k3.o: config.h sysdep.h
+unexhp9k3.o: config.h sysdep.h syssignal.h
 unexhp9k800.o: $(LISP_H)
 unexmips.o: config.h getpagesize.h
 unexnt.o: $(LISP_H) intl-auto-encap-win32.h sysfile.h syswindows.h
--- a/src/emodules.h	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/emodules.h	Mon Nov 18 06:53:08 2002 +0000
@@ -85,10 +85,13 @@
 #define dump_add_root_struct_ptr(varaddr,descaddr) DO_NOTHING
 #define dump_add_opaque(varaddr,size) DO_NOTHING
 #define dump_add_root_block(ptraddress,desc) DO_NOTHING
+#undef dump_add_opaque_int
 #define dump_add_opaque_int(int_varaddr) DO_NOTHING
+#undef dump_add_opaque_fixnum
 #define dump_add_opaque_fixnum(fixnum_varaddr) DO_NOTHING
 #define dump_add_root_object(varaddr) DO_NOTHING
 #define dump_add_weak_object_chain(varaddr) DO_NOTHING
+#undef staticpro
 #define staticpro(DSF_location) staticpro_nodump(DSF_location)
 
 #undef DEFSYMBOL
--- a/src/eval.c	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/eval.c	Mon Nov 18 06:53:08 2002 +0000
@@ -2063,11 +2063,11 @@
 			     Lisp_Object arg)
 {
   /* This function can GC */
-  int speccount = specpdl_depth();
+  int speccount = specpdl_depth ();
   Lisp_Object tem;
 
   /* ((handler-fun . (handler-arg . nil)) ... ) */
-  tem = noseeum_cons (noseeum_cons (make_opaque_ptr (handler),
+  tem = noseeum_cons (noseeum_cons (make_opaque_ptr ((void *) handler),
 				    noseeum_cons (handler_arg, Qnil)),
 		      Vcondition_handlers);
   record_unwind_protect (condition_bind_unwind, tem);
@@ -3673,6 +3673,22 @@
 }
 
 
+
+static void
+run_post_gc_hook (void)
+{
+  Lisp_Object args[2];
+
+  args[0] = Qpost_gc_hook;
+  args[1] = Fcons (Fcons (Qfinalize_list, zap_finalize_list ()), Qnil);
+  
+  run_hook_with_args_trapping_problems
+    ("Error in post-gc-hook",
+     2, args,
+     RUN_HOOKS_TO_COMPLETION,
+     INHIBIT_QUIT | NO_INHIBIT_ERRORS);
+}
+
 DEFUN ("funcall", Ffuncall, 1, MANY, 0, /*
 Call first argument as a function, passing the remaining arguments to it.
 Thus, (funcall 'cons 'x 'y) returns (x . y).
@@ -3703,11 +3719,9 @@
 	}
       if (need_to_signal_post_gc)
 	{
-	  static void run_post_gc_hook(void); /* forward */
-
 	  need_to_signal_post_gc = 0;
-	  recompute_funcall_allocation_flag();
-	  run_post_gc_hook();
+	  recompute_funcall_allocation_flag ();
+	  run_post_gc_hook ();
 	}
     }
 
@@ -5537,20 +5551,6 @@
 		   RUN_HOOKS_TO_COMPLETION, flags));
 }
 
-static void
-run_post_gc_hook()
-{
-  Lisp_Object args[2];
-
-  args[0] = Qpost_gc_hook;
-  args[1] = Fcons (Fcons (Qfinalize_list, zap_finalize_list()), Qnil);
-  
-  run_hook_with_args_trapping_problems
-    ("Error in post-gc-hook",
-     2, args,
-     RUN_HOOKS_TO_COMPLETION,
-     INHIBIT_QUIT | NO_INHIBIT_ERRORS);
-}
 
 /************************************************************************/
 /*		       The special binding stack			*/
--- a/src/event-Xt.c	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/event-Xt.c	Mon Nov 18 06:53:08 2002 +0000
@@ -1684,8 +1684,10 @@
 }
 
 /* Create a synthetic X focus event. */
+void emacs_Xt_enqueue_focus_event (Widget wants_it, Lisp_Object frame,
+				   int in_p);
 void
-enqueue_focus_event (Widget wants_it, Lisp_Object frame, int in_p)
+emacs_Xt_enqueue_focus_event (Widget wants_it, Lisp_Object frame, int in_p)
 {
   Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
   Lisp_Event *ev          = XEVENT (emacs_event);
--- a/src/event-msw.c	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/event-msw.c	Mon Nov 18 06:53:08 2002 +0000
@@ -3353,7 +3353,7 @@
       {
 	LPNMHDR nmhdr = (LPNMHDR) lParam;
 
-	if ((int) nmhdr->code == TTN_NEEDTEXT)
+	if (nmhdr->code == TTN_NEEDTEXT)
 	  {
 #ifdef HAVE_TOOLBARS
 	    LPTOOLTIPTEXTW tttextw = (LPTOOLTIPTEXTW) lParam;
@@ -3383,14 +3383,14 @@
 #endif
 	  }
 	/* handle tree view callbacks */
-	else if ((int) nmhdr->code == TVN_SELCHANGED)
+	else if (nmhdr->code == TVN_SELCHANGED)
 	  {
 	    NM_TREEVIEW *ptree = (NM_TREEVIEW *) lParam;
 	    frame = XFRAME (mswindows_find_frame (hwnd));
 	    mswindows_handle_gui_wm_command (frame, 0, ptree->itemNew.lParam);
 	  }
 	/* handle tab control callbacks */
-	else if ((int) nmhdr->code == TCN_SELCHANGE)
+	else if (nmhdr->code == TCN_SELCHANGE)
 	  {
 	    TC_ITEM item;
 	    int idx = qxeSendMessage (nmhdr->hwndFrom, TCM_GETCURSEL, 0, 0);
@@ -4225,8 +4225,8 @@
       mods |= (keymap [VK_CONTROL] & 0x80) ? XEMACS_MOD_CONTROL : 0;
     }
 
-  mods |= (keys_is_real ? fwKeys & MK_SHIFT : (keymap [VK_SHIFT] & 0x80))
-    ? XEMACS_MOD_SHIFT : 0;
+  mods |= (keys_is_real ? (int) (fwKeys & MK_SHIFT) :
+	   (keymap [VK_SHIFT] & 0x80)) ? XEMACS_MOD_SHIFT : 0;
   mods |= fwKeys & MK_LBUTTON ? XEMACS_MOD_BUTTON1 : 0;
   mods |= fwKeys & MK_MBUTTON ? XEMACS_MOD_BUTTON2 : 0;
   mods |= fwKeys & MK_RBUTTON ? XEMACS_MOD_BUTTON3 : 0;
--- a/src/fileio.c	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/fileio.c	Mon Nov 18 06:53:08 2002 +0000
@@ -1350,19 +1350,14 @@
 
     LISP_STRING_TO_ALLOCA (expanded_name, path);
 
-#if defined(WIN32_FILENAMES) && defined(CYGWIN)
+#if defined (WIN32_FILENAMES) && defined (CYGWIN)
     /* When using win32 filenames in cygwin we want file-truename to
        detect that c:/windows == /windows for example. */
-    if ((IS_DIRECTORY_SEP (path[0]) 
-	 && (elen == 1 || !IS_DIRECTORY_SEP (path[1])))
-	|| (isalpha (path[0])
-	    && (elen == 1 || !IS_DEVICE_SEP (path[1])))) {
-      int ltwff2 =
-	cygwin_posix_to_win32_path_list_buf_size (path);
-      p = (Ibyte *) alloca (ltwff2);
-      cygwin_posix_to_win32_path_list (path, p);
-      path = p;
-    }
+    if (! (IS_DIRECTORY_SEP (path[0]) && IS_DIRECTORY_SEP (path[1])))
+      {
+	LOCAL_TO_WIN32_FILE_FORMAT (path, p);
+	path = p;
+      }
 #endif
     p = path;
 
--- a/src/glyphs-x.c	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/glyphs-x.c	Mon Nov 18 06:53:08 2002 +0000
@@ -142,17 +142,16 @@
 				     Lisp_Object domain);
 
 #ifdef HAVE_X_WIDGETS
-static void
-update_widget_face (widget_value* wv,
-		    Lisp_Image_Instance* ii, Lisp_Object domain);
-static void
-update_tab_widget_face (widget_value* wv,
-			Lisp_Image_Instance* ii, Lisp_Object domain);
+static void update_widget_face (widget_value* wv,
+				Lisp_Image_Instance* ii, Lisp_Object domain);
+static void update_tab_widget_face (widget_value* wv,
+				    Lisp_Image_Instance* ii,
+				    Lisp_Object domain);
 #endif
-void
-emacs_Xt_handle_widget_losing_focus (struct frame* f, Widget losing_widget);
-void
-enqueue_focus_event (Widget wants_it, Lisp_Object frame, int in_p);
+void emacs_Xt_handle_widget_losing_focus (struct frame* f,
+					  Widget losing_widget);
+void emacs_Xt_enqueue_focus_event (Widget wants_it, Lisp_Object frame,
+				   int in_p);
 
 #include "bitmaps.h"
 
@@ -2081,13 +2080,14 @@
       if (!IMAGE_INSTANCE_SUBWINDOW_DISPLAYEDP (p))
 	XtMapWidget (IMAGE_INSTANCE_X_CLIPWIDGET (p));
       /* See comments in glyphs-msw.c about keyboard focus. */
-      if (IMAGE_INSTANCE_WANTS_INITIAL_FOCUS (p)) {
-	/* #### FIXME to pop-up the find dialog we map the text-field
-	   seven times! This doesn't show on a fast linux box but does
-	   under X on windows. */
-	enqueue_focus_event (IMAGE_INSTANCE_X_WIDGET_ID (p),
-			     IMAGE_INSTANCE_FRAME (p), 1);
-      }
+      if (IMAGE_INSTANCE_WANTS_INITIAL_FOCUS (p))
+	{
+	  /* #### FIXME to pop-up the find dialog we map the text-field
+	     seven times! This doesn't show on a fast linux box but does
+	     under X on windows. */
+	  emacs_Xt_enqueue_focus_event (IMAGE_INSTANCE_X_WIDGET_ID (p),
+					IMAGE_INSTANCE_FRAME (p), 1);
+	}
     }
 }
 
--- a/src/glyphs.h	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/glyphs.h	Mon Nov 18 06:53:08 2002 +0000
@@ -1004,12 +1004,11 @@
 extern Lisp_Object Qxpm, Qxface, Qetched_in, Qetched_out, Qbevel_in, Qbevel_out;
 extern Lisp_Object Q_data, Q_file, Q_color_symbols, Qconst_glyph_variable;
 extern Lisp_Object Qxbm, Qedit_field, Qgroup, Qlabel, Qcombo_box, Qscrollbar;
-extern Lisp_Object Qtree_view, Qtab_control, Qprogress_gauge, Q_border;
+extern Lisp_Object Qtree_view, Qtab_control, Qprogress_gauge;
 extern Lisp_Object Q_mask_file, Q_mask_data, Q_hotspot_x, Q_hotspot_y;
-extern Lisp_Object Q_foreground, Q_background, Q_face, Q_descriptor, Q_group;
-extern Lisp_Object Q_width, Q_height, Q_pixel_width, Q_pixel_height, Q_text;
-extern Lisp_Object Q_items, Q_properties, Q_image, Qimage_conversion_error;
-extern Lisp_Object Q_orientation, Q_margin_width;
+extern Lisp_Object Q_foreground, Q_background, Q_face, Q_group;
+extern Lisp_Object Q_pixel_width, Q_pixel_height;
+extern Lisp_Object Qimage_conversion_error;
 extern Lisp_Object Vcontinuation_glyph, Vcontrol_arrow_glyph, Vhscroll_glyph;
 extern Lisp_Object Vinvisible_text_glyph, Voctal_escape_glyph, Vtruncation_glyph;
 extern Lisp_Object Vxemacs_logo;
--- a/src/intl-auto-encap-win32.c	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/intl-auto-encap-win32.c	Mon Nov 18 06:53:08 2002 +0000
@@ -1407,14 +1407,7 @@
     return DdeInitializeA (pidInst, pfnCallback, afCmd, ulRes);
 }
 
-HSZ
-qxeDdeCreateStringHandle (DWORD idInst, const Extbyte * psz, int iCodePage)
-{
-  if (XEUNICODE_P)
-    return DdeCreateStringHandleW (idInst, (LPCWSTR) psz, iCodePage);
-  else
-    return DdeCreateStringHandleA (idInst, (LPCSTR) psz, iCodePage);
-}
+/* Skipping DdeCreateStringHandle because error in Cygwin prototype */
 
 DWORD
 qxeDdeQueryString (DWORD idInst, HSZ hsz, Extbyte * psz, DWORD cchMax, int iCodePage)
--- a/src/intl-auto-encap-win32.h	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/intl-auto-encap-win32.h	Mon Nov 18 06:53:08 2002 +0000
@@ -1003,11 +1003,7 @@
 #endif
 UINT qxeDdeInitialize (LPDWORD pidInst, PFNCALLBACK pfnCallback, DWORD afCmd, DWORD ulRes);
 
-#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
-#undef DdeCreateStringHandle
-#define DdeCreateStringHandle error use qxeDdeCreateStringHandle or DdeCreateStringHandleA/DdeCreateStringHandleW
-#endif
-HSZ qxeDdeCreateStringHandle (DWORD idInst, const Extbyte * psz, int iCodePage);
+/* Skipping DdeCreateStringHandle because error in Cygwin prototype */
 
 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
 #undef DdeQueryString
--- a/src/intl-encap-win32.c	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/intl-encap-win32.c	Mon Nov 18 06:53:08 2002 +0000
@@ -898,7 +898,7 @@
 file DDEML.H
 
 yes DdeInitialize
-yes DdeCreateStringHandle
+skip DdeCreateStringHandle error in Cygwin prototype
 yes DdeQueryString
 // #### split-sized (or split-simple??? not completely obvious) structure MONHSZSTRUCT, used when DDE event MF_HSZ_INFO is sent as part of the XTYP_MONITOR transaction sent to a DDE callback; not yet handled
 
@@ -1282,6 +1282,16 @@
     return RegConnectRegistryA ((LPSTR) lpMachineName, hKey, phkResult);
 }
 
+HSZ
+qxeDdeCreateStringHandle (DWORD idInst, const Extbyte * psz, int iCodePage)
+{
+  /* Cygwin mistakenly omits const in second argument. */
+  if (XEUNICODE_P)
+    return DdeCreateStringHandleW (idInst, (LPWSTR) psz, iCodePage);
+  else
+    return DdeCreateStringHandleA (idInst, (LPSTR) psz, iCodePage);
+}
+
 /* NOTE: NT 4.0+ only */
 UINT
 qxeExtractIconEx (const Extbyte * lpszFile, int nIconIndex, HICON FAR * phiconLarge, HICON FAR * phiconSmall, UINT nIcons)
--- a/src/intl-win32.c	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/intl-win32.c	Mon Nov 18 06:53:08 2002 +0000
@@ -1300,7 +1300,9 @@
   return Qnil;
 }
 
-Lisp_Object 
+#if 0 /* Unused */
+
+static Lisp_Object 
 mswindows_get_registry_charset (Ibyte *registry)
 {
   Lisp_Object charset_tail;
@@ -1321,6 +1323,8 @@
   return charset;
 }
 
+#endif /* 0 */
+
 
 
 #if 0 /* #### from Emacs 20.6; consider porting */
@@ -1610,7 +1614,38 @@
 
 #ifdef CYGWIN
 
-/* based on newlib strncpy, strcpy */
+/* based on newlib str*() */
+
+#ifndef HAVE_WCSCMP
+
+int
+wcscmp (const wchar_t *s1, const wchar_t *s2)
+{
+  while (*s1 != '\0' && *s1 == *s2)
+    {
+      s1++;
+      s2++;
+    }
+
+  return *s1 - *s2;
+}
+
+#endif /* not HAVE_WCSCMP */
+
+#ifndef HAVE_WCSLEN
+
+size_t
+wcslen (const wchar_t *str)
+{
+  const wchar_t *start = str;
+
+  while (*str)
+    str++;
+
+  return str - start;
+}
+
+#endif /* not HAVE_WCSLEN */
 
 wchar_t *
 wcsncpy (wchar_t *dst0, const wchar_t *src0, size_t count)
--- a/src/lisp-disunion.h	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/lisp-disunion.h	Mon Nov 18 06:53:08 2002 +0000
@@ -100,8 +100,6 @@
 
 #define make_int(x) ((Lisp_Object) (((x) << INT_GCBITS) | Lisp_Type_Int_Bit))
 
-#define volatile_make_int(x) make_int (x)
-
 #define make_char_1(x) ((Lisp_Object) (((x) << GCBITS) | Lisp_Type_Char))
 
 #define INTP(x) ((EMACS_UINT)(x) & Lisp_Type_Int_Bit)
--- a/src/lisp-union.h	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/lisp-union.h	Mon Nov 18 06:53:08 2002 +0000
@@ -111,33 +111,6 @@
   return obj;
 }
 
-#ifdef __cplusplus
-
-#define volatile_make_int(val) make_int (val)
-
-#else
-
-/* Ugh, need different definition to avoid compiler complaint in
-   unix_send_process().  Furthermore, there's no way under C++, it seems,
-   to declare something volatile and then return it.  Perhaps I'd have to
-   assign to something else instead?  But in any case, the warnings about
-   volatile clobbering doesn't occur in C++.  I bet the thing is that C++
-   already has a built-in system for dealing with non-local exits and such,
-   in a smart way that doesn't clobber registers, and incorporates
-   longjmp() into that.  */
-DECLARE_INLINE_HEADER (
-Lisp_Object
-volatile_make_int (EMACS_INT val)
-)
-{
-  volatile Lisp_Object obj;
-  obj.s.bits = 1;
-  obj.s.val = val;
-  return obj;
-}
-
-#endif /* __cplusplus */
-
 DECLARE_INLINE_HEADER (
 Lisp_Object
 make_char_1 (Ichar val)
--- a/src/lisp.h	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/lisp.h	Mon Nov 18 06:53:08 2002 +0000
@@ -782,6 +782,27 @@
 #define max(a,b) (((a) > (b)) ? (a) : (b))
 #endif
 
+/* Sim, senhor, prefiro toma-lo no cu.
+
+   Regular C complains about possible clobbering of local vars NOT declared
+   as volatile if there's a longjmp() in a function.  C++ complains if such
+   vars ARE volatile; or more correctly, sans volatile no problem even when
+   you longjmp, avec volatile you get unfixable compile errors like
+
+/src/xemacs/lilfix/src/process-unix.c: In function `void
+   unix_send_process(Lisp_Object, lstream*)':
+/src/xemacs/lilfix/src/process-unix.c:1577: no matching function for call to `
+   Lisp_Object::Lisp_Object(volatile Lisp_Object&)'
+/src/xemacs/lilfix/src/lisp-union.h:32: candidates are:
+   Lisp_Object::Lisp_Object(const Lisp_Object&)
+*/
+
+#ifdef __cplusplus
+#define VOLATILE_IF_NOT_CPP
+#else
+#define VOLATILE_IF_NOT_CPP volatile
+#endif
+
 #ifndef PRINTF_ARGS
 # if defined (__GNUC__) && (__GNUC__ >= 2)
 #  define PRINTF_ARGS(string_index,first_to_check) \
@@ -2765,7 +2786,8 @@
       lrecord_type_subr, /* lrecord_type_index */			\
       1, /* mark bit */							\
       1, /* c_readonly bit */						\
-      1  /* lisp_readonly bit */					\
+      1, /* lisp_readonly bit */					\
+      0  /* unused */                                                   \
     },									\
     min_args,								\
     max_args,								\
@@ -2837,7 +2859,6 @@
 
 void signal_quit (void);
 
-extern int dont_check_for_quit;
 int begin_dont_check_for_quit (void);
 int begin_do_check_for_quit (void);
 
@@ -3451,7 +3472,6 @@
 extern int find_file_compare_truenames;
 extern int find_file_use_truenames;
 Ibyte *get_initial_directory (Ibyte *pathname, Bytecount size);
-extern Lisp_Object Vbuffer_alist;
 void set_buffer_internal (struct buffer *b);
 struct buffer *decode_buffer (Lisp_Object buffer, int allow_string);
 
@@ -4076,9 +4096,6 @@
 extern Lisp_Object Vfile_name_coding_system, Vkeyboard_coding_system;
 extern Lisp_Object Vterminal_coding_system;
 extern Lisp_Object Qcanonicalize_after_coding;
-void init_charset_unicode_tables (Lisp_Object charset);
-void free_charset_unicode_tables (Lisp_Object charset);
-void recalculate_unicode_precedence (void);
 int coding_system_is_for_text_file (Lisp_Object coding_system);
 Lisp_Object find_coding_system_for_text_file (Lisp_Object name, int eol_wrap);
 Lisp_Object get_coding_system_for_text_file (Lisp_Object name, int eol_wrap);
@@ -4994,7 +5011,7 @@
 extern Lisp_Object Qerror_message, Qevent_live_p, Qexit, Qextent_live_p;
 extern Lisp_Object Qexternal_debugging_output, Qfeaturep, Qfile_error;
 extern Lisp_Object Qfile_name_sans_extension, Qfinal;
-extern Lisp_Object Qforeground, Qformat, Qframe_live_p, Qgraphic, Qgtk;
+extern Lisp_Object Qforeground, Qformat, Qframe_live_p, Qgraphic;
 extern Lisp_Object Qgui_error, Qicon_glyph_p, Qidentity, Qinhibit_quit;
 extern Lisp_Object Qinhibit_read_only, Qinteger_char_or_marker_p;
 extern Lisp_Object Qinteger_or_char_p, Qinteger_or_marker_p, Qintegerp;
@@ -5002,13 +5019,13 @@
 extern Lisp_Object Qinvalid_byte_code, Qinvalid_change, Qinvalid_constant;
 extern Lisp_Object Qinvalid_function, Qinvalid_operation;
 extern Lisp_Object Qinvalid_read_syntax, Qinvalid_state, Qio_error, Qlambda;
-extern Lisp_Object Qlayout, Qlist_formation_error, Qlistp, Qload, Qlock_shift;
+extern Lisp_Object Qlayout, Qlist_formation_error, Qlistp, Qload;
 extern Lisp_Object Qlong_name, Qmacro, Qmakunbound, Qmalformed_list;
 extern Lisp_Object Qmalformed_property_list, Qmark, Qmodule;
 extern Lisp_Object Qmono_pixmap_image_instance_p, Qmouse_leave_buffer_hook;
 extern Lisp_Object Qnative_layout, Qnatnump, Qnetwork_error, Qno_catch;
 extern Lisp_Object Qnothing_image_instance_p, Qnumber_char_or_marker_p;
-extern Lisp_Object Qnumberp, Qout_of_memory, Qoutput_charset_conversion;
+extern Lisp_Object Qnumberp, Qout_of_memory;
 extern Lisp_Object Qoverflow_error, Qpoint, Qpointer_glyph_p;
 extern Lisp_Object Qpointer_image_instance_p, Qprint_length;
 extern Lisp_Object Qprint_string_length, Qprinting_unreadable_object;
--- a/src/process-unix.c	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/process-unix.c	Mon Nov 18 06:53:08 2002 +0000
@@ -1494,10 +1494,10 @@
 static void
 unix_send_process (Lisp_Object proc, struct lstream *lstream)
 {
-  /* Use volatile to protect variables from being clobbered by longjmp.  */
-  SIGTYPE (*volatile old_sigpipe) (int) = 0;
-  volatile Lisp_Object vol_proc = proc;
-  Lisp_Process *volatile p = XPROCESS (proc);
+  /* See comment lisp.h circa line 787 */
+  SIGTYPE (*VOLATILE_IF_NOT_CPP old_sigpipe) (int) = 0;
+  VOLATILE_IF_NOT_CPP Lisp_Object vol_proc = proc;
+  Lisp_Process *VOLATILE_IF_NOT_CPP p = XPROCESS (proc);
 
   /* #### JV: layering violation?
 
@@ -1544,7 +1544,7 @@
 	      /* Buffer is full.  Wait, accepting input;
 		 that may allow the program
 		 to finish doing output and read more.  */
-	      Faccept_process_output (Qnil, volatile_make_int (1), Qnil);
+	      Faccept_process_output (Qnil, make_int (1), Qnil);
 	      /* It could have *really* finished, deleting the process */
 	      if (NILP(p->pipe_outstream))
 		return;
--- a/src/procimpl.h	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/procimpl.h	Mon Nov 18 06:53:08 2002 +0000
@@ -174,10 +174,6 @@
 
 extern int windowed_process_io;
 
-#ifdef HAVE_MULTICAST
-extern Lisp_Object Qmulticast;
-#endif
-
 #ifdef PROCESS_IO_BLOCKING
 extern Lisp_Object network_stream_blocking_port_list;
 #endif  /* PROCESS_IO_BLOCKING */
--- a/src/s/cygwin32.h	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/s/cygwin32.h	Mon Nov 18 06:53:08 2002 +0000
@@ -62,7 +62,12 @@
 #define ORDINARY_LINK
 #endif
 
+#if __GNUC__ >= 3
+#define C_SWITCH_SYSTEM -fno-caller-saves
+#else
 #define C_SWITCH_SYSTEM -fno-caller-saves -fvtable-thunks
+#endif
+
 #define LIBS_SYSTEM -lwinmm
 #define WIN32_LEAN_AND_MEAN
 
--- a/src/s/mingw32.h	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/s/mingw32.h	Mon Nov 18 06:53:08 2002 +0000
@@ -1,6 +1,6 @@
 /* system description file for mingw32.
    Copyright (C) 1993, 1994, 1995, 1999 Free Software Foundation, Inc.
-   Copyright (C) 2001 Ben Wing.
+   Copyright (C) 2001, 2002 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -21,6 +21,15 @@
 
 /* based on cygwin32.h by Andy Piper <andy@xemacs.org> */
 
+/* NOTE: MinGW is a way of using GCC to target the native Windows
+   environment.  This works similarly to building with Cygwin, but the
+   resulting executable does not use the Cygwin DLL.  Instead, MINGW
+   provides import libraries for the standard C library DLL's (specifically
+   CRTDLL -- #### how does this differ from MSVCRT and LIBC.LIB?).  This
+   means that code for MinGW will be very similar to code written for
+   VC++.  See comment in windowsnt.h for more information on how Cygwin
+   and native Windows relate. */
+
 #include "win32-native.h"
 
 #define MINGW
--- a/src/s/windowsnt.h	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/s/windowsnt.h	Mon Nov 18 06:53:08 2002 +0000
@@ -44,12 +44,8 @@
    that give you direct access to the Win32 API -- XEmacs uses this to
    provide GUI support under Cygwin.  The two environments also use
    different compilers -- Native Windows uses Visual C++, and Cygwin uses
-   GCC.  (MINGW, however, is a way of using GCC to target the Native
-   Windows environment.  This works similarly to building with Cygwin, but
-   the resulting executable does not use the Cygwin DLL.  Instead, MINGW
-   provides import libraries for the standard C library DLL's
-   (specifically CRTDLL -- #### how does this differ from MSVCRT and
-   LIBC.LIB?).)
+   GCC.  (MinGW, however, is a way of using GCC to target the Native
+   Windows environment.  See comment in mingw32.h.)
 
 2. There are two windowing environments we can target XEmacs for when
    running under MS Windows -- Windows native, and X. (It may seem strange
--- a/src/sheap.c	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/sheap.c	Mon Nov 18 06:53:08 2002 +0000
@@ -27,7 +27,7 @@
 #include <sheap-adjust.h>
 
 #define STATIC_HEAP_BASE	0x800000
-#define STATIC_HEAP_SLOP	0xf0000
+#define STATIC_HEAP_SLOP	0x500000
 #define STATIC_HEAP_SIZE \
 (STATIC_HEAP_BASE + SHEAP_ADJUSTMENT + STATIC_HEAP_SLOP)
 #define BLOCKSIZE	(1<<12)
@@ -82,19 +82,18 @@
     {
       if (static_heap_ptr + size >= static_heap_base + static_heap_size)
 	{
-	  printf(
-
-"\nRequested %d bytes, static heap exhausted!  base is %p, current ptr
-is %p. You have exhausted the static heap. 
-
-If you are simply trying to compile, remove sheap-adjust.h
-and recompile from the top level. If this doesn't
-work then STATIC_HEAP_SLOP (defined in this file) is too small.
-
-If you want to run temacs, change SHEAP_ADJUSTMENT in sheap-adjust.h
-to 0 or a +ve number. Generally you should *not* try to run temacs
-with a static heap, you should dump first.\n", size,
-static_heap_base, static_heap_ptr);
+	  printf (
+"\nRequested %d bytes, static heap exhausted!  base is %p, current ptr\n"
+"is %p. You have exhausted the static heap. \n"
+"\n"
+"If you are simply trying to compile, remove sheap-adjust.h\n"
+"and recompile from the top level. If this doesn't\n"
+"work then STATIC_HEAP_SLOP (defined in this file) is too small.\n"
+"\n"
+"If you want to run temacs, change SHEAP_ADJUSTMENT in sheap-adjust.h\n"
+"to 0 or a +ve number. Generally you should *not* try to run temacs\n"
+"with a static heap, you should dump first.\n",
+          size, static_heap_base, static_heap_ptr);
 
 	  exit(-1);
 	  return 0;
--- a/src/symbols.c	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/symbols.c	Mon Nov 18 06:53:08 2002 +0000
@@ -1837,7 +1837,8 @@
 #ifdef HAVE_SHLIB
 	  if (unloading_module)
 	    {
-	      unstaticpro_nodump (symbol_value_forward_forward
+	      unstaticpro_nodump ((Lisp_Object *)
+				  symbol_value_forward_forward
 				  (XSYMBOL_VALUE_FORWARD (valcontents)));
 	      sym->value = newval;
 	      return newval;
--- a/src/symeval.h	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/symeval.h	Mon Nov 18 06:53:08 2002 +0000
@@ -361,7 +361,8 @@
 	  lrecord_type_symbol_value_forward, /* lrecord_type_index */	\
 	  1, /* mark bit */						\
 	  1, /* c_readonly bit */					\
-	  1  /* lisp_readonly bit */					\
+	  1, /* lisp_readonly bit */					\
+          0  /* unused */                                               \
 	},								\
 	0, /* next */							\
 	0, /* uid  */							\
--- a/src/syswindows.h	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/syswindows.h	Mon Nov 18 06:53:08 2002 +0000
@@ -296,72 +296,87 @@
 #define CBEMAXSTRLEN 260
 #endif
 
-typedef struct {
-        NMHDR hdr;
-        BOOL fChanged;
-        int iNewSelection;
-        WCHAR szText[CBEMAXSTRLEN];
-        int iWhy;
+#ifndef NMCBEENDEDIT
+
+typedef struct
+{
+  NMHDR hdr;
+  BOOL fChanged;
+  int iNewSelection;
+  WCHAR szText[CBEMAXSTRLEN];
+  int iWhy;
 } NMCBEENDEDITW, *LPNMCBEENDEDITW, *PNMCBEENDEDITW;
 
-typedef struct {
-        NMHDR hdr;
-        BOOL fChanged;
-        int iNewSelection;
-        char szText[CBEMAXSTRLEN];
-        int iWhy;
+typedef struct
+{
+  NMHDR hdr;
+  BOOL fChanged;
+  int iNewSelection;
+  char szText[CBEMAXSTRLEN];
+  int iWhy;
 } NMCBEENDEDITA, *LPNMCBEENDEDITA,*PNMCBEENDEDITA;
 
+#endif /* not NMCBEENDEDIT */
+
 #if (_WIN32_IE >= 0x0400)
 
-typedef struct {
-    NMHDR hdr;
-    int   iItemid;
-    WCHAR szText[CBEMAXSTRLEN];
-}NMCBEDRAGBEGINW, *LPNMCBEDRAGBEGINW, *PNMCBEDRAGBEGINW;
+#ifndef NMCBEDRAGBEGIN
+
+typedef struct
+{
+  NMHDR hdr;
+  int   iItemid;
+  WCHAR szText[CBEMAXSTRLEN];
+} NMCBEDRAGBEGINW, *LPNMCBEDRAGBEGINW, *PNMCBEDRAGBEGINW;
 
-typedef struct {
-    NMHDR hdr;
-    int   iItemid;
-    char szText[CBEMAXSTRLEN];
-}NMCBEDRAGBEGINA, *LPNMCBEDRAGBEGINA, *PNMCBEDRAGBEGINA;
+typedef struct
+{
+  NMHDR hdr;
+  int   iItemid;
+  char szText[CBEMAXSTRLEN];
+} NMCBEDRAGBEGINA, *LPNMCBEDRAGBEGINA, *PNMCBEDRAGBEGINA;
+
+#endif /* not NMCBEDRAGBEGIN */
+
 typedef struct tagNMDATETIMEFORMATA
 {
-    NMHDR nmhdr;
-    LPCSTR  pszFormat;
-    SYSTEMTIME st;
-    LPCSTR pszDisplay;
-    CHAR szDisplay[64];
+  NMHDR nmhdr;
+  LPCSTR  pszFormat;
+  SYSTEMTIME st;
+  LPCSTR pszDisplay;
+  CHAR szDisplay[64];
 } NMDATETIMEFORMATA, FAR * LPNMDATETIMEFORMATA;
 
 typedef struct tagNMDATETIMEFORMATW
 {
-    NMHDR nmhdr;
-    LPCWSTR pszFormat;
-    SYSTEMTIME st;
-    LPCWSTR pszDisplay;
-    WCHAR szDisplay[64];
+  NMHDR nmhdr;
+  LPCWSTR pszFormat;
+  SYSTEMTIME st;
+  LPCWSTR pszDisplay;
+  WCHAR szDisplay[64];
 } NMDATETIMEFORMATW, FAR * LPNMDATETIMEFORMATW;
 
-typedef struct tagNMTTDISPIFNOA {
-    NMHDR hdr;
-    LPSTR lpszText;
-    char szText[80];
-    HINSTANCE hinst;
-    UINT uFlags;
+typedef struct tagNMTTDISPIFNOA
+{
+  NMHDR hdr;
+  LPSTR lpszText;
+  char szText[80];
+  HINSTANCE hinst;
+  UINT uFlags;
 #if (_WIN32_IE >= 0x0300)
-    LPARAM lParam;
+  LPARAM lParam;
 #endif
 } NMTTDISPINFOA, FAR *LPNMTTDISPINFOA;
 
-typedef struct tagNMTTDISPINFOW {
-    NMHDR hdr;
-    LPWSTR lpszText;
-    WCHAR szText[80];
-    HINSTANCE hinst;
-    UINT uFlags;
+typedef struct tagNMTTDISPINFOW
+{
+  NMHDR hdr;
+  LPWSTR lpszText;
+  WCHAR szText[80];
+  HINSTANCE hinst;
+  UINT uFlags;
 #if (_WIN32_IE >= 0x0300)
-    LPARAM lParam;
+  LPARAM lParam;
 #endif
 } NMTTDISPINFOW, FAR *LPNMTTDISPINFOW;
 
@@ -539,6 +554,12 @@
 /* would be encapsulatable but for Cygwin problems */
 
 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
+#undef DdeCreateStringHandle
+#define DdeCreateStringHandle error use qxeDdeCreateStringHandle or DdeCreateStringHandleA/DdeCreateStringHandleW
+#endif
+HSZ qxeDdeCreateStringHandle (DWORD idInst, const Extbyte * psz, int iCodePage);
+
+#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
 #undef RegConnectRegistry
 #define RegConnectRegistry error use qxeRegConnectRegistry or RegConnectRegistryA/RegConnectRegistryW
 #endif
--- a/src/unexcw.c	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/unexcw.c	Mon Nov 18 06:53:08 2002 +0000
@@ -469,7 +469,7 @@
   long n;
   for (; size > 0; size -= sizeof (page))
     {
-      n = size > (long) sizeof (page) ? sizeof (page) : size;
+      n = size > (long) sizeof (page) ? (long) sizeof (page) : size;
       if (read (a_out, page, n) != n || write (a_new, page, n) != n)
 	PERROR ("dump_out()");
     }