xemacs-beta: configure comparison

comparison configure @ 442:abe6d1db359e r21-2-36

Import from CVS: tag r21-2-36

author	cvs
date	Mon, 13 Aug 2007 11:35:02 +0200
parents	8de8e3f6228a
children	576fb035e263

comparison

equal deleted inserted replaced

-:72a7cfa4a488
+:abe6d1db359e
 ### Don't edit this script!
 ### This script was automatically generated by the `autoconf' program
 ### from the file `./configure.in'.
 ### To rebuild it, execute the command
 ###	autoconf
-### in the this directory.  You must have autoconf version 2.12 or later.
+### in the this directory.  You must have autoconf version 2.13 or later.
 ### This file is part of XEmacs.
 ### XEmacs is free software; you can redistribute it and/or modify it
 ### under the terms of the GNU General Public License as published by
 infodir='${prefix}/info'
 mandir='${prefix}/man'
 subdirs=
 MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
 ac_max_here_lines=12
 trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
 # File descriptor usage:
 sitelispdir='${datadir}/${inststaticdir}/site-lisp'
 sitemoduledir='${datadir}/${inststaticdir}/site-modules'
 pkgdir='${datadir}/${instvardir}/lisp'
 package_path=''
 etcdir='${datadir}/${instvardir}/etc'
-lockdir='${statedir}/${inststaticdir}/lock'
 archlibdir='${datadir}/${instvardir}/${configuration}'
 docdir='${archlibdir}'
 with_prefix='yes'
 with_site_lisp='no'
 with_site_modules='yes'
 	with_wnn6	| \
 	with_workshop	| \
 	with_sparcworks | \
 	with_tooltalk	| \
 	with_ldap	| \
+	with_postgresql	| \
 	with_pop	| \
 	with_kerberos	| \
 	with_hesiod	| \
 	with_dnet	| \
 	with_infodock	| \
 	external_widget | \
 	verbose		| \
 	extra_verbose	| \
-	const_is_losing | \
 	usage_tracking	| \
 	use_union_type	| \
 	pdump		| \
 	debug		| \
 	use_assertions	| \
 	memory_usage_stats | \
 	with_clash_detection | \
 	with_modules | \
-	no_doc_file )
+	quick_build )
 	  	  case "$val" in
 	    y | ye | yes )	val=yes ;;
 	    n | no )		val=no	;;
 	    * ) (echo "$progname: Usage error:"
 echo " " "The \`--$optname' option requires a boolean value: \`yes' or \`no'."
 	      nomalloc )      error_check_malloc=no ;;
 	      byte_code )     error_check_byte_code=yes ;;
 	      nobyte_code )   error_check_byte_code=no ;;
+	      glyphs )     error_check_glyphs=yes ;;
+	      noglyphs )   error_check_glyphs=no ;;
 	      * ) bogus_error_check=yes ;;
 	    esac
 	    if test "$bogus_error_check" -o \
 	         \( -n "$new_default" -a -n "$echeck_notfirst" \) ; then
 		if test "$error_check_default" = yes ; then
-		  types="\`all' (default), \`none', \`noextents', \`notypecheck', \`nobufpos', \`nogc', \`nomalloc', and \`nobyte-code'."
+		  types="\`all' (default), \`none', \`noextents', \`notypecheck', \`nobufpos', \`nogc', \`nomalloc', \`noglyphs' and \`nobyte-code'."
 		else
-		  types="\`all', \`none' (default), \`extents', \`typecheck', \`bufpos', \`gc', \`malloc', and \`byte-code'."
+		  types="\`all', \`none' (default), \`extents', \`typecheck', \`bufpos', \`gc', \`malloc', \`glyphs' and \`byte-code'."
 		fi
 		(echo "$progname: Usage error:"
 echo " " "Valid types for the \`--$optname' option are:
 $types."
 echo "  Use \`$progname --help' to show usage.") >&2 && exit 1
 		error_check_typecheck=$new_default
 		error_check_bufpos=$new_default
 		error_check_gc=$new_default
 		error_check_malloc=$new_default
 		error_check_byte_code=$new_default
+		error_check_glyphs=$new_default
 		new_default=	# reset this
 	    fi
 	    echeck_notfirst=true
 	  done
 	;;
 		prefix | exec_prefix | bindir | datadir | statedir | libdir | \
-	mandir | infodir | infopath | lispdir | etcdir | lockdir | pkgdir | \
+	mandir | infodir | infopath | lispdir | etcdir | pkgdir | \
 	archlibdir | docdir | package_path )
 	   	   if test "$valomitted" = "yes"; then
 	     if test "$#" = 0; then
 		 (echo "$progname: Usage error:"
 echo " " "The \`--$optname' option requires a value."
 cat >> confdefs.h <<\EOF
 #define ETCDIR_USER_DEFINED 1
 EOF
 }
 ;;
-statedir | lockdir ) { test "$extra_verbose" = "yes" && cat << \EOF
-Defining LOCKDIR_USER_DEFINED
-EOF
-cat >> confdefs.h <<\EOF
-#define LOCKDIR_USER_DEFINED 1
-EOF
-}
-;;
 	     docdir ) { test "$extra_verbose" = "yes" && cat << \EOF
 Defining DOCDIR_USER_DEFINED
 EOF
 cat >> confdefs.h <<\EOF
 #define DOCDIR_USER_DEFINED 1
 		"usage" | "help" ) ${PAGER-more} ${srcdir}/configure.usage; exit 0 ;;
 		"with_menubars"   | \
 	"with_scrollbars" | \
-	"with_dialogs" | \
+	"with_dialogs"    | \
 	"with_widgets" )
 	  case "$val" in
 	    l | lu | luc | luci | lucid )		val=lucid  ;;
 	    m | mo | mot | moti | motif )		val=motif  ;;
 	    a | at | ath | athe | athen | athena )	val=athena ;;
-	    n | no | non | none )			val=no ;;
+	    n | no | non | none )			val=no     ;;
+	    y | ye | yes )				val=yes    ;;
 	    * ) (echo "$progname: Usage error:"
 echo " " "The \`--$optname' option must have one of these values:
-\`lucid', \`motif', \`athena', or \`no'."
+\`lucid', \`motif', \`athena', \`yes', or \`no'."
 echo "  Use \`$progname --help' to show usage.") >&2 && exit 1 ;;
 	  esac
 	  eval "$opt=\"$val\""
 	;;
 		"use_minimal_tagbits" | \
 	"use_indexed_lrecord_implementation" | \
 	"run_in_place"	| \
+	"const_is_losing" | \
 	"with_gnu_make" )
 	  echo "configure: warning: Obsolete option \`--$optname' ignored." 1>&2
 	;;
 	* ) (echo "$progname: Usage error:"
 echo "  Use \`$progname --help' to show usage.") >&2 && exit 1
 fi
 fi
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:836: checking whether ln -s works" >&5
+echo "configure:834: checking whether ln -s works" >&5
 rm -f conftestdata
 if ln -s X conftestdata 2>/dev/null
 then
 rm -f conftestdata
 CPPFLAGS="$CPPFLAGS -DINFODOCK"
 else
 PROGNAME=xemacs
 fi
+{ test "$extra_verbose" = "yes" && cat << EOF
+Defining EMACS_PROGNAME = "$PROGNAME"
+EOF
+cat >> confdefs.h <<EOF
+#define EMACS_PROGNAME "$PROGNAME"
+EOF
+}
 if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi
 test "${error_check_extents=$beta}"   = yes && { test "$extra_verbose" = "yes" && cat << \EOF
 Defining ERROR_CHECK_EXTENTS
 EOF
 cat >> confdefs.h <<\EOF
 test "${error_check_byte_code=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF
 Defining ERROR_CHECK_BYTE_CODE
 EOF
 cat >> confdefs.h <<\EOF
 #define ERROR_CHECK_BYTE_CODE 1
+EOF
+}
+test "${error_check_glyphs=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF
+Defining ERROR_CHECK_GLYPHS
+EOF
+cat >> confdefs.h <<\EOF
+#define ERROR_CHECK_GLYPHS 1
 EOF
 }
 if test "${debug:=$beta}" = "yes"; then
 use_assertions=yes memory_usage_stats=yes
 }
 echo $ac_n "checking "host system type"""... $ac_c" 1>&6
-echo "configure:1084: checking "host system type"" >&5
+echo "configure:1099: 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/'`
 canonical=`echo "$canonical" | sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'`
 echo "$ac_t""$configuration" 1>&6
 hppa-*-*         ) machine=hp800 ;;
 m88k-dg-*        ) machine=aviion ;;
 m68*-sony-*      ) machine=news ;;
 mips-sony-*      ) machine=news-risc ;;
 clipper-*        ) machine=clipper ;;
-arm-*            ) machine=arm ;;
+arm*             ) machine=arm ;;
-armv34lb-*   ) machine=arm ;;
 ns32k-*          ) machine=ns32000 ;;
 esac
 case "$canonical" in
 *-*-linux*    ) opsys=linux ;;
 m68k-*-linux* ) machine=m68k opsys=linux ;;
 esac
-if test -z "$machine" -o -z "$opsys"; then
+test -z "$machine" && machine=`echo $canonical | sed 's/-.*$//'`
-(echo "$progname: XEmacs hasn't been ported to \`$canonical' systems."
+test -z "$opsys"   && opsys=`echo $canonical | sed 's/^^-*-^-*-//'`
-echo "$progname: Check \`etc/MACHINES' for recognized configuration names."
-) >&2
+if test -r "${srcdir}/src/m/${machine}.h"; then
-exit 1
+machfile="m/${machine}.h"
-fi
+{ test "$extra_verbose" = "yes" && cat << EOF
+Defining config_machfile = "$machfile"
+EOF
+cat >> confdefs.h <<EOF
+#define config_machfile "$machfile"
+EOF
+}
+else
+echo "XEmacs has no builtin knowledge of \`$machine' machines."
+echo "Using configure-time autodetection only."
+fi
+if test -r "${srcdir}/src/s/${opsys}.h"; then
+opsysfile="s/${opsys}.h"
+{ test "$extra_verbose" = "yes" && cat << EOF
+Defining config_opsysfile = "$opsysfile"
+EOF
+cat >> confdefs.h <<EOF
+#define config_opsysfile "$opsysfile"
+EOF
+}
+else
+echo "XEmacs has no builtin knowledge of \`$opsys' operating systems."
+echo "Using configure-time autodetection only."
+fi
 if test -z "$dynamic"; then
 case "$opsys" in
 hpux* | sunos4* ) dynamic=no ;;
 *) dynamic=yes ;;
 #define STACK_TRACE_EYE_CATCHER $stack_trace_eye_catcher
 EOF
 }
-machfile="m/${machine}.h"
-opsysfile="s/${opsys}.h"
 test "$with_sparcworks" = "yes" && with_workshop=yes # compatibility alias
 if test "$with_workshop $with_tooltalk" = "yes no"; then
 (echo "$progname: Usage error:"
 echo " " "--with-workshop requires --with-tooltalk"
 extra_objs="$extra_objs sunpro.o" &&  if test "$extra_verbose" = "yes"; then
 echo "    xemacs will be linked with \"sunpro.o\""
 fi
 fi
-if test "$with_clash_detection" = "yes"; then
+if test "$with_clash_detection" != "no"; then
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining CLASH_DETECTION
 EOF
 cat >> confdefs.h <<\EOF
 #define CLASH_DETECTION 1
 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:1580: checking for $ac_word" >&5
+echo "configure:1618: checking for $ac_word" >&5
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
 if test -z "$CC"; then
 # 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:1607: checking for $ac_word" >&5
+echo "configure:1645: checking for $ac_word" >&5
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
 case "`uname -s`" in
 *win32* | *WIN32*)
 # 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:1655: checking for $ac_word" >&5
+echo "configure:1693: checking for $ac_word" >&5
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
 fi
 test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1684: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1722: 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'
 xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
 xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
 ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
 cross_compiling=no
 cat > conftest.$ac_ext << EOF
-#line 1697 "configure"
+#line 1735 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1740: \"$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
 ac_cv_prog_cc_cross=no
 else
 echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
 if test $ac_cv_prog_cc_works = no; then
 { 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:1730: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1768: 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:1735: checking whether we are using GNU C" >&5
+echo "configure:1773: 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:1742: \"$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:1780: \"$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
 fi
 ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1760: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1798: checking whether ${CC-cc} accepts -g" >&5
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
 ac_cv_prog_cc_g=yes
 else
 if   test "$with_gcc" = "no"  -a "$GCC" = "yes"; then
 CC=${NON_GNU_CC-cc}
 # 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:1793: checking for $ac_word" >&5
+echo "configure:1831: checking for $ac_word" >&5
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
 if test -z "$CC"; then
 # 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:1820: checking for $ac_word" >&5
+echo "configure:1858: checking for $ac_word" >&5
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
 case "`uname -s`" in
 *win32* | *WIN32*)
 # 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:1868: checking for $ac_word" >&5
+echo "configure:1906: checking for $ac_word" >&5
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
 fi
 test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1897: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1935: 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'
 xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
 xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
 ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
 cross_compiling=no
 cat > conftest.$ac_ext << EOF
-#line 1910 "configure"
+#line 1948 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:1915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1953: \"$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
 ac_cv_prog_cc_cross=no
 else
 echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
 if test $ac_cv_prog_cc_works = no; then
 { 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:1943: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1981: 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:1948: checking whether we are using GNU C" >&5
+echo "configure:1986: 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:1955: \"$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:1993: \"$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
 fi
 ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1973: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2011: checking whether ${CC-cc} accepts -g" >&5
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
 ac_cv_prog_cc_g=yes
 else
 elif test "$with_gcc" = "yes" -a "$GCC" != "yes" ; then
 CC=gcc
 # 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:2006: checking for $ac_word" >&5
+echo "configure:2044: checking for $ac_word" >&5
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
 if test -z "$CC"; then
 # 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:2033: checking for $ac_word" >&5
+echo "configure:2071: checking for $ac_word" >&5
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
 case "`uname -s`" in
 *win32* | *WIN32*)
 # 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:2081: checking for $ac_word" >&5
+echo "configure:2119: checking for $ac_word" >&5
 if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
 fi
 test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2110: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2148: 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'
 xe_ldflags='$LDFLAGS $ld_switch_site $ld_switch_machine $ld_switch_system $ld_switch_x_site $ld_switch_run'
 xe_libs='$ld_call_shared $xe_check_libs $X_EXTRA_LIBS $libs_x $X_PRE_LIBS $LIBS $libs_machine $libs_system $libs_standard'
 ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
 cross_compiling=no
 cat > conftest.$ac_ext << EOF
-#line 2123 "configure"
+#line 2161 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:2128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2166: \"$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
 ac_cv_prog_cc_cross=no
 else
 echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
 if test $ac_cv_prog_cc_works = no; then
 { 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:2156: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2194: 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:2161: checking whether we are using GNU C" >&5
+echo "configure:2199: 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:2168: \"$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:2206: \"$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
 fi
 ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2186: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2224: checking whether ${CC-cc} accepts -g" >&5
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
 ac_cv_prog_cc_g=yes
 else
 test -n "$CPP" -a -d "$CPP" && CPP=
 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:2223: checking how to run the C preprocessor" >&5
+echo "configure:2261: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
 CPP=
 fi
 if test -z "$CPP"; then
 # substituted into the Makefile and "${CC-cc}" will confuse make.
 CPP="${CC-cc} -E"
 # On the NeXT, cc -E runs the code through the compiler's parser,
 # not just through cpp.
 cat > conftest.$ac_ext <<EOF
-#line 2236 "configure"
+#line 2274 "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:2242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2280: \"$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
 :
 else
 echo "$ac_err" >&5
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 rm -rf conftest*
 CPP="${CC-cc} -E -traditional-cpp"
 cat > conftest.$ac_ext <<EOF
-#line 2253 "configure"
+#line 2291 "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:2259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2297: \"$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
 :
 else
 echo "$ac_err" >&5
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 rm -rf conftest*
 CPP="${CC-cc} -nologo -E"
 cat > conftest.$ac_ext <<EOF
-#line 2270 "configure"
+#line 2308 "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:2276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2314: \"$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
 :
 else
 echo "$ac_err" >&5
 ac_cv_prog_CPP="$CPP"
 fi
 echo "$ac_t""$CPP" 1>&6
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:2301: checking for AIX" >&5
+echo "configure:2340: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2303 "configure"
+#line 2342 "configure"
 #include "confdefs.h"
 #ifdef _AIX
 yes
 #endif
 rm -rf conftest*
 echo "$ac_t""no" 1>&6
 fi
 rm -f conftest*
 echo $ac_n "checking for GNU libc""... $ac_c" 1>&6
-echo "configure:2330: checking for GNU libc" >&5
+echo "configure:2369: checking for GNU libc" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2332 "configure"
+#line 2371 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
 #if ! (defined __GLIBC__ || defined __GNU_LIBRARY__)
 ******* ======= ******** &&&&&&&&
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:2344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 have_glibc=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 #define _GNU_SOURCE 1
 EOF
 }
+case "$opsys" in
-cat > conftest.$ac_ext <<EOF
+sol2)
-#line 2366 "configure"
+{ test "$extra_verbose" = "yes" && cat << \EOF
+Defining __EXTENSIONS__
+EOF
+cat >> confdefs.h <<\EOF
+#define __EXTENSIONS__ 1
+EOF
+}
+if test "$os_release" -ge 55; then
+{ test "$extra_verbose" = "yes" && cat << \EOF
+Defining _XOPEN_SOURCE = 500
+EOF
+cat >> confdefs.h <<\EOF
+#define _XOPEN_SOURCE 500
+EOF
+}
+{ test "$extra_verbose" = "yes" && cat << \EOF
+Defining _XOPEN_SOURCE_EXTENDED
+EOF
+cat >> confdefs.h <<\EOF
+#define _XOPEN_SOURCE_EXTENDED 1
+EOF
+}
+fi ;;
+linux)
+{ test "$extra_verbose" = "yes" && cat << \EOF
+Defining _POSIX_C_SOURCE = 199506L
+EOF
+cat >> confdefs.h <<\EOF
+#define _POSIX_C_SOURCE 199506L
+EOF
+}
+{ test "$extra_verbose" = "yes" && cat << \EOF
+Defining _XOPEN_SOURCE = 500
+EOF
+cat >> confdefs.h <<\EOF
+#define _XOPEN_SOURCE 500
+EOF
+}
+{ test "$extra_verbose" = "yes" && cat << \EOF
+Defining _XOPEN_SOURCE_EXTENDED
+EOF
+cat >> confdefs.h <<\EOF
+#define _XOPEN_SOURCE_EXTENDED 1
+EOF
+}
+;;
+esac
+cat > conftest.$ac_ext <<EOF
+#line 2460 "configure"
 #include "confdefs.h"
 int main () {
 #if defined __SUNPRO_C
 return 11;
 #elif defined __DECC
 return 12;
+#elif defined __USLC__ && defined __SCO_VERSION__
+return 13;
 #else
 return 0;
 #endif
 }
 EOF
-if { (eval echo configure:2378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:2474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 :
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 rm -fr conftest*
 case "$conftest_rc" in
 11) echo "You appear to be using the SunPro C compiler."; __SUNPRO_C=yes ;;
 12) echo "You appear to be using the DEC C compiler."   ; __DECC=yes ;;
+13) echo "You appear to be using the SCO C compiler."   ; __USLC__=yes ;;
 esac
 fi
 rm -fr conftest*
 tempcname="conftest.c"
-cat > $tempcname <<EOF
+cat > $tempcname < confdefs.h
+cat >> $tempcname <<EOF
 #define NOT_C_CODE
 #define C_SWITCH_SITE
 #define C_SWITCH_X_SITE
 #define LD_SWITCH_SITE
 #define LD_SWITCH_X_SITE
 #define LD_SWITCH_X_SITE_AUX
 #define OS_RELEASE $os_release
+#ifdef config_opsysfile
 #include "$srcdir/src/$opsysfile"
+#endif
+#ifdef config_machfile
 #include "$srcdir/src/$machfile"
+#endif
 #ifndef LIBS_MACHINE
 #define LIBS_MACHINE
 #endif
 configure___ libs_machine=LIBS_MACHINE
 #define LD_SWITCH_SHARED "-c"
 #endif
 configure___ ld_switch_shared=LD_SWITCH_SHARED
+#define ORDINARY_LD "\$(CC) \$(CFLAGS)"
+configure___ ordinary_ld=ORDINARY_LD
 #ifdef ORDINARY_LINK
-#define LD "\$(CC) \$(CFLAGS)"
+#define LD ORDINARY_LD
 #else /* no ORDINARY LINK */
 #ifdef COFF_ENCAPSULATE
 #define LD "\$(CC) -nostdlib"
 #else /* not COFF_ENCAPSULATE */
 #ifdef LINKER
 eval `$CPP -Isrc $tempcname \
 	| sed -n -e "s/[ 	]*=[ 	\"]*/='/" -e "s/[ 	\"]*\$/'/" -e "s/^configure___//p"`
 rm $tempcname
+if test "$pdump" = "yes"; then
+ordinary_link="yes"
+ld="${ordinary_ld}"
+start_files=
+libs_standard=
+unexec=
+lib_gcc=
+fi
 test "$extra_verbose" = "yes" && \
 for var in libs_machine libs_system libs_termcap libs_standard   objects_machine objects_system c_switch_machine c_switch_system   ld_switch_machine ld_switch_system unexec ld_switch_shared   ld lib_gcc ld_text_start_addr start_files ordinary_link   have_terminfo mail_use_flock mail_use_lockf; do eval "echo \"$var = '\$$var'\""; done && echo ""
 case "$opsys" in mingw*) mingw_include=`eval "gcc -print-file-name=libc.a"` ;
 	mingw_include=`eval "dirname $mingw_include"` ;
 	c_switch_system="$c_switch_system $mingw_include" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"$mingw_include\" to \$c_switch_system"; fi ;;
 esac
 test "$ordinary_link" = "no" -a -z "$libs_standard" && libs_standard="-lc"
-test "$__DECC" = "yes" && c_switch_site="$c_switch_site -std" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"-std\" to \$c_switch_site"; fi
+test "$__DECC" = "yes" && c_switch_site="$c_switch_site -std1" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"-std1\" to \$c_switch_site"; fi
+if test "$__USLC__" = yes; then
+echo $ac_n "checking for whether the -Kalloca compiler flag is needed""... $ac_c" 1>&6
+echo "configure:2703: checking for whether the -Kalloca compiler flag is needed" >&5
+need_kalloca=no
+cat > conftest.$ac_ext <<EOF
+#line 2706 "configure"
+#include "confdefs.h"
+int main() {
+void *x = alloca(4);
+; return 0; }
+EOF
+if { (eval echo configure:2713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+rm -rf conftest*
+:
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+xe_save_c_switch_system="$c_switch_system"
+c_switch_system="$c_switch_system -Kalloca"
+cat > conftest.$ac_ext <<EOF
+#line 2724 "configure"
+#include "confdefs.h"
+int main() {
+void *x = alloca(4);
+; return 0; }
+EOF
+if { (eval echo configure:2731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+rm -rf conftest*
+need_kalloca=yes
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+c_switch_system="$xe_save_c_switch_system"
+fi
+rm -f conftest*
+echo "$ac_t""$need_kalloca" 1>&6
+test "$need_kalloca" = "yes" && c_switch_system="$c_switch_system -Kalloca" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"-Kalloca\" to \$c_switch_system"; fi
+fi
 if test "$cflags_specified" = "no"; then
 if   test "$GCC" = "yes"; then
 CFLAGS="-g -O3 -Wall -Wno-switch -Wpointer-arith -Winline -Wmissing-prototypes -Wshadow"
 elif test "$__SUNPRO_C" = "yes"; then
 CFLAGS="-g -O3 -qstrict -qnoansialias -qlibansi -qinfo -qro -qmaxmem=20000"
 else
 CFLAGS="-O" ;  fi
 fi
+if test "$GCC" = "yes"; then
+echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6
+echo "configure:2764: 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.*)
+case "$CFLAGS" in
+*-O2*|*-O3*)
+case "$CFLAGS" in
+*-fno-schedule-insns*) ;;
+*)
+echo "$ac_t""yes" 1>&6
+echo "configure: warning: Don't use -O2 with gcc 2.8.1 and egcs 1.0 under SPARC architectures" 1>&2
+echo "configure: warning: without also using -fno-schedule-insns." 1>&2
+{ echo "configure: error: Aborting due to known problem" 1>&2; exit 1; }
+;;
+esac
+;;
+esac
+;;
+		    Linux:alpha:egcs-2.91.*)
+echo "$ac_t""yes" 1>&6
+echo "configure: warning: There have been reports of egcs-1.1 not compiling XEmacs correctly on" 1>&2
+echo "configure: warning: Alpha Linux.  There have also been reports that egcs-1.0.3a is O.K." 1>&2
+{ echo "configure: error: Aborting due to known problem" 1>&2; exit 1; }
+;;
+*:i*86*:2.7.2*)
+	case "$GCC_VERSION" in
+	    2.7.2)
+		case "$CFLAGS" in
+	    *-O2*|*-O3*)
+	case "$CFLAGS" in
+	                    *-fno-strength-reduce*) ;;
+	            *)
+echo "$ac_t""yes" 1>&6
+	        echo "configure: warning: Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using" 1>&2
+	                        echo "configure: warning: -fno-strength-reduce." 1>&2
+	                { echo "configure: error: Aborting due to known problem" 1>&2; exit 1; }
+	                        ;;
+	                esac
+	                ;;
+		esac
+		;;
+	esac
+case "$CFLAGS" in
+	 *-fno-caller-saves*) ;;
+	 *)
+echo "$ac_t""yes" 1>&6
+	    echo "configure: warning: Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using" 1>&2
+	    echo "configure: warning: -fno-caller-saves." 1>&2
+{ echo "configure: error: Aborting due to known problem" 1>&2; exit 1; }
+	    ;;
+esac
+	;;
+esac
+echo "$ac_t""no" 1>&6
+fi
 if test "$GCC" = "yes"; then
 set x $ld_switch_system; shift; ld_switch_system=""
 while test -n "$1"; do
 case $1 in
 echo "    xemacs will be linked with \"$objects_machine\""
 fi
 test -n "$objects_system"  && extra_objs="$extra_objs $objects_system" &&  if test "$extra_verbose" = "yes"; then
 echo "    xemacs will be linked with \"$objects_system\""
 fi
-test -n "$unexec"          && extra_objs="$extra_objs $unexec" &&  if test "$extra_verbose" = "yes"; then
+test -n "$unexec"          && test ! "$pdump" = "yes" && extra_objs="$extra_objs $unexec" &&  if test "$extra_verbose" = "yes"; then
 echo "    xemacs will be linked with \"$unexec\""
 fi
+test "$pdump" = "yes" && extra_objs="$extra_objs dumper.o" &&  if test "$extra_verbose" = "yes"; then
+echo "    xemacs will be linked with \"dumper.o\""
+fi
 echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:2664: checking for dynodump" >&5
+echo "configure:2887: checking for dynodump" >&5
 if test "$unexec" != "unexsol2.o"; then
 echo "$ac_t""no" 1>&6
 else
 echo "$ac_t""yes" 1>&6
 { test "$extra_verbose" = "yes" && cat << \EOF
 for f in "/usr/lpp/X11/bin/smt.exp" "/usr/bin/X11/smt.exp"; do
 if test -r "$f"; then start_flags="${start_flags},-bI:${f}"; break; fi
 done
 echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6
-echo "configure:2702: checking for terminateAndUnload in -lC" >&5
+echo "configure:2925: 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 2707 "configure"
+#line 2930 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char terminateAndUnload();
 int main() {
 terminateAndUnload()
 ; return 0; }
 EOF
-if { (eval echo configure:2718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 esac
 fi
 if test "$add_runtime_path" = "yes"; then
 echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:2826: checking "for runtime libraries flag"" >&5
+echo "configure:3049: checking "for runtime libraries flag"" >&5
 case "$opsys" in
 sol2 ) dash_r="-R" ;;
 decosf* | linux* | irix*) dash_r="-rpath " ;;
 *)
 dash_r=""
 esac
 shift
 done
 fi
 cat > conftest.$ac_ext <<EOF
-#line 2848 "configure"
+#line 3071 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:2855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 dash_r="$try_dash_r"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 	doug_lea_malloc=yes
 else
 	doug_lea_malloc=no
 fi
 after_morecore_hook_exists=yes
-echo $ac_n "checking for malloc_get_state""... $ac_c" 1>&6
-echo "configure:2957: checking for malloc_get_state" >&5
-cat > conftest.$ac_ext <<EOF
-#line 2960 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-which can conflict with char malloc_get_state(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-builtin and then its argument prototype would still apply.  */
-char malloc_get_state();
-int main() {
-/* The GNU C library defines this for functions which it implements
-to always fail with ENOSYS.  Some functions are actually named
-something starting with __ and the normal name is an alias.  */
-#if defined (__stub_malloc_get_state) || defined (__stub___malloc_get_state)
-choke me
-#else
-malloc_get_state();
-#endif
-; return 0; }
-EOF
-if { (eval echo configure:2983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-rm -rf conftest*
-eval "ac_cv_func_malloc_get_state=yes"
-else
-echo "configure: failed program was:" >&5
-cat conftest.$ac_ext >&5
-rm -rf conftest*
-eval "ac_cv_func_malloc_get_state=no"
-fi
-rm -f conftest*
-if eval "test \"`echo '$ac_cv_func_'malloc_get_state`\" = yes"; then
-echo "$ac_t""yes" 1>&6
-:
-else
-echo "$ac_t""no" 1>&6
-doug_lea_malloc=no
-fi
 echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
-echo "configure:3003: checking for malloc_set_state" >&5
+echo "configure:3180: checking for malloc_set_state" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3006 "configure"
+#line 3183 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char malloc_set_state(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 malloc_set_state();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3206: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "$ac_t""no" 1>&6
 doug_lea_malloc=no
 fi
 echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
-echo "configure:3049: checking whether __after_morecore_hook exists" >&5
+echo "configure:3226: checking whether __after_morecore_hook exists" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3051 "configure"
+#line 3228 "configure"
 #include "confdefs.h"
 extern void (* __after_morecore_hook)();
 int main() {
 __after_morecore_hook = 0
 ; return 0; }
 EOF
-if { (eval echo configure:3058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3235: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
 if test "$system_malloc" = "yes" ; then
 GNU_MALLOC=no
 GNU_MALLOC_reason="
-(The GNU allocators don't work with this system configuration)."
+- The GNU allocators don't work with this system configuration."
 elif test "$with_system_malloc" = "yes" ; then
 GNU_MALLOC=no
 GNU_MALLOC_reason="
-(User chose not to use GNU allocators)."
+- User chose not to use GNU allocators."
 elif test "$with_debug_malloc" = "yes" ; then
 GNU_MALLOC=no
 GNU_MALLOC_reason="
-(User chose to use Debugging Malloc)."
+- User chose to use Debugging Malloc."
 fi
-if test "$doug_lea_malloc" = "yes" ; then
+if test "$doug_lea_malloc" = "yes" -a "$GNU_MALLOC" = "yes" ; then
-if test "$GNU_MALLOC" = yes ; then
+GNU_MALLOC_reason="
-GNU_MALLOC_reason="
+- Using Doug Lea's new malloc from the GNU C Library."
-(Using Doug Lea's new malloc from the GNU C Library.)"
-fi
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining DOUG_LEA_MALLOC
 EOF
 cat >> confdefs.h <<\EOF
 #define DOUG_LEA_MALLOC 1
 EOF
 }
 if test "$after_morecore_hook_exists" = "no" ; then
 GNU_MALLOC_reason="
-(Using Doug Lea's new malloc from the Linux C Library.)"
+- Using Doug Lea's new malloc from the Linux C Library."
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining _NO_MALLOC_WARNING_
 EOF
 cat >> confdefs.h <<\EOF
 #define _NO_MALLOC_WARNING_ 1
 EOF
 }
 fi
-use_minimal_tagbits=yes
 fi
 # 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:3117: checking for $ac_word" >&5
+echo "configure:3291: checking for $ac_word" >&5
 if test -n "$RANLIB"; then
 ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
 IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # 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:3172: checking for a BSD compatible install" >&5
+echo "configure:3346: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
 for ac_dir in $PATH; do
 # Account for people who put trailing slashes in PATH elements.
 for ac_prog in 'bison -y' byacc
 do
 # 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:3226: checking for $ac_word" >&5
+echo "configure:3400: checking for $ac_word" >&5
 if test -n "$YACC"; then
 ac_cv_prog_YACC="$YACC" # Let the user override the test.
 else
 IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
 test -n "$YACC" && break
 done
 test -n "$YACC" || YACC="yacc"
-for ac_hdr in mach/mach.h sys/stropts.h sys/timeb.h sys/time.h unistd.h
+for ac_hdr in   a.out.h   cygwin/version.h   fcntl.h   inttypes.h   libgen.h   locale.h   mach/mach.h   sys/param.h   sys/pstat.h   sys/time.h   sys/timeb.h   sys/un.h   ulimit.h   unistd.h   utime.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3258: checking for $ac_hdr" >&5
+echo "configure:3432: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3261 "configure"
+#line 3435 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3440: \"$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
 else
 echo "$ac_t""no" 1>&6
 fi
 done
-for ac_hdr in utime.h locale.h libgen.h fcntl.h ulimit.h cygwin/version.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3299: checking for $ac_hdr" >&5
-cat > conftest.$ac_ext <<EOF
-#line 3302 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3307: \"$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 kstat.h sys/pstat.h inttypes.h sys/un.h a.out.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3340: checking for $ac_hdr" >&5
-cat > conftest.$ac_ext <<EOF
-#line 3343 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3348: \"$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
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3378: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3470: checking for sys/wait.h that is POSIX.1 compatible" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3381 "configure"
+#line 3473 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
 #ifndef WEXITSTATUS
 #define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
 int s;
 wait (&s);
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 ac_cv_header_sys_wait_h=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 fi
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3421: checking for ANSI C header files" >&5
+echo "configure:3513: checking for ANSI C header files" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3424 "configure"
+#line 3516 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3432: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3524: \"$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*
 ac_cv_header_stdc=yes
 else
 rm -f conftest*
 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 3449 "configure"
+#line 3541 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 egrep "memchr" >/dev/null 2>&1; then
 fi
 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 3467 "configure"
+#line 3559 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 egrep "free" >/dev/null 2>&1; then
 fi
 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 3485 "configure"
+#line 3577 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
 int main () { int i; for (i = 0; i < 256; i++)
 if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 EOF
-if { (eval echo configure:3496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 :
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 }
 fi
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3522: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3614: checking whether time.h and sys/time.h may both be included" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3525 "configure"
+#line 3617 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include <time.h>
 int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 ac_cv_header_time=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 fi
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:3558: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:3650: checking for sys_siglist declaration in signal.h or unistd.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3561 "configure"
+#line 3653 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
 /* NetBSD declares sys_siglist in unistd.h.  */
 #ifdef HAVE_UNISTD_H
 #endif
 int main() {
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:3573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3665: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 ac_cv_decl_sys_siglist=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6
-echo "configure:3598: checking for struct utimbuf" >&5
+echo "configure:3690: checking for struct utimbuf" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3600 "configure"
+#line 3692 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>
 #else
 #endif
 int main() {
 static struct utimbuf x; x.actime = x.modtime;
 ; return 0; }
 EOF
-if { (eval echo configure:3619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 echo "$ac_t""yes" 1>&6
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_STRUCT_UTIMBUF
 EOF
 echo "$ac_t""no" 1>&6
 fi
 rm -f conftest*
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3639: checking return type of signal handlers" >&5
+echo "configure:3731: checking return type of signal handlers" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3642 "configure"
+#line 3734 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
 #ifdef signal
 #undef signal
 int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 ac_cv_type_signal=void
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 EOF
 }
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3681: checking for size_t" >&5
+echo "configure:3773: checking for size_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3684 "configure"
+#line 3776 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
 }
 fi
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3715: checking for pid_t" >&5
+echo "configure:3807: checking for pid_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3718 "configure"
+#line 3810 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
 }
 fi
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3749: checking for uid_t in sys/types.h" >&5
+echo "configure:3841: checking for uid_t in sys/types.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3752 "configure"
+#line 3844 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 egrep "uid_t" >/dev/null 2>&1; then
 }
 fi
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:3788: checking for mode_t" >&5
+echo "configure:3880: checking for mode_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3791 "configure"
+#line 3883 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
 }
 fi
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3822: checking for off_t" >&5
+echo "configure:3914: checking for off_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3825 "configure"
+#line 3917 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
 }
 fi
 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:3856: checking for ssize_t" >&5
+echo "configure:3948: checking for ssize_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3859 "configure"
+#line 3951 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include <stdlib.h>
 #include <stddef.h>
 }
 fi
+echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
+echo "configure:3983: checking for socklen_t" >&5
+cat > conftest.$ac_ext <<EOF
+#line 3985 "configure"
+#include "confdefs.h"
+#include <sys/socket.h>
+socklen_t x;
+int main() {
+; return 0; }
+EOF
+if { (eval echo configure:3994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+rm -rf conftest*
+echo "$ac_t""yes" 1>&6
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+cat > conftest.$ac_ext <<EOF
+#line 4003 "configure"
+#include "confdefs.h"
+#include <sys/socket.h>
+int accept (int, struct sockaddr *, size_t *);
+int main() {
+; return 0; }
+EOF
+if { (eval echo configure:4012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+rm -rf conftest*
+echo "$ac_t""size_t" 1>&6
+{ test "$extra_verbose" = "yes" && cat << \EOF
+Defining socklen_t = size_t
+EOF
+cat >> confdefs.h <<\EOF
+#define socklen_t size_t
+EOF
+}
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+echo "$ac_t""int" 1>&6
+{ test "$extra_verbose" = "yes" && cat << \EOF
+Defining socklen_t = int
+EOF
+cat >> confdefs.h <<\EOF
+#define socklen_t int
+EOF
+}
+fi
+rm -f conftest*
+fi
+rm -f conftest*
 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:3891: checking for struct timeval" >&5
+echo "configure:4044: checking for struct timeval" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3893 "configure"
+#line 4046 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>
 #else
 #endif
 int main() {
 static struct timeval x; x.tv_sec = x.tv_usec;
 ; return 0; }
 EOF
-if { (eval echo configure:3909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 echo "$ac_t""yes" 1>&6
 HAVE_TIMEVAL=yes
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_TIMEVAL
 HAVE_TIMEVAL=no
 fi
 rm -f conftest*
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:3931: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:4084: checking whether struct tm is in sys/time.h or time.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3934 "configure"
+#line 4087 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
 int main() {
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:3942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4095: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 ac_cv_struct_tm=time.h
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 fi
 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:3966: checking for tm_zone in struct tm" >&5
+echo "configure:4119: checking for tm_zone in struct tm" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3969 "configure"
+#line 4122 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
 int main() {
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:3977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 ac_cv_struct_tm_zone=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 EOF
 }
 else
 echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:4000: checking for tzname" >&5
+echo "configure:4153: checking for tzname" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4003 "configure"
+#line 4156 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
 extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
 #endif
 int main() {
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:4013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 ac_cv_var_tzname=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 fi
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4039: checking for working const" >&5
+echo "configure:4192: checking for working const" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4042 "configure"
+#line 4195 "configure"
 #include "confdefs.h"
 int main() {
 /* Ultrix mips cc rejects this.  */
 const int foo = 10;
 }
 ; return 0; }
 EOF
-if { (eval echo configure:4091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 ac_cv_c_const=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:4116: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:4269: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 cat > conftestmake <<\EOF
 all:
 	@echo 'ac_maketemp="${MAKE}"'
 SET_MAKE="MAKE=${MAKE-make}"
 fi
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:4141: checking whether byte ordering is bigendian" >&5
+echo "configure:4294: 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 4146 "configure"
+#line 4299 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
 int main() {
 #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
 bogus endian macros
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4310: \"$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 4161 "configure"
+#line 4314 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
 int main() {
 #if BYTE_ORDER != BIG_ENDIAN
 not big endian
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 ac_cv_c_bigendian=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
 if test $ac_cv_c_bigendian = unknown; then
 cat > conftest.$ac_ext <<EOF
-#line 4189 "configure"
+#line 4342 "configure"
 #include "confdefs.h"
 main () {
 /* Are we little or big endian?  From Harbison&Steele.  */
 union
 {
 } u;
 u.l = 1;
 exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:4202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 ac_cv_c_bigendian=no
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 fi
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:4229: checking size of short" >&5
+echo "configure:4382: checking size of short" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4232 "configure"
+#line 4385 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
 {
 FILE *f=fopen("conftestval", "w");
 if (!f) exit(1);
 fprintf(f, "%d\n", sizeof(short));
 exit(0);
 }
 EOF
-if { (eval echo configure:4243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 ac_cv_sizeof_short=`cat conftestval`
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 echo "*** PANIC *** Configure tests are not working - compiler is broken."
 echo "*** PANIC *** Please examine config.log for compilation errors."
 exit 1
 fi
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4271: checking size of int" >&5
+echo "configure:4424: checking size of int" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4274 "configure"
+#line 4427 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
 {
 FILE *f=fopen("conftestval", "w");
 if (!f) exit(1);
 fprintf(f, "%d\n", sizeof(int));
 exit(0);
 }
 EOF
-if { (eval echo configure:4285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 ac_cv_sizeof_int=`cat conftestval`
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 EOF
 }
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4307: checking size of long" >&5
+echo "configure:4460: checking size of long" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4310 "configure"
+#line 4463 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
 {
 FILE *f=fopen("conftestval", "w");
 if (!f) exit(1);
 fprintf(f, "%d\n", sizeof(long));
 exit(0);
 }
 EOF
-if { (eval echo configure:4321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 ac_cv_sizeof_long=`cat conftestval`
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 EOF
 }
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4343: checking size of long long" >&5
+echo "configure:4496: checking size of long long" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4346 "configure"
+#line 4499 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
 {
 FILE *f=fopen("conftestval", "w");
 if (!f) exit(1);
 fprintf(f, "%d\n", sizeof(long long));
 exit(0);
 }
 EOF
-if { (eval echo configure:4357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4510: \"$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
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 EOF
 }
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:4379: checking size of void *" >&5
+echo "configure:4532: checking size of void *" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4382 "configure"
+#line 4535 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
 {
 FILE *f=fopen("conftestval", "w");
 if (!f) exit(1);
 fprintf(f, "%d\n", sizeof(void *));
 exit(0);
 }
 EOF
-if { (eval echo configure:4393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4546: \"$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
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 }
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:4416: checking for long file names" >&5
+echo "configure:4569: 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:
 #      .		the current directory, where building will happen
 #      $prefix/lib	where we will be installing things
 fi
 echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:4462: checking for sin" >&5
+echo "configure:4615: checking for sin" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4465 "configure"
+#line 4618 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char sin(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 sin();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4641: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 :
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:4506: checking for sin in -lm" >&5
+echo "configure:4659: 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 4511 "configure"
+#line 4664 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char sin();
 int main() {
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:4522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 EOF
 }
 cat > conftest.$ac_ext <<EOF
-#line 4566 "configure"
+#line 4719 "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:4573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4726: \"$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
 EOF
 cat >> confdefs.h <<\EOF
 cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
 echo "checking type of mail spool file locking" 1>&6
-echo "configure:4590: checking type of mail spool file locking" >&5
+echo "configure:4743: 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:4594: checking for $ac_func" >&5
+echo "configure:4747: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4597 "configure"
+#line 4750 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char $ac_func(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 $ac_func();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4773: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 done
 test -z "$mail_locking" -a "$mail_use_flock" = "yes" && mail_locking=flock
 test -z "$mail_locking" -a "$mail_use_lockf" = "yes" && mail_locking=lockf
 test -z "$mail_locking" -a "$mail_use_locking" = "yes" && mail_locking=locking
+if   test -z "$mail_locking"; then
+case "$opsys" in cygwin* | mingw*)
+mail_locking=pop ;;
+esac
+fi
 if   test "$mail_locking" = "lockf"; then { test "$extra_verbose" = "yes" && cat << \EOF
 Defining MAIL_LOCK_LOCKF
 EOF
 cat >> confdefs.h <<\EOF
 #define MAIL_LOCK_LOCKF 1
 cat >> confdefs.h <<\EOF
 #define MAIL_LOCK_LOCKING 1
 EOF
 }
+elif test "$mail_locking" = "pop"; then
+with_pop=yes
+mail_locking=
 else mail_locking="dot-locking"; { test "$extra_verbose" = "yes" && cat << \EOF
 Defining MAIL_LOCK_DOT
 EOF
 cat >> confdefs.h <<\EOF
 #define MAIL_LOCK_DOT 1
 { echo "Error:" "locking mail locking requested but not available." >&2; exit 1; }
 case "$opsys" in decosf*)
 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:4693: checking for cma_open in -lpthreads" >&5
+echo "configure:4855: 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 4698 "configure"
+#line 4860 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char cma_open();
 int main() {
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:4709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 test "$ac_cv_lib_pthreads_cma_open" = "yes" && \
 c_switch_site="$c_switch_site -threads" ;;
 esac
 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:4745: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:4907: 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;
 else echo "$ac_t""yes" 1>&6; ld_switch_site="$ld_switch_site -xildoff" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"-xildoff\" to \$ld_switch_site"; fi
 fi
 else echo "$ac_t""no" 1>&6
 fi
-if test "$opsys" = "sol2" && test "$OS_RELEASE" -ge 56; then
+if test "$opsys" = "sol2"; then
-echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
+if test "$os_release" -ge 56; then
-echo "configure:4756: checking for \"-z ignore\" linker flag" >&5
+echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-case "`ld -h 2>&1`" in
+echo "configure:4919: checking for \"-z ignore\" linker flag" >&5
-*-z\ ignore\|record* ) echo "$ac_t""yes" 1>&6
+case "`ld -h 2>&1`" in
-ld_switch_site="-z ignore $ld_switch_site" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-z ignore\" to \$ld_switch_site"; fi ;;
+*-z\ ignore\|record* ) echo "$ac_t""yes" 1>&6
-*) echo "$ac_t""no" 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 ;;
-esac
+*) echo "$ac_t""no" 1>&6 ;;
+esac
+fi
 fi
 echo "checking "for specified window system"" 1>&6
-echo "configure:4766: checking "for specified window system"" >&5
+echo "configure:4930: checking "for specified window system"" >&5
 if test "$with_x11" != "no"; then
 test "$x_includes $x_libraries" != "NONE NONE" && \
 window_system=x11 with_x11=yes
 # If we find X, set shell vars x_includes and x_libraries to the
 # paths, otherwise set no_x=yes.
 # 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:4799: checking for X" >&5
+echo "configure:4963: checking for X" >&5
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
 withval="$with_x"
 :
 # Guess where to find include files, by looking for this one X11 .h file.
 test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
 # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 4859 "configure"
+#line 5023 "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:4864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5028: \"$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*
 # We can compile using X headers with no special include directory.
 ac_x_includes=
 # See if we find them without any special options.
 # Don't add to $LIBS permanently.
 ac_save_LIBS="$LIBS"
 LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4933 "configure"
+#line 5097 "configure"
 #include "confdefs.h"
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:4940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5104: \"$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.
 ac_x_libraries=
 else
 # For Solaris; some versions of Sun CC require a space after -R and
 # others require no space.  Words are not sufficient . . . .
 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:5049: checking whether -R must be followed by a space" >&5
+echo "configure:5213: 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 5052 "configure"
+#line 5216 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:5059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 ac_R_nospace=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 	echo "$ac_t""no" 1>&6
 	X_LIBS="$X_LIBS -R$x_libraries"
 else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 5075 "configure"
+#line 5239 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:5082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 ac_R_space=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test "$with_dnet" = "no" ; then
 ac_cv_lib_dnet_dnet_ntoa=no
 else
 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:5118: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:5282: 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 5123 "configure"
+#line 5287 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char dnet_ntoa();
 int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 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:5158: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:5322: 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 5163 "configure"
+#line 5327 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char dnet_ntoa();
 int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
 # needs -lnsl.
 # 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:5203: checking for gethostbyname" >&5
+echo "configure:5367: checking for gethostbyname" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5206 "configure"
+#line 5370 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char gethostbyname(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 gethostbyname();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:5229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5393: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test $ac_cv_func_gethostbyname = no; then
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:5250: checking for gethostbyname in -lnsl" >&5
+echo "configure:5414: 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 5255 "configure"
+#line 5419 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char gethostbyname();
 int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:5266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 # on later versions), says simon@lia.di.epfl.ch: it contains
 # gethostby* variants that don't use the nameserver (or something).
 # -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:5296: checking for connect" >&5
+echo "configure:5460: checking for connect" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5299 "configure"
+#line 5463 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char connect(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 connect();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:5322: \"$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_func_connect=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test $ac_cv_func_connect = no; then
 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:5345: checking "$xe_msg_checking"" >&5
+echo "configure:5509: 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 5350 "configure"
+#line 5514 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char connect();
 int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:5361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
 echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:5385: checking for remove" >&5
+echo "configure:5549: checking for remove" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5388 "configure"
+#line 5552 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char remove(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 remove();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:5411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5575: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test $ac_cv_func_remove = no; then
 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:5432: checking for remove in -lposix" >&5
+echo "configure:5596: 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 5437 "configure"
+#line 5601 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char remove();
 int main() {
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:5448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
 echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:5472: checking for shmat" >&5
+echo "configure:5636: checking for shmat" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5475 "configure"
+#line 5639 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char shmat(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 shmat();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:5498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5662: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test $ac_cv_func_shmat = no; then
 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:5519: checking for shmat in -lipc" >&5
+echo "configure:5683: 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 5524 "configure"
+#line 5688 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char shmat();
 int main() {
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:5535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
 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:5571: checking "$xe_msg_checking"" >&5
+echo "configure:5735: 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 5576 "configure"
+#line 5740 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char IceConnectionNumber();
 int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:5587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 X_CFLAGS="$X_CFLAGS -I${inc_dir}" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"-I${inc_dir}\" to \$X_CFLAGS"; fi
 esac
 break;     fi
 done
-if test "$GCC" = yes -a -d /usr/shlib; then X_LIBS="$X_LIBS -L/usr/shlib" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"-L/usr/shlib\" to \$X_LIBS"; fi; fi
+case "$opsys" in
+decosf*) if test "$GCC" = yes -a -d /usr/shlib; then X_LIBS="$X_LIBS -L/usr/shlib" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"-L/usr/shlib\" to \$X_LIBS"; fi; fi ;;
+esac
 ld_switch_x_site="$X_LIBS"
 if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then
 EOF
 }
 echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:5756: checking for X defines extracted by xmkmf" >&5
+echo "configure:5922: checking for X defines extracted by xmkmf" >&5
 rm -fr conftestdir
 if mkdir conftestdir; then
 cd conftestdir
 cat > Imakefile <<'EOF'
 xetest:
 xmkmf_defines=`${MAKE-make} xetest 2>/dev/null | grep -v make`
 fi
 cd ..
 rm -fr conftestdir
 for word in $xmkmf_defines; do
-case "$word" in
+case "$word" in -D* )
-	-D*=* ) ;;
+	sym=`echo '' $word | sed -e 's:^ *-D::' -e 's:=.*::'`
-	-D* ) word=`echo '' $word | sed -e 's:^ *-D::'`
+	case "$word" in
-	      { test "$extra_verbose" = "yes" && cat << EOF
+	  -D*=* ) val=`echo '' $word | sed -e 's:^.*=::'` ;;
-Defining $word
+	  *     ) val=1 ;;
+	esac
+	if grep "^#define $sym " confdefs.h >/dev/null; then :; else
+	  if test "$val" = "1"
+	    then { test "$extra_verbose" = "yes" && cat << EOF
+Defining $sym
 EOF
 cat >> confdefs.h <<EOF
-#define $word 1
+#define $sym 1
 EOF
 }
-;;
+	    else { test "$extra_verbose" = "yes" && cat << EOF
+Defining $sym = $val
+EOF
+cat >> confdefs.h <<EOF
+#define $sym $val
+EOF
+}
+	  fi
+	fi  ;;
 esac
 done
 fi
 ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:5788: checking for X11/Intrinsic.h" >&5
+echo "configure:5969: checking for X11/Intrinsic.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5791 "configure"
+#line 5972 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5796: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5977: \"$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
 fi
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:5820: checking for XOpenDisplay in -lX11" >&5
+echo "configure:6001: 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 5825 "configure"
+#line 6006 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char XOpenDisplay();
 int main() {
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:5836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test "$have_lib_x11" != "yes"; then
 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:5861: checking "$xe_msg_checking"" >&5
+echo "configure:6042: 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 5866 "configure"
+#line 6047 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char XGetFontProperty();
 int main() {
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:5877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 libs_x="-lX11"
 test "$extra_verbose" = "yes" && echo "    Setting libs_x to \"-lX11\""
 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:5904: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:6085: 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 5909 "configure"
+#line 6090 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char XShapeSelectInput();
 int main() {
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:5920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:5943: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:6124: 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 5948 "configure"
+#line 6129 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char XtOpenDisplay();
 int main() {
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:5959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:5982: checking the version of X11 being used" >&5
+echo "configure:6163: checking the version of X11 being used" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5984 "configure"
+#line 6165 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:5989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 ./conftest foobar; x11_release=$?
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 #define THIS_IS_X11R${x11_release} 1
 EOF
 }
+if test "${x11_release}" = "4"; then
+case "$with_widgets" in
+"" | "no") with_widgets=no ;;
+*) { echo "Error:" "Widget support requires X11R5 or greater" >&2; exit 1; } ;;
+esac
+fi
+for ac_func in XConvertCase
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:6201: checking for $ac_func" >&5
+cat > conftest.$ac_ext <<EOF
+#line 6204 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+builtin and then its argument prototype would still apply.  */
+char $ac_func();
+int main() {
+/* The GNU C library defines this for functions which it implements
+to always fail with ENOSYS.  Some functions are actually named
+something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:6227: \"$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
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+echo "$ac_t""yes" 1>&6
+ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+{ test "$extra_verbose" = "yes" && cat << EOF
+Defining $ac_tr_func
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+}
+else
+echo "$ac_t""no" 1>&6
+fi
+done
 for ac_hdr in X11/Xlocale.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6014: checking for $ac_hdr" >&5
+echo "configure:6259: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6017 "configure"
+#line 6262 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6267: \"$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
 fi
 done
 echo $ac_n "checking for XFree86""... $ac_c" 1>&6
-echo "configure:6053: checking for XFree86" >&5
+echo "configure:6298: checking for XFree86" >&5
 if test -d "/usr/X386/include" -o \
 -f "/etc/XF86Config"    -o \
 	  -f "/etc/X11/XF86Config" -o \
 	  -f "/usr/X11R6/lib/X11/XF86Config"; then
 echo "$ac_t""yes" 1>&6
 echo "$ac_t""no" 1>&6
 fi
 test -z "$with_xmu" && {
 echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:6073: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:6318: 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 6078 "configure"
+#line 6323 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char XmuReadBitmapDataFromFile();
 int main() {
 XmuReadBitmapDataFromFile()
 ; return 0; }
 EOF
-if { (eval echo configure:6089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:6128: checking for main in -lXbsd" >&5
+echo "configure:6373: 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 6133 "configure"
+#line 6378 "configure"
 #include "confdefs.h"
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:6140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 fi
 if test "$with_msw" != "no"; then
 echo "checking for MS-Windows" 1>&6
-echo "configure:6177: checking for MS-Windows" >&5
+echo "configure:6422: checking for MS-Windows" >&5
 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:6180: checking for main in -lgdi32" >&5
+echo "configure:6425: 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 6185 "configure"
+#line 6430 "configure"
 #include "confdefs.h"
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:6192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 #define HAVE_MS_WINDOWS 1
 EOF
 }
 install_pp="$blddir/lib-src/installexe.sh"
-libs_system="$libs_system -lshell32 -lgdi32 -luser32 -lcomctl32 -lwinspool" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"-lshell32 -lgdi32 -luser32 -lcomctl32 -lwinspool\" to \$libs_system"; fi
+libs_system="$libs_system -lshell32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -lwinspool" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"-lshell32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -lwinspool\" to \$libs_system"; fi
 test "$with_dragndrop" != no && dragndrop_proto="$dragndrop_proto msw" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"msw\" to \$dragndrop_proto"; fi
 if test "$window_system" != x11; then
 	window_system=msw
 	test "$with_scrollbars" != "no" && with_scrollbars=msw \
 	    && extra_objs="$extra_objs scrollbar-msw.o" &&  if test "$extra_verbose" = "yes"; then
 	test "$with_dialogs"    != "no" && extra_objs="$extra_objs dialog-msw.o" &&  if test "$extra_verbose" = "yes"; then
 echo "    xemacs will be linked with \"dialog-msw.o\""
 fi
 fi
 cat > conftest.$ac_ext <<EOF
-#line 6258 "configure"
+#line 6503 "configure"
 #include "confdefs.h"
 #include <fcntl.h>
 int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
 EOF
-if { (eval echo configure:6263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6508: \"$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
 EOF
 cat >> confdefs.h <<\EOF
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 rm -fr conftest*
-const_is_losing=no
 with_file_coding=yes
 extra_objs="$extra_objs console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o glyphs-msw.o gui-msw.o" &&  if test "$extra_verbose" = "yes"; then
 echo "    xemacs will be linked with \"console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o glyphs-msw.o gui-msw.o\""
 fi
 fi
 fi
 eval "with_${feature}=no"
 done
 fi
+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:6572: checking for X11/extensions/shape.h" >&5
+cat > conftest.$ac_ext <<EOF
+#line 6575 "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:6580: \"$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
+{ test "$extra_verbose" = "yes" && cat << \EOF
+Defining HAVE_BALLOON_HELP
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_BALLOON_HELP 1
+EOF
+}
+extra_objs="$extra_objs balloon_help.o balloon-x.o" &&  if test "$extra_verbose" = "yes"; then
+echo "    xemacs will be linked with \"balloon_help.o balloon-x.o\""
+fi
+else
+echo "$ac_t""no" 1>&6
+fi
+fi
 bitmapdir=
 case "$window_system" in
 x11  ) HAVE_X_WINDOWS=yes; echo "  Using X11." ;;
 msw  ) HAVE_X_WINDOWS=no ; echo "  Using MS-Windows." ;;
 test "$opsys" = "hpux9"     && opsysfile="s/hpux9-x11r4.h"
 test "$opsys" = "hpux9-shr" && opsysfile="s/hpux9shxr4.h"
 esac
 echo "checking for WM_COMMAND option" 1>&6
-echo "configure:6339: checking for WM_COMMAND option" >&5;
+echo "configure:6627: checking for WM_COMMAND option" >&5;
 if test "$with_wmcommand" != "no"; then
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_WMCOMMAND
 EOF
 cat >> confdefs.h <<\EOF
 fi
 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:6354: checking for X11/Xauth.h" >&5
+echo "configure:6642: checking for X11/Xauth.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6357 "configure"
+#line 6645 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6650: \"$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
 with_xauth=no
 fi
 }
 test -z "$with_xauth" && {
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:6385: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:6673: 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 6390 "configure"
+#line 6678 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char XauGetAuthByAddr();
 int main() {
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:6401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test "$with_tooltalk" != "no" ; then
 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:6446: checking for ${dir}tt_c.h" >&5
+echo "configure:6734: checking for ${dir}tt_c.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6449 "configure"
+#line 6737 "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:6454: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6742: \"$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
 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
-tt_c_h_path="${dir}tt_c.h"; break
+tt_c_h_file="${dir}tt_c.h"; break
 else
 echo "$ac_t""no" 1>&6
 fi
 done
-if test -z "$tt_c_h_path"; then
+if test -z "$tt_c_h_file"; then
 if test "$with_tooltalk" = "yes"; then
 (echo "$progname: Usage error:"
 echo " " "Unable to find required tooltalk header files."
 echo "  Use \`$progname --help' to show usage.") >&2 && exit 1
 fi
 for extra_libs in "" "-lI18N -lce" "-lcxx"; do
 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:6490: checking "$xe_msg_checking"" >&5
+echo "configure:6778: 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 6495 "configure"
+#line 6783 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char tt_message_create();
 int main() {
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:6506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 #define TOOLTALK 1
 EOF
 }
 { test "$extra_verbose" = "yes" && cat << EOF
-Defining TT_C_H_PATH = "$tt_c_h_path"
+Defining TT_C_H_FILE = "$tt_c_h_file"
 EOF
 cat >> confdefs.h <<EOF
-#define TT_C_H_PATH "$tt_c_h_path"
+#define TT_C_H_FILE "$tt_c_h_file"
 EOF
 }
 libs_x="$tt_libs $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"$tt_libs\" to \$libs_x"; fi
 extra_objs="$extra_objs tooltalk.o" &&  if test "$extra_verbose" = "yes"; then
 fi
 fi
 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:6563: checking for Dt/Dt.h" >&5
+echo "configure:6851: checking for Dt/Dt.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6566 "configure"
+#line 6854 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6859: \"$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
 with_cde=no
 fi
 }
 test -z "$with_cde" && {
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:6594: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:6882: 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 6599 "configure"
+#line 6887 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char DtDndDragStart();
 int main() {
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:6610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 dnd_objs="$dnd_objs offix.o" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"offix.o\" to \$dnd_objs"; fi
 dragndrop_proto="$dragndrop_proto OffiX" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"OffiX\" to \$dragndrop_proto"; fi
 fi
 echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
-echo "configure:6679: checking if drag and drop API is needed" >&5
+echo "configure:6967: checking if drag and drop API is needed" >&5
 if test "$with_dragndrop" != "no" ; then
 if test -n "$dragndrop_proto" ; then
 with_dragndrop=yes
 echo "$ac_t""yes (${dragndrop_proto} )" 1>&6
 { test "$extra_verbose" = "yes" && cat << \EOF
 echo "$ac_t""no" 1>&6
 fi
 fi
 echo "checking for LDAP" 1>&6
-echo "configure:6700: checking for LDAP" >&5
+echo "configure:6988: checking for LDAP" >&5
 test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ldap.h""... $ac_c" 1>&6
-echo "configure:6703: checking for ldap.h" >&5
+echo "configure:6991: checking for ldap.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6706 "configure"
+#line 6994 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6999: \"$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
 with_ldap=no
 fi
 }
 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:6734: checking for lber.h" >&5
+echo "configure:7022: checking for lber.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6737 "configure"
+#line 7025 "configure"
 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7030: \"$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
 fi
 }
 if test "$with_ldap" != "no"; then
 echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
-echo "configure:6766: checking for ldap_search in -lldap" >&5
+echo "configure:7054: 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 6771 "configure"
+#line 7059 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char ldap_search();
 int main() {
 ldap_search()
 ; return 0; }
 EOF
-if { (eval echo configure:6782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 test "$with_ldap_nolber" = "no" && {
 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:6807: checking "$xe_msg_checking"" >&5
+echo "configure:7095: 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 6812 "configure"
+#line 7100 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char ldap_open();
 int main() {
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:6823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 test "$with_ldap_nolber" = "no" -a "$with_ldap_lber" = "no" && {
 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:6848: checking "$xe_msg_checking"" >&5
+echo "configure:7136: 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 6853 "configure"
+#line 7141 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char ldap_open();
 int main() {
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:6864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 test "$with_ldap_nolber" = "no" -a "$with_ldap_lber" = "no" -a "$with_ldap_krb" = "no" && {
 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:6889: checking "$xe_msg_checking"" >&5
+echo "configure:7177: 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 6894 "configure"
+#line 7182 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char ldap_open();
 int main() {
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:6905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 LIBS="-lldap $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lldap\" to \$LIBS"; fi
 fi
 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:6956: checking for $ac_func" >&5
+echo "configure:7244: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6959 "configure"
+#line 7247 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char $ac_func(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 $ac_func();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:6982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7270: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 done
 fi
+if test "$with_postgresql" != "no"; then
+echo "checking for PostgreSQL" 1>&6
+echo "configure:7301: 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:7306: checking for ${header_dir}libpq-fe.h" >&5
+cat > conftest.$ac_ext <<EOF
+#line 7309 "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:7314: \"$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
+libpq_fe_h_file=${header_dir}libpq-fe.h; break
+else
+echo "$ac_t""no" 1>&6
+fi
+done
+test -n "$libpq_fe_h_file" && {
+echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
+echo "configure:7338: 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 7343 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+builtin and then its argument prototype would still apply.  */
+char PQconnectdb();
+int main() {
+PQconnectdb()
+; return 0; }
+EOF
+if { (eval echo configure:7354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=yes"
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+xe_check_libs=""
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+echo "$ac_t""yes" 1>&6
+have_libpq=yes
+else
+echo "$ac_t""no" 1>&6
+fi
+}
+if test -n "$libpq_fe_h_file" -a "$have_libpq" = "yes"; then
+with_postgresql=yes
+{ test "$extra_verbose" = "yes" && cat << \EOF
+Defining HAVE_POSTGRESQL
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_POSTGRESQL 1
+EOF
+}
+echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
+echo "configure:7387: 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 7392 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+builtin and then its argument prototype would still apply.  */
+char PQconnectStart();
+int main() {
+PQconnectStart()
+; return 0; }
+EOF
+if { (eval echo configure:7403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=yes"
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+xe_check_libs=""
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+echo "$ac_t""yes" 1>&6
+with_postgresqlv7=yes;
+{ test "$extra_verbose" = "yes" && cat << \EOF
+Defining HAVE_POSTGRESQLV7
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_POSTGRESQLV7 1
+EOF
+}
+else
+echo "$ac_t""no" 1>&6
+fi
+{ test "$extra_verbose" = "yes" && cat << EOF
+Defining LIBPQ_FE_H_FILE = "$libpq_fe_h_file"
+EOF
+cat >> confdefs.h <<EOF
+#define LIBPQ_FE_H_FILE "$libpq_fe_h_file"
+EOF
+}
+LIBS="-lpq $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lpq\" to \$LIBS"; fi
+extra_objs="$extra_objs postgresql.o" &&  if test "$extra_verbose" = "yes"; then
+echo "    xemacs will be linked with \"postgresql.o\""
+fi
+elif test "$with_postgresql" = "yes"; then
+{ echo "Error:" "Required PostgreSQL support cannot be provided.  Check --site-prefixes." >&2; exit 1; }
+fi
+fi
 if test "$window_system" != "none"; then
 echo "checking for graphics libraries" 1>&6
-echo "configure:7014: checking for graphics libraries" >&5
+echo "configure:7451: checking for graphics libraries" >&5
 xpm_problem=""
 if test -z "$with_xpm"; then
 echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:7019: checking for Xpm - no older than 3.4f" >&5
+echo "configure:7456: checking for Xpm - no older than 3.4f" >&5
 xe_check_libs=-lXpm
 cat > conftest.$ac_ext <<EOF
-#line 7022 "configure"
+#line 7459 "configure"
 #include "confdefs.h"
+#define XPM_NUMBERS
 #include <X11/xpm.h>
 int main(int c, char **v) {
 return c == 1 ? 0 :
 XpmIncludeVersion != XpmLibraryVersion() ? 1 :
 XpmIncludeVersion < 30406 ? 2 : 0 ;}
 EOF
-if { (eval echo configure:7030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7468: \"$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
 with_xpm=yes;
 else
 EOF
 }
 libs_x="-lXpm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXpm\" to \$libs_x"; fi
 echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6
-echo "configure:7072: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:7510: checking for \"FOR_MSW\" xpm" >&5
 xe_check_libs=-lXpm
 cat > conftest.$ac_ext <<EOF
-#line 7075 "configure"
+#line 7513 "configure"
 #include "confdefs.h"
 int main() {
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:7082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 xpm_for_msw=no
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 fi
 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:7108: checking for compface.h" >&5
+echo "configure:7546: checking for compface.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7111 "configure"
+#line 7549 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7554: \"$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
 with_xface=no
 fi
 }
 test -z "$with_xface" && {
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:7139: checking for UnGenFace in -lcompface" >&5
+echo "configure:7577: 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 7144 "configure"
+#line 7582 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char UnGenFace();
 int main() {
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:7155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test "$with_png $with_tiff" != "no no"; then
 echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
-echo "configure:7207: checking for inflate in -lc" >&5
+echo "configure:7645: 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 7212 "configure"
+#line 7650 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char inflate();
 int main() {
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:7223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 :
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:7242: checking for inflate in -lz" >&5
+echo "configure:7680: 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 7247 "configure"
+#line 7685 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char inflate();
 int main() {
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:7258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 libs_x="-lz $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lz\" to \$libs_x"; fi
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:7277: checking for inflate in -lgz" >&5
+echo "configure:7715: 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 7282 "configure"
+#line 7720 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char inflate();
 int main() {
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:7293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 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:7323: checking for jpeglib.h" >&5
+echo "configure:7761: checking for jpeglib.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7326 "configure"
+#line 7764 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7331: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7769: \"$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
 with_jpeg=no
 fi
 }
 test -z "$with_jpeg" && {
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:7354: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:7792: 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 7359 "configure"
+#line 7797 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char jpeg_destroy_decompress();
 int main() {
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:7370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 libs_x="-ljpeg $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-ljpeg\" to \$libs_x"; fi
 fi
 png_problem=""
 test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:7406: checking for pow" >&5
+echo "configure:7844: checking for pow" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7409 "configure"
+#line 7847 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char pow(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 pow();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:7432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7870: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 with_png=no
 fi
 }
 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:7453: checking for png.h" >&5
+echo "configure:7891: checking for png.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7456 "configure"
+#line 7894 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7461: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7899: \"$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
 with_png=no
 fi
 }
 test -z "$with_png" && {
 echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:7484: checking for png_read_image in -lpng" >&5
+echo "configure:7922: 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 7489 "configure"
+#line 7927 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char png_read_image();
 int main() {
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:7500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 }
 if test -z "$with_png"; then
 echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:7523: checking for workable png version information" >&5
+echo "configure:7961: checking for workable png version information" >&5
 xe_check_libs="-lpng -lz"
 cat > conftest.$ac_ext <<EOF
-#line 7526 "configure"
+#line 7964 "configure"
 #include "confdefs.h"
 #include <png.h>
 int main(int c, char **v) {
 if (c == 1) return 0;
 if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1;
 return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}
 EOF
-if { (eval echo configure:7534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7972: \"$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
 	with_png=yes;
 else
 libs_x="-lpng $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lpng\" to \$libs_x"; fi
 fi
 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:7577: checking for tiffio.h" >&5
+echo "configure:8015: checking for tiffio.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7580 "configure"
+#line 8018 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7585: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8023: \"$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
 with_tiff=no
 fi
 }
 test -z "$with_tiff" && {
 echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:7608: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:8046: 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 7613 "configure"
+#line 8051 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char TIFFClientOpen();
 int main() {
 TIFFClientOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:7624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test "$with_x11" = "yes"; then
 echo "checking for X11 graphics libraries" 1>&6
-echo "configure:7663: checking for X11 graphics libraries" >&5
+echo "configure:8101: checking for X11 graphics libraries" >&5
 echo "checking for the Athena widgets" 1>&6
-echo "configure:7666: checking for the Athena widgets" >&5
+echo "configure:8104: checking for the Athena widgets" >&5
 case "$with_athena" in
 "xaw" | "")	athena_variant=Xaw	athena_3d=no  ;;
 "3d")	athena_variant=Xaw3d	athena_3d=yes ;;
 "next")	athena_variant=neXtaw	athena_3d=yes ;;
 esac
 if test "$athena_3d" = "no"; then
 echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:7680: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:8118: 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 7685 "configure"
+#line 8123 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char XawScrollbarSetThumb();
 int main() {
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:7696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 echo "$ac_t""yes" 1>&6
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:7712: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:8150: 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 7717 "configure"
+#line 8155 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char threeDClassRec();
 int main() {
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:7728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:7759: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:8197: 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 7764 "configure"
+#line 8202 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char threeDClassRec();
 int main() {
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:7775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "$ac_t""yes" 1>&6
 athena_lib=$athena_variant
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6
-echo "configure:7793: checking for threeDClassRec in -lXaw" >&5
+echo "configure:8231: 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 7798 "configure"
+#line 8236 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char threeDClassRec();
 int main() {
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:7809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 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:7840: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:8278: checking for X11/Xaw/ThreeD.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7843 "configure"
+#line 8281 "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:7848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8286: \"$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 "configure: warning: "Could not find a non-3d Athena header set."" 1>&2
 else
 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:7868: checking for X11/Xaw/XawInit.h" >&5
+echo "configure:8306: checking for X11/Xaw/XawInit.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7871 "configure"
+#line 8309 "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:7876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8314: \"$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
 fi
 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:7902: checking for X11/$athena_variant/XawInit.h" >&5
+echo "configure:8340: checking for X11/$athena_variant/XawInit.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7905 "configure"
+#line 8343 "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:7910: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8348: \"$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
 rm -f conftest*
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
 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:7927: checking for X11/$athena_variant/ThreeD.h" >&5
+echo "configure:8365: checking for X11/$athena_variant/ThreeD.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7930 "configure"
+#line 8368 "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:7935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8373: \"$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
 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:7963: checking for $athena_variant/XawInit.h" >&5
+echo "configure:8401: checking for $athena_variant/XawInit.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7966 "configure"
+#line 8404 "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:7971: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8409: \"$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
 rm -f conftest*
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
 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:7988: checking for $athena_variant/ThreeD.h" >&5
+echo "configure:8426: checking for $athena_variant/ThreeD.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 7991 "configure"
+#line 8429 "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:7996: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8434: \"$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
 fi
 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:8025: checking for X11/Xaw3d/XawInit.h" >&5
+echo "configure:8463: checking for X11/Xaw3d/XawInit.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8028 "configure"
+#line 8466 "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:8033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8471: \"$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
 rm -f conftest*
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
 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:8050: checking for X11/Xaw3d/ThreeD.h" >&5
+echo "configure:8488: checking for X11/Xaw3d/ThreeD.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8053 "configure"
+#line 8491 "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:8058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8496: \"$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
 fi
 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:8090: checking for Xaw3d/XawInit.h" >&5
+echo "configure:8528: checking for Xaw3d/XawInit.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8093 "configure"
+#line 8531 "configure"
 #include "confdefs.h"
 #include <Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8536: \"$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
 rm -f conftest*
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
 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:8115: checking for Xaw3d/ThreeD.h" >&5
+echo "configure:8553: checking for Xaw3d/ThreeD.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8118 "configure"
+#line 8556 "configure"
 #include "confdefs.h"
 #include <Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8561: \"$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
 fi
 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:8155: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:8593: checking for X11/Xaw/ThreeD.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8158 "configure"
+#line 8596 "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:8163: \"$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*
 eval "ac_cv_header_$ac_safe=yes"
 else
 have_xaw=no
 fi
 ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:8198: checking for Xm/Xm.h" >&5
+echo "configure:8636: checking for Xm/Xm.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8201 "configure"
+#line 8639 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8644: \"$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
 rm -f conftest*
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
 echo "$ac_t""yes" 1>&6
 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:8223: checking for XmStringFree in -lXm" >&5
+echo "configure:8661: 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 8228 "configure"
+#line 8666 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char XmStringFree();
 int main() {
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:8239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test "$have_motif" = "yes"; then
 echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:8268: checking for Lesstif" >&5
+echo "configure:8706: checking for Lesstif" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8270 "configure"
+#line 8708 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 #ifdef LESSTIF_VERSION
 yes
 #endif
 lwlib_objs="$lwlib_objs lwlib-Xaw.o" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"lwlib-Xaw.o\" to \$lwlib_objs"; fi
 libs_x="-l$athena_lib $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-l$athena_lib\" to \$libs_x"; fi
 { test "$extra_verbose" = "yes" && cat << EOF
-Defining ATHENA_H_PATH = $athena_h_path
+Defining ATHENA_Scrollbar_h_ = "$athena_h_path/Scrollbar.h"
 EOF
 cat >> confdefs.h <<EOF
-#define ATHENA_H_PATH $athena_h_path
+#define ATHENA_Scrollbar_h_ "$athena_h_path/Scrollbar.h"
+EOF
+}
+{ test "$extra_verbose" = "yes" && cat << EOF
+Defining ATHENA_Dialog_h_ = "$athena_h_path/Dialog.h"
+EOF
+cat >> confdefs.h <<EOF
+#define ATHENA_Dialog_h_ "$athena_h_path/Dialog.h"
+EOF
+}
+{ test "$extra_verbose" = "yes" && cat << EOF
+Defining ATHENA_Form_h_ = "$athena_h_path/Form.h"
+EOF
+cat >> confdefs.h <<EOF
+#define ATHENA_Form_h_ "$athena_h_path/Form.h"
+EOF
+}
+{ test "$extra_verbose" = "yes" && cat << EOF
+Defining ATHENA_Command_h_ = "$athena_h_path/Command.h"
+EOF
+cat >> confdefs.h <<EOF
+#define ATHENA_Command_h_ "$athena_h_path/Command.h"
+EOF
+}
+{ test "$extra_verbose" = "yes" && cat << EOF
+Defining ATHENA_Label_h_ = "$athena_h_path/Label.h"
+EOF
+cat >> confdefs.h <<EOF
+#define ATHENA_Label_h_ "$athena_h_path/Label.h"
+EOF
+}
+{ test "$extra_verbose" = "yes" && cat << EOF
+Defining ATHENA_LabelP_h_ = "$athena_h_path/LabelP.h"
+EOF
+cat >> confdefs.h <<EOF
+#define ATHENA_LabelP_h_ "$athena_h_path/LabelP.h"
+EOF
+}
+{ test "$extra_verbose" = "yes" && cat << EOF
+Defining ATHENA_Toggle_h_ = "$athena_h_path/Toggle.h"
+EOF
+cat >> confdefs.h <<EOF
+#define ATHENA_Toggle_h_ "$athena_h_path/Toggle.h"
+EOF
+}
+{ test "$extra_verbose" = "yes" && cat << EOF
+Defining ATHENA_ToggleP_h_ = "$athena_h_path/ToggleP.h"
+EOF
+cat >> confdefs.h <<EOF
+#define ATHENA_ToggleP_h_ "$athena_h_path/ToggleP.h"
+EOF
+}
+{ test "$extra_verbose" = "yes" && cat << EOF
+Defining ATHENA_AsciiText_h_ = "$athena_h_path/AsciiText.h"
+EOF
+cat >> confdefs.h <<EOF
+#define ATHENA_AsciiText_h_ "$athena_h_path/AsciiText.h"
+EOF
+}
+{ test "$extra_verbose" = "yes" && cat << EOF
+Defining ATHENA_XawInit_h_ = "$athena_h_path/XawInit.h"
+EOF
+cat >> confdefs.h <<EOF
+#define ATHENA_XawInit_h_ "$athena_h_path/XawInit.h"
 EOF
 }
 { test "$extra_verbose" = "yes" && cat << \EOF
 cat >> confdefs.h <<\EOF
 #define NEED_ATHENA 1
 EOF
 }
+need_athena="yes"
 if test "$athena_3d" = "yes"; then
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_ATHENA_3D
 EOF
 fi
 fi
 if test "$with_mule" = "yes" ; then
 echo "checking for Mule-related features" 1>&6
-echo "configure:8603: checking for Mule-related features" >&5
+echo "configure:9114: checking for Mule-related features" >&5
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining MULE
 EOF
 cat >> confdefs.h <<\EOF
 #define MULE 1
 for ac_hdr in libintl.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8628: checking for $ac_hdr" >&5
+echo "configure:9139: checking for $ac_hdr" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8631 "configure"
+#line 9142 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9147: \"$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
 fi
 done
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:8667: checking for strerror in -lintl" >&5
+echo "configure:9178: 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 8672 "configure"
+#line 9183 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char strerror();
 int main() {
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:8683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 echo "checking for Mule input methods" 1>&6
-echo "configure:8716: checking for Mule input methods" >&5
+echo "configure:9227: checking for Mule input methods" >&5
 case "$with_xim" in "" | "yes" )
 echo "checking for XIM" 1>&6
-echo "configure:8719: checking for XIM" >&5
+echo "configure:9230: checking for XIM" >&5
 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:8722: checking for XOpenIM in -lX11" >&5
+echo "configure:9233: 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 8727 "configure"
+#line 9238 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char XOpenIM();
 int main() {
 XOpenIM()
 ; return 0; }
 EOF
-if { (eval echo configure:8738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test "$have_motif $have_lesstif" = "yes no"; then
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:8762: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:9273: 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 8767 "configure"
+#line 9278 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char XmImMbLookupString();
 int main() {
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:8778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 fi
 if test "$with_xfs" = "yes" ; then
 echo "checking for XFontSet" 1>&6
-echo "configure:8843: checking for XFontSet" >&5
+echo "configure:9354: checking for XFontSet" >&5
 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:8846: checking for XmbDrawString in -lX11" >&5
+echo "configure:9357: 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 8851 "configure"
+#line 9362 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char XmbDrawString();
 int main() {
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:8862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 fi
 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:8902: checking for wnn/jllib.h" >&5
+echo "configure:9413: checking for wnn/jllib.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8905 "configure"
+#line 9416 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8910: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9421: \"$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
 }
 if test "$with_wnn" != "no"; then
 for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8935: checking for $ac_func" >&5
+echo "configure:9446: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 8938 "configure"
+#line 9449 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char $ac_func(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 $ac_func();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:8961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9472: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 done
 test "$ac_cv_func_crypt" != "yes" && {
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:8990: checking for crypt in -lcrypt" >&5
+echo "configure:9501: 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 8995 "configure"
+#line 9506 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char crypt();
 int main() {
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:9006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 fi
 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:9041: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:9552: 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 9046 "configure"
+#line 9557 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char jl_dic_list_e();
 int main() {
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:9057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "$ac_t""yes" 1>&6
 libwnn=wnn
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6
-echo "configure:9075: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:9586: 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 9080 "configure"
+#line 9591 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char jl_dic_list_e();
 int main() {
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:9091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "$ac_t""yes" 1>&6
 libwnn=wnn4
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6
-echo "configure:9109: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:9620: 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 9114 "configure"
+#line 9625 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char jl_dic_list_e();
 int main() {
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:9125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "$ac_t""yes" 1>&6
 libwnn=wnn6
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6
-echo "configure:9143: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:9654: 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 9148 "configure"
+#line 9659 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char dic_list_e();
 int main() {
 dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:9159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "    xemacs will be linked with \"mule-wnnfns.o\""
 fi
 if test "$with_wnn6" != "no"; then
 echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6
-echo "configure:9207: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:9718: 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 9212 "configure"
+#line 9723 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char jl_fi_dic_list();
 int main() {
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:9223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 canna_includes_found=no
 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:9258: checking for canna/jrkanji.h" >&5
+echo "configure:9769: checking for canna/jrkanji.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9261 "configure"
+#line 9772 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9777: \"$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
 -d "/usr/local/canna/include"; then
 save_c_switch_site="$c_switch_site"
 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:9293: checking for canna/jrkanji.h" >&5
+echo "configure:9804: checking for canna/jrkanji.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9296 "configure"
+#line 9807 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9812: \"$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
 fi
 fi
 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:9329: checking for canna/RK.h" >&5
+echo "configure:9840: checking for canna/RK.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9332 "configure"
+#line 9843 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9337: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9848: \"$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
 with_canna=no
 fi
 }
 test -z "$with_canna" && {
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:9360: checking for RkBgnBun in -lRKC" >&5
+echo "configure:9871: 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 9365 "configure"
+#line 9876 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char RkBgnBun();
 int main() {
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:9376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 }
 test -z "$with_canna" && {
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:9399: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:9910: 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 9404 "configure"
+#line 9915 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char jrKanjiControl();
 int main() {
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:9415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test "$need_motif" = "yes" ; then
 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:9464: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:9975: 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 9469 "configure"
+#line 9980 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char layout_object_getvalue();
 int main() {
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:9480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 fi
 fi
-for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getpt getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strcasecmp strerror tzset ulimit usleep utimes waitpid vsnprintf fsync ftruncate umask
+for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror tzset ulimit usleep utimes waitpid vsnprintf fsync ftruncate umask
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9566: checking for $ac_func" >&5
+echo "configure:10077: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9569 "configure"
+#line 10080 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char $ac_func(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 $ac_func();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:9592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10103: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "$ac_t""no" 1>&6
 fi
 done
-extra_objs="$extra_objs realpath.o" &&  if test "$extra_verbose" = "yes"; then
+for ac_func in getpt _getpt grantpt unlockpt ptsname killpg tcgetpgrp
-echo "    xemacs will be linked with \"realpath.o\""
-fi
-for ac_func in getloadavg
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9627: checking for $ac_func" >&5
+echo "configure:10134: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9630 "configure"
+#line 10137 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char $ac_func(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 $ac_func();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:9653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10160: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "$ac_t""no" 1>&6
 fi
 done
-if test "$ac_cv_func_getloadavg" != "yes"
+echo $ac_n "checking for openpty""... $ac_c" 1>&6
-then
+echo "configure:10189: checking for openpty" >&5
-extra_objs="$extra_objs getloadavg.o" &&  if test "$extra_verbose" = "yes"; then
+cat > conftest.$ac_ext <<EOF
+#line 10192 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+which can conflict with char openpty(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+builtin and then its argument prototype would still apply.  */
+char openpty();
+int main() {
+/* The GNU C library defines this for functions which it implements
+to always fail with ENOSYS.  Some functions are actually named
+something starting with __ and the normal name is an alias.  */
+#if defined (__stub_openpty) || defined (__stub___openpty)
+choke me
+#else
+openpty();
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:10215: \"$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
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_func_openpty=no"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_func_'openpty`\" = yes"; then
+echo "$ac_t""yes" 1>&6
+have_openpty=yes
+else
+echo "$ac_t""no" 1>&6
+echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
+echo "configure:10234: 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 10239 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+builtin and then its argument prototype would still apply.  */
+char openpty();
+int main() {
+openpty()
+; return 0; }
+EOF
+if { (eval echo configure:10250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=yes"
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+xe_check_libs=""
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+echo "$ac_t""yes" 1>&6
+have_openpty=yes need_libutil=yes
+else
+echo "$ac_t""no" 1>&6
+fi
+fi
+if test "$have_openpty" = "yes"; then
+{ test "$extra_verbose" = "yes" && cat << \EOF
+Defining HAVE_OPENPTY
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_OPENPTY 1
+EOF
+}
+for ac_hdr in pty.h libutil.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:10285: checking for $ac_hdr" >&5
+cat > conftest.$ac_ext <<EOF
+#line 10288 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10293: \"$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
+test "$need_libutil" = "yes" && libs_system="$libs_system -lutil" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"-lutil\" to \$libs_system"; fi
+fi
+for ac_hdr in sys/stropts.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:10329: checking for $ac_hdr" >&5
+cat > conftest.$ac_ext <<EOF
+#line 10332 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10337: \"$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
+if test "$ac_cv_header_sys_stropts_h" = "yes"; then
+for ac_func in isastream
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:10370: checking for $ac_func" >&5
+cat > conftest.$ac_ext <<EOF
+#line 10373 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+builtin and then its argument prototype would still apply.  */
+char $ac_func();
+int main() {
+/* The GNU C library defines this for functions which it implements
+to always fail with ENOSYS.  Some functions are actually named
+something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:10396: \"$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
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+echo "$ac_t""yes" 1>&6
+ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+{ test "$extra_verbose" = "yes" && cat << EOF
+Defining $ac_tr_func
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+}
+else
+echo "$ac_t""no" 1>&6
+fi
+done
+for ac_hdr in sys/strtio.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:10427: checking for $ac_hdr" >&5
+cat > conftest.$ac_ext <<EOF
+#line 10430 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10435: \"$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
+fi
+extra_objs="$extra_objs realpath.o" &&  if test "$extra_verbose" = "yes"; then
+echo "    xemacs will be linked with \"realpath.o\""
+fi
+for ac_func in getloadavg
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:10472: checking for $ac_func" >&5
+cat > conftest.$ac_ext <<EOF
+#line 10475 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+builtin and then its argument prototype would still apply.  */
+char $ac_func();
+int main() {
+/* The GNU C library defines this for functions which it implements
+to always fail with ENOSYS.  Some functions are actually named
+something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:10498: \"$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
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+echo "$ac_t""yes" 1>&6
+ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+{ test "$extra_verbose" = "yes" && cat << EOF
+Defining $ac_tr_func
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+}
+else
+echo "$ac_t""no" 1>&6
+fi
+done
+if test "$ac_cv_func_getloadavg" = "yes"; then
+for ac_hdr in sys/loadavg.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:10531: checking for $ac_hdr" >&5
+cat > conftest.$ac_ext <<EOF
+#line 10534 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10539: \"$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
+else
+extra_objs="$extra_objs getloadavg.o" &&  if test "$extra_verbose" = "yes"; then
 echo "    xemacs will be linked with \"getloadavg.o\""
 fi
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:9689: checking for kstat_open in -lkstat" >&5
+echo "configure:10575: 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 9694 "configure"
+#line 10580 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char kstat_open();
 int main() {
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:9705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
 echo "$ac_t""no" 1>&6
 fi
+for ac_hdr in kstat.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:10626: checking for $ac_hdr" >&5
+cat > conftest.$ac_ext <<EOF
+#line 10629 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10634: \"$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
 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:9739: checking for kvm_read in -lkvm" >&5
+echo "configure:10666: 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 9744 "configure"
+#line 10671 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char kvm_read();
 int main() {
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:9755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:9789: checking whether netdb declares h_errno" >&5
+echo "configure:10716: checking whether netdb declares h_errno" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9791 "configure"
+#line 10718 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:9798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10725: \"$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_H_ERRNO
 EOF
 echo "$ac_t""no" 1>&6
 fi
 rm -f conftest*
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:9818: checking for sigsetjmp" >&5
+echo "configure:10745: checking for sigsetjmp" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9820 "configure"
+#line 10747 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:9827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10754: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 echo "$ac_t""yes" 1>&6
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_SIGSETJMP
 EOF
 echo "$ac_t""no" 1>&6
 fi
 rm -f conftest*
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:9847: checking whether localtime caches TZ" >&5
+echo "configure:10774: checking whether localtime caches TZ" >&5
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 9851 "configure"
+#line 10778 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
 # include <stdlib.h>
 #endif
 if (localtime (&now)->tm_hour != hour_unset)
 exit (1);
 exit (0);
 }
 EOF
-if { (eval echo configure:9886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:10813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 emacs_cv_localtime_cache=no
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 fi
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:9916: checking whether gettimeofday accepts one or two arguments" >&5
+echo "configure:10843: checking whether gettimeofday accepts one or two arguments" >&5
 cat > conftest.$ac_ext <<EOF
-#line 9918 "configure"
+#line 10845 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>
 #endif
 int main() {
 struct timeval time;
-struct timezone dummy;
+gettimeofday (&time, 0);
-gettimeofday (&time, &dummy);
 ; return 0; }
 EOF
-if { (eval echo configure:9940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10866: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 rm -f conftest*
 fi
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:9962: checking for inline" >&5
+echo "configure:10888: checking for inline" >&5
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
 cat > conftest.$ac_ext <<EOF
-#line 9967 "configure"
+#line 10893 "configure"
 #include "confdefs.h"
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:9974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
 ac_cv_c_inline=$ac_kw; break
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 EOF
 }
 ;;
 esac
-if test "$ac_cv_c_inline" != "no"; then
+test "$ac_cv_c_inline" != "no" -a "$GCC" = "yes" && extra_objs="$extra_objs inline.o" &&  if test "$extra_verbose" = "yes"; then
-{ test "$extra_verbose" = "yes" && cat << \EOF
-Defining HAVE_INLINE
-EOF
-cat >> confdefs.h <<\EOF
-#define HAVE_INLINE 1
-EOF
-}
-test "$GCC" = "yes" && extra_objs="$extra_objs inline.o" &&  if test "$extra_verbose" = "yes"; then
 echo "    xemacs will be linked with \"inline.o\""
 fi
-fi
 # 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:10024: checking for working alloca.h" >&5
+echo "configure:10940: checking for working alloca.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10027 "configure"
+#line 10943 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:10034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10950: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 fi
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:10058: checking for alloca" >&5
+echo "configure:10974: checking for alloca" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10061 "configure"
+#line 10977 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
 #else
 int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:10089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11005: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 EOF
 }
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:10128: checking whether alloca needs Cray hooks" >&5
+echo "configure:11044: checking whether alloca needs Cray hooks" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10131 "configure"
+#line 11047 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
 #else
 wenotbecray
 echo "$ac_t""$ac_cv_os_cray" 1>&6
 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:10155: checking for $ac_func" >&5
+echo "configure:11071: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10158 "configure"
+#line 11074 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char $ac_func(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 $ac_func();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:10181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11097: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 done
 fi
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:10211: checking stack direction for C alloca" >&5
+echo "configure:11127: checking stack direction for C alloca" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10214 "configure"
+#line 11130 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
 static char *addr = 0;
 auto char dummy;
 main ()
 {
 exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:10233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 ac_cv_c_stack_direction=1
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 echo "    xemacs will be linked with \"$ALLOCA\""
 fi
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:10262: checking for vfork.h" >&5
+echo "configure:11178: checking for vfork.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10265 "configure"
+#line 11181 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11186: \"$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
 else
 echo "$ac_t""no" 1>&6
 fi
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:10298: checking for working vfork" >&5
+echo "configure:11214: checking for working vfork" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10301 "configure"
+#line 11217 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 	 || fstat(fileno(stdout), &st) != 0
 	 );
 }
 }
 EOF
-if { (eval echo configure:10396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 ac_cv_func_vfork_works=yes
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 fi
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:10422: checking for working strcoll" >&5
+echo "configure:11338: checking for working strcoll" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10425 "configure"
+#line 11341 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
 {
 exit (strcoll ("abc", "def") >= 0 ||
 	strcoll ("ABC", "DEF") >= 0 ||
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:10435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 ac_cv_func_strcoll_works=yes
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10463: checking for $ac_func" >&5
+echo "configure:11379: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10466 "configure"
+#line 11382 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char $ac_func(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 $ac_func();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:10489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11405: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "$ac_t""no" 1>&6
 fi
 done
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:10517: checking whether getpgrp takes no argument" >&5
+echo "configure:11433: checking whether getpgrp takes no argument" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10520 "configure"
+#line 11436 "configure"
 #include "confdefs.h"
 /*
 * If this system has a BSD-style getpgrp(),
 * which takes a pid argument, exit unsuccessfully.
 exit(s>>8);
 }
 }
 EOF
-if { (eval echo configure:10575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 ac_cv_func_getpgrp_void=yes
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 fi
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:10602: checking for working mmap" >&5
+echo "configure:11518: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 10605 "configure"
+#line 11521 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/mman.h>
 return 0;
 perror ("conftest: mmap failed");
 return 1;
 }
 EOF
-if { (eval echo configure:10638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 have_mmap=yes
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 #define HAVE_MMAP 1
 EOF
 }
-test "$GNU_MALLOC" != "yes"   -a "$have_mmap" != "yes" && rel_alloc=no
+test "$GNU_MALLOC" != "yes" -a "$have_mmap" != "yes" && rel_alloc=no
-test "$rel_alloc" = "default" -a "$have_mmap"  = "yes" && rel_alloc=yes
+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:11580: checking for M_MMAP_THRESHOLD" >&5
+cat > conftest.$ac_ext <<EOF
+#line 11582 "configure"
+#include "confdefs.h"
+#include <malloc.h>
+int main() {
+#ifndef M_MMAP_THRESHOLD
+#error No M_MMAP_THRESHOLD :-(
+!@+$%^&*_)(_ - unlikely to compile...
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:11594: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+rm -rf conftest*
+rel_alloc=no; echo "$ac_t""yes" 1>&6;
+else
+echo "configure: failed program was:" >&5
+cat conftest.$ac_ext >&5
+rm -rf conftest*
+rel_alloc=yes; echo "$ac_t""no" 1>&6;
+fi
+rm -f conftest*
+else
+rel_alloc=yes
+fi
+fi
 test "$rel_alloc" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
 Defining REL_ALLOC
 EOF
 cat >> confdefs.h <<\EOF
 #define REL_ALLOC 1
 }
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:10673: checking for termios.h" >&5
+echo "configure:11619: checking for termios.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10676 "configure"
+#line 11622 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11627: \"$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
 else
 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:10724: checking for termio.h" >&5
+echo "configure:11670: checking for termio.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10727 "configure"
+#line 11673 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11678: \"$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
 fi
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:10764: checking for socket" >&5
+echo "configure:11710: checking for socket" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10767 "configure"
+#line 11713 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char socket(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 socket();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:10790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11736: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
 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:10805: checking for netinet/in.h" >&5
+echo "configure:11751: checking for netinet/in.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10808 "configure"
+#line 11754 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11759: \"$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
 rm -f conftest*
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
 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:10830: checking for arpa/inet.h" >&5
+echo "configure:11776: checking for arpa/inet.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10833 "configure"
+#line 11779 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11784: \"$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
 #define HAVE_SOCKETS 1
 EOF
 }
 echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:10863: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:11809: checking "for sun_len member in struct sockaddr_un"" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10865 "configure"
+#line 11811 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 int main() {
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:10876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11822: \"$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
 EOF
 cat >> confdefs.h <<\EOF
 rm -rf conftest*
 echo "$ac_t""no" 1>&6
 fi
 rm -f conftest*
 echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:10894: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:11840: checking "for ip_mreq struct in netinet/in.h"" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10896 "configure"
+#line 11842 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <netinet/in.h>
 int main() {
 static struct ip_mreq x;
 ; return 0; }
 EOF
-if { (eval echo configure:10906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11852: \"$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
 EOF
 cat >> confdefs.h <<\EOF
 echo "$ac_t""no" 1>&6
 fi
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:10937: checking for msgget" >&5
+echo "configure:11883: checking for msgget" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10940 "configure"
+#line 11886 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char msgget(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 msgget();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:10963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11909: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if eval "test \"`echo '$ac_cv_func_'msgget`\" = yes"; then
 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:10978: checking for sys/ipc.h" >&5
+echo "configure:11924: checking for sys/ipc.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 10981 "configure"
+#line 11927 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11932: \"$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
 rm -f conftest*
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
 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:11003: checking for sys/msg.h" >&5
+echo "configure:11949: checking for sys/msg.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11006 "configure"
+#line 11952 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11011: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11957: \"$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
 fi
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:11049: checking for dirent.h" >&5
+echo "configure:11995: checking for dirent.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11052 "configure"
+#line 11998 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12003: \"$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
 else
 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:11084: checking for sys/dir.h" >&5
+echo "configure:12030: checking for sys/dir.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11087 "configure"
+#line 12033 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12038: \"$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
 fi
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:11125: checking for nlist.h" >&5
+echo "configure:12071: checking for nlist.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11128 "configure"
+#line 12074 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12079: \"$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
 fi
 echo "checking "for sound support"" 1>&6
-echo "configure:11163: checking "for sound support"" >&5
+echo "configure:12109: 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:11170: checking for multimedia/audio_device.h" >&5
+echo "configure:12116: checking for multimedia/audio_device.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11173 "configure"
+#line 12119 "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:11178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12124: \"$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
 case "$canonical" in
 *-sgi-* )
 if test -z "$native_sound_lib"; then
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:11226: checking for ALopenport in -laudio" >&5
+echo "configure:12172: 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 11231 "configure"
+#line 12177 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char ALopenport();
 int main() {
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:11242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi ;;
 hppa*-hp-hpux* )
 if test -z "$native_sound_lib"; then
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:11273: checking for AOpenAudio in -lAlib" >&5
+echo "configure:12219: 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 11278 "configure"
+#line 12224 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char AOpenAudio();
 int main() {
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:11289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test -z "$sound_found"; then
 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:11327: checking for ${dir}/soundcard.h" >&5
+echo "configure:12273: checking for ${dir}/soundcard.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11330 "configure"
+#line 12276 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11335: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12281: \"$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
 need_miscplay=yes
 extra_objs="$extra_objs linuxplay.o" &&  if test "$extra_verbose" = "yes"; then
 echo "    xemacs will be linked with \"linuxplay.o\""
 fi
 { test "$extra_verbose" = "yes" && cat << EOF
-Defining SOUNDCARD_H_PATH = "${dir}/soundcard.h"
+Defining SOUNDCARD_H_FILE = "${dir}/soundcard.h"
 EOF
 cat >> confdefs.h <<EOF
-#define SOUNDCARD_H_PATH "${dir}/soundcard.h"
+#define SOUNDCARD_H_FILE "${dir}/soundcard.h"
 EOF
 }
 break
 else
 echo "$ac_t""no" 1>&6
 fi
 done
+fi
+if test -z "$sound_found"; then
+if test "$with_msw" = "yes"; then
+sound_found=yes
+native_sound_lib=
+fi
 fi
 test "$sound_found" = "yes" && with_native_sound=yes
 fi
 fi
 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:11389: checking for audio/audiolib.h" >&5
+echo "configure:12342: checking for audio/audiolib.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11392 "configure"
+#line 12345 "configure"
 #include "confdefs.h"
 #include <audio/audiolib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11397: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12350: \"$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
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
 echo "$ac_t""yes" 1>&6
 echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6
-echo "configure:11415: checking for AuOpenServer in -laudio" >&5
+echo "configure:12368: 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 11420 "configure"
+#line 12373 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char AuOpenServer();
 int main() {
 AuOpenServer()
 ; return 0; }
 EOF
-if { (eval echo configure:11431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 extra_objs="$extra_objs nas.o" &&  if test "$extra_verbose" = "yes"; then
 echo "    xemacs will be linked with \"nas.o\""
 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 11470 "configure"
+#line 12423 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 egrep "AuXtErrorJump" >/dev/null 2>&1; then
 if test "$with_esd_sound" != "no"; then
 # 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:11501: checking for $ac_word" >&5
+echo "configure:12454: 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.
 else
 IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
 if test "$have_esd_config" = "yes"; then
 save_c_switch_site="$c_switch_site" save_LIBS="$LIBS"
 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:11530: checking for esd_play_stream" >&5
+echo "configure:12483: checking for esd_play_stream" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11533 "configure"
+#line 12486 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char esd_play_stream(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 esd_play_stream();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:11556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12509: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 test -z "$with_tty" && with_tty=yes
 if test "$with_tty" = "yes"  ; then
 echo "checking for TTY-related features" 1>&6
-echo "configure:11607: checking for TTY-related features" >&5
+echo "configure:12560: checking for TTY-related features" >&5
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_TTY
 EOF
 cat >> confdefs.h <<\EOF
 #define HAVE_TTY 1
 fi
 if test -z "$with_ncurses"; then
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:11623: checking for tgetent in -lncurses" >&5
+echo "configure:12576: 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 11628 "configure"
+#line 12581 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char tgetent();
 int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:11639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 EOF
 }
 ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:11672: checking for ncurses/curses.h" >&5
+echo "configure:12625: checking for ncurses/curses.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11675 "configure"
+#line 12628 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12633: \"$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
 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
-curses_h_path=ncurses/curses.h
+curses_h_file=ncurses/curses.h
 else
 echo "$ac_t""no" 1>&6
 fi
 ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:11702: checking for ncurses/term.h" >&5
+echo "configure:12655: checking for ncurses/term.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11705 "configure"
+#line 12658 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12663: \"$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
 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
-term_h_path=ncurses/term.h
+term_h_file=ncurses/term.h
 else
 echo "$ac_t""no" 1>&6
 fi
 extra_objs="$extra_objs terminfo.o" &&  if test "$extra_verbose" = "yes"; then
 if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then
 save_c_switch_site="$c_switch_site"
 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:11740: checking for ncurses/curses.h" >&5
+echo "configure:12693: checking for ncurses/curses.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11743 "configure"
+#line 12696 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12701: \"$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
 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
-curses_h_path=ncurses/curses.h
+curses_h_file=ncurses/curses.h
 else
 echo "$ac_t""no" 1>&6
 fi
 if test "$ac_cv_header_ncurses_curses_h" = "yes"
 	LIBS="$libs_termcap $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"$libs_termcap\" to \$LIBS"; fi
 else
 	for lib in curses termlib termcap; do
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:11783: checking for tgetent in -l$lib" >&5
+echo "configure:12736: 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 11788 "configure"
+#line 12741 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char tgetent();
 int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:11799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test -n "$libs_termcap"; then
 	LIBS="$libs_termcap $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"$libs_termcap\" to \$LIBS"; fi
 else
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:11830: checking for tgetent in -lcurses" >&5
+echo "configure:12783: 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 11835 "configure"
+#line 12788 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char tgetent();
 int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:11846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 echo "$ac_t""yes" 1>&6
 LIBS="-lcurses $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lcurses\" to \$LIBS"; fi
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:11864: checking for tgetent in -ltermcap" >&5
+echo "configure:12817: 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 11869 "configure"
+#line 12822 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char tgetent();
 int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:11880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 fi
 fi
 { test "$extra_verbose" = "yes" && cat << EOF
-Defining CURSES_H_PATH = "${curses_h_path-curses.h}"
+Defining CURSES_H_FILE = "${curses_h_file-curses.h}"
 EOF
 cat >> confdefs.h <<EOF
-#define CURSES_H_PATH "${curses_h_path-curses.h}"
+#define CURSES_H_FILE "${curses_h_file-curses.h}"
 EOF
 }
 { test "$extra_verbose" = "yes" && cat << EOF
-Defining TERM_H_PATH = "${term_h_path-term.h}"
+Defining TERM_H_FILE = "${term_h_file-term.h}"
 EOF
 cat >> confdefs.h <<EOF
-#define TERM_H_PATH "${term_h_path-term.h}"
+#define TERM_H_FILE "${term_h_file-term.h}"
 EOF
 }
 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:11928: checking for gpm.h" >&5
+echo "configure:12881: checking for gpm.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11931 "configure"
+#line 12884 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11936: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12889: \"$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
 with_gpm=no
 fi
 }
 test -z "$with_gpm" && {
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:11959: checking for Gpm_Open in -lgpm" >&5
+echo "configure:12912: 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 11964 "configure"
+#line 12917 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char Gpm_Open();
 int main() {
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:11975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
 != "no no no" && echo "checking for database support" 1>&6
-echo "configure:12025: checking for database support" >&5
+echo "configure:12978: 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:12030: checking for ndbm.h" >&5
+echo "configure:12983: checking for ndbm.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12033 "configure"
+#line 12986 "configure"
 #include "confdefs.h"
 #include <ndbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12991: \"$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
 fi
 if test "$with_database_gdbm" != "no"; then
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:12068: checking for dbm_open in -lgdbm" >&5
+echo "configure:13021: 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 12073 "configure"
+#line 13026 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char dbm_open();
 int main() {
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:12084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test "$with_database_dbm" != "no"; then
 echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:12112: checking for dbm_open" >&5
+echo "configure:13065: checking for dbm_open" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12115 "configure"
+#line 13068 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char dbm_open(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 dbm_open();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:12138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13091: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:12157: checking for dbm_open in -ldbm" >&5
+echo "configure:13110: 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 12162 "configure"
+#line 13115 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char dbm_open();
 int main() {
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:12173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 }
 if test "$with_database_berkdb" != "no"; then
 echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:12214: checking for Berkeley db.h" >&5
+echo "configure:13167: checking for Berkeley db.h" >&5
-for path in "db/db.h" "db.h"; do
+for header in "db/db.h" "db.h"; do
 cat > conftest.$ac_ext <<EOF
-#line 12217 "configure"
+#line 13170 "configure"
 #include "confdefs.h"
+#include <stdlib.h>
+#if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1)
 #ifdef HAVE_INTTYPES_H
 #define __BIT_TYPES_DEFINED__
 #include <inttypes.h>
 typedef uint8_t  u_int8_t;
 typedef uint16_t u_int16_t;
 typedef uint32_t u_int32_t;
 #ifdef WE_DONT_NEED_QUADS
 typedef uint64_t u_int64_t;
 #endif
 #endif
-#include <$path>
+#endif
+#include <$header>
 int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:12235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 rm -rf conftest*
-db_h_path="$path"; break
+db_h_file="$header"; break
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
 done
-if test -z "$db_h_path"
+if test -z "$db_h_file"
 then echo "$ac_t""no" 1>&6; with_database_berkdb=no
-else echo "$ac_t""$db_h_path" 1>&6
+else echo "$ac_t""$db_h_file" 1>&6
 fi
 if test "$with_database_berkdb" != "no"; then
 echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:12251: checking for Berkeley DB version" >&5
+echo "configure:13208: checking for Berkeley DB version" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12253 "configure"
+#line 13210 "configure"
 #include "confdefs.h"
-#include <$db_h_path>
+#include <$db_h_file>
 #if DB_VERSION_MAJOR > 1
 yes
 #endif
 EOF
 echo "$ac_t""1" 1>&6; dbfunc=dbopen
 fi
 rm -f conftest*
 echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:12272: checking for $dbfunc" >&5
+echo "configure:13229: checking for $dbfunc" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12275 "configure"
+#line 13232 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char $dbfunc(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 $dbfunc();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:12298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13255: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:12317: checking for $dbfunc in -ldb" >&5
+echo "configure:13274: 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 12322 "configure"
+#line 13279 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char $dbfunc();
 int main() {
 $dbfunc()
 ; return 0; }
 EOF
-if { (eval echo configure:12333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 fi
 if test "$with_database_berkdb" = "yes"; then
 { test "$extra_verbose" = "yes" && cat << EOF
-Defining DB_H_PATH = "$db_h_path"
+Defining DB_H_FILE = "$db_h_file"
 EOF
 cat >> confdefs.h <<EOF
-#define DB_H_PATH "$db_h_path"
+#define DB_H_FILE "$db_h_file"
 EOF
 }
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_BERKELEY_DB
 fi
 if test "$with_socks" = "yes"; then
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:12397: checking for SOCKSinit in -lsocks" >&5
+echo "configure:13354: 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 12402 "configure"
+#line 13359 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char SOCKSinit();
 int main() {
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:12413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 LIBS="-Bstatic -lut -Bdynamic $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-Bstatic -lut -Bdynamic\" to \$LIBS"; fi
 fi
 if test "$with_modules" != "no"; then
 echo "checking for module support" 1>&6
-echo "configure:12468: checking for module support" >&5
+echo "configure:13425: checking for module support" >&5
-ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
+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:12472: checking for dlfcn.h" >&5
+echo "configure:13432: checking for dlfcn.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12475 "configure"
+#line 13435 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12480: \"$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*
 eval "ac_cv_header_$ac_safe=yes"
 else
 fi
 rm -f conftest*
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
 echo "$ac_t""yes" 1>&6
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:12498: checking for dlopen in -ldl" >&5
+echo "configure:13458: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 xe_check_libs=" -ldl "
 cat > conftest.$ac_ext <<EOF
-#line 12503 "configure"
+#line 13463 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char dlopen();
 int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:12514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 have_dl=yes libdl=dl
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:12533: checking for dlopen in -lc" >&5
+echo "configure:13493: checking for dlopen in -lc" >&5
 ac_lib_var=`echo c'_'dlopen | sed 'y%./+-%__p_%'`
 xe_check_libs=" -lc "
 cat > conftest.$ac_ext <<EOF
-#line 12538 "configure"
+#line 13498 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char dlopen();
 int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:12549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 else
 echo "$ac_t""no" 1>&6
 fi
 if test -n "$have_dl"; then
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_DLOPEN
 EOF
 cat >> confdefs.h <<\EOF
 #define HAVE_DLOPEN 1
 EOF
 }
 else
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:12588: checking for shl_load in -ldld" >&5
+echo "configure:13548: 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 12593 "configure"
+#line 13553 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char shl_load();
 int main() {
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:12604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 xe_check_libs=""
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 echo "$ac_t""yes" 1>&6
 libdl=dld have_dl=yes;
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_SHL_LOAD
 EOF
 cat >> confdefs.h <<\EOF
 #define HAVE_SHL_LOAD 1
 EOF
 else
 echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:12631: checking for dld_init in -ldld" >&5
+echo "configure:13591: 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 12636 "configure"
+#line 13596 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 builtin and then its argument prototype would still apply.  */
 char dld_init();
 int main() {
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:12647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 eval "ac_cv_lib_$ac_lib_var=yes"
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 xe_check_libs=""
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 echo "$ac_t""yes" 1>&6
 libdl=dld have_dl=yes;
 { test "$extra_verbose" = "yes" && cat << \EOF
 Defining HAVE_DLD_INIT
 EOF
 cat >> confdefs.h <<\EOF
 #define HAVE_DLD_INIT 1
 EOF
 fi
 fi
+fi
 if test -n "$have_dl"; then
 dll_ld=
 dll_ldflags=
 dll_cflags=
 ld_dynamic_link_flags=
 xehost=$canonical
 xealias=$internal_configuration
 echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:12692: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:13652: checking how to build dynamic libraries for ${xehost}" >&5
 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
 case "$xehost" in
 *-*-linux-gnu*) ;;
 *-*-linux*) xehost=`echo $xehost | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
 esac
 # Now see if the compiler is really GCC.
 if test "$GCC" = "yes"; then
 XEGCC=yes
 else
 echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:12720: checking checking whether we are using GNU C" >&5
+echo "configure:13680: checking checking whether we are using GNU C" >&5
 cat > conftest.$ac_ext <<EOF
-#line 12722 "configure"
+#line 13682 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 yes;
 #endif
 echo "$ac_t""${XEGCC}" 1>&6
 fi
 echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:12744: checking how to produce PIC code" >&5
+echo "configure:13704: checking how to produce PIC code" >&5
 wl=
 can_build_shared=yes
 if test "$XEGCC" = yes; then
 wl='-Wl,'
 case "$xehost_os" in
 aix3* | aix4* | irix5* | irix6* | osf3* | osf4*)
 # PIC is the default for these OSes.
 ;;
-os2*)
+aix3* | aix4* | os2*)
 # We can build DLLs from non-PIC.
 ;;
 amigaos*)
 # FIXME: we need at least 68020 code to build shared libraries, but
 # adding the `-m68020' flag to GCC prevents building anything better,
 # like `-m68040'.
 dll_cflags='-m68020 -resident32 -malways-restore-a4'
 ;;
+*cygwin* | *mingw* )
+# PIC is the default
+;;
 *)
 dll_cflags='-fPIC'
 ;;
 esac
 else
 esac
 fi
 if test -n "$dll_cflags"; then
 echo "$ac_t""${dll_cflags}" 1>&6
 # 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:12837: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:13800: checking if PIC flag ${dll_cflags} really works" >&5
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $dll_cflags -DPIC"
 cat > conftest.$ac_ext <<EOF
-#line 12841 "configure"
+#line 13804 "configure"
 #include "confdefs.h"
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:12848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13811: \"$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
 # reports no error.  So, we need to grep stderr for (Bundled).
 if grep '(Bundled)' config.log >/dev/null; then
 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:12879: checking if C compiler can produce shared libraries" >&5
+echo "configure:13842: checking if C compiler can produce shared libraries" >&5
 if test "$XEGCC" = yes; then
 xcldf="-shared"
 xldf="-shared"
 else # Not using GCC
 case "$xehost_os" in
 LDFLAGS="$xcldf $LDFLAGS"
 LIBS=
 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 12930 "configure"
+#line 13893 "configure"
 #include "confdefs.h"
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:12937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 rm -rf conftest*
 cc_produces_so=yes
 else
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 if test -z "$LTLD"; then
 ac_prog=ld
 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:12962: checking for ld used by GCC" >&5
+echo "configure:13925: checking for ld used by GCC" >&5
 ac_prog=`($CC -print-prog-name=ld) 2>&5`
 case "$ac_prog" in
 # Accept absolute paths.
 /*)
 if test -z "$LTLD"; then
 with_gnu_ld=unknown
 ;;
 esac
 else
 echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:12987: checking for GNU ld" >&5
+echo "configure:13950: checking for GNU ld" >&5
 fi
 if test -z "$LTLD"; then
 IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
 for ac_dir in $PATH; do
 ld_dynamic_link_flags=
 # 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:13025: checking if the linker is GNU ld" >&5
+echo "configure:13988: 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
 else
 xe_gnu_ld=no
 if test "$cc_produces_so" = "yes"; then
 dll_ld=$CC
 dll_ldflags=$xcldf
 can_build_shared=yes
+ld_shlibs=yes
 else
 # 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:13052: checking whether the linker supports shared libraries" >&5
+echo "configure:14016: checking whether the linker supports shared libraries" >&5
 dll_ld=$CC
 dll_ldflags=$LDFLAGS
 ld_shlibs=yes
 can_build_shared=yes
 if test "$xe_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then
 INSTALL_ARCH_DEP_SUBDIR="$INSTALL_ARCH_DEP_SUBDIR src" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"src\" to \$INSTALL_ARCH_DEP_SUBDIR"; fi
 test -n "$libdl" && LIBS="-l${libdl} $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-l${libdl}\" to \$LIBS"; fi
 for ac_func in dlerror _dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13267: checking for $ac_func" >&5
+echo "configure:14231: checking for $ac_func" >&5
 cat > conftest.$ac_ext <<EOF
-#line 13270 "configure"
+#line 14234 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
 which can conflict with char $ac_func(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 $ac_func();
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:13293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14257: \"$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
 echo "configure: failed program was:" >&5
 cat conftest.$ac_ext >&5
 with_modules=no
 fi
 fi
 cat > conftest.$ac_ext <<EOF
-#line 13332 "configure"
+#line 14296 "configure"
 #include "confdefs.h"
 int main(int c,char *v[]){return 0;}
 EOF
-if { (eval echo configure:13336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:14300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
 :
 else
 conftest_rc="$?"
 echo "configure: failed program was:" >&5
 done
-LOCKDIR=$lockdir
-while true; do
-case "$LOCKDIR" in
-*\$* ) eval "LOCKDIR=$LOCKDIR" ;;
-*) break ;;
-esac
-done
 DOCDIR=$docdir
 while true; do
 case "$DOCDIR" in
 *\$* ) eval "DOCDIR=$DOCDIR" ;;
 *) break ;;
 cat >> confdefs.h <<EOF
 #define EMACS_CONFIG_OPTIONS "$ac_configure_args"
 EOF
 }
-{ test "$extra_verbose" = "yes" && cat << EOF
-Defining config_machfile = "$machfile"
-EOF
-cat >> confdefs.h <<EOF
-#define config_machfile "$machfile"
-EOF
-}
-{ test "$extra_verbose" = "yes" && cat << EOF
-Defining config_opsysfile = "$opsysfile"
-EOF
-cat >> confdefs.h <<EOF
-#define config_opsysfile "$opsysfile"
-EOF
-}
 null_string=""
 { test "$extra_verbose" = "yes" && cat << EOF
 Defining LD_SWITCH_X_SITE = $null_string
 cat >> confdefs.h <<\EOF
 #define EXTERNAL_WIDGET 1
 EOF
 }
-test "$no_doc_file"        = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+test "$quick_build"        = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
-Defining NO_DOC_FILE
+Defining QUICK_BUILD
 EOF
 cat >> confdefs.h <<\EOF
-#define NO_DOC_FILE 1
+#define QUICK_BUILD 1
 EOF
 }
 test "$with_purify"        = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
 Defining PURIFY
 (
 echo "
 XEmacs ${emacs_major_version}.${emacs_minor_version}${xemacs_betaname} \"$xemacs_codename\" configured for \`$canonical'.
+"
-Where should the build process find the source code?    $srcdir
+echo "
-What installation prefix should install use?		  $prefix
+Compilation / Installation:"
-What operating system and machine description files should XEmacs use?
+echo "  Source code location:              $srcdir"
-\`$opsysfile' and \`$machfile'
+echo "  Installation prefix:               $prefix"
-What compiler should XEmacs be built with?              $CC $CFLAGS
+if test -n "$site_includes"; then
-Should XEmacs use the GNU version of malloc?            ${GNU_MALLOC}${GNU_MALLOC_reason}
+echo "  Additional header files:           $site_includes"
-Should XEmacs use the relocating allocator for buffers? $rel_alloc
+fi
-What window system should XEmacs use?                   ${window_system}"
+if test -n "$site_libraries"; then
+echo "  Additional libraries:              $site_libraries"
+fi
+if test -n "$site_prefixes"; then
+echo "  Additional prefixes:               $site_prefixes"
+fi
+if test -n "$runpath"; then
+echo "  Runtime library search path:       $runpath"
+fi
+if test -n "$opsysfile"
+then echo "  Operating system description file: \`$opsysfile'"
+else echo "  Not using any operating system description file"
+fi
+if test -n "$machfile"
+then echo "  Machine description file:          \`$machfile'"
+else echo "  Not using any machine description file"
+fi
+echo "  Compiler:                          $CC $CFLAGS"
+echo "  Relocating allocator for buffers:  $rel_alloc"
+echo "  GNU version of malloc:             ${GNU_MALLOC}${GNU_MALLOC_reason}"
+echo "
+Window System:"
+if test "$with_msw" = "yes"; then
+echo "  Compiling in support for the Microsoft window system."
+fi
 if test "$with_x11" = "yes"; then
-echo "  Where do we find X Windows header files?                $x_includes"
+echo "  Compiling in support for the X window system:"
-echo "  Where do we find X Windows libraries?                   $x_libraries"
+echo "    - X Windows headers location:                 $x_includes"
-fi
+echo "    - X Windows libraries location:               $x_libraries"
-if test -n "$site_includes"; then
+if test "$with_xauth" != yes; then
-echo "  Additional header files:                                $site_includes"
+echo "    - Xau (X authority) not available."
 fi
-if test -n "$site_libraries"; then
+if test "$with_xmu" != yes; then
-echo "  Additional libraries:                                   $site_libraries"
+echo "    - Xmu library not available; substituting equivalent routines."
 fi
-if test -n "$site_prefixes"; then
+if test "$with_wmcommand" != no; then
-echo "  Additional prefixes:                                    $site_prefixes"
+echo "    - Handling WM_COMMAND properly."
 fi
-if test -n "$runpath"; then
+fi
-echo "  Runtime library search path:                            $runpath"
+if test "$need_athena" = "yes"; then
-fi
+echo "  Compiling in support for the Athena widget set:"
-if test "$have_xaw" = "yes"; then
+echo "    - Athena headers location:                    $athena_h_path"
-echo "  Athena library to link:                                 $athena_lib"
+echo "    - Athena library to link:                     $athena_lib"
-echo "  Athena header include path:                             $athena_h_path"
+fi
-fi
+case "$with_menubars" in
-test "$with_dnet"  = yes && echo "  Compiling in support for DNET."
+lucid ) echo "  Using Lucid menubars." ;;
-test "$with_socks" = yes && echo "  Compiling in support for SOCKS."
+motif ) echo "  Using Motif menubars."
-test "$with_xauth" = yes && echo "  Compiling in support for XAUTH."
+echo "  *WARNING*  The Motif menubar implementation is currently buggy."
-if test "$with_xmu" != yes -a "$with_x11" = yes; then
+echo "             We recommend using the Lucid menubar instead."
-echo "  No Xmu; substituting equivalent routines."
+echo "             Re-run configure with --with-menubars='lucid'." ;;
-fi
+msw ) echo "  Using MS-Windows menubars." ;;
+esac
+case "$with_scrollbars" in
+lucid  ) echo "  Using Lucid scrollbars."      ;;
+motif  ) echo "  Using Motif scrollbars."      ;;
+athena ) echo "  Using Athena scrollbars."     ;;
+msw ) echo "  Using MS-Windows scrollbars." ;;
+esac
+case "$with_dialogs" in
+motif  ) echo "  Using Motif dialog boxes."
+if test "$unexec" = "unexaix.o"; then if test "`uname -v`" = 4 -a "`uname -r`" -ge 3; then
+echo "  *WARNING*  The Motif dialog boxes cause problems on AIX 4.3 and higher."
+echo "             We recommend using the Athena dialog boxes instead."
+echo "             Install libXaw and re-run configure with --with-dialogs='athena'."
+echo "             Read the PROBLEMS file for more information."
+fi; fi ;;
+athena ) echo "  Using Athena dialog boxes."     ;;
+msw ) echo "  Using MS-Windows dialog boxes." ;;
+esac
+case "$with_widgets" in
+motif  ) echo "  Using Motif native widgets."      ;;
+athena ) echo "  Using Athena native widgets."     ;;
+msw ) echo "  Using MS-Windows native widgets." ;;
+esac
+if test "$with_dragndrop" = yes; then
+echo "  Compiling in support for Drag'n'Drop (EXPERIMENTAL)."
+echo "    -  Drag'n'Drop prototype:                             $dragndrop_proto."
+fi
+echo "
+TTY:"
+test "$with_ncurses" = yes && echo "  Compiling in support for ncurses."
+test "$with_gpm" = yes && echo "  Compiling in support for GPM (General Purpose Mouse)."
+echo "
+Images:"
+test "$with_gif" = yes && echo "  Compiling in support for GIF  images (builtin)."
 if test "$with_xpm" = yes; then
-echo "  Compiling in support for XPM images."
+echo "  Compiling in support for XPM  images."
 elif test "$with_x11" = yes; then
-echo "  --------------------------------------------------------------------"
+echo "  WARNING: -----------------------------------------------------------"
-echo "  WARNING: Compiling without XPM support."
+echo "  WARNING: Compiling without XPM image support."
 if test "$xpm_problem" != ""; then
 echo "  Reason: $xpm_problem"
 fi
 echo "  WARNING: You should strongly consider installing XPM."
 echo "  WARNING: Otherwise toolbars and other graphics will look suboptimal."
 echo "  WARNING: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux)"
-echo "  --------------------------------------------------------------------"
+echo "  WARNING: -----------------------------------------------------------"
 fi
 if test "$with_png" = yes; then
-echo "  Compiling in support for PNG image handling."
+echo "  Compiling in support for PNG  images."
 elif test "$window_system" != "none"; then
-echo "  --------------------------------------------------------------------"
+echo "  WARNING: -----------------------------------------------------------"
 echo "  WARNING: Compiling without PNG image support."
 if test "$png_problem" != ""; then
 echo "  Reason: $png_problem"
 fi
 echo "  WARNING: You should strongly consider installing the PNG libraries."
 echo "  WARNING: Otherwise certain images and glyphs may not display."
 echo "  WARNING: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux)"
-echo "  --------------------------------------------------------------------"
+echo "  WARNING: -----------------------------------------------------------"
 fi
-test "$with_gif"   = yes && echo "  Compiling in support for (builtin) GIF image handling."
+test "$with_jpeg" = yes && echo "  Compiling in support for JPEG images."
-test "$with_jpeg"  = yes && echo "  Compiling in support for JPEG image handling."
+test "$with_tiff" = yes && echo "  Compiling in support for TIFF images."
-test "$with_tiff"  = yes && echo "  Compiling in support for TIFF image handling."
 test "$with_xface" = yes && echo "  Compiling in support for X-Face message headers."
-test "$with_native_sound" = yes && echo "  Compiling in native sound support."
+echo "
-test "$with_nas_sound"    = yes && echo "  Compiling in network sound (NAS) support."
+Sound:"
-test "$old_nas"           = yes && echo "     nas library lacks error trapping, will play synchronously."
+test "$with_native_sound" = yes && echo "  Compiling in support for sound (native)."
-test "$with_esd_sound"    = yes && echo "  Compiling in support for Enlightened Sound Daemon (ESD)."
+test "$with_nas_sound" = yes && echo "  Compiling in support for NAS (network audio system)."
+test "$old_nas" = yes && echo "    - NAS library lacks error trapping; will play synchronously."
-test "$with_database_berkdb" = yes && echo "  Compiling in support for Berkeley DB."
+test "$with_esd_sound" = yes && echo "  Compiling in support for ESD (Enlightened Sound Daemon)."
+echo "
+Databases:"
+test "$with_database_berkdb" = yes && echo "  Compiling in support for Berkeley database."
 test "$with_database_dbm"    = yes && echo "  Compiling in support for DBM."
 test "$with_database_gdbm"   = yes && echo "  Compiling in support for GNU DBM."
+test "$with_ldap" = yes && echo "  Compiling in support for LDAP."
-test "$with_ldap"	     = yes && echo "  Compiling in support for LDAP."
+if test "$with_postgresql" = yes; then
+echo "  Compiling in support for PostgreSQL."
-test "$with_ncurses"  = yes && echo "  Compiling in support for ncurses."
+echo "    - Using PostgreSQL header file:  $libpq_fe_h_file"
-test "$with_gpm"      = yes && echo "  Compiling in support for GPM (General Purpose Mouse)."
+test "$with_postgresqlv7" = yes && echo "    - Using PostgreSQL V7 bindings."
+fi
-test "$with_mule"     = yes && echo "  Compiling in Mule (multi-lingual) support."
-test "$with_file_coding"     = yes && echo "  Compiling in File coding support."
+echo "
-test "$with_xim"      != no && echo "  Compiling in XIM (X11R5+ I18N input method) support."
+Internationalization:"
-test "$with_xim" = motif    && echo "    Using Motif to provide XIM support."
+test "$with_mule" = yes && echo "  Compiling in support for Mule (multi-lingual Emacs)."
-test "$with_xim" = xlib     && echo "    Using raw Xlib to provide XIM support."
+test "$with_file_coding" = yes && echo "  Compiling in support for file coding."
-test "$with_xfs" = yes      && echo "    Using XFontSet to provide bilingual menubar."
+test "$with_xim" != no && echo "  Compiling in support for XIM (X11R5+ I18N input method)."
-test "$with_canna"    = yes && echo "  Compiling in support for Canna on Mule."
+test "$with_xim" = motif && echo "    - Using Motif to provide XIM support."
+test "$with_xim" = xlib && echo "    - Using raw Xlib to provide XIM support."
+test "$with_xfs" = yes && echo "    - Using XFontSet to provide bilingual menubar."
+test "$with_canna" = yes && echo "  Compiling in support for Canna on Mule."
 if test "$with_wnn" = yes; then
 echo "  Compiling in support for the WNN input method on Mule."
-test "$with_wnn6" = yes && echo "    Using WNN version 6."
+test "$with_wnn6" = yes && echo "    - Using WNN version 6."
 fi
-test "$with_i18n3"    = yes && echo "  Compiling in I18N support, level 3 (doesn't currently work)."
+test "$with_i18n3" = yes && echo "  Compiling in support for I18N level 3 (doesn't currently work)."
-test "$with_cde"      = yes && echo "  Compiling in support for CDE."
+echo "
+Mail:"
+test "$with_pop" = yes && echo "  Compiling in support for POP mail retrieval."
+test "$with_kerberos" = yes && echo "  Compiling in support for Kerberos POP authentication."
+test "$with_hesiod" = yes && echo "  Compiling in support for Hesiod POP server access."
+test -n "$mail_locking" && echo "  Compiling in support for \"$mail_locking\" mail spool file locking method."
+echo "
+Other Features:"
 test "$with_tooltalk" = yes && echo "  Compiling in support for ToolTalk."
-test "$with_offix"    = yes && echo "  Compiling in support for OffiX."
-test "$with_dragndrop" = yes && echo "  Compiling in EXPERIMENTAL support for Drag'n'Drop ($dragndrop_proto )."
 test "$with_workshop" = yes && echo "  Compiling in support for Sun WorkShop."
-test "$with_wmcommand"  != no && echo "  Compiling in support for proper WM_COMMAND handling."
+test "$with_socks" = yes && echo "  Compiling in support for SOCKS."
-case "$with_menubars" in
+test "$with_dnet" = yes && echo "  Compiling in support for DNET."
-lucid ) echo "  Using Lucid menubars." ;;
+test "$with_modules" = "yes" && echo "  Compiling in support for dynamic shared object modules."
-motif ) echo "  Using Motif menubars."
+test "$use_union_type" = yes && echo "  Using the union type for Lisp_Objects."
-echo "  *WARNING*  The Motif menubar implementation is currently buggy."
+test "$pdump" = yes && echo "  Using the new portable dumper."
-echo "             We recommend using the Lucid menubar instead."
+test "$debug" = yes && echo "  Compiling in support for extra debugging code."
-echo "             Re-run configure with --with-menubars='lucid'." ;;
+test "$usage_tracking" = yes && echo "  Compiling in support for active usage tracking (Sun internal)."
-msw ) echo "  Using MS-Windows menubars." ;;
+if test "$error_check_extents $error_check_typecheck $error_check_bufpos $error_check_gc $error_check_malloc $error_check_glyphs" \
-esac
+!= "no no no no no no"; then
-case "$with_scrollbars" in
-lucid    ) echo "  Using Lucid scrollbars."     ;;
-motif    ) echo "  Using Motif scrollbars."     ;;
-athena   ) echo "  Using Athena scrollbars."    ;;
-msw ) echo "  Using MS-Windows scrollbars." ;;
-esac
-case "$with_widgets" in
-motif    ) echo "  Using Motif native widgets."     ;;
-athena   ) echo "  Using Athena native widgets."    ;;
-msw ) echo "  Using MS-Windows native widgets." ;;
-esac
-case "$with_dialogs" in
-motif    )
-echo "  Using Motif dialog boxes."
-if test "$unexec" = "unexaix.o"; then if test "`uname -v`" = 4 -a "`uname -r`" -ge 3; then
-echo "  *WARNING*  The Motif dialog boxes cause problems on AIX 4.3 and higher."
-echo "             We recommend using the Athena dialog boxes instead."
-echo "             Install libXaw and re-run configure with --with-dialogs='athena'."
-echo "             Read the PROBLEMS file for more information."
-fi; fi
-;;
-athena   ) echo "  Using Athena dialog boxes."    ;;
-msw ) echo "  Using MS-Windows dialog boxes." ;;
-esac
-test "$with_modules" = "yes" && echo "  Compiling in dynamic shared object module support."
-test "$with_clash_detection" = yes && \
-echo "  Clash detection will use \"$lockdir\" for locking files."
-echo "  movemail will use \"$mail_locking\" for locking mail spool files."
-test "$with_pop"	= yes && echo "  Using POP for mail access."
-test "$with_kerberos"	= yes && echo "  Using Kerberos for POP authentication."
-test "$with_hesiod"	= yes && echo "  Using Hesiod to get POP server host."
-test "$use_union_type"  = yes && echo "  Using the union type for Lisp_Objects."
-test "$pdump"           = yes && echo "  Using the new portable dumper (wishful thinking)."
-test "$debug"           = yes && echo "  Compiling in extra code for debugging."
-test "$usage_tracking"  = yes && echo "  Compiling with usage tracking active (Sun internal)."
-if test "$error_check_extents $error_check_typecheck $error_check_bufpos $error_check_gc $error_check_malloc" \
-!= "no no no no no"; then
 echo "  WARNING: ---------------------------------------------------------"
 echo "  WARNING: Compiling in support for runtime error checking."
 echo "  WARNING: XEmacs will run noticeably more slowly as a result."
 echo "  WARNING: Error checking is on by default for XEmacs beta releases."
 echo "  WARNING: ---------------------------------------------------------"
 s%@SITEMODULEDIR_USER_DEFINED@%$SITEMODULEDIR_USER_DEFINED%g
 s%@SITEMODULEDIR@%$SITEMODULEDIR%g
 s%@etcdir@%$etcdir%g
 s%@ETCDIR_USER_DEFINED@%$ETCDIR_USER_DEFINED%g
 s%@ETCDIR@%$ETCDIR%g
-s%@lockdir@%$lockdir%g
-s%@LOCKDIR_USER_DEFINED@%$LOCKDIR_USER_DEFINED%g
-s%@LOCKDIR@%$LOCKDIR%g
 s%@docdir@%$docdir%g
 s%@DOCDIR_USER_DEFINED@%$DOCDIR_USER_DEFINED%g
 s%@DOCDIR@%$DOCDIR%g
 s%@archlibdir@%$archlibdir%g
 s%@ARCHLIBDIR_USER_DEFINED@%$ARCHLIBDIR_USER_DEFINED%g
 echo creating $dir/Makefile
 $CPP -I. -I${top_srcdir}/src  junk.c \
 | sed -e 's/^\#.*//'		\
 	-e 's/^[ 	][ 	]*$//'\
 	-e 's/^ /	/'		\
-| sed -n -e '/^..*$/p'	\
+	-e '/^[ ]*$/d'	\
-| sed '/^\"/ {
+	-e '/^\"/ {
 	s/\\\([\"]\)/\1/g
 	s/^[ 	]*\"//
 	s/\"[ 	]*$//
 }' > Makefile.new
 chmod 444 Makefile.new
 echo creating $dir/GNUmakefile
 $CPP -I. -I${top_srcdir}/src -DUSE_GNU_MAKE junk.c \
 | sed -e 's/^\#.*//'		\
 	-e 's/^[ 	][ 	]*$//'\
 	-e 's/^ /	/'		\
-| sed -n -e '/^..*$/p'	\
+	-e '/^[ ]*$/d'	\
-| sed '/^\"/ {
+	-e '/^\"/ {
 	s/\\\([\"]\)/\1/g
 	s/^[ 	]*\"//
 	s/\"[ 	]*$//
 }' > Makefile.new
 chmod 444 Makefile.new

Mercurial > hg > xemacs-beta

comparison configure @ 442:abe6d1db359e r21-2-36